diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-02-24 18:15:25 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:32:38 +0000 |
| commit | 282fa5ff059db6f6daa108d5ec4ea3d0bfbe0fe2 (patch) | |
| tree | 3833ef47e4b21d4c9d07041407899df27ed409e5 /meta/recipes-multimedia | |
| parent | b21d7de7d992349a77014805bfb17449d37c66f3 (diff) | |
| download | openembedded-core-282fa5ff059db6f6daa108d5ec4ea3d0bfbe0fe2.tar.gz openembedded-core-282fa5ff059db6f6daa108d5ec4ea3d0bfbe0fe2.tar.bz2 openembedded-core-282fa5ff059db6f6daa108d5ec4ea3d0bfbe0fe2.zip | |
gstreamer1.0-plugins-XXX: move inherit gettext into common .inc file
gstreamer1.0-plugins-base/good/bad/ugly.inc all independently inherit
gettext. Move into the common gstreamer1.0-plugins.inc include file.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
5 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index cb6cbadf1d..6117e699d8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" DEPENDS += "gstreamer1.0-plugins-base libpng jpeg" -inherit gettext bluetooth +inherit bluetooth # opengl packageconfig factored out to make it easy for distros # and BSP layers to pick either (desktop) opengl, gles2, or no GL diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc index e04096c0e8..cde0019a56 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc @@ -4,8 +4,6 @@ LICENSE = "GPLv2+ & LGPLv2+" DEPENDS += "iso-codes util-linux zlib" -inherit gettext - PACKAGES_DYNAMIC =+ "^libgst.*" PACKAGECONFIG ??= " \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index 8f996d690f..3f56d1def0 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc @@ -4,8 +4,6 @@ LICENSE = "GPLv2+ & LGPLv2.1+" DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2" -inherit gettext - PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc index 869022a2d2..839ff8a21b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc @@ -5,8 +5,6 @@ LICENSE_FLAGS = "commercial" DEPENDS += "gstreamer1.0-plugins-base libid3tag" -inherit gettext - PACKAGECONFIG ??= " \ a52dec lame mad mpeg2dec orc \ " diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc index 6ea911e011..d2b3820901 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc @@ -5,7 +5,7 @@ SECTION = "multimedia" DEPENDS = "gstreamer1.0 glib-2.0-native" -inherit autotools pkgconfig upstream-version-is-even +inherit autotools pkgconfig gettext upstream-version-is-even acpaths = "-I ${S}/common/m4 -I ${S}/m4" |