diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-12-06 12:23:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-11 15:54:26 +0000 |
| commit | 22549ed65f0e413d7f4375e5eba7c86302a46acd (patch) | |
| tree | f2e0bbdcc1b78b713bd2193bbce89d71484d95a3 | |
| parent | c8e3fe46df84e782cc1becc4c5a8cd954ef85f34 (diff) | |
| download | openembedded-core-22549ed65f0e413d7f4375e5eba7c86302a46acd.tar.gz openembedded-core-22549ed65f0e413d7f4375e5eba7c86302a46acd.tar.bz2 openembedded-core-22549ed65f0e413d7f4375e5eba7c86302a46acd.zip | |
mesa: common packaging cleanup
mesa-dri ships the configuration file in mesa 9, so ship that and don't claim
it's empty. Clean up libegl and libgbm packaging.
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 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index d5f83e413e..e661eee72b 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 = "r5" +INC_PR = "r6" PE = "2" DEPENDS = "libxml2-native makedepend-native flex-native bison-native" @@ -37,9 +37,6 @@ 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 \ @@ -76,7 +73,8 @@ python __anonymous() { d.appendVar("RCONFLICTS_" + fullp, pkgs) } -FILES_libegl-mesa = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" +FILES_${PN} = "${sysconfdir}/drirc" +FILES_libegl-mesa = "${libdir}/libEGL.so.*" FILES_libgbm = "${libdir}/libgbm.so.*" FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*" @@ -84,8 +82,9 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" +FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" -FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" +FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" FILES_libglapi-dev = "${libdir}/libglapi.*" FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" |