aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-12-21 11:29:27 -0600
committerTom Zanussi <tom.zanussi@intel.com>2011-12-22 09:21:30 -0600
commitf308cef33a6e0d2a64a91dcda3fc52829c5b1090 (patch)
tree8ef78a6a8e1f91a77d31de2feddf1a253f561ab3
parentb6d5d9a3b06caf578103a04dc5fcf5e476343205 (diff)
downloadmeta-intel-f308cef33a6e0d2a64a91dcda3fc52829c5b1090.tar.gz
meta-intel-f308cef33a6e0d2a64a91dcda3fc52829c5b1090.tar.bz2
meta-intel-f308cef33a6e0d2a64a91dcda3fc52829c5b1090.zip
meta-intel: add PROVIDES for extra packages provided by libva
libva provides some extra packages such as libva-glx. Add PROVIDES for them so the rest of the build system knows about it. We also need to add the dependency relationships between libva, libva-x11, and libva-glx. Also remove the bogus RDEPENDS on the display components. Also libva-glx depends on mesa-dri - if it's not there, libva-glx won't be built. Also, add missing -dev and -dbg packaging. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Acked-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--common/recipes-multimedia/libva/libva.inc42
1 files changed, 31 insertions, 11 deletions
diff --git a/common/recipes-multimedia/libva/libva.inc b/common/recipes-multimedia/libva/libva.inc
index 93b3caec..d897f36e 100644
--- a/common/recipes-multimedia/libva/libva.inc
+++ b/common/recipes-multimedia/libva/libva.inc
@@ -17,25 +17,45 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
-INC_PR = "r0"
+INC_PR = "r1"
-DEPENDS = "libxext libxfixes libdrm"
+DEPENDS = "libxext libxfixes libdrm mesa-dri"
inherit autotools pkgconfig
PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
+PROVIDES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
PACKAGES =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
+PACKAGES =+ "${PN}-x11-dbg ${PN}-tpi-dbg ${PN}-glx-dbg ${PN}-egl-dbg"
+RPROVIDES_${PN}-dev =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
-RDEPENDS_${PN} =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
+RDEPENDS_${PN}-tpi =+ "${PN}"
+RDEPENDS_${PN}-x11 =+ "${PN}"
+RDEPENDS_${PN}-glx =+ "${PN}-x11"
+RDEPENDS_${PN}-egl =+ "${PN}-x11"
FILES_${PN}-dbg += "${libdir}/dri/.debug"
FILES_${PN} += "${libdir}/dri"
-FILES_${PN}-x11-dev =+ "${libdir}/libva-x11.so"
-FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi.so"
-FILES_${PN}-glx-dev =+ "${libdir}/libva-glx.so"
-FILES_${PN}-egl-dev =+ "${libdir}/libva-egl.so"
-FILES_${PN}-x11 =+ "${libdir}/libva-x11.*"
-FILES_${PN}-tpi =+ "${libdir}/libva-tpi.*"
-FILES_${PN}-glx =+ "${libdir}/libva-glx.*"
-FILES_${PN}-egl =+ "${libdir}/libva-egl.*"
+FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}"
+FILES_${PN}-tpi =+ "${libdir}/libva-tpi*${SOLIBS}"
+FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}"
+FILES_${PN}-egl =+ "${libdir}/libva-egl*${SOLIBS}"
+
+FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*${SOLIBSDEV}"
+FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*${SOLIBSDEV}"
+FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*${SOLIBSDEV}"
+FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*${SOLIBSDEV}"
+FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*.la"
+FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*.la"
+FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*.la"
+FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*.la"
+FILES_${PN}-x11-dev =+ "${libdir}/pkgconfig/libva-x11*.pc"
+FILES_${PN}-tpi-dev =+ "${libdir}/pkgconfig/libva-tpi*.pc"
+FILES_${PN}-glx-dev =+ "${libdir}/pkgconfig/libva-glx*.pc"
+FILES_${PN}-egl-dev =+ "${libdir}/pkgconfig/libva-egl*.pc"
+
+FILES_${PN}-x11-dbg =+ "${libdir}/.debug/libva-x11.*"
+FILES_${PN}-tpi-dbg =+ "${libdir}/.debug/libva-tpi.*"
+FILES_${PN}-glx-dbg =+ "${libdir}/.debug/libva-glx.*"
+FILES_${PN}-egl-dbg =+ "${libdir}/.debug/libva-egl.*"