diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2016-03-07 15:34:31 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:19 +0000 |
| commit | 15fca0e3e282cde9ebe30df78e02bedd3e747f44 (patch) | |
| tree | 190e6eb052603b70d07222ea85f6c01bea9aaf78 /meta | |
| parent | f69b36c2c8b77e6d991dce8fdc63887f32526d31 (diff) | |
| download | openembedded-core-15fca0e3e282cde9ebe30df78e02bedd3e747f44.tar.gz openembedded-core-15fca0e3e282cde9ebe30df78e02bedd3e747f44.tar.bz2 openembedded-core-15fca0e3e282cde9ebe30df78e02bedd3e747f44.zip | |
Revert "gstreamer1.0-plugins-XXX: move inherit gettext into common .inc file"
Do not assume that the recipes in OE-Core are the only ones using
gstreamer1.0-plugins.inc or that all GStreamer plugins support
localization. Without this reversal, all our GStreamer plugin recipes
started spewing out:
configure: WARNING: unrecognized options: --disable-nls
This reverts commit 282fa5ff059db6f6daa108d5ec4ea3d0bfbe0fe2.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
5 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index 64d89b0c42..a8bff19b1c 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 bluetooth +inherit gettext 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 240ee5f6ab..f0c80cef79 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc @@ -4,6 +4,8 @@ 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 6b005aae7c..4621bf8943 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc @@ -4,6 +4,8 @@ LICENSE = "GPLv2+ & LGPLv2.1+" DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2" +inherit gettext + PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc index 38e358f8ac..aff223072d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc @@ -5,6 +5,8 @@ LICENSE_FLAGS = "commercial" DEPENDS += "gstreamer1.0-plugins-base libid3tag" +inherit gettext + PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ a52dec lame mad mpeg2dec \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc index 128a1fe819..2dcec509d9 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 gettext upstream-version-is-even gobject-introspection +inherit autotools pkgconfig upstream-version-is-even gobject-introspection acpaths = "-I ${S}/common/m4 -I ${S}/m4" |