summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch20
-rw-r--r--meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch7
-rw-r--r--meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch13
-rw-r--r--meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch11
-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_19.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc4
-rw-r--r--meta/recipes-graphics/mesa/mesa_19.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa_18.3.4.bb)5
8 files changed, 34 insertions, 75 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 1c2ded0e60..d065e2285c 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 81bcaa1aeecf1e66b4d94181e9a827d68e970b03 Mon Sep 17 00:00:00 2001 1From e53837ad7b01364f34a533b95f4817c1795789de Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 20 Feb 2019 16:17:00 -0300 3Date: Wed, 20 Feb 2019 16:17:00 -0300
4Subject: [PATCH 1/5] Simplify wayland-scanner lookup 4Subject: [PATCH 1/4] 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.
@@ -12,31 +12,33 @@ PKG_CONFIG_SYSROOT_DIR.
12Upstream-Status: Pending 12Upstream-Status: Pending
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
15--- 16---
16 configure.ac | 7 +------ 17 configure.ac | 7 +------
17 1 file changed, 1 insertion(+), 6 deletions(-) 18 1 file changed, 1 insertion(+), 6 deletions(-)
18 19
19diff --git a/configure.ac b/configure.ac 20diff --git a/configure.ac b/configure.ac
20index cd9ff259fad..402b4a91946 100644 21index 1ef68fe68e6..1816a4cd475 100644
21--- a/configure.ac 22--- a/configure.ac
22+++ b/configure.ac 23+++ b/configure.ac
23@@ -1841,16 +1841,11 @@ for plat in $platforms; do 24@@ -1854,16 +1854,11 @@ for plat in $platforms; do
24 fi 25 fi
25 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` 26 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
26 27
27- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], 28- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
28- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, 29- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
29- WAYLAND_SCANNER='') 30- WAYLAND_SCANNER='')
30 PKG_CHECK_EXISTS([wayland-scanner >= 1.15], 31 PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
31 AC_SUBST(SCANNER_ARG, 'private-code'), 32 AC_SUBST(SCANNER_ARG, 'private-code'),
32 AC_SUBST(SCANNER_ARG, 'code')) 33 AC_SUBST(SCANNER_ARG, 'code'))
33 34
34- if test "x$WAYLAND_SCANNER" = x; then 35- if test "x$WAYLAND_SCANNER" = x; then
35- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) 36- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
36- fi 37- fi
37+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) 38+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
38 39
39 if test "x$WAYLAND_SCANNER" = "x:"; then 40 if test "x$WAYLAND_SCANNER" = "x:"; then
40 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) 41 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
41-- 42--
422.20.1 432.21.0
44
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 12dca61e19..aaeb0f11ba 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 34c3d07b67e6c08f555473a86ff158951abb6000 Mon Sep 17 00:00:00 2001 1From f212b6bed4bf265aec069c21cdc4b7c2d9cb32df 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/5] winsys/svga/drm: Include sys/types.h 4Subject: [PATCH 2/4] 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
@@ -13,6 +13,7 @@ system headers
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Upstream-Status: Backport [7dfdfbf8c37e52e7b9b09f7d1d434edad3ebc864] 14Upstream-Status: Backport [7dfdfbf8c37e52e7b9b09f7d1d434edad3ebc864]
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
16--- 17---
17 src/gallium/winsys/svga/drm/vmw_screen.h | 1 + 18 src/gallium/winsys/svga/drm/vmw_screen.h | 1 +
18 1 file changed, 1 insertion(+) 19 1 file changed, 1 insertion(+)
@@ -30,5 +31,5 @@ index a87c087d9c5..cb34fec48e7 100644
30 #define VMW_GMR_POOL_SIZE (16*1024*1024) 31 #define VMW_GMR_POOL_SIZE (16*1024*1024)
31 #define VMW_QUERY_POOL_SIZE (8192) 32 #define VMW_QUERY_POOL_SIZE (8192)
32-- 33--
332.20.1 342.21.0
34 35
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 59b118d9f4..96edc2172b 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 c5b5bf6c31be1823be1d0317eabe16558a4f0762 Mon Sep 17 00:00:00 2001 1From ce7b9ff6517fda089f296b2af2c1c49604872514 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/5] Properly get LLVM version when using LLVM Git releases 4Subject: [PATCH 3/4] 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
@@ -13,15 +13,16 @@ doing
13Upstream-Status: Pending 13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
16--- 17---
17 configure.ac | 4 ++-- 18 configure.ac | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-) 19 1 file changed, 2 insertions(+), 2 deletions(-)
19 20
20diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
21index cbc455e130f..0065376f4b7 100644 22index 1816a4cd475..13fed9daf59 100644
22--- a/configure.ac 23--- a/configure.ac
23+++ b/configure.ac 24+++ b/configure.ac
24@@ -1111,7 +1111,7 @@ strip_unwanted_llvm_flags() { 25@@ -1124,7 +1124,7 @@ strip_unwanted_llvm_flags() {
25 26
26 llvm_set_environment_variables() { 27 llvm_set_environment_variables() {
27 if test "x$LLVM_CONFIG" != xno; then 28 if test "x$LLVM_CONFIG" != xno; then
@@ -30,7 +31,7 @@ index cbc455e130f..0065376f4b7 100644
30 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` 31 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
31 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` 32 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
32 LLVM_LIBDIR=`$LLVM_CONFIG --libdir` 33 LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
33@@ -2860,7 +2860,7 @@ detect_old_buggy_llvm() { 34@@ -2870,7 +2870,7 @@ detect_old_buggy_llvm() {
34 dnl ourselves. 35 dnl ourselves.
35 dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) 36 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 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
@@ -40,5 +41,5 @@ index cbc455e130f..0065376f4b7 100644
40 41
41 if test "x$llvm_have_one_so" = xyes; then 42 if test "x$llvm_have_one_so" = xyes; then
42-- 43--
432.20.1 442.21.0
44 45
diff --git a/meta/recipes-graphics/mesa/files/0004-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 8c91790249..45bcd466a3 100644
--- a/meta/recipes-graphics/mesa/files/0004-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 f48b8f073f921ce5be859130313e9d392ef3e78e Mon Sep 17 00:00:00 2001 1From 5489e1d22e18740a1924628c5c97096d48dcfbf8 Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Fri, 15 Feb 2019 10:57:06 -0200 3Date: Fri, 15 Feb 2019 10:57:06 -0200
4Subject: [PATCH 4/5] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR 4Subject: [PATCH 4/4] 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
@@ -21,10 +21,10 @@ Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
21 1 file changed, 1 insertion(+), 1 deletion(-) 21 1 file changed, 1 insertion(+), 1 deletion(-)
22 22
23diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
24index 0065376f4b7..b21fb2210c6 100644 24index 13fed9daf59..6cff8afb7cf 100644
25--- a/configure.ac 25--- a/configure.ac
26+++ b/configure.ac 26+++ b/configure.ac
27@@ -1839,7 +1839,7 @@ for plat in $platforms; do 27@@ -1852,7 +1852,7 @@ for plat in $platforms; do
28 if test "x$enable_egl" = xyes; then 28 if test "x$enable_egl" = xyes; then
29 PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED]) 29 PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED])
30 fi 30 fi
@@ -33,3 +33,6 @@ index 0065376f4b7..b21fb2210c6 100644
33 33
34 PKG_CHECK_EXISTS([wayland-scanner >= 1.15], 34 PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
35 AC_SUBST(SCANNER_ARG, 'private-code'), 35 AC_SUBST(SCANNER_ARG, 'private-code'),
36--
372.21.0
38
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
deleted file mode 100644
index 1782576db2..0000000000
--- a/meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch
+++ /dev/null
@@ -1,49 +0,0 @@
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.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb
index d4b1c1c454..d4b1c1c454 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_18.3.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 59e8a204c7..54818d7e0d 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -42,7 +42,9 @@ EXTRA_OECONF = "--enable-shared-glapi \
42 --enable-glx-read-only-text \ 42 --enable-glx-read-only-text \
43 PYTHON2=python2 \ 43 PYTHON2=python2 \
44 --with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \ 44 --with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \
45 --with-platforms='${PLATFORMS}'" 45 --with-platforms='${PLATFORMS}' \
46 --enable-autotools \
47"
46 48
47PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ 49PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
48 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium', '', d)} \ 50 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium', '', d)} \
diff --git a/meta/recipes-graphics/mesa/mesa_18.3.4.bb b/meta/recipes-graphics/mesa/mesa_19.0.0.bb
index 27f4f0241f..024acdad0b 100644
--- a/meta/recipes-graphics/mesa/mesa_18.3.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_19.0.0.bb
@@ -5,11 +5,10 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
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-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ 7 file://0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
8 file://0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch \
9" 8"
10 9
11SRC_URI[md5sum] = "6f2a5e01dd5cb91d05a9534f5a80c35d" 10SRC_URI[md5sum] = "d0d76cd8b00bc1308e37985d4a45d3c5"
12SRC_URI[sha256sum] = "32314da4365d37f80d84f599bd9625b00161c273c39600ba63b45002d500bb07" 11SRC_URI[sha256sum] = "5a549dfb40ec31e5c36c47aadac04554cb2e2a8d144a046a378fc16da57e38f8"
13 12
14#because we cannot rely on the fact that all apps will use pkgconfig, 13#because we cannot rely on the fact that all apps will use pkgconfig,
15#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 14#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 20:53:54 +0000