summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-06-06 10:45:48 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-18 11:07:58 +0100
commitb77d478b3d41a0c2aced9f704a9b1a01f9c8e0ed (patch)
treee203ec50c739fd85472c4debff2757f2d5294c9f /meta/recipes-graphics
parent559f4951e2ec786a05e39a685299d4913a28056e (diff)
downloadpoky-b77d478b3d41a0c2aced9f704a9b1a01f9c8e0ed.tar.gz
mesa: Update 18.0.2 -> 18.1.1
This includes all bugfixes of 18.0.x series and major new features. For list of changes check: https://www.mesa3d.org/relnotes/18.1.0.html https://www.mesa3d.org/relnotes/18.1.1.html (From OE-Core rev: 8803a6e31a4b64eb9d3c146567375c98972074df) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch18
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch34
-rw-r--r--meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch38
-rw-r--r--meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch (renamed from meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch)12
-rw-r--r--meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch (renamed from meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch)15
-rw-r--r--meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch (renamed from meta/recipes-graphics/mesa/files/llvm-config-version.patch)13
-rw-r--r--meta/recipes-graphics/mesa/files/0006-Use-Python-3-to-execute-the-scripts.patch (renamed from meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch)12
-rw-r--r--meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch36
-rw-r--r--meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch29
-rw-r--r--meta/recipes-graphics/mesa/files/vulkan-mkdir.patch41
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa_18.1.1.bb (renamed from meta/recipes-graphics/mesa/mesa_18.0.2.bb)19
12 files changed, 121 insertions, 146 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
index f908d46550..822066243b 100644
--- a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
+++ b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
@@ -1,8 +1,9 @@
1From 342311dbb190735b7b32ab20f81c1d8dbcfe717a Mon Sep 17 00:00:00 2001 1From 327c3dcbfa005f5d1b2fcda07ca1198d65bd23c5 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 11 Oct 2017 15:40:42 +0800 3Date: Wed, 11 Oct 2017 15:40:42 +0800
4Subject: [PATCH] Makefile.vulkan.am: explictly add lib expat to intel 4Subject: [PATCH 1/7] Makefile.vulkan.am: explictly add lib expat to intel
5 libvulkan's lib depends 5 libvulkan's lib depends
6Organization: O.S. Systems Software LTDA.
6 7
7While built with "-fvisibility=default" 8While built with "-fvisibility=default"
8... 9...
@@ -28,11 +29,11 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
28 src/intel/Makefile.vulkan.am | 1 + 29 src/intel/Makefile.vulkan.am | 1 +
29 1 file changed, 1 insertion(+) 30 1 file changed, 1 insertion(+)
30 31
31Index: mesa-17.3.6/src/intel/Makefile.vulkan.am 32diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
32=================================================================== 33index 4125cb205a..356c4f8452 100644
33--- mesa-17.3.6.orig/src/intel/Makefile.vulkan.am 34--- a/src/intel/Makefile.vulkan.am
34+++ mesa-17.3.6/src/intel/Makefile.vulkan.am 35+++ b/src/intel/Makefile.vulkan.am
35@@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \ 36@@ -161,6 +161,7 @@ VULKAN_LIB_DEPS = \
36 $(LIBDRM_LIBS) \ 37 $(LIBDRM_LIBS) \
37 $(PTHREAD_LIBS) \ 38 $(PTHREAD_LIBS) \
38 $(DLOPEN_LIBS) \ 39 $(DLOPEN_LIBS) \
@@ -40,3 +41,6 @@ Index: mesa-17.3.6/src/intel/Makefile.vulkan.am
40 -lm 41 -lm
41 42
42 if HAVE_PLATFORM_ANDROID 43 if HAVE_PLATFORM_ANDROID
44--
452.17.1
46
diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
deleted file mode 100644
index 2444b2846b..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From c908f0c13ac81a3a52140f129a13b2bc997ff4ee Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 15 Nov 2016 15:20:49 +0200
4Subject: [PATCH] Simplify wayland-scanner lookup
5
6Don't use pkg-config to lookup the path of a binary that's in the path.
7
8Alternatively we'd have to prefix the path returned by pkg-config with
9PKG_CONFIG_SYSROOT_DIR.
10
11Upstream-Status: Pending
12Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
13---
14 configure.ac | 7 +------
15 1 file changed, 1 insertion(+), 6 deletions(-)
16
17Index: mesa-17.3.6/configure.ac
18===================================================================
19--- mesa-17.3.6.orig/configure.ac
20+++ mesa-17.3.6/configure.ac
21@@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then
22 with_platforms=$with_egl_platforms
23 fi
24
25-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
26- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
27- WAYLAND_SCANNER='')
28-if test "x$WAYLAND_SCANNER" = x; then
29- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
30-fi
31+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
32
33 PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no])
34 if test "x$have_wayland_protocols" = xyes; then
diff --git a/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch
new file mode 100644
index 0000000000..e7585060ac
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch
@@ -0,0 +1,38 @@
1From 135f6ae990df9abe3765ed339f76c55026c86fe5 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 15 Nov 2016 15:20:49 +0200
4Subject: [PATCH 2/7] Simplify wayland-scanner lookup
5Organization: O.S. Systems Software LTDA.
6
7Don't use pkg-config to lookup the path of a binary that's in the path.
8
9Alternatively we'd have to prefix the path returned by pkg-config with
10PKG_CONFIG_SYSROOT_DIR.
11
12Upstream-Status: Pending
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14---
15 configure.ac | 7 +------
16 1 file changed, 1 insertion(+), 6 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index f1fbdcc6c7..7c95598afc 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -1796,12 +1796,7 @@ for plat in $platforms; do
23 PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
24 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
25
26- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
27- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
28- WAYLAND_SCANNER='')
29- if test "x$WAYLAND_SCANNER" = x; then
30- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
31- fi
32+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
33
34 if test "x$WAYLAND_SCANNER" = "x:"; then
35 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
36--
372.17.1
38
diff --git a/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch b/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch
index 549b8671ab..17368c88fa 100644
--- a/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch
+++ b/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch
@@ -1,7 +1,8 @@
1From d8750776404b1031d762966d0f551d13d2fe05a7 Mon Sep 17 00:00:00 2001 1From edb22b2f4df8dab39559ace867c3c67bc12851ae Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 16 Aug 2017 18:58:20 -0700 3Date: Wed, 16 Aug 2017 18:58:20 -0700
4Subject: [PATCH] winsys/svga/drm: Include sys/types.h 4Subject: [PATCH 3/7] winsys/svga/drm: Include sys/types.h
5Organization: O.S. Systems Software LTDA.
5 6
6vmw_screen.h uses dev_t which is defines in sys/types.h 7vmw_screen.h uses dev_t which is defines in sys/types.h
7this header is required to be included for getting dev_t 8this header is required to be included for getting dev_t
@@ -11,14 +12,11 @@ system headers
11 12
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
13--- 14---
14
15Upstream-Status: Submitted
16
17 src/gallium/winsys/svga/drm/vmw_screen.h | 1 + 15 src/gallium/winsys/svga/drm/vmw_screen.h | 1 +
18 1 file changed, 1 insertion(+) 16 1 file changed, 1 insertion(+)
19 17
20diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h 18diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
21index 0ef8e84..2eda97e 100644 19index f21cabb51f..4c972fdaa9 100644
22--- a/src/gallium/winsys/svga/drm/vmw_screen.h 20--- a/src/gallium/winsys/svga/drm/vmw_screen.h
23+++ b/src/gallium/winsys/svga/drm/vmw_screen.h 21+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
24@@ -41,6 +41,7 @@ 22@@ -41,6 +41,7 @@
@@ -30,5 +28,5 @@ index 0ef8e84..2eda97e 100644
30 #define VMW_GMR_POOL_SIZE (16*1024*1024) 28 #define VMW_GMR_POOL_SIZE (16*1024*1024)
31 #define VMW_QUERY_POOL_SIZE (8192) 29 #define VMW_QUERY_POOL_SIZE (8192)
32-- 30--
332.14.1 312.17.1
34 32
diff --git a/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch b/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch
index 0e014dcc80..f23b9875cd 100644
--- a/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch
+++ b/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch
@@ -1,7 +1,8 @@
1From 00bcd599310dc7fce4fe336ffd85902429051a0c Mon Sep 17 00:00:00 2001 1From 52468545daa0c2d205312e06304d8fb374e0bbf0 Mon Sep 17 00:00:00 2001
2From: Igor Gnatenko <i.gnatenko.brain@gmail.com> 2From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
3Date: Sun, 20 Mar 2016 13:27:04 +0100 3Date: Sun, 20 Mar 2016 13:27:04 +0100
4Subject: [PATCH 2/4] hardware gloat 4Subject: [PATCH 4/7] hardware gloat
5Organization: O.S. Systems Software LTDA.
5 6
6Upstream-Status: Inappropriate [not author] 7Upstream-Status: Inappropriate [not author]
7Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> 8Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
@@ -11,10 +12,10 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
11 2 files changed, 14 insertions(+) 12 2 files changed, 14 insertions(+)
12 13
13diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c 14diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
14index 4f61de8..3b0ec77 100644 15index 3f5d0327bf..86808e016b 100644
15--- a/src/gallium/drivers/llvmpipe/lp_screen.c 16--- a/src/gallium/drivers/llvmpipe/lp_screen.c
16+++ b/src/gallium/drivers/llvmpipe/lp_screen.c 17+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
17@@ -411,6 +411,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, 18@@ -449,6 +449,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
18 if (!format_desc) 19 if (!format_desc)
19 return FALSE; 20 return FALSE;
20 21
@@ -29,10 +30,10 @@ index 4f61de8..3b0ec77 100644
29 target == PIPE_TEXTURE_1D || 30 target == PIPE_TEXTURE_1D ||
30 target == PIPE_TEXTURE_1D_ARRAY || 31 target == PIPE_TEXTURE_1D_ARRAY ||
31diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c 32diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
32index 031602b..c279120 100644 33index 25f6f74f36..61629ef2ff 100644
33--- a/src/gallium/drivers/softpipe/sp_screen.c 34--- a/src/gallium/drivers/softpipe/sp_screen.c
34+++ b/src/gallium/drivers/softpipe/sp_screen.c 35+++ b/src/gallium/drivers/softpipe/sp_screen.c
35@@ -358,6 +358,13 @@ softpipe_is_format_supported( struct pipe_screen *screen, 36@@ -397,6 +397,13 @@ softpipe_is_format_supported( struct pipe_screen *screen,
36 if (!format_desc) 37 if (!format_desc)
37 return FALSE; 38 return FALSE;
38 39
@@ -47,5 +48,5 @@ index 031602b..c279120 100644
47 return FALSE; 48 return FALSE;
48 49
49-- 50--
502.7.4 512.17.1
51 52
diff --git a/meta/recipes-graphics/mesa/files/llvm-config-version.patch b/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
index fd79991aab..94189ac714 100644
--- a/meta/recipes-graphics/mesa/files/llvm-config-version.patch
+++ b/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
@@ -1,5 +1,8 @@
1From 33025fb1650768a0b923f3c824c270628eef83db Mon Sep 17 00:00:00 2001
1From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
2Subject: [PATCH] Properly get LLVM version when using LLVM Git releases 3Date: Tue, 5 Jun 2018 11:11:10 -0300
4Subject: [PATCH 5/7] Properly get LLVM version when using LLVM Git releases
5Organization: O.S. Systems Software LTDA.
3 6
4$ llvm-config-host --version 7$ llvm-config-host --version
55.0.0git-9a5c333388c 85.0.0git-9a5c333388c
@@ -15,10 +18,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15 1 file changed, 2 insertions(+), 2 deletions(-) 18 1 file changed, 2 insertions(+), 2 deletions(-)
16 19
17diff --git a/configure.ac b/configure.ac 20diff --git a/configure.ac b/configure.ac
18index a02173f244..b107f04c2e 100644 21index 7c95598afc..c248248c6b 100644
19--- a/configure.ac 22--- a/configure.ac
20+++ b/configure.ac 23+++ b/configure.ac
21@@ -995,7 +995,7 @@ strip_unwanted_llvm_flags() { 24@@ -1075,7 +1075,7 @@ strip_unwanted_llvm_flags() {
22 25
23 llvm_set_environment_variables() { 26 llvm_set_environment_variables() {
24 if test "x$LLVM_CONFIG" != xno; then 27 if test "x$LLVM_CONFIG" != xno; then
@@ -27,7 +30,7 @@ index a02173f244..b107f04c2e 100644
27 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` 30 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
28 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` 31 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
29 LLVM_LIBDIR=`$LLVM_CONFIG --libdir` 32 LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
30@@ -2644,7 +2644,7 @@ detect_old_buggy_llvm() { 33@@ -2776,7 +2776,7 @@ detect_old_buggy_llvm() {
31 dnl ourselves. 34 dnl ourselves.
32 dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) 35 dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
33 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, 36 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
@@ -37,5 +40,5 @@ index a02173f244..b107f04c2e 100644
37 40
38 if test "x$llvm_have_one_so" = xyes; then 41 if test "x$llvm_have_one_so" = xyes; then
39-- 42--
402.15.1 432.17.1
41 44
diff --git a/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch b/meta/recipes-graphics/mesa/files/0006-Use-Python-3-to-execute-the-scripts.patch
index 0b4aabf979..72ce0a33a0 100644
--- a/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch
+++ b/meta/recipes-graphics/mesa/files/0006-Use-Python-3-to-execute-the-scripts.patch
@@ -1,7 +1,7 @@
1From 18c3e684a8259a0644214f88c7ead7fa31573fd9 Mon Sep 17 00:00:00 2001 1From 2c6f0c6f83d2012d2ffb64f1caff966497de8f72 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Fri, 29 Dec 2017 10:27:59 -0200 3Date: Fri, 29 Dec 2017 10:27:59 -0200
4Subject: [PATCH] Use Python 3 to execute the scripts 4Subject: [PATCH 6/7] Use Python 3 to execute the scripts
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7The MESA build system uses Python 2 but as OE-Core has moved away from 7The MESA build system uses Python 2 but as OE-Core has moved away from
@@ -15,11 +15,11 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
18index b107f04c2e..055546142d 100644 18index c248248c6b..10f199d63c 100644
19--- a/configure.ac 19--- a/configure.ac
20+++ b/configure.ac 20+++ b/configure.ac
21@@ -114,7 +114,7 @@ AC_PROG_CXX 21@@ -122,7 +122,7 @@ AM_PROG_CC_C_O
22 AM_PROG_CC_C_O 22 AC_PROG_NM
23 AM_PROG_AS 23 AM_PROG_AS
24 AX_CHECK_GNU_MAKE 24 AX_CHECK_GNU_MAKE
25-AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python]) 25-AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
@@ -28,5 +28,5 @@ index b107f04c2e..055546142d 100644
28 AC_PROG_MKDIR_P 28 AC_PROG_MKDIR_P
29 29
30-- 30--
312.15.1 312.17.1
32 32
diff --git a/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch b/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch
new file mode 100644
index 0000000000..e56d1588fd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch
@@ -0,0 +1,36 @@
1From 9a25f6e7a0eb8825ab089fdd166dbaee778a4c81 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 6 Jun 2018 09:50:35 -0300
4Subject: [PATCH 7/7] dri: i965: Add missing time.h include
5Organization: O.S. Systems Software LTDA.
6
7This fixes a build error when using musl:
8
9,----
10| In file included from .../src/mesa/drivers/dri/i965/intel_upload.c:33:0:
11| .../src/mesa/drivers/dri/i965/brw_bufmgr.h:132:4: error: unknown type name 'time_t'
12| time_t free_time;
13| ^~~~~~
14`----
15
16Upstream-Status: Pending
17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18---
19 src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
23index 68f5e0c2c8..5b60a23763 100644
24--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
25+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
26@@ -37,6 +37,7 @@
27 #include <stdbool.h>
28 #include <stdint.h>
29 #include <stdio.h>
30+#include <time.h>
31 #include "util/u_atomic.h"
32 #include "util/list.h"
33
34--
352.17.1
36
diff --git a/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch b/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch
deleted file mode 100644
index d2d67558b6..0000000000
--- a/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Configure checks for compiler to be gcc and then it enables asm_offsets
2generation. see
3
4https://cgit.freedesktop.org/mesa/mesa/commit/?id=73c9b4b0e05fc66629ba250846948dc55c0e7a0d
5
6However, we missed the check when enabling this on cross compilation
7when architecture for both host and target is x86
8
9Fixes errors like
10./gen_matypes > matypes.h
11/bin/bash: ./gen_matypes: No such file or directory
12
13-Khem
14
15Upstream-Status: Submitted
16
17Index: mesa-12.0.1/configure.ac
18===================================================================
19--- mesa-12.0.1.orig/configure.ac
20+++ mesa-12.0.1/configure.ac
21@@ -732,7 +732,7 @@ test "x$enable_asm" = xno && AC_MSG_RESU
22 if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then
23 case "$host_cpu" in
24 i?86 | x86_64 | amd64)
25- if test "x$host_cpu" != "x$target_cpu"; then
26+ if test "x$host_cpu" != "x$target_cpu" -o "x$acv_mesa_CLANG" = xyes; then
27 enable_asm=no
28 AC_MSG_RESULT([no, cross compiling])
29 fi
diff --git a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
deleted file mode 100644
index 9922a55b40..0000000000
--- a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 4854c72bc21486f81712c8693588f7af6c64cf93 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 9 May 2018 20:41:36 +0100
7Subject: [PATCH] src/intel/Makefile.vulkan.am: add missing MKDIR_GEN
8
9Out of tree builds can try to write into a directory that doesn't exist yet:
10
11| Traceback (most recent call last):
12| File "../../../mesa-18.0.2/src/intel/vulkan/anv_icd.py", line 46, in <module>
13| with open(args.out, 'w') as f:
14| IOError: [Errno 2] No such file or directory: 'vulkan/intel_icd.x86_64.json'
15| Makefile:4882: recipe for target 'vulkan/intel_icd.x86_64.json' failed
16
17Add missing MKDIR_GEN calls to solve this.
18---
19 src/intel/Makefile.vulkan.am | 2 ++
20 1 file changed, 2 insertions(+)
21
22diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
23index 0bcbf0419c..4125cb205a 100644
24--- a/src/intel/Makefile.vulkan.am
25+++ b/src/intel/Makefile.vulkan.am
26@@ -64,10 +64,12 @@ EXTRA_DIST += \
27 vulkan/TODO
28
29 vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py
30+ $(MKDIR_GEN)
31 $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
32 --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
33
34 vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py
35+ $(MKDIR_GEN)
36 $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
37 --lib-path="${libdir}" --out $@
38
39--
402.11.0
41
diff --git a/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb
index 73267eb4f0..73267eb4f0 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa_18.0.2.bb b/meta/recipes-graphics/mesa/mesa_18.1.1.bb
index f2ac38e919..aab4a19315 100644
--- a/meta/recipes-graphics/mesa/mesa_18.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.1.1.bb
@@ -1,18 +1,17 @@
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://disable-asm-on-non-gcc.patch \
5 file://Use-Python-3-to-execute-the-scripts.patch \
6 file://0001-Use-wayland-scanner-in-the-path.patch \
7 file://0002-hardware-gloat.patch \
8 file://llvm-config-version.patch \
9 file://0001-winsys-svga-drm-Include-sys-types.h.patch \
10 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ 4 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
11 file://vulkan-mkdir.patch \ 5 file://0002-Simplify-wayland-scanner-lookup.patch \
12 " 6 file://0003-winsys-svga-drm-Include-sys-types.h.patch \
7 file://0004-hardware-gloat.patch \
8 file://0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
9 file://0006-Use-Python-3-to-execute-the-scripts.patch \
10 file://0007-dri-i965-Add-missing-time.h-include.patch \
11"
13 12
14SRC_URI[md5sum] = "3c303da98ec2ce37c795baeba5aee31e" 13SRC_URI[md5sum] = "063468c930ff61d211ece0191874fa95"
15SRC_URI[sha256sum] = "98fa159768482dc568b9f8bf0f36c7acb823fa47428ffd650b40784f16b9e7b3" 14SRC_URI[sha256sum] = "d3312a2ede5aac14a47476b208b8e3a401367838330197c4588ab8ad420d7781"
16 15
17#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,
18#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 17#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 16:06:28 +0000