From 87a7f6539f6bd00087f6aaf3a2514054069bbd87 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 30 Sep 2015 10:09:57 +0300 Subject: gstreamer: default to gstreamer 1.0 Fix QA error with gstreamer plugins: ERROR: QA Issue: gstreamer1.0-plugins-ugly: Files/directories were installed but not shipped Emulator does not actually provide opengl, so remove it from DISTRO_FEATURES. gstreamer1.0-plugins-bad build would otherwise fail. Change-Id: I88e157f29ab1a29055fcbd4d2cd7850ca43efead Reviewed-by: Teemu Holappa Reviewed-by: Laszlo Agocs --- conf/distro/b2qt.conf | 4 ++-- conf/distro/include/emulator.conf | 2 +- recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 5e38e3c..f31a9d7 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -41,8 +41,8 @@ DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" -# use GStreamer 0.10, optionally change to "gstreamer" to use GStreamer 1.0 -DISTRO_FEATURES += "gstreamer010" +# use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10 +DISTRO_FEATURES += "gstreamer" PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo" PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native" diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 0457756..28be593 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -34,7 +34,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client" KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest" -DISTRO_FEATURES_remove = "webengine" +DISTRO_FEATURES_remove = "webengine opengl" MACHINE_EXTRA_INSTALL = "\ mount-vboxsf \ diff --git a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend index eee313b..cff6298 100644 --- a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend +++ b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend @@ -1 +1,2 @@ PACKAGECONFIG_append = " x264" +FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/*.prs" -- cgit v1.2.3-54-g00ecf