sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Daniel Stone 2012-10-26 16:00:09 +01:00 committed by Richard Purdie
parent ad9ad06056
commit 662a445b30
3 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-graphics/glew/glew_1.9.0.bb
View File

@ -5,9 +5,9 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2"
DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu"
DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu"
PR = "r0"
PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
file://autotools.patch \

27
meta/recipes-graphics/mesa/libglu_9.0.0.bb Normal file
View File

@ -0,0 +1,27 @@
SUMMARY = "The OpenGL utility toolkit"
DESCRIPTION = "GLU is a utility toolkit used with OpenGL implementations"
HOMEPAGE = "http://mesa3d.org"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \
file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9"
# Epoch as this used to be part of mesa-dri
PE = "2"
PR = "0"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${PV}.tar.bz2"
SRC_URI[md5sum] = "be9249132ff49275461cf92039083030"
SRC_URI[sha256sum] = "1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12"
S = "${WORKDIR}/glu-${PV}"
DEPENDS = "virtual/libgl"
inherit autotools pkgconfig
# Remove the mesa-glu dependency in mesa-glu-dev, as mesa-glu is empty
RDEPENDS_${PN}-dev = ""

12
meta/recipes-graphics/mesa/mesa-common.inc
View File

@ -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/*"