Patchwork [3/8] mpeg2dec: add PACKAGECONFIG for x11 and fix dependencies

login
register
mail settings
Submitter Martin Jansa
Date Aug. 9, 2014, 4:07 p.m.
Message ID <1407600483-31215-3-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/77667/
State Accepted
Commit 984c6a462bc07cbd34de2d7e2afdaca1e68fdee7
Headers show

Comments

Martin Jansa - Aug. 9, 2014, 4:07 p.m.
* 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>
---
 meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index 1211284..cede2bf 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"