[oe-commits] Florian Boor : gst-plugins-bad: Do not build problematic AAC codec building an enterprise distro.

[git at git.openembedded.org]

Module: openembedded.git
Branch: master
Commit: 86ff745847ebfcfb77730851b72a7d576422c660
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=86ff745847ebfcfb77730851b72a7d576422c660

Author: Florian Boor <florian at kernelconcepts.de>
Date:   Wed Sep 26 11:07:42 2012 +0200

gst-plugins-bad: Do not build problematic AAC codec building an enterprise distro.

     AAC codecs are problematic to ship. Ensure not to pull these in building
     for an Enterprise distribution. Tested for ARMv5TE for now.

Signed-off-by: Florian Boor <florian.boor at kernelconcepts.de>

---

 recipes/gstreamer/gst-plugins-bad_0.10.21.bb |    9 ++++++---
 recipes/gstreamer/gst-plugins.inc            |    6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.21.bb b/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
index da73ae1..15439d2 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
@@ -7,7 +7,7 @@ SRC_URI[archive.sha256sum] = "422badacbda37ac33cb446c6751dabcd0b223c308dbb01024a
 
 DEPENDS += "opencv orc-native orc libcdaudio gst-plugins-base openssl directfb libmodplug librsvg"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # We don't have vdpau headers in OE and it creates crosscompile badness.
 # Also, mpeg2enc and mplex from mjpegtools don't build, because of AC_TRY_RUN.
@@ -17,6 +17,8 @@ EXTRA_OECONF += " \
         --disable-vdpau \
 "
 
+EXTRA_OECONF += "${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-faac --disable-faad', '', d)}"
+
 PACKAGES_DYNAMIC = "\
 gst-plugin-adpcmdec* \
 gst-plugin-adpcmenc* \
@@ -40,8 +42,6 @@ gst-plugin-dtmf* \
 gst-plugin-dvb* \
 gst-plugin-dvbsuboverlay* \
 gst-plugin-dvdspu* \
-gst-plugin-faac* \
-gst-plugin-faad* \
 gst-plugin-fbdevsink* \
 gst-plugin-festival* \
 gst-plugin-freeze* \
@@ -100,3 +100,6 @@ gst-plugin-vmnc* \
 gst-plugin-vp8* \
 gst-plugin-y4mdec* \
 "
+
+PACKAGES_DYNAMIC += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-faac* gst-plugin-faad*', d)}"
+
diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc
index 1813841..b2c575a 100644
--- a/recipes/gstreamer/gst-plugins.inc
+++ b/recipes/gstreamer/gst-plugins.inc
@@ -2,10 +2,10 @@ require gst-common.inc
 require gst-plugins-package.inc
 
 DESCRIPTION = "Plugins for GStreamer"
-DEPENDS += "libcdio wavpack libvisual gstreamer jack virtual/libsdl libvpx x264 libmms libmusicbrainz schroedinger faac faad2 libmikmod liboil libogg tremor libvorbis"
-DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
+DEPENDS += "libcdio wavpack libvisual gstreamer jack virtual/libsdl libvpx x264 libmms libmusicbrainz schroedinger libmikmod liboil libogg tremor libvorbis"
+DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag faac faad2', d)}"
 
-INC_PR = "r11"
+INC_PR = "r12"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2;name=archive"