summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-13 15:30:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-17 17:24:55 +0000
commit02cb80816e9d40dd3e0ca63d0777a45c12efc961 (patch)
tree38d88d67666a937c9c9d57857967870ac8e38142 /meta/recipes-graphics
parentc5d7ab6a2441ad3247cccae2442d2a20e55f7d96 (diff)
downloadpoky-02cb80816e9d40dd3e0ca63d0777a45c12efc961.tar.gz
mesa: remove dependency on mesa-dri in mesa-dri-dev
Move /etc/drirc to libdricommon so mesa-dri is empty, and remove the automatic dependency on mesa-dri in mesa-dri-dev. (From OE-Core rev: 882bf3bc5f038d5e072df1bf3ecddd66e025e673) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 1d3655f43f..70957eb9b3 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
14 14
15INC_PR = "r8" 15INC_PR = "r9"
16PE = "2" 16PE = "2"
17 17
18DEPENDS = "libxml2-native makedepend-native flex-native bison-native" 18DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
@@ -37,6 +37,9 @@ PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
37# Multiple virtual/gl providers being built breaks staging 37# Multiple virtual/gl providers being built breaks staging
38EXCLUDE_FROM_WORLD = "1" 38EXCLUDE_FROM_WORLD = "1"
39 39
40# Remove the mesa-dri dependency on mesa-dri-dev, as mesa-dri is empty
41RDEPENDS_${PN}-dev = ""
42
40PACKAGES =+ "libegl-mesa libegl-mesa-dev \ 43PACKAGES =+ "libegl-mesa libegl-mesa-dev \
41 libosmesa libosmesa-dev \ 44 libosmesa libosmesa-dev \
42 libgl-mesa libgl-mesa-dev \ 45 libgl-mesa libgl-mesa-dev \
@@ -79,8 +82,7 @@ python __anonymous() {
79 d.appendVar("RCONFLICTS_" + fullp, pkgs) 82 d.appendVar("RCONFLICTS_" + fullp, pkgs)
80} 83}
81 84
82FILES_${PN} = "${sysconfdir}/drirc" 85FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*"
83FILES_libdricore = "${libdir}/libdricore*.so.*"
84FILES_libegl-mesa = "${libdir}/libEGL.so.*" 86FILES_libegl-mesa = "${libdir}/libEGL.so.*"
85FILES_libgbm = "${libdir}/libgbm.so.*" 87FILES_libgbm = "${libdir}/libgbm.so.*"
86FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" 88FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"