summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-10-26 16:00:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-02 16:18:25 +0000
commit662a445b30af4d7538c3e7081dd9403acd006938 (patch)
tree6bd87a27f154d659ee80656e9e5b2604447330e0
parentad9ad06056bb9ee1f9da54d60dfabb3240798018 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/glew/glew_1.9.0.bb4
-rw-r--r--meta/recipes-graphics/mesa/libglu_9.0.0.bb27
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc12
3 files changed, 36 insertions, 7 deletions
diff --git a/meta/recipes-graphics/glew/glew_1.9.0.bb b/meta/recipes-graphics/glew/glew_1.9.0.bb
index 00fff110fc..599d64bceb 100644
--- a/meta/recipes-graphics/glew/glew_1.9.0.bb
+++ b/meta/recipes-graphics/glew/glew_1.9.0.bb
@@ -5,9 +5,9 @@ SECTION = "x11"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" 6LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2"
7 7
8DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu" 8DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu"
9 9
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
13 file://autotools.patch \ 13 file://autotools.patch \
diff --git a/meta/recipes-graphics/mesa/libglu_9.0.0.bb b/meta/recipes-graphics/mesa/libglu_9.0.0.bb
new file mode 100644
index 0000000000..79807491bd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/libglu_9.0.0.bb
@@ -0,0 +1,27 @@
1SUMMARY = "The OpenGL utility toolkit"
2DESCRIPTION = "GLU is a utility toolkit used with OpenGL implementations"
3
4HOMEPAGE = "http://mesa3d.org"
5BUGTRACKER = "https://bugs.freedesktop.org"
6SECTION = "x11"
7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \
9 file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9"
10
11# Epoch as this used to be part of mesa-dri
12PE = "2"
13PR = "0"
14
15SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${PV}.tar.bz2"
16
17SRC_URI[md5sum] = "be9249132ff49275461cf92039083030"
18SRC_URI[sha256sum] = "1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12"
19
20S = "${WORKDIR}/glu-${PV}"
21
22DEPENDS = "virtual/libgl"
23
24inherit autotools pkgconfig
25
26# Remove the mesa-glu dependency in mesa-glu-dev, as mesa-glu is empty
27RDEPENDS_${PN}-dev = ""
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"
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 = "r3" 15INC_PR = "r4"
16PE = "2" 16PE = "2"
17 17
18DEPENDS = "libxml2-native makedepend-native flex-native bison-native" 18DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
@@ -24,7 +24,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
24 24
25inherit autotools pkgconfig pythonnative 25inherit autotools pkgconfig pythonnative
26 26
27EXTRA_OECONF = "--enable-glu \ 27EXTRA_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"
42RDEPENDS_${PN}-dev = "" 42RDEPENDS_${PN}-dev = ""
43 43
44PACKAGES =+ "libegl libegl-dev \ 44PACKAGES =+ "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
53do_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
54FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" 58FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
55FILES_libgbm = "${libdir}/libgbm.so.*" 59FILES_libgbm = "${libdir}/libgbm.so.*"
56FILES_libgles1 = "${libdir}/libGLESv1*.so.*" 60FILES_libgles1 = "${libdir}/libGLESv1*.so.*"
57FILES_libgles2 = "${libdir}/libGLESv2.so.*" 61FILES_libgles2 = "${libdir}/libGLESv2.so.*"
58FILES_libgl = "${libdir}/libGL.so.*" 62FILES_libgl = "${libdir}/libGL.so.*"
59FILES_libglapi = "${libdir}/libglapi.so.*" 63FILES_libglapi = "${libdir}/libglapi.so.*"
60FILES_libglu = "${libdir}/libGLU.so.*"
61FILES_libosmesa = "${libdir}/libOSMesa.so.*" 64FILES_libosmesa = "${libdir}/libOSMesa.so.*"
62 65
63FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" 66FILES_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"
66FILES_libglapi-dev = "${libdir}/libglapi.*" 69FILES_libglapi-dev = "${libdir}/libglapi.*"
67FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" 70FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
68FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" 71FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
69FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc"
70FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" 72FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
71 73
72FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" 74FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"