diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-01-18 17:28:57 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:40 +0000 |
| commit | c4a5b8d7c9a78a29d080b15f049df5a1fba3c4eb (patch) | |
| tree | 7cd318f673afff6a0b706efe324c4ed47b5252a9 /meta/recipes-multimedia | |
| parent | 2087769982b1d629a18c10de7dc3e21785b99664 (diff) | |
| download | openembedded-core-c4a5b8d7c9a78a29d080b15f049df5a1fba3c4eb.tar.gz openembedded-core-c4a5b8d7c9a78a29d080b15f049df5a1fba3c4eb.tar.bz2 openembedded-core-c4a5b8d7c9a78a29d080b15f049df5a1fba3c4eb.zip | |
gstreamer1.0-plugins-base: minor formatting improvements
Fix duplicate x11 dependencies (DEPENDS and x11 PACKAGECONFIG).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Diffstat (limited to 'meta/recipes-multimedia')
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 LICENSE = "GPLv2+ & LGPLv2+" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" -DEPENDS += "freetype liboil util-linux iso-codes zlib" +DEPENDS += "freetype iso-codes liboil util-linux zlib" inherit gettext PACKAGES_DYNAMIC =+ "^libgst.*" PACKAGECONFIG ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - orc ivorbis ogg theora vorbis pango gio-unix-2.0 \ - " + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + gio-unix-2.0 ivorbis ogg orc pango theora vorbis \ +" -X11DEPENDS = "virtual/libx11 libsm libxrender" +X11DEPENDS = "virtual/libx11 libsm libxrender libxv" X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" -PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" + PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" +PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" -PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" -PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" +PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" -PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" EXTRA_OECONF += " \ --enable-zlib \ --disable-freetypetest \ " -FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" - CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" + +FILES_${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 @@ include gstreamer1.0-plugins-base.inc LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ - " + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" SRC_URI += "file://get-caps-from-src-pad-when-query-caps.patch \ 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" include gstreamer1.0-plugins-base.inc LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ - " - -S = "${WORKDIR}/git" + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d" +S = "${WORKDIR}/git" + do_configure_prepend() { cd ${S} ./autogen.sh --noconfigure cd ${B} } - |