diff options
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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" -INC_PR = "r3" +INC_PR = "r4" PE = "2" DEPENDS = "libxml2-native makedepend-native flex-native bison-native" @@ -24,7 +24,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/mesa:" inherit autotools pkgconfig pythonnative -EXTRA_OECONF = "--enable-glu \ +EXTRA_OECONF = "--disable-glu \ --disable-glw \ --disable-glut \ --enable-shared-glapi" @@ -42,7 +42,6 @@ EXCLUDE_FROM_WORLD = "1" RDEPENDS_${PN}-dev = "" PACKAGES =+ "libegl libegl-dev \ - libglu libglu-dev \ libosmesa libosmesa-dev \ libgl libgl-dev \ libglapi libglapi-dev \ @@ -51,13 +50,17 @@ PACKAGES =+ "libegl libegl-dev \ libgles2 libgles2-dev \ " +do_install_append () { + # GLU is now in libglu (this shouldn't be required in Mesa 9.x) + rm -f ${D}${includedir}/GL/glu* +} + FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" FILES_libgbm = "${libdir}/libgbm.so.*" FILES_libgles1 = "${libdir}/libGLESv1*.so.*" FILES_libgles2 = "${libdir}/libGLESv2.so.*" FILES_libgl = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" -FILES_libglu = "${libdir}/libGLU.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" 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" FILES_libglapi-dev = "${libdir}/libglapi.*" FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" -FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc" FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" |