* [PATCH 1/1] Revert "gstreamer1.0-plugins-XXX: move inherit gettext into common .inc file"
2016-03-07 14:34 [PATCH 0/1] Revert recent change to streamer1.0-plugins.inc Peter Kjellerstedt
@ 2016-03-07 14:34 ` Peter Kjellerstedt
0 siblings, 0 replies; 2+ messages in thread
From: Peter Kjellerstedt @ 2016-03-07 14:34 UTC (permalink / raw)
To: openembedded-core, Andre McCurdy
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>
---
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 2 +-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 2 ++
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 ++
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc | 2 ++
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 2 +-
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 64d89b0..a8bff19 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 f75efea..427611a 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 6b005aa..4621bf8 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 38e358f..aff2230 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 18ed6cf..0a6ff80 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
+inherit autotools pkgconfig upstream-version-is-even
acpaths = "-I ${S}/common/m4 -I ${S}/m4"
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread