summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa-git
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/recipes-graphics/mesa/mesa-git
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/recipes-graphics/mesa/mesa-git')
-rw-r--r--meta/recipes-graphics/mesa/mesa-git/uclibc.patch57
1 files changed, 0 insertions, 57 deletions
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