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:27:33 +0100
commit984c6a462bc07cbd34de2d7e2afdaca1e68fdee7 (patch)
tree2a8449c30f0d7e33d7d346a956b4de127b41a529
parent1636d2322eb85ce1c2e06eafc910929abd3eacd5 (diff)
downloadpoky-984c6a462bc07cbd34de2d7e2afdaca1e68fdee7.tar.gz
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? (From OE-Core rev: 1876548c14945c317d4f0a3a2b8df44ea1ed019f) 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"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154" 7 file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154"
8 8
9DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
10
11PR = "r2" 9PR = "r2"
12 10
13SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz \ 11SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz \
@@ -18,7 +16,10 @@ SRC_URI[sha256sum] = "c74a76068f8ec36d4bb59a03bf1157be44118ca02252180e8b358b0b5e
18 16
19inherit autotools pkgconfig 17inherit autotools pkgconfig
20 18
21EXTRA_OECONF = "--enable-shared --disable-sdl --with-x" 19EXTRA_OECONF = "--enable-shared --disable-sdl"
20
21PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
22PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv"
22 23
23PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev" 24PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev"
24 25