diff options
| author |   Ross Burton <ross.burton@intel.com> | 2012-12-13 15:30:31 +0000 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2012-12-14 15:17:20 -0800 |
| commit | 882bf3bc5f038d5e072df1bf3ecddd66e025e673 (patch) | |
| tree | b70add9ac468e5b1a4f77415a41e9536ba65195f | |
| parent | 5a3116638394dc72c54cf5d4f8bd42a7be0b1768 (diff) | |
| download | openembedded-core-contrib-882bf3bc5f038d5e072df1bf3ecddd66e025e673.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-common.inc | 8 |
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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" -INC_PR = "r8" +INC_PR = "r9" PE = "2" DEPENDS = "libxml2-native makedepend-native flex-native bison-native" @@ -37,6 +37,9 @@ PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" # Multiple virtual/gl providers being built breaks staging EXCLUDE_FROM_WORLD = "1" +# Remove the mesa-dri dependency on mesa-dri-dev, as mesa-dri is empty +RDEPENDS_${PN}-dev = "" + PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libosmesa libosmesa-dev \ libgl-mesa libgl-mesa-dev \ @@ -79,8 +82,7 @@ python __anonymous() { d.appendVar("RCONFLICTS_" + fullp, pkgs) } -FILES_${PN} = "${sysconfdir}/drirc" -FILES_libdricore = "${libdir}/libdricore*.so.*" +FILES_libdricore = "${sysconfdir}/drirc ${libdir}/libdricore*.so.*" FILES_libegl-mesa = "${libdir}/libEGL.so.*" FILES_libgbm = "${libdir}/libgbm.so.*" FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" |