summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-06 12:23:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-11 15:54:38 +0000
commitcf94122286f035f49ec1d3dfcaafa0c7e171f544 (patch)
treec2ad854cc9dba88996ead5731c15e181606e8162 /meta/recipes-graphics
parent74b2e40d89cb79cb58a8135bd095720c74c44681 (diff)
downloadpoky-cf94122286f035f49ec1d3dfcaafa0c7e171f544.tar.gz
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. (From OE-Core rev: 22549ed65f0e413d7f4375e5eba7c86302a46acd) 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.inc11
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"
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 = "r5" 15INC_PR = "r6"
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,9 +37,6 @@ 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
43PACKAGES =+ "libegl-mesa libegl-mesa-dev \ 40PACKAGES =+ "libegl-mesa libegl-mesa-dev \
44 libosmesa libosmesa-dev \ 41 libosmesa libosmesa-dev \
45 libgl-mesa libgl-mesa-dev \ 42 libgl-mesa libgl-mesa-dev \
@@ -76,7 +73,8 @@ python __anonymous() {
76 d.appendVar("RCONFLICTS_" + fullp, pkgs) 73 d.appendVar("RCONFLICTS_" + fullp, pkgs)
77} 74}
78 75
79FILES_libegl-mesa = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" 76FILES_${PN} = "${sysconfdir}/drirc"
77FILES_libegl-mesa = "${libdir}/libEGL.so.*"
80FILES_libgbm = "${libdir}/libgbm.so.*" 78FILES_libgbm = "${libdir}/libgbm.so.*"
81FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" 79FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
82FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*" 80FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
@@ -84,8 +82,9 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*"
84FILES_libglapi = "${libdir}/libglapi.so.*" 82FILES_libglapi = "${libdir}/libglapi.so.*"
85FILES_libosmesa = "${libdir}/libOSMesa.so.*" 83FILES_libosmesa = "${libdir}/libOSMesa.so.*"
86 84
85FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
87FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" 86FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
88FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" 87FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
89FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" 88FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
90FILES_libglapi-dev = "${libdir}/libglapi.*" 89FILES_libglapi-dev = "${libdir}/libglapi.*"
91FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" 90FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"