summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch28
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_17.3.7.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa_17.3.8.bb (renamed from meta/recipes-graphics/mesa/mesa_17.3.7.bb)5
3 files changed, 2 insertions, 31 deletions
diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch
deleted file mode 100644
index 30f55f4dac..0000000000
--- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From: Otavio Salvador <otavio@ossystems.com.br>
2Subject: [PATCH] endianness check is OS wide and not specific to libc
3
4Upstream-Status: Accepted [https://cgit.freedesktop.org/mesa/mesa/commit/?id=cbee1bfb34274668a05995b9d4c78ddec9e5ea4c]
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
9---
10 src/util/u_endian.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/util/u_endian.h b/src/util/u_endian.h
14index 9e09f80181..3148033fae 100644
15--- a/src/util/u_endian.h
16+++ b/src/util/u_endian.h
17@@ -27,7 +27,7 @@
18 #ifndef U_ENDIAN_H
19 #define U_ENDIAN_H
20
21-#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__)
22+#if defined(__linux__)
23 #include <endian.h>
24
25 #if __BYTE_ORDER == __LITTLE_ENDIAN
26--
272.15.1
28
diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.3.7.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb
index 73267eb4f0..73267eb4f0 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_17.3.7.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb
diff --git a/meta/recipes-graphics/mesa/mesa_17.3.7.bb b/meta/recipes-graphics/mesa/mesa_17.3.8.bb
index 9c75d6c693..2d3fd3ca38 100644
--- a/meta/recipes-graphics/mesa/mesa_17.3.7.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.3.8.bb
@@ -1,7 +1,6 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ 3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
4 file://replace_glibc_check_with_linux.patch \
5 file://disable-asm-on-non-gcc.patch \ 4 file://disable-asm-on-non-gcc.patch \
6 file://Use-Python-3-to-execute-the-scripts.patch \ 5 file://Use-Python-3-to-execute-the-scripts.patch \
7 file://0001-Use-wayland-scanner-in-the-path.patch \ 6 file://0001-Use-wayland-scanner-in-the-path.patch \
@@ -12,8 +11,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
12 file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \ 11 file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \
13 " 12 "
14 13
15SRC_URI[md5sum] = "769137f2538562c300c4b76bcb097377" 14SRC_URI[md5sum] = "203d1a79156ab6926f2d253b377e9d9d"
16SRC_URI[sha256sum] = "0595904a8fba65a8fe853a84ad3c940205503b94af41e8ceed245fada777ac1e" 15SRC_URI[sha256sum] = "8f9d9bf281c48e4a8f5228816577263b4c655248dc7666e75034ab422951a6b1"
17 16
18#because we cannot rely on the fact that all apps will use pkgconfig, 17#because we cannot rely on the fact that all apps will use pkgconfig,
19#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 18#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER