[PATCH 0/4] GStreamer 0.10 improvements

[PATCH 0/4] GStreamer 0.10 improvements

[Ross Burton]

Hi,

Found these sitting in a branch that was never sent.  Two small fixes and then
element selection cleanup to use PACKAGECONFIG.

Ross

The following changes since commit edcbb79583e1577cb64d368e3902915dea50a96e:

  ref-manual: Added note about issues on supported distros (2013-06-21 14:26:31 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/gst

for you to fetch changes up to f8e66c6a3d0ae67e780bfd2d8191ba3a729f2800:

  gst-plugins-bad: element selection rationalisation (2013-06-24 09:51:01 +0100)

----------------------------------------------------------------
Ross Burton (4):
      gst-plugins-bad: use correct option when enabling librsvg
      gst-plugins-bad: tremor was moved from here to -base
      gst-plugins-base: element selection rationalisation
      gst-plugins-bad: element selection rationalisation

 .../gstreamer/gst-plugins-bad_0.10.23.bb             |   18 ++++++++++++------
 .../gstreamer/gst-plugins-base_0.10.36.bb            |   12 +++++++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

Ross Burton (4):
  gst-plugins-bad: use correct option when enabling librsvg
  gst-plugins-bad: tremor was moved from here to -base
  gst-plugins-base: element selection rationalisation
  gst-plugins-bad: element selection rationalisation

 .../gstreamer/gst-plugins-bad_0.10.23.bb             |   18 ++++++++++++------
 .../gstreamer/gst-plugins-base_0.10.36.bb            |   12 +++++++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

-- 
1.7.10.4

[PATCH 1/4] gst-plugins-bad: use correct option when enabling librsvg

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
index 80a8b04..3d86f00 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disab
                  --disable-orc --disable-neon"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'librsvg', '', d)}"
-PACKAGECONFIG[librsvg] = "--enable-librsvg,--disable-librsvg,librsvg,"
+PACKAGECONFIG[librsvg] = "--enable-rsvg,--disable-rsvg,librsvg,"
 
 ARM_INSTRUCTION_SET = "arm"
 
-- 
1.7.10.4

[PATCH 2/4] gst-plugins-bad: tremor was moved from here to -base

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
index 3d86f00..87f338f 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
@@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c"
 
-DEPENDS += "gst-plugins-base tremor curl"
+DEPENDS += "gst-plugins-base curl"
 
 PR = "r4"
 
 inherit gettext
 
 EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio --disable-directfb \
-                 --with-plugins=wavpack,ivorbis,mpegvideoparse --disable-vdpau --disable-apexsink \
+                 --with-plugins=wavpack,mpegvideoparse --disable-vdpau --disable-apexsink \
                  --disable-orc --disable-neon"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'librsvg', '', d)}"
-- 
1.7.10.4

[PATCH 3/4] gst-plugins-base: element selection rationalisation

[Ross Burton]

Use PACKAGECONFIG to control the X11 elements, and add statements for the
elements that we don't always enable.

Remove the freetype dependency as it's apparently (but not really) only needed
by the examples.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../gstreamer/gst-plugins-base_0.10.36.bb                  |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
index 462c54d..26c562c 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
 
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv libsm libice', '', d)}"
-DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora util-linux tremor"
+DEPENDS += "alsa-lib liboil libogg libvorbis libtheora util-linux tremor"
 
 SRC_URI += "file://gst-plugins-base-tremor.patch \
             file://configure.ac-fix-subparse-plugin.patch"
@@ -19,7 +18,14 @@ PR = "r7"
 
 inherit gettext
 
-EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-gnome_vfs --disable-orc"
+EXTRA_OECONF += "--disable-freetypetest"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+
+PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs"
+PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
+PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
+PACKAGECONFIG[x11] = "--enable-x --enable-xvideo,--disable-x --disable-xvideo,virtual/libx11 libxv libsm libice"
 
 do_configure_prepend() {
 	# This m4 file contains nastiness which conflicts with libtool 2.2.2
-- 
1.7.10.4

[PATCH 4/4] gst-plugins-bad: element selection rationalisation

[Ross Burton]

Using --with-plugins means you only get the elements you enable, so we were
dropping vast numbers of useful plugins such as the MPEG muxers.

Instead, follow gst-plugins-base by using PACKAGECONFIG to enable/disable
plugins with optional dependencies.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../gstreamer/gst-plugins-bad_0.10.23.bb             |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
index 87f338f..a3a1204 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
@@ -6,18 +6,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c"
 
-DEPENDS += "gst-plugins-base curl"
+DEPENDS += "gst-plugins-base"
 
 PR = "r4"
 
 inherit gettext
 
-EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio --disable-directfb \
-                 --with-plugins=wavpack,mpegvideoparse --disable-vdpau --disable-apexsink \
-                 --disable-orc --disable-neon"
+EXTRA_OECONF += "--disable-experimental \
+                 --disable-sdl --disable-cdaudio --disable-directfb \
+                 --disable-vdpau --disable-apexsink"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'librsvg', '', d)}"
-PACKAGECONFIG[librsvg] = "--enable-rsvg,--disable-rsvg,librsvg,"
+PACKAGECONFIG ??= "bzip curl \
+                   ${@base_contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}"
+
+PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2"
+PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
+PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg,"
+PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
+PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
 
 ARM_INSTRUCTION_SET = "arm"
 
-- 
1.7.10.4