summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch27
-rw-r--r--meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch8
-rw-r--r--meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch12
-rw-r--r--meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch32
-rw-r--r--meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch (renamed from meta/recipes-graphics/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch)28
-rw-r--r--meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch36
-rw-r--r--meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch49
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc13
-rw-r--r--meta/recipes-graphics/mesa/mesa_18.3.4.bb (renamed from meta/recipes-graphics/mesa/mesa_18.1.9.bb)9
10 files changed, 99 insertions, 115 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
index a50d2a2ba2..1c2ded0e60 100644
--- a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
+++ b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
@@ -1,7 +1,7 @@
1From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001 1From 81bcaa1aeecf1e66b4d94181e9a827d68e970b03 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Tue, 15 Nov 2016 15:20:49 +0200 3Date: Wed, 20 Feb 2019 16:17:00 -0300
4Subject: [PATCH 1/6] Simplify wayland-scanner lookup 4Subject: [PATCH 1/5] Simplify wayland-scanner lookup
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7Don't use pkg-config to lookup the path of a binary that's in the path. 7Don't use pkg-config to lookup the path of a binary that's in the path.
@@ -17,23 +17,26 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
17 1 file changed, 1 insertion(+), 6 deletions(-) 17 1 file changed, 1 insertion(+), 6 deletions(-)
18 18
19diff --git a/configure.ac b/configure.ac 19diff --git a/configure.ac b/configure.ac
20index 14f1af2b2f..916d0bd207 100644 20index cd9ff259fad..402b4a91946 100644
21--- a/configure.ac 21--- a/configure.ac
22+++ b/configure.ac 22+++ b/configure.ac
23@@ -1825,12 +1825,7 @@ for plat in $platforms; do 23@@ -1841,16 +1841,11 @@ for plat in $platforms; do
24 PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) 24 fi
25 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` 25 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
26 26
27- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], 27- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
28- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, 28- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
29- WAYLAND_SCANNER='') 29- WAYLAND_SCANNER='')
30 PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
31 AC_SUBST(SCANNER_ARG, 'private-code'),
32 AC_SUBST(SCANNER_ARG, 'code'))
33
30- if test "x$WAYLAND_SCANNER" = x; then 34- if test "x$WAYLAND_SCANNER" = x; then
31- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) 35- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
32- fi 36- fi
33+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) 37+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
34 38
35 if test "x$WAYLAND_SCANNER" = "x:"; then 39 if test "x$WAYLAND_SCANNER" = "x:"; then
36 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) 40 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
37-- 41--
382.18.0 422.20.1
39
diff --git a/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch b/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
index ffb3bf7a63..12dca61e19 100644
--- a/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
+++ b/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
@@ -1,7 +1,7 @@
1From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001 1From 34c3d07b67e6c08f555473a86ff158951abb6000 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 2/6] winsys/svga/drm: Include sys/types.h 4Subject: [PATCH 2/5] winsys/svga/drm: Include sys/types.h
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7vmw_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
@@ -18,7 +18,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18 1 file changed, 1 insertion(+) 18 1 file changed, 1 insertion(+)
19 19
20diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h 20diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
21index f21cabb51f..4c972fdaa9 100644 21index a87c087d9c5..cb34fec48e7 100644
22--- a/src/gallium/winsys/svga/drm/vmw_screen.h 22--- a/src/gallium/winsys/svga/drm/vmw_screen.h
23+++ b/src/gallium/winsys/svga/drm/vmw_screen.h 23+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
24@@ -41,6 +41,7 @@ 24@@ -41,6 +41,7 @@
@@ -30,5 +30,5 @@ index f21cabb51f..4c972fdaa9 100644
30 #define VMW_GMR_POOL_SIZE (16*1024*1024) 30 #define VMW_GMR_POOL_SIZE (16*1024*1024)
31 #define VMW_QUERY_POOL_SIZE (8192) 31 #define VMW_QUERY_POOL_SIZE (8192)
32-- 32--
332.18.0 332.20.1
34 34
diff --git a/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
index 5e735ca105..59b118d9f4 100644
--- a/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
+++ b/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
@@ -1,7 +1,7 @@
1From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001 1From c5b5bf6c31be1823be1d0317eabe16558a4f0762 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 5 Jun 2018 11:11:10 -0300 3Date: Tue, 5 Jun 2018 11:11:10 -0300
4Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases 4Subject: [PATCH 3/5] Properly get LLVM version when using LLVM Git releases
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7$ llvm-config-host --version 7$ llvm-config-host --version
@@ -18,10 +18,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18 1 file changed, 2 insertions(+), 2 deletions(-) 18 1 file changed, 2 insertions(+), 2 deletions(-)
19 19
20diff --git a/configure.ac b/configure.ac 20diff --git a/configure.ac b/configure.ac
21index 916d0bd207..dd172f1ebe 100644 21index cbc455e130f..0065376f4b7 100644
22--- a/configure.ac 22--- a/configure.ac
23+++ b/configure.ac 23+++ b/configure.ac
24@@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() { 24@@ -1111,7 +1111,7 @@ strip_unwanted_llvm_flags() {
25 25
26 llvm_set_environment_variables() { 26 llvm_set_environment_variables() {
27 if test "x$LLVM_CONFIG" != xno; then 27 if test "x$LLVM_CONFIG" != xno; then
@@ -30,7 +30,7 @@ index 916d0bd207..dd172f1ebe 100644
30 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` 30 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
31 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` 31 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
32 LLVM_LIBDIR=`$LLVM_CONFIG --libdir` 32 LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
33@@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() { 33@@ -2860,7 +2860,7 @@ detect_old_buggy_llvm() {
34 dnl ourselves. 34 dnl ourselves.
35 dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) 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, 36 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
@@ -40,5 +40,5 @@ index 916d0bd207..dd172f1ebe 100644
40 40
41 if test "x$llvm_have_one_so" = xyes; then 41 if test "x$llvm_have_one_so" = xyes; then
42-- 42--
432.18.0 432.20.1
44 44
diff --git a/meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch b/meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
deleted file mode 100644
index 8953c4a18f..0000000000
--- a/meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
+++ /dev/null
@@ -1,32 +0,0 @@
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/recipes-graphics/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
index 0212922c5d..8c91790249 100644
--- a/meta/recipes-graphics/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
+++ b/meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
@@ -1,7 +1,7 @@
1From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001 1From f48b8f073f921ce5be859130313e9d392ef3e78e Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 29 Aug 2018 22:10:30 -0300 3Date: Fri, 15 Feb 2019 10:57:06 -0200
4Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR 4Subject: [PATCH 4/5] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7This allows to override the wayland-protocols pkgdatadir with the 7This allows to override the wayland-protocols pkgdatadir with the
@@ -11,27 +11,25 @@ pkgconfig would return an absolute path in
11/usr/share/wayland-protocols 11/usr/share/wayland-protocols
12for the pkgdatadir value, which is not suitable for cross-compiling. 12for the pkgdatadir value, which is not suitable for cross-compiling.
13 13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Upstream-Status: Pending 14Upstream-Status: Pending
16 15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
18--- 19---
19 configure.ac | 2 +- 20 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-) 21 1 file changed, 1 insertion(+), 1 deletion(-)
21 22
22diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
23index 40cac36ac2..728bbdcbc4 100644 24index 0065376f4b7..b21fb2210c6 100644
24--- a/configure.ac 25--- a/configure.ac
25+++ b/configure.ac 26+++ b/configure.ac
26@@ -1823,7 +1823,7 @@ for plat in $platforms; do 27@@ -1839,7 +1839,7 @@ for plat in $platforms; do
27 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED]) 28 if test "x$enable_egl" = xyes; then
28 PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED]) 29 PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED])
29 PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) 30 fi
30- WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` 31- WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
31+ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) 32+ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
32 33
33 AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) 34 PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
34 35 AC_SUBST(SCANNER_ARG, 'private-code'),
35--
362.18.0
37
diff --git a/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch b/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
deleted file mode 100644
index d40e7b5855..0000000000
--- a/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
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/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch b/meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch
new file mode 100644
index 0000000000..1782576db2
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch
@@ -0,0 +1,49 @@
1From f452e30ab664fe608acc107cc03d2efa8731d938 Mon Sep 17 00:00:00 2001
2From: Gurchetan Singh <gurchetansingh@chromium.org>
3Date: Wed, 28 Nov 2018 08:39:34 -0800
4Subject: [PATCH 5/5] egl: add missing #include <stddef.h> in egldevice.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8Organization: O.S. Systems Software LTDA.
9
10Otherwise, I get this error:
11
12main/egldevice.h:54:13: error: ‘NULL’ undeclared (first use in this function)
13 dev = NULL;
14 ^~~~
15with this config:
16
17./autogen.sh --enable-gles1 --enable-gles2 --with-platforms='surfaceless' --disable-glx
18 --with-dri-drivers="i965" --with-gallium-drivers="" --enable-gbm
19
20v3: Use stddef.h (Matt)
21v4: Modify commit message (Eric)
22
23Reviewed-by: Matt Turner <mattst88@gmail.com>
24Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
25
26Upstream-Status: Backport [https://cgit.freedesktop.org/mesa/mesa/commit/?id=eb44c36cf1729e7e200b77cf8ea755dff72d1639]
27Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
28---
29 src/egl/main/egldevice.h | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/src/egl/main/egldevice.h b/src/egl/main/egldevice.h
33index ddcdcd17f5a..83a47d5eacc 100644
34--- a/src/egl/main/egldevice.h
35+++ b/src/egl/main/egldevice.h
36@@ -31,9 +31,9 @@
37
38
39 #include <stdbool.h>
40+#include <stddef.h>
41 #include "egltypedefs.h"
42
43-
44 #ifdef __cplusplus
45 extern "C" {
46 #endif
47--
482.20.1
49
diff --git a/meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb b/meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb
index 73267eb4f0..73267eb4f0 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 66ed649efe..0ce7e4d626 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -55,7 +55,7 @@ PACKAGECONFIG_class-nativesdk ?= "gbm dri-native egl"
55# "gbm" requires "dri", "opengl" 55# "gbm" requires "dri", "opengl"
56PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" 56PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
57 57
58X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" 58X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr"
59# "x11" requires "opengl" 59# "x11" requires "opengl"
60PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" 60PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
61PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" 61PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
@@ -104,7 +104,7 @@ GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600',
104GALLIUMDRIVERS_append = ",virgl" 104GALLIUMDRIVERS_append = ",virgl"
105 105
106# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers 106# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
107PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" 107PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
108MESA_LLVM_RELEASE ?= "8.0" 108MESA_LLVM_RELEASE ?= "8.0"
109PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \ 109PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \
110 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" 110 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
@@ -152,7 +152,6 @@ do_install_append () {
152 rm -f ${D}${libdir}/gbm/*.la 152 rm -f ${D}${libdir}/gbm/*.la
153 153
154 # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 154 # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
155 rm -f ${D}${sysconfdir}/drirc
156 chrpath --delete ${D}${libdir}/dri/*_dri.so || true 155 chrpath --delete ${D}${libdir}/dri/*_dri.so || true
157 156
158 # libwayland-egl has been moved to wayland 1.15+ 157 # libwayland-egl has been moved to wayland 1.15+
@@ -219,8 +218,7 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
219 218
220PACKAGES_DYNAMIC += "^mesa-driver-.*" 219PACKAGES_DYNAMIC += "^mesa-driver-.*"
221 220
222FILES_${PN} += "${sysconfdir}/drirc" 221FILES_mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf"
223FILES_mesa-megadriver = "${libdir}/dri/*"
224FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" 222FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
225FILES_libegl-mesa = "${libdir}/libEGL.so.*" 223FILES_libegl-mesa = "${libdir}/libEGL.so.*"
226FILES_libgbm = "${libdir}/libgbm.so.*" 224FILES_libgbm = "${libdir}/libgbm.so.*"
@@ -243,3 +241,8 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}
243FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ 241FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
244 ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ 242 ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
245 ${libdir}/pkgconfig/xatracker.pc" 243 ${libdir}/pkgconfig/xatracker.pc"
244
245# Fix upgrade path from mesa to mesa-megadriver
246RREPLACES_mesa-megadriver = "mesa"
247RCONFLICTS_mesa-megadriver = "mesa"
248RPROVIDES_mesa-megadriver = "mesa"
diff --git a/meta/recipes-graphics/mesa/mesa_18.1.9.bb b/meta/recipes-graphics/mesa/mesa_18.3.4.bb
index 86d6a6bf3a..27f4f0241f 100644
--- a/meta/recipes-graphics/mesa/mesa_18.1.9.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.3.4.bb
@@ -4,13 +4,12 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
4 file://0001-Simplify-wayland-scanner-lookup.patch \ 4 file://0001-Simplify-wayland-scanner-lookup.patch \
5 file://0002-winsys-svga-drm-Include-sys-types.h.patch \ 5 file://0002-winsys-svga-drm-Include-sys-types.h.patch \
6 file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ 6 file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
7 file://0004-Use-Python-3-to-execute-the-scripts.patch \ 7 file://0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
8 file://0005-dri-i965-Add-missing-time.h-include.patch \ 8 file://0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch \
9 file://0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
10" 9"
11 10
12SRC_URI[md5sum] = "2f8d2098ab478bc3907e42130577b54a" 11SRC_URI[md5sum] = "6f2a5e01dd5cb91d05a9534f5a80c35d"
13SRC_URI[sha256sum] = "55f5778d58a710a63d6635f000535768faf7db9e8144dc0f4fd1989f936c1a83" 12SRC_URI[sha256sum] = "32314da4365d37f80d84f599bd9625b00161c273c39600ba63b45002d500bb07"
14 13
15#because we cannot rely on the fact that all apps will use pkgconfig, 14#because we cannot rely on the fact that all apps will use pkgconfig,
16#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 15#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-10 18:24:18 +0000