summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2012-08-02 16:49:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 14:18:52 (GMT)
commitc5084487eb7526323684e5389d28352c5787ebd2 (patch)
tree4b05a4ce6ae7425c469bf2edfe6f183921d25323
parentabfa907b4c4e682be63b82a14d5f0855d137e3c5 (diff)
downloadpoky-c5084487eb7526323684e5389d28352c5787ebd2.tar.gz
mesa: Update to 8.0.4 (latest stable version)
- The license file has changed, but the project still has the same license - Patches have been rebased on top of the 8.0 branch. crossfix.patch and crossfix-mklib.patch have been merged as they address the same problem (From OE-Core rev: e4039eb74b20e96d4b8837cd58cf2d13d091e1ad) Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-8.0.4.inc (renamed from meta/recipes-graphics/mesa/mesa-7.11.inc)13
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc4
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb (renamed from meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb)4
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb (renamed from meta/recipes-graphics/mesa/mesa-dri_7.11.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa-git.inc9
-rw-r--r--meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb (renamed from meta/recipes-graphics/mesa/mesa-xlib_7.11.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch52
-rw-r--r--meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch (renamed from meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch)39
-rw-r--r--meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch (renamed from meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch)30
-rw-r--r--meta/recipes-graphics/mesa/mesa/crossfix.patch18
-rw-r--r--meta/recipes-graphics/mesa/mesa/uclibc.patch42
11 files changed, 118 insertions, 93 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
index 7c4a690..d9d17bb 100644
--- a/meta/recipes-graphics/mesa/mesa-7.11.inc
+++ b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
@@ -1,16 +1,15 @@
1DEPENDS += "mesa-dri-glsl-native" 1DEPENDS += "mesa-dri-glsl-native"
2 2
3
4SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
5 file://uclibc.patch \ 4 file://0001-Compile-with-uclibc.patch \
6 file://crossfix.patch \ 5 file://0002-cross-compile.patch \
7 file://crossfix-mklib.patch \ 6 file://0003-fix-for-x32.patch \
8 file://mesa_fix_for_x32.patch \
9 " 7 "
8
10S = "${WORKDIR}/Mesa-${PV}" 9S = "${WORKDIR}/Mesa-${PV}"
11 10
12SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13" 11SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
13SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf" 12SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
14 13
15do_configure_prepend() { 14do_configure_prepend() {
16 #check for python not python2, because python-native does not stage python2 binary/link 15 #check for python not python2, because python-native does not stage python2 binary/link
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index ff9f882..aac3bbe 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -10,9 +10,9 @@ HOMEPAGE = "http://mesa3d.org"
10BUGTRACKER = "https://bugs.freedesktop.org" 10BUGTRACKER = "https://bugs.freedesktop.org"
11SECTION = "x11" 11SECTION = "x11"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
14 14
15INC_PR = "r18" 15INC_PR = "r0"
16PE = "2" 16PE = "2"
17 17
18 18
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
index 9194595..a81fb6d 100644
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc
8DEPENDS = "makedepend-native" 8DEPENDS = "makedepend-native"
9 9
10SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" 10SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
11SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13" 11SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
12SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf" 12SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
13 13
14S = "${WORKDIR}/Mesa-${PV}/src/glsl/" 14S = "${WORKDIR}/Mesa-${PV}/src/glsl/"
15 15
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
index 219e555..219e555 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 1b4c0a6..32b1d96 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -1,14 +1,15 @@
1DEPENDS += "mesa-dri-glsl-native" 1DEPENDS += "mesa-dri-glsl-native"
2 2
3SRCREV = "983fa4ad523535debf2e94cf6ac1fd4c5630c0d2" 3SRCREV = "c1f4867c89adb1a6b19d66ec8ad146115909f0a7"
4PV = "7.11+gitr${SRCPV}" 4PV = "8.0.4+git${SRCPV}"
5 5
6LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" 6LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
7FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:" 7FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
8 8
9SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ 9SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
10 file://uclibc.patch \ 10 file://0001-Compile-with-uclibc.patch \
11 file://crossfix.patch \ 11 file://0002-cross-compile.patch \
12 file://0003-fix-for-x32.patch \
12 " 13 "
13S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
14 15
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
index 7547b22..7547b22 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch b/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch
new file mode 100644
index 0000000..d39270a
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch
@@ -0,0 +1,52 @@
1Compile with uclibc
2
3Upstream-Status: Pending
4---
5 configure.ac | 3 +++
6 src/glsl/strtod.c | 2 +-
7 src/mesa/main/imports.c | 2 +-
8 3 files changed, 5 insertions(+), 2 deletions(-)
9
10diff --git a/configure.ac b/configure.ac
11index fbaa376..454dad2 100644
12--- a/configure.ac
13+++ b/configure.ac
14@@ -543,6 +543,9 @@ AC_SUBST([DLOPEN_LIBS])
15 dnl See if posix_memalign is available
16 AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
17
18+dnl See if newlocale is available
19+AC_CHECK_FUNCS_ONCE(newlocale)
20+
21 dnl SELinux awareness.
22 AC_ARG_ENABLE([selinux],
23 [AS_HELP_STRING([--enable-selinux],
24diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
25index a876e13..9fce7e9 100644
26--- a/src/glsl/strtod.c
27+++ b/src/glsl/strtod.c
28@@ -45,7 +45,7 @@ double
29 glsl_strtod(const char *s, char **end)
30 {
31 #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
32- !defined(__HAIKU__)
33+ !defined(__HAIKU__) && defined (HAVE_NEWLOCALE)
34 static locale_t loc = NULL;
35 if (!loc) {
36 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
37diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
38index d3727ef..363bf32 100644
39--- a/src/mesa/main/imports.c
40+++ b/src/mesa/main/imports.c
41@@ -767,7 +767,7 @@ float
42 _mesa_strtof( const char *s, char **end )
43 {
44 #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
45- !defined(ANDROID) && !defined(__HAIKU__)
46+ !defined(ANDROID) && !defined(__HAIKU__) && defined (HAVE_NEWLOCALE)
47 static locale_t loc = NULL;
48 if (!loc) {
49 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
50--
511.7.10.4
52
diff --git a/meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch b/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch
index dc08228..dc8e994 100644
--- a/meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch
+++ b/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch
@@ -1,4 +1,7 @@
1This patch is ported from WindRiver linux and to fix cross compile failure. 1cross compile
2
3This patch is ported from WindRiver linux and to fix cross compile
4failure.
2 5
3And original commits are: 6And original commits are:
4commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b 7commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b
@@ -7,10 +10,15 @@ commit 5c4212084b871a0c0fb7d174280ec9a634637deb
7Upstream-Status: Pending 10Upstream-Status: Pending
8 11
9Signed-off-by: Kang Kai <kai.kang@windriver.com> 12Signed-off-by: Kang Kai <kai.kang@windriver.com>
13---
14 bin/mklib | 24 ++++++++++++------------
15 1 file changed, 12 insertions(+), 12 deletions(-)
10 16
11--- Mesa-7.10.2/bin/mklib.orig 2011-09-28 16:15:34.170000074 +0800 17diff --git a/bin/mklib b/bin/mklib
12+++ Mesa-7.10.2/bin/mklib 2011-09-28 16:15:42.370000073 +0800 18index 9bac29e..b33aa90 100755
13@@ -49,8 +49,8 @@ 19--- a/bin/mklib
20+++ b/bin/mklib
21@@ -49,8 +49,8 @@ expand_archives() {
14 /*) ;; 22 /*) ;;
15 *) FILE="$ORIG_DIR/$FILE" ;; 23 *) FILE="$ORIG_DIR/$FILE" ;;
16 esac 24 esac
@@ -21,7 +29,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
21 for MEMBER in $MEMBERS ; do 29 for MEMBER in $MEMBERS ; do
22 NEWFILES="$NEWFILES $DIR/$MEMBER" 30 NEWFILES="$NEWFILES $DIR/$MEMBER"
23 done 31 done
24@@ -77,7 +77,7 @@ 32@@ -77,7 +77,7 @@ expand_archives() {
25 make_ar_static_lib() { 33 make_ar_static_lib() {
26 OPTS=$1 34 OPTS=$1
27 shift; 35 shift;
@@ -30,7 +38,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
30 shift; 38 shift;
31 LIBNAME=$1 39 LIBNAME=$1
32 shift; 40 shift;
33@@ -87,11 +87,11 @@ 41@@ -87,11 +87,11 @@ make_ar_static_lib() {
34 rm -f ${LIBNAME} 42 rm -f ${LIBNAME}
35 43
36 # make static lib 44 # make static lib
@@ -45,7 +53,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
45 fi 53 fi
46 54
47 echo ${LIBNAME} 55 echo ${LIBNAME}
48@@ -313,9 +313,9 @@ 56@@ -313,9 +313,9 @@ case $ARCH in
49 if [ "x$LINK" = "x" ] ; then 57 if [ "x$LINK" = "x" ] ; then
50 # -linker was not specified so set default link command now 58 # -linker was not specified so set default link command now
51 if [ $CPLUSPLUS = 1 ] ; then 59 if [ $CPLUSPLUS = 1 ] ; then
@@ -57,7 +65,19 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
57 fi 65 fi
58 fi 66 fi
59 67
60@@ -531,9 +531,9 @@ 68@@ -535,9 +535,9 @@ case $ARCH in
69 if [ "x$LINK" = "x" ] ; then
70 # -linker was not specified so set default link command now
71 if [ $CPLUSPLUS = 1 ] ; then
72- LINK=g++
73+ LINK=$CXX
74 else
75- LINK=gcc
76+ LINK=$CC
77 fi
78 fi
79
80@@ -903,9 +903,9 @@ case $ARCH in
61 if [ "x$LINK" = "x" ] ; then 81 if [ "x$LINK" = "x" ] ; then
62 # -linker was not specified so set default link command now 82 # -linker was not specified so set default link command now
63 if [ $CPLUSPLUS = 1 ] ; then 83 if [ $CPLUSPLUS = 1 ] ; then
@@ -69,3 +89,6 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
69 fi 89 fi
70 fi 90 fi
71 91
92--
931.7.10.4
94
diff --git a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch b/meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch
index f072c34..2d6a150 100644
--- a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
+++ b/meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch
@@ -1,16 +1,19 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Using uname like this when cross compiling is a really bad idea. We 3Using uname like this when cross compiling is a really bad idea. We
4provide the correct linker flags, lets just assume we can get this 4provide the correct linker flags, lets just assume we can get this
5right ourselves. 5right ourselves.
6 6
7RP 2012/04/26 7RP 2012/04/26
8---
9 bin/mklib | 16 ----------------
10 1 file changed, 16 deletions(-)
8 11
9Index: Mesa-7.11/bin/mklib 12diff --git a/bin/mklib b/bin/mklib
10=================================================================== 13index b33aa90..16cb017 100755
11--- Mesa-7.11.orig/bin/mklib 2012-04-26 19:43:20.729150109 +0000 14--- a/bin/mklib
12+++ Mesa-7.11/bin/mklib 2012-04-26 20:30:22.421086163 +0000 15+++ b/bin/mklib
13@@ -330,13 +330,7 @@ 16@@ -330,15 +330,7 @@ case $ARCH in
14 ;; 17 ;;
15 esac 18 esac
16 19
@@ -18,13 +21,15 @@ Index: Mesa-7.11/bin/mklib
18- # environment. If so, pass -m32 flag to linker. 21- # environment. If so, pass -m32 flag to linker.
19 set ${OBJECTS} 22 set ${OBJECTS}
20- ABI32=`file $1 | grep 32-bit` 23- ABI32=`file $1 | grep 32-bit`
21- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then 24- ARM=`file $1 | grep ARM`
25- # Do not add "-m32" option for arm.
26- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
22- OPTS="-m32 ${OPTS}" 27- OPTS="-m32 ${OPTS}"
23- fi 28- fi
24 29
25 if [ "${ALTOPTS}" ] ; then 30 if [ "${ALTOPTS}" ] ; then
26 OPTS=${ALTOPTS} 31 OPTS=${ALTOPTS}
27@@ -387,13 +381,7 @@ 32@@ -389,15 +381,7 @@ case $ARCH in
28 # exptmp is removed below 33 # exptmp is removed below
29 fi 34 fi
30 35
@@ -32,9 +37,14 @@ Index: Mesa-7.11/bin/mklib
32- # environment. If so, pass -m32 flag to linker. 37- # environment. If so, pass -m32 flag to linker.
33 set ${OBJECTS} 38 set ${OBJECTS}
34- ABI32=`file $1 | grep 32-bit` 39- ABI32=`file $1 | grep 32-bit`
35- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then 40- ARM=`file $1 | grep ARM`
41- # Do not add "-m32" option for arm.
42- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
36- OPTS="-m32 ${OPTS}" 43- OPTS="-m32 ${OPTS}"
37- fi 44- fi
38 if [ "${ALTOPTS}" ] ; then 45 if [ "${ALTOPTS}" ] ; then
39 OPTS=${ALTOPTS} 46 OPTS=${ALTOPTS}
40 fi 47 fi
48--
491.7.10.4
50
diff --git a/meta/recipes-graphics/mesa/mesa/crossfix.patch b/meta/recipes-graphics/mesa/mesa/crossfix.patch
deleted file mode 100644
index d300e2f..0000000
--- a/meta/recipes-graphics/mesa/mesa/crossfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Upstream-Status: Pending
2
3Index: Mesa-7.5/bin/mklib
4===================================================================
5--- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100
6+++ Mesa-7.5/bin/mklib 2009-08-12 13:04:19.000000000 +0100
7@@ -234,9 +234,9 @@
8 if [ "x$LINK" = "x" ] ; then
9 # -linker was not specified so set default link command now
10 if [ $CPLUSPLUS = 1 ] ; then
11- LINK=g++
12+ LINK=$CXX
13 else
14- LINK=gcc
15+ LINK=$CC
16 fi
17 fi
18
diff --git a/meta/recipes-graphics/mesa/mesa/uclibc.patch b/meta/recipes-graphics/mesa/mesa/uclibc.patch
deleted file mode 100644
index 49d0234..0000000
--- a/meta/recipes-graphics/mesa/mesa/uclibc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Upstream-Status: Pending
2
3Index: Mesa-7.10.2/src/mesa/main/imports.c
4===================================================================
5--- Mesa-7.10.2.orig/src/mesa/main/imports.c 2011-03-01 12:57:29.000000000 -0800
6+++ Mesa-7.10.2/src/mesa/main/imports.c 2011-07-20 19:08:49.441785510 -0700
7@@ -757,7 +757,7 @@
8 float
9 _mesa_strtof( const char *s, char **end )
10 {
11-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
12+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
13 static locale_t loc = NULL;
14 if (!loc) {
15 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
16Index: Mesa-7.10.2/src/glsl/strtod.c
17===================================================================
18--- Mesa-7.10.2.orig/src/glsl/strtod.c 2011-01-03 16:45:51.000000000 -0800
19+++ Mesa-7.10.2/src/glsl/strtod.c 2011-07-20 19:10:21.441785488 -0700
20@@ -44,7 +44,7 @@
21 double
22 glsl_strtod(const char *s, char **end)
23 {
24-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
25+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
26 static locale_t loc = NULL;
27 if (!loc) {
28 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
29Index: Mesa-7.10.2/configure.ac
30===================================================================
31--- Mesa-7.10.2.orig/configure.ac 2011-07-20 19:09:02.000000000 -0700
32+++ Mesa-7.10.2/configure.ac 2011-07-20 19:09:57.121785492 -0700
33@@ -450,6 +450,9 @@
34 dnl See if posix_memalign is available
35 AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
36
37+dnl See if newlocale is available
38+AC_CHECK_FUNCS_ONCE(newlocale)
39+
40 dnl SELinux awareness.
41 AC_ARG_ENABLE([selinux],
42 [AS_HELP_STRING([--enable-selinux],