summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-06 12:23:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-11 15:54:38 +0000
commit66d92cb3eea6e1e57df408a19f9034eba5bec5fd (patch)
tree96dfe6f2e81a30ace36caf753f2a6fd3f31f73ed /meta
parenta63dc47e56d298f2f0d58fda675b77dc0df2b301 (diff)
downloadpoky-66d92cb3eea6e1e57df408a19f9034eba5bec5fd.tar.gz
mesa-dri: upgrade -git version to current master
license.html was reformated so the checksum changed. The GLSL compiler can be built using CC_FOR_BUILD, so we don't need mesa-dri-glsl-native. Update common packaging to include libdricore and the skeleton libgles3, and remove the driver .la files. mesa-git/uclibc.patch isn't applied, remove. x32 support is integrated into mklib, drop 0003-fix-for-x32.patch. uclibc is checked for upstream, drop 0001-Compile-with-uclibc.patch. (From OE-Core rev: 8060a24c679ba17aea48bdeb4b8cfd460885f65f) 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')
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc13
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb23
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-git.inc17
-rw-r--r--meta/recipes-graphics/mesa/mesa-git/uclibc.patch57
5 files changed, 17 insertions, 95 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index e661eee72b..c11d402dce 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 = "r6" 15INC_PR = "r7"
16PE = "2" 16PE = "2"
17 17
18DEPENDS = "libxml2-native makedepend-native flex-native bison-native" 18DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
@@ -40,15 +40,20 @@ EXCLUDE_FROM_WORLD = "1"
40PACKAGES =+ "libegl-mesa libegl-mesa-dev \ 40PACKAGES =+ "libegl-mesa libegl-mesa-dev \
41 libosmesa libosmesa-dev \ 41 libosmesa libosmesa-dev \
42 libgl-mesa libgl-mesa-dev \ 42 libgl-mesa libgl-mesa-dev \
43 libdricore libdricore-dev \
43 libglapi libglapi-dev \ 44 libglapi libglapi-dev \
44 libgbm libgbm-dev \ 45 libgbm libgbm-dev \
45 libgles1-mesa libgles1-mesa-dev \ 46 libgles1-mesa libgles1-mesa-dev \
46 libgles2-mesa libgles2-mesa-dev \ 47 libgles2-mesa libgles2-mesa-dev \
48 libgles3-mesa libgles3-mesa-dev \
47 " 49 "
48 50
49do_install_append () { 51do_install_append () {
50 # GLU is now in libglu (this shouldn't be required in Mesa 9.x) 52 # GLU is now in libglu (this shouldn't be required in Mesa 9.x)
51 rm -f ${D}${includedir}/GL/glu* 53 rm -f ${D}${includedir}/GL/glu*
54
55 # Drivers never need libtool .la files
56 rm -f ${D}${libdir}/dri/*.la
52} 57}
53 58
54# For the packages that make up the OpenGL interfaces, inject variables so that 59# For the packages that make up the OpenGL interfaces, inject variables so that
@@ -56,7 +61,8 @@ do_install_append () {
56# RPROVIDEs/RCONFLICTs on the generic libgl name. 61# RPROVIDEs/RCONFLICTs on the generic libgl name.
57python __anonymous() { 62python __anonymous() {
58 for p in (("libegl", "libegl1"), ("libgl", "libgl1"), 63 for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
59 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2")): 64 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
65 ("libgles3",)):
60 fullp = p[0] + "-mesa" 66 fullp = p[0] + "-mesa"
61 pkgs = " ".join(p) 67 pkgs = " ".join(p)
62 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") 68 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
@@ -74,6 +80,7 @@ python __anonymous() {
74} 80}
75 81
76FILES_${PN} = "${sysconfdir}/drirc" 82FILES_${PN} = "${sysconfdir}/drirc"
83FILES_libdricore = "${libdir}/libdricore*.so.*"
77FILES_libegl-mesa = "${libdir}/libEGL.so.*" 84FILES_libegl-mesa = "${libdir}/libEGL.so.*"
78FILES_libgbm = "${libdir}/libgbm.so.*" 85FILES_libgbm = "${libdir}/libgbm.so.*"
79FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" 86FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
@@ -83,12 +90,14 @@ FILES_libglapi = "${libdir}/libglapi.so.*"
83FILES_libosmesa = "${libdir}/libOSMesa.so.*" 90FILES_libosmesa = "${libdir}/libOSMesa.so.*"
84 91
85FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" 92FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
93FILES_libdricore-dev = "${libdir}/libdricore*.*"
86FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" 94FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
87FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" 95FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
88FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" 96FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
89FILES_libglapi-dev = "${libdir}/libglapi.*" 97FILES_libglapi-dev = "${libdir}/libglapi.*"
90FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" 98FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
91FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" 99FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
100FILES_libgles3-mesa-dev = "${includedir}/GLES3"
92FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" 101FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
93 102
94FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" 103FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
deleted file mode 100644
index 4611f8032b..0000000000
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1require mesa-dri-glsl-native.inc
2
3LIC_FILES_CHKSUM = "file://../../docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
4
5SRCREV = "c1f4867c89adb1a6b19d66ec8ad146115909f0a7"
6PV = "8.0.4+git${SRCPV}"
7DEFAULT_PREFERENCE = "-1"
8
9SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
10S = "${WORKDIR}/git/src/glsl"
11
12inherit native
13
14# use default config for native build
15do_configure_prepend() {
16 ln -sf ${S}/../../configs/default ${S}/../../configs/current
17}
18
19do_install() {
20 install -d ${D}/${bindir}/glsl
21 install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler
22 install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
23}
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index e9e4a88a7f..69a433e7c3 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -5,4 +5,4 @@ require mesa-dri.inc
5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default 5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
6DEFAULT_PREFERENCE = "-2" 6DEFAULT_PREFERENCE = "-2"
7 7
8PR = "${INC_PR}.3" 8PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index b907931b7b..d558d0b3b6 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -1,21 +1,14 @@
1DEPENDS += "mesa-dri-glsl-native" 1# Current pre-9.1 commit
2SRCREV = "1665af3066f3d58c42e9d5b13098f13615a7672c"
3PV = "9.1~git${SRCPV}"
2 4
3SRCREV = "c1f4867c89adb1a6b19d66ec8ad146115909f0a7" 5LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
4PV = "8.0.4+git${SRCPV}"
5
6LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
7FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:" 6FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
8 7
9SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ 8SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
10 file://0001-Compile-with-uclibc.patch \
11 file://0002-cross-compile.patch \ 9 file://0002-cross-compile.patch \
12 file://0003-fix-for-x32.patch \
13 " 10 "
11
14SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}" 12SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}"
15 13
16S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
17
18do_configure_prepend() {
19 # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
20 sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
21}
diff --git a/meta/recipes-graphics/mesa/mesa-git/uclibc.patch b/meta/recipes-graphics/mesa/mesa-git/uclibc.patch
deleted file mode 100644
index 0b031f9c35..0000000000
--- a/meta/recipes-graphics/mesa/mesa-git/uclibc.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1Upstream-Status: Pending
2
3From 904bd5127bd88f45abf4a376676e0a487cfb018a Mon Sep 17 00:00:00 2001
4From: Martin Jansa <Martin.Jansa@gmail.com>
5Date: Thu, 13 Oct 2011 12:46:53 +0200
6Subject: [PATCH] configure: add check HAVE_NEWLOCALE to fix build with uclibc
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 configure.ac | 3 +++
11 src/glsl/strtod.c | 2 +-
12 src/mesa/main/imports.c | 2 +-
13 3 files changed, 5 insertions(+), 2 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 49e81ad..468cfd7 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -507,6 +507,9 @@ AC_SUBST([DLOPEN_LIBS])
20 dnl See if posix_memalign is available
21 AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
22
23+dnl See if newlocale is available
24+AC_CHECK_FUNCS_ONCE(newlocale)
25+
26 dnl SELinux awareness.
27 AC_ARG_ENABLE([selinux],
28 [AS_HELP_STRING([--enable-selinux],
29diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
30index ff34591..88aa5ef 100644
31--- a/src/glsl/strtod.c
32+++ b/src/glsl/strtod.c
33@@ -44,7 +44,7 @@
34 double
35 glsl_strtod(const char *s, char **end)
36 {
37-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
38+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
39 static locale_t loc = NULL;
40 if (!loc) {
41 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
42diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
43index 345a1c5..493e0fb 100644
44--- a/src/mesa/main/imports.c
45+++ b/src/mesa/main/imports.c
46@@ -767,7 +767,7 @@ float
47 _mesa_strtof( const char *s, char **end )
48 {
49 #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
50- !defined(ANDROID)
51+ !defined(ANDROID) && defined (HAVE_NEWLOCALE)
52 static locale_t loc = NULL;
53 if (!loc) {
54 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
55--
561.7.7
57