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:33:03 +0000 |
commit | 7f84ad03b872f9228080a6f185926f5670536a49 (patch) | |
tree | e9353fa3d101bacc6633452bb7ec1092cba58439 /meta/recipes-multimedia/gstreamer | |
parent | 2ce48e696ca92178c2852e4e74f6cea98a466df6 (diff) | |
download | poky-7f84ad03b872f9228080a6f185926f5670536a49.tar.gz |
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.
(From OE-Core rev: 282fa5ff059db6f6daa108d5ec4ea3d0bfbe0fe2)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
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+" | |||
4 | 4 | ||
5 | DEPENDS += "gstreamer1.0-plugins-base libpng jpeg" | 5 | DEPENDS += "gstreamer1.0-plugins-base libpng jpeg" |
6 | 6 | ||
7 | inherit gettext bluetooth | 7 | inherit bluetooth |
8 | 8 | ||
9 | # opengl packageconfig factored out to make it easy for distros | 9 | # opengl packageconfig factored out to make it easy for distros |
10 | # and BSP layers to pick either (desktop) opengl, gles2, or no GL | 10 | # 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+" | |||
4 | 4 | ||
5 | DEPENDS += "iso-codes util-linux zlib" | 5 | DEPENDS += "iso-codes util-linux zlib" |
6 | 6 | ||
7 | inherit gettext | ||
8 | |||
9 | PACKAGES_DYNAMIC =+ "^libgst.*" | 7 | PACKAGES_DYNAMIC =+ "^libgst.*" |
10 | 8 | ||
11 | PACKAGECONFIG ??= " \ | 9 | 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+" | |||
4 | 4 | ||
5 | DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2" | 5 | DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2" |
6 | 6 | ||
7 | inherit gettext | ||
8 | |||
9 | PACKAGECONFIG ??= " \ | 7 | PACKAGECONFIG ??= " \ |
10 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 8 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ |
11 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 9 | ${@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" | |||
5 | 5 | ||
6 | DEPENDS += "gstreamer1.0-plugins-base libid3tag" | 6 | DEPENDS += "gstreamer1.0-plugins-base libid3tag" |
7 | 7 | ||
8 | inherit gettext | ||
9 | |||
10 | PACKAGECONFIG ??= " \ | 8 | PACKAGECONFIG ??= " \ |
11 | a52dec lame mad mpeg2dec orc \ | 9 | a52dec lame mad mpeg2dec orc \ |
12 | " | 10 | " |
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" | |||
5 | 5 | ||
6 | DEPENDS = "gstreamer1.0 glib-2.0-native" | 6 | DEPENDS = "gstreamer1.0 glib-2.0-native" |
7 | 7 | ||
8 | inherit autotools pkgconfig upstream-version-is-even | 8 | inherit autotools pkgconfig gettext upstream-version-is-even |
9 | 9 | ||
10 | acpaths = "-I ${S}/common/m4 -I ${S}/m4" | 10 | acpaths = "-I ${S}/common/m4 -I ${S}/m4" |
11 | 11 | ||