summaryrefslogtreecommitdiffstats
path: root/meta-intel-extras/recipes/mesa/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta-intel-extras/recipes/mesa/files')
-rw-r--r--meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch39
-rw-r--r--meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch34
-rw-r--r--meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch44
-rw-r--r--meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch32
-rw-r--r--meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch36
-rw-r--r--meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch37
6 files changed, 222 insertions, 0 deletions
diff --git a/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
new file mode 100644
index 0000000..a50d2a2
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
@@ -0,0 +1,39 @@
1From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 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 1/6] 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>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15---
16 configure.ac | 7 +------
17 1 file changed, 1 insertion(+), 6 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index 14f1af2b2f..916d0bd207 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -1825,12 +1825,7 @@ for plat in $platforms; do
24 PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
25 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
26
27- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
28- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
29- WAYLAND_SCANNER='')
30- if test "x$WAYLAND_SCANNER" = x; then
31- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
32- fi
33+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
34
35 if test "x$WAYLAND_SCANNER" = "x:"; then
36 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
37--
382.18.0
39
diff --git a/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch b/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
new file mode 100644
index 0000000..ffb3bf7
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
@@ -0,0 +1,34 @@
1From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 16 Aug 2017 18:58:20 -0700
4Subject: [PATCH 2/6] winsys/svga/drm: Include sys/types.h
5Organization: O.S. Systems Software LTDA.
6
7vmw_screen.h uses dev_t which is defines in sys/types.h
8this header is required to be included for getting dev_t
9definition. This issue happens on musl C library, it is hidden
10on glibc since sys/types.h is included through another
11system headers
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Upstream-Status: Backport [7dfdfbf8c37e52e7b9b09f7d1d434edad3ebc864]
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16---
17 src/gallium/winsys/svga/drm/vmw_screen.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
21index f21cabb51f..4c972fdaa9 100644
22--- a/src/gallium/winsys/svga/drm/vmw_screen.h
23+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
24@@ -41,6 +41,7 @@
25 #include "svga_winsys.h"
26 #include "pipebuffer/pb_buffer_fenced.h"
27 #include <os/os_thread.h>
28+#include <sys/types.h>
29
30 #define VMW_GMR_POOL_SIZE (16*1024*1024)
31 #define VMW_QUERY_POOL_SIZE (8192)
32--
332.18.0
34
diff --git a/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
new file mode 100644
index 0000000..5e735ca
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
@@ -0,0 +1,44 @@
1From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 5 Jun 2018 11:11:10 -0300
4Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases
5Organization: O.S. Systems Software LTDA.
6
7$ llvm-config-host --version
85.0.0git-9a5c333388c
9
10We need to ignore everything after 5.0.0 which is what the cut cmd is
11doing
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16---
17 configure.ac | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 916d0bd207..dd172f1ebe 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() {
25
26 llvm_set_environment_variables() {
27 if test "x$LLVM_CONFIG" != xno; then
28- LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
29+ LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5`
30 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
31 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
32 LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
33@@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() {
34 dnl ourselves.
35 dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
36 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
37- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
38+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5`
39 AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
40
41 if test "x$llvm_have_one_so" = xyes; then
42--
432.18.0
44
diff --git a/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch b/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
new file mode 100644
index 0000000..8953c4a
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
@@ -0,0 +1,32 @@
1From ebe6077a1d74e56b28249f71e8760295fa846ed2 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Fri, 29 Dec 2017 10:27:59 -0200
4Subject: [PATCH 4/6] Use Python 3 to execute the scripts
5Organization: O.S. Systems Software LTDA.
6
7The MESA build system uses Python 2 but as OE-Core has moved away from
8it, we change it to use Python 3 instead.
9
10Upstream-Status: Inappropriate [ configuration ]
11
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13---
14 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index dd172f1ebe..40cac36ac2 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -122,7 +122,7 @@ AM_PROG_CC_C_O
22 AC_PROG_NM
23 AM_PROG_AS
24 AX_CHECK_GNU_MAKE
25-AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
26+AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python])
27 AC_PROG_SED
28 AC_PROG_MKDIR_P
29
30--
312.18.0
32
diff --git a/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch b/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
new file mode 100644
index 0000000..d40e7b5
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
@@ -0,0 +1,36 @@
1From 9e0368af471af3a36e0eb526453f892598120065 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 5/6] 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: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2]
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.18.0
36
diff --git a/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
new file mode 100644
index 0000000..0212922
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
@@ -0,0 +1,37 @@
1From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 29 Aug 2018 22:10:30 -0300
4Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
5Organization: O.S. Systems Software LTDA.
6
7This allows to override the wayland-protocols pkgdatadir with the
8WAYLAND_PROTOCOLS_DATADIR from environment.
9
10pkgconfig would return an absolute path in
11/usr/share/wayland-protocols
12for the pkgdatadir value, which is not suitable for cross-compiling.
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Upstream-Status: Pending
16
17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index 40cac36ac2..728bbdcbc4 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -1823,7 +1823,7 @@ for plat in $platforms; do
27 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED])
28 PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED])
29 PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
30- WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
31+ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
32
33 AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
34
35--
362.18.0
37
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-11 09:33:26 +0000