diff options
author | Daniel Stone <daniel@fooishbar.org> | 2012-10-26 16:00:09 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-02 16:18:25 +0000 |
commit | 662a445b30af4d7538c3e7081dd9403acd006938 (patch) | |
tree | 6bd87a27f154d659ee80656e9e5b2604447330e0 /meta/recipes-graphics/mesa/mesa-common.inc | |
parent | ad9ad06056bb9ee1f9da54d60dfabb3240798018 (diff) | |
download | poky-662a445b30af4d7538c3e7081dd9403acd006938.tar.gz |
mesa: Build separate GLU library
Mesa has removed GLU from the core tree upstream, so remove it from the
Mesa build and add the separate tarball as a new recipe.
(From OE-Core rev: 4395691a44b198ba0b9a969cbade669e8de07a4f)
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-common.inc')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-common.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index faa8183237..460877ccfb 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc | |||
@@ -12,7 +12,7 @@ SECTION = "x11" | |||
12 | LICENSE = "MIT" | 12 | LICENSE = "MIT" |
13 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" | 13 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" |
14 | 14 | ||
15 | INC_PR = "r3" | 15 | INC_PR = "r4" |
16 | PE = "2" | 16 | PE = "2" |
17 | 17 | ||
18 | DEPENDS = "libxml2-native makedepend-native flex-native bison-native" | 18 | DEPENDS = "libxml2-native makedepend-native flex-native bison-native" |
@@ -24,7 +24,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/mesa:" | |||
24 | 24 | ||
25 | inherit autotools pkgconfig pythonnative | 25 | inherit autotools pkgconfig pythonnative |
26 | 26 | ||
27 | EXTRA_OECONF = "--enable-glu \ | 27 | EXTRA_OECONF = "--disable-glu \ |
28 | --disable-glw \ | 28 | --disable-glw \ |
29 | --disable-glut \ | 29 | --disable-glut \ |
30 | --enable-shared-glapi" | 30 | --enable-shared-glapi" |
@@ -42,7 +42,6 @@ EXCLUDE_FROM_WORLD = "1" | |||
42 | RDEPENDS_${PN}-dev = "" | 42 | RDEPENDS_${PN}-dev = "" |
43 | 43 | ||
44 | PACKAGES =+ "libegl libegl-dev \ | 44 | PACKAGES =+ "libegl libegl-dev \ |
45 | libglu libglu-dev \ | ||
46 | libosmesa libosmesa-dev \ | 45 | libosmesa libosmesa-dev \ |
47 | libgl libgl-dev \ | 46 | libgl libgl-dev \ |
48 | libglapi libglapi-dev \ | 47 | libglapi libglapi-dev \ |
@@ -51,13 +50,17 @@ PACKAGES =+ "libegl libegl-dev \ | |||
51 | libgles2 libgles2-dev \ | 50 | libgles2 libgles2-dev \ |
52 | " | 51 | " |
53 | 52 | ||
53 | do_install_append () { | ||
54 | # GLU is now in libglu (this shouldn't be required in Mesa 9.x) | ||
55 | rm -f ${D}${includedir}/GL/glu* | ||
56 | } | ||
57 | |||
54 | FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" | 58 | FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" |
55 | FILES_libgbm = "${libdir}/libgbm.so.*" | 59 | FILES_libgbm = "${libdir}/libgbm.so.*" |
56 | FILES_libgles1 = "${libdir}/libGLESv1*.so.*" | 60 | FILES_libgles1 = "${libdir}/libGLESv1*.so.*" |
57 | FILES_libgles2 = "${libdir}/libGLESv2.so.*" | 61 | FILES_libgles2 = "${libdir}/libGLESv2.so.*" |
58 | FILES_libgl = "${libdir}/libGL.so.*" | 62 | FILES_libgl = "${libdir}/libGL.so.*" |
59 | FILES_libglapi = "${libdir}/libglapi.so.*" | 63 | FILES_libglapi = "${libdir}/libglapi.so.*" |
60 | FILES_libglu = "${libdir}/libGLU.so.*" | ||
61 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" | 64 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" |
62 | 65 | ||
63 | FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" | 66 | FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" |
@@ -66,7 +69,6 @@ FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" | |||
66 | FILES_libglapi-dev = "${libdir}/libglapi.*" | 69 | FILES_libglapi-dev = "${libdir}/libglapi.*" |
67 | FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" | 70 | FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" |
68 | FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" | 71 | FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" |
69 | FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc" | ||
70 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" | 72 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" |
71 | 73 | ||
72 | FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" | 74 | FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" |