[oe-commits] [openembedded-core] 67/116: gstreamer1.0-plugins-XXX: move inherit gettext into common .inc file
git at git.openembedded.org
git at git.openembedded.org
Sun Feb 28 11:29:53 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 27137909c946607201e72bf6e45b9847f9f50046
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Wed Feb 24 18:15:25 2016 -0800
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 at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.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, 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 cb6cbad..6117e69 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 e04096c..cde0019 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 8f996d6..3f56d1d 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 869022a..839ff8a 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 6ea911e..d2b3820 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"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list