diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-12-21 11:29:27 -0600 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2011-12-22 09:21:30 -0600 |
commit | f308cef33a6e0d2a64a91dcda3fc52829c5b1090 (patch) | |
tree | 8ef78a6a8e1f91a77d31de2feddf1a253f561ab3 /common/recipes-multimedia/libva | |
parent | b6d5d9a3b06caf578103a04dc5fcf5e476343205 (diff) | |
download | meta-intel-f308cef33a6e0d2a64a91dcda3fc52829c5b1090.tar.gz |
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>
Diffstat (limited to 'common/recipes-multimedia/libva')
-rw-r--r-- | common/recipes-multimedia/libva/libva.inc | 42 |
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" | |||
17 | LICENSE = "MIT" | 17 | LICENSE = "MIT" |
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" | 18 | LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" |
19 | 19 | ||
20 | INC_PR = "r0" | 20 | INC_PR = "r1" |
21 | 21 | ||
22 | DEPENDS = "libxext libxfixes libdrm" | 22 | DEPENDS = "libxext libxfixes libdrm mesa-dri" |
23 | 23 | ||
24 | inherit autotools pkgconfig | 24 | inherit autotools pkgconfig |
25 | 25 | ||
26 | PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl" | 26 | PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl" |
27 | PROVIDES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl" | ||
27 | PACKAGES =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev" | 28 | PACKAGES =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev" |
29 | PACKAGES =+ "${PN}-x11-dbg ${PN}-tpi-dbg ${PN}-glx-dbg ${PN}-egl-dbg" | ||
30 | RPROVIDES_${PN}-dev =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev" | ||
28 | 31 | ||
29 | RDEPENDS_${PN} =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl" | 32 | RDEPENDS_${PN}-tpi =+ "${PN}" |
33 | RDEPENDS_${PN}-x11 =+ "${PN}" | ||
34 | RDEPENDS_${PN}-glx =+ "${PN}-x11" | ||
35 | RDEPENDS_${PN}-egl =+ "${PN}-x11" | ||
30 | 36 | ||
31 | FILES_${PN}-dbg += "${libdir}/dri/.debug" | 37 | FILES_${PN}-dbg += "${libdir}/dri/.debug" |
32 | FILES_${PN} += "${libdir}/dri" | 38 | FILES_${PN} += "${libdir}/dri" |
33 | 39 | ||
34 | FILES_${PN}-x11-dev =+ "${libdir}/libva-x11.so" | 40 | FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}" |
35 | FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi.so" | 41 | FILES_${PN}-tpi =+ "${libdir}/libva-tpi*${SOLIBS}" |
36 | FILES_${PN}-glx-dev =+ "${libdir}/libva-glx.so" | 42 | FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}" |
37 | FILES_${PN}-egl-dev =+ "${libdir}/libva-egl.so" | 43 | FILES_${PN}-egl =+ "${libdir}/libva-egl*${SOLIBS}" |
38 | FILES_${PN}-x11 =+ "${libdir}/libva-x11.*" | 44 | |
39 | FILES_${PN}-tpi =+ "${libdir}/libva-tpi.*" | 45 | FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*${SOLIBSDEV}" |
40 | FILES_${PN}-glx =+ "${libdir}/libva-glx.*" | 46 | FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*${SOLIBSDEV}" |
41 | FILES_${PN}-egl =+ "${libdir}/libva-egl.*" | 47 | FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*${SOLIBSDEV}" |
48 | FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*${SOLIBSDEV}" | ||
49 | FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*.la" | ||
50 | FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*.la" | ||
51 | FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*.la" | ||
52 | FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*.la" | ||
53 | FILES_${PN}-x11-dev =+ "${libdir}/pkgconfig/libva-x11*.pc" | ||
54 | FILES_${PN}-tpi-dev =+ "${libdir}/pkgconfig/libva-tpi*.pc" | ||
55 | FILES_${PN}-glx-dev =+ "${libdir}/pkgconfig/libva-glx*.pc" | ||
56 | FILES_${PN}-egl-dev =+ "${libdir}/pkgconfig/libva-egl*.pc" | ||
57 | |||
58 | FILES_${PN}-x11-dbg =+ "${libdir}/.debug/libva-x11.*" | ||
59 | FILES_${PN}-tpi-dbg =+ "${libdir}/.debug/libva-tpi.*" | ||
60 | FILES_${PN}-glx-dbg =+ "${libdir}/.debug/libva-glx.*" | ||
61 | FILES_${PN}-egl-dbg =+ "${libdir}/.debug/libva-egl.*" | ||