summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-18 17:28:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:23 +0000
commitbeb80910e9f805e50b6446a31202343763c00467 (patch)
tree665668841486a70b076f7f831d475ec0a9fc0a27 /meta
parent61f30b4781bfd752fa04914672bba9ec01f99455 (diff)
downloadpoky-beb80910e9f805e50b6446a31202343763c00467.tar.gz
gstreamer1.0-plugins-base: minor formatting improvements
Fix duplicate x11 dependencies (DEPENDS and x11 PACKAGECONFIG). (From OE-Core rev: c4a5b8d7c9a78a29d080b15f049df5a1fba3c4eb) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc26
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb3
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb8
3 files changed, 17 insertions, 20 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 4375a4b507..d543bdd067 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -2,38 +2,38 @@ require gstreamer1.0-plugins.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2+" 3LICENSE = "GPLv2+ & LGPLv2+"
4 4
5DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" 5DEPENDS += "freetype iso-codes liboil util-linux zlib"
6DEPENDS += "freetype liboil util-linux iso-codes zlib"
7 6
8inherit gettext 7inherit gettext
9 8
10PACKAGES_DYNAMIC =+ "^libgst.*" 9PACKAGES_DYNAMIC =+ "^libgst.*"
11 10
12PACKAGECONFIG ??= " \ 11PACKAGECONFIG ??= " \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
14 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 12 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
15 orc ivorbis ogg theora vorbis pango gio-unix-2.0 \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
16 " 14 gio-unix-2.0 ivorbis ogg orc pango theora vorbis \
15"
17 16
18X11DEPENDS = "virtual/libx11 libsm libxrender" 17X11DEPENDS = "virtual/libx11 libsm libxrender libxv"
19X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" 18X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm"
20X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" 19X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm"
21PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" 20
22PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 21PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
22PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
23PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0"
23PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" 24PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor"
24PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" 25PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg"
25PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
26PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
27PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" 26PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
28PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" 27PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
29PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" 28PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual"
30PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" 29PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
30PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
31 31
32EXTRA_OECONF += " \ 32EXTRA_OECONF += " \
33 --enable-zlib \ 33 --enable-zlib \
34 --disable-freetypetest \ 34 --disable-freetypetest \
35" 35"
36 36
37FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
38
39CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" 37CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
38
39FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb
index 473dbcd8fe..d5687a8b01 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb
@@ -1,9 +1,8 @@
1include gstreamer1.0-plugins-base.inc 1include gstreamer1.0-plugins-base.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
5 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ 4 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
6 " 5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
7 6
8SRC_URI += "file://get-caps-from-src-pad-when-query-caps.patch \ 7SRC_URI += "file://get-caps-from-src-pad-when-query-caps.patch \
9 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ 8 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
index fbe3a42cd7..f021f98608 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
@@ -3,17 +3,15 @@ DEFAULT_PREFERENCE = "-1"
3include gstreamer1.0-plugins-base.inc 3include gstreamer1.0-plugins-base.inc
4 4
5LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
6 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
7 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ 6 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
8 " 7 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
9
10S = "${WORKDIR}/git"
11 8
12SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d" 9SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d"
13 10
11S = "${WORKDIR}/git"
12
14do_configure_prepend() { 13do_configure_prepend() {
15 cd ${S} 14 cd ${S}
16 ./autogen.sh --noconfigure 15 ./autogen.sh --noconfigure
17 cd ${B} 16 cd ${B}
18} 17}
19