summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-04-29 16:33:20 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-30 23:04:12 +0100
commitf2db690d8d518f90c362f9874d24f4b4b22fd9d2 (patch)
tree40c70a8c71c1ad46ef1c66e913586deea118b1a2 /meta
parent44f5b0e449417f21f2559bc2e6906985cae1f802 (diff)
downloadpoky-f2db690d8d518f90c362f9874d24f4b4b22fd9d2.tar.gz
mesa: Upgrade 10.4.4 -> 10.5.4
* Remove patches that are no longer needed * git build depends on python module mako. Inherit pythonnative for this * source directory changed: default S is now correct in mesa recipe, but still needs to be set in mesa-gl (From OE-Core rev: b3035cac6f505fda2bea31da63ab381b104cfd2e) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_10.5.4.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb)2
-rw-r--r--meta/recipes-graphics/mesa/mesa/0001-PTHREAD_MUTEX_RECURSIVE_NP-is-specific-to-glibc.patch29
-rw-r--r--meta/recipes-graphics/mesa/mesa/0002-mesa-simplify-detection-of-fpclassify.patch53
-rw-r--r--meta/recipes-graphics/mesa/mesa_10.5.4.bb (renamed from meta/recipes-graphics/mesa/mesa_10.4.4.bb)11
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb10
5 files changed, 12 insertions, 93 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb b/meta/recipes-graphics/mesa/mesa-gl_10.5.4.bb
index 2acc21dce5..fc2bca9982 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_10.5.4.bb
@@ -6,6 +6,8 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:"
6 6
7PROVIDES = "virtual/libgl virtual/mesa" 7PROVIDES = "virtual/libgl virtual/mesa"
8 8
9S = "${WORKDIR}/mesa-${PV}"
10
9PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 11PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
10 12
11EXCLUDE_FROM_WORLD = "1" 13EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-graphics/mesa/mesa/0001-PTHREAD_MUTEX_RECURSIVE_NP-is-specific-to-glibc.patch b/meta/recipes-graphics/mesa/mesa/0001-PTHREAD_MUTEX_RECURSIVE_NP-is-specific-to-glibc.patch
deleted file mode 100644
index 52443d8422..0000000000
--- a/meta/recipes-graphics/mesa/mesa/0001-PTHREAD_MUTEX_RECURSIVE_NP-is-specific-to-glibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 46cdd464efbada13478f5e39a50aef85599ff91b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 4 Apr 2015 15:50:53 -0700
4Subject: [PATCH 1/2] PTHREAD_MUTEX_RECURSIVE_NP is specific to glibc
5
6use glibc guard around it
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Upstream-Status: Pending
10---
11 include/c11/threads_posix.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
15index f9c165d..c641de4 100644
16--- a/include/c11/threads_posix.h
17+++ b/include/c11/threads_posix.h
18@@ -178,7 +178,7 @@ mtx_init(mtx_t *mtx, int type)
19 return thrd_error;
20 pthread_mutexattr_init(&attr);
21 if ((type & mtx_recursive) != 0) {
22-#if defined(__linux__) || defined(__linux)
23+#if defined __GLIBC__ && (defined(__linux__) || defined(__linux))
24 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
25 #else
26 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
27--
282.1.4
29
diff --git a/meta/recipes-graphics/mesa/mesa/0002-mesa-simplify-detection-of-fpclassify.patch b/meta/recipes-graphics/mesa/mesa/0002-mesa-simplify-detection-of-fpclassify.patch
deleted file mode 100644
index dd7a188a2f..0000000000
--- a/meta/recipes-graphics/mesa/mesa/0002-mesa-simplify-detection-of-fpclassify.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From c09606093c6b8e47d7cb6745eff192184eaaae07 Mon Sep 17 00:00:00 2001
2From: Felix Janda <felix.janda@posteo.de>
3Date: Fri, 23 Jan 2015 17:57:15 +0100
4Subject: [PATCH 2/2] mesa: simplify detection of fpclassify
5
6Fixes compilation with musl libc.
7
8Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9Upstream-Status: Backport
10---
11 src/mesa/main/querymatrix.c | 18 +++++++-----------
12 1 file changed, 7 insertions(+), 11 deletions(-)
13
14diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c
15index eb36c76..ef85175 100644
16--- a/src/mesa/main/querymatrix.c
17+++ b/src/mesa/main/querymatrix.c
18@@ -37,8 +37,12 @@
19 #define INT_TO_FIXED(x) ((GLfixed) ((x) << 16))
20 #define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))
21
22-#if defined(_MSC_VER)
23-#if _MSC_VER < 1800 /* Not required on VS2013 and above. */
24+#if defined(fpclassify)
25+/* ISO C99 says that fpclassify is a macro. Assume that any implementation
26+ * of fpclassify, whether it's in a C99 compiler or not, will be a macro.
27+ */
28+#elif defined(_MSC_VER)
29+/* Not required on VS2013 and above. */
30 /* Oddly, the fpclassify() function doesn't exist in such a form
31 * on MSVC. This is an implementation using slightly different
32 * lower-level Windows functions.
33@@ -71,16 +75,8 @@ fpclassify(double x)
34 return FP_NAN;
35 }
36 }
37-#endif /* _MSC_VER < 1800 */
38-
39-#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
40- defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
41- (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \
42- (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__)
43-
44-/* fpclassify is available. */
45
46-#elif !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600
47+#else
48
49 enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
50 fpclassify(double x)
51--
522.1.4
53
diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb b/meta/recipes-graphics/mesa/mesa_10.5.4.bb
index 7b22bb0d44..150c664ebf 100644
--- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_10.5.4.bb
@@ -1,14 +1,9 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz"
4 file://0001-PTHREAD_MUTEX_RECURSIVE_NP-is-specific-to-glibc.patch \
5 file://0002-mesa-simplify-detection-of-fpclassify.patch \
6 "
7 4
8SRC_URI[md5sum] = "62faf98ac79c5587f8e917e187419e6c" 5SRC_URI[md5sum] = "26644437b6447fb3dbae50714a019797"
9SRC_URI[sha256sum] = "f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c" 6SRC_URI[sha256sum] = "b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803"
10
11S = "${WORKDIR}/Mesa-${PV}"
12 7
13#because we cannot rely on the fact that all apps will use pkgconfig, 8#because we cannot rely on the fact that all apps will use pkgconfig,
14#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 9#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index a6d2880be9..0260617742 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -2,13 +2,17 @@ require ${BPN}.inc
2 2
3DEFAULT_PREFERENCE = "-1" 3DEFAULT_PREFERENCE = "-1"
4 4
5SRCREV = "62eb27ac8bbd979796f50e253f6c786d7d791242" 5SRCREV = "ea0d1f575c214c09ba3df12644a960e86e031766"
6PV = "10.4.4+git${SRCPV}" 6PV = "10.5.4+git${SRCPV}"
7 7
8SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4" 8SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.5"
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
11 11
12DEPENDS += "python-mako-native"
13
14inherit pythonnative
15
12#because we cannot rely on the fact that all apps will use pkgconfig, 16#because we cannot rely on the fact that all apps will use pkgconfig,
13#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 17#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
14do_install_append() { 18do_install_append() {