summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-08-09 18:07:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 11:14:08 +0100
commit1876548c14945c317d4f0a3a2b8df44ea1ed019f (patch)
tree8acac2ab7cf4138e901099e4be9fd2ac21146adc
parente6e20fba657e37e1d2b7440a00cfb3c395bde19f (diff)
downloadopenembedded-core-contrib-1876548c14945c317d4f0a3a2b8df44ea1ed019f.tar.gz
openembedded-core-contrib-1876548c14945c317d4f0a3a2b8df44ea1ed019f.tar.bz2
openembedded-core-contrib-1876548c14945c317d4f0a3a2b8df44ea1ed019f.zip
mpeg2dec: add PACKAGECONFIG for x11 and fix dependencies
* the configure script checks for Xext and Xv when X/libvo is enabled * fixes following warnings: WARN: mpeg2dec: mpeg2dec rdepends on libxext but it isn't a build dependency? WARN: mpeg2dec: mpeg2dec rdepends on libxv but it isn't a build dependency? Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index 12112842c3..cede2bf100 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
@@ -6,8 +6,6 @@ LICENSE_FLAGS = "commercial"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154"
-DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
-
PR = "r2"
SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz \
@@ -18,7 +16,10 @@ SRC_URI[sha256sum] = "c74a76068f8ec36d4bb59a03bf1157be44118ca02252180e8b358b0b5e
inherit autotools pkgconfig
-EXTRA_OECONF = "--enable-shared --disable-sdl --with-x"
+EXTRA_OECONF = "--enable-shared --disable-sdl"
+
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv"
PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev"