diff --git a/custom/list.hash b/custom/list.hash index b6c80641a7a0abebbc9c4dcf4438735a44969a83..f15ba7b9839ad77dea58644dbfabb8d653f5a3b6 100644 --- a/custom/list.hash +++ b/custom/list.hash @@ -40,7 +40,10 @@ be6ac651da6356e2ce471d6c3d4dc2d8 package/llvm-project/llvm/Config.in 38a00ce9a91212eeb814cb4f7b38173e package/llvm-project/llvm/llvm.hash 64b2fa393cafff6958f4bfd2b9e30f24 package/luajit/Config.in e135d51d57e1d2a13110ad411fb88dfc package/mesa3d-headers/mesa3d-headers.mk +a8d9861d7f26b168b3a104e6b46b6737 package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch 43c3f173bb600176635f60f8f106f935 package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +b17e97b82a8258a86cd952eb7aa7078a package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch +fdebedec61730e0904f7a2c95f38ce2e package/mesa3d/0004-Fix-uClibc-build.patch ed6723404b629755642d93306effccf3 package/mesa3d/Config.in 56c99af2aaeed83c243e7455722db56f package/mesa3d/mesa3d.hash ff9e11eba41f7142fb7f3baad789cb16 package/mesa3d/mesa3d.mk @@ -62,6 +65,8 @@ f3586b2f134ef6ef8f4b9ed2b8d03b6c package/spirv-llvm-translator/spirv-llvm-trans 332f068347b0f585827a44aa5442229e package/vulkan-headers/vulkan-headers.hash e976c695dba9a44cf05b82c31d9aa70f package/vulkan-headers/vulkan-headers.mk cda968895ea475556573b7ad22c207ef package/vulkan-loader/vulkan-loader.hash +c617700c4655dc91ad9ba6377b85add7 package/wayland-protocols/wayland-protocols.hash +da3d91f2b99563cf43fe0a5aa855ef91 package/wayland-protocols/wayland-protocols.mk 7d75ef4bb83efa9de526c3d1ba09884e package/wlroots/Config.in 2cf0c56bbf21a27a146c534f0c4b5fbb package/wlroots/wlroots.hash 7deca18b80b621e96934bb187cdc54fe package/wlroots/wlroots.mk diff --git a/custom/package/mesa3d-headers/mesa3d-headers.mk b/custom/package/mesa3d-headers/mesa3d-headers.mk index 2cb69c9c67c1a8e4ecbf6b04f864f1f51cc3e1a1..68174698858bbc8b05d8c5e9a5bb1c9aa519021c 100644 --- a/custom/package/mesa3d-headers/mesa3d-headers.mk +++ b/custom/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.2.6 +MESA3D_HEADERS_VERSION = 25.1.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/custom/package/mesa3d-headers/mesa3d-headers.mk.patch b/custom/package/mesa3d-headers/mesa3d-headers.mk.patch index 32db10c5fd11ae8ab726aef13a3eb7b1b52d8b30..af0de3915b08139ba85789acbf7337a5485f68a3 100644 --- a/custom/package/mesa3d-headers/mesa3d-headers.mk.patch +++ b/custom/package/mesa3d-headers/mesa3d-headers.mk.patch @@ -1,5 +1,5 @@ diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk -index 33c60b285f..2cb69c9c67 100644 +index 33c60b285f..6817469885 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif @@ -7,7 +7,7 @@ index 33c60b285f..2cb69c9c67 100644 # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.9 -+MESA3D_HEADERS_VERSION = 24.2.6 ++MESA3D_HEADERS_VERSION = 25.1.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch new file mode 100644 index 0000000000000000000000000000000000000000..d40ccc53902f4f6048ac053b6c0d2f68819c401e --- /dev/null +++ b/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch @@ -0,0 +1,13 @@ +diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build +index 56a9894f0db..0410c9a898d 100644 +--- a/src/gallium/frontends/clover/meson.build ++++ b/src/gallium/frontends/clover/meson.build +@@ -10,7 +10,7 @@ clover_opencl_cpp_args = [ + '-DCL_USE_DEPRECATED_OPENCL_2_0_APIS', + '-DCL_USE_DEPRECATED_OPENCL_2_1_APIS', + '-DCL_USE_DEPRECATED_OPENCL_2_2_APIS', +- '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir')) ++ '-DLIBCLC_INCLUDEDIR="/usr/share"', + ] + clover_incs = [inc_include, inc_src, inc_gallium, inc_gallium_aux] + diff --git a/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch.patch b/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch.patch new file mode 100644 index 0000000000000000000000000000000000000000..9b295fa9a17ee3d8b6721367b0969f080253cb19 --- /dev/null +++ b/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch.patch @@ -0,0 +1,51 @@ +diff --git a/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +index e3c70c3f24..d40ccc5390 100644 +--- a/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch ++++ b/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +@@ -1,41 +1,13 @@ +-From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 +-From: Romain Naour +-Date: Wed, 17 Apr 2019 23:07:42 +0200 +-Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR +- +-LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation +-will look for OpenCL "headers" on the target, when building the OpenCL +-kernels. +- +-The value returned by pkg-config for includedir is relevant when +-cross-compiling, on the build machine. But in this specific case, we +-really need a value that is valid on the target. +- +-Those headers are installed by the libclc package in /usr/share so +-that they are not removed by Buildroot target-finalize logic. +- +-Based on the patch for autotools provided by Valentin Korenblit. +- +-Signed-off-by: Romain Naour +-Signed-off-by: Bernd Kuhls +-[rebased for 20.2.0 & 20.3.0] +---- +- src/gallium/frontends/clover/meson.build | 2 +- +- 1 file changed, 1 insertion(+), 1 deletion(-) +- + diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build +-index 62ac5f5278d..ecdeb39669c 100644 ++index 56a9894f0db..0410c9a898d 100644 + --- a/src/gallium/frontends/clover/meson.build + +++ b/src/gallium/frontends/clover/meson.build +-@@ -27,7 +27,7 @@ ++@@ -10,7 +10,7 @@ clover_opencl_cpp_args = [ + '-DCL_USE_DEPRECATED_OPENCL_2_0_APIS', + '-DCL_USE_DEPRECATED_OPENCL_2_1_APIS', + '-DCL_USE_DEPRECATED_OPENCL_2_2_APIS', +-- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')), ++- '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir')) + + '-DLIBCLC_INCLUDEDIR="/usr/share"', +- '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir')) + ] +- clover_spirv_cpp_args = [] +--- +-2.20.1 +- ++ clover_incs = [inc_include, inc_src, inc_gallium, inc_gallium_aux] ++ diff --git a/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index cda792b9dba96ed2ee529cc5bfe4a3fea8b0609b..9bb046607984a1e63114ba97852d9b5404405ed9 100644 --- a/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -1,29 +1,8 @@ -From f719e942dde0a46a9ff0080001cb3466012ffcc0 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 9 Mar 2020 13:01:14 +0100 -Subject: [PATCH] vc4: add meson option to disable optional neon support - -Not all toolchains are able to compile the runtime -optional vc4 neon support, so add an meson option -to force disabling it at compile time. - -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 -Signed-off-by: Peter Seiderer -Signed-off-by: Bernd Kuhls -[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0 & 24.2.1] -Signed-off-by: Peter Seiderer -[fix syntax error after previous rebases] ---- - meson_options.txt | 7 +++++++ - src/gallium/drivers/vc4/meson.build | 4 ++-- - src/gallium/drivers/vc4/vc4_tiling.h | 4 ++-- - 3 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 8e0bf2a..1cf0e07 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -148,6 +148,13 @@ option( +diff --git a/meson.options b/meson.options +index 06ff1b24bd7..f613bd3de7c 100644 +--- a/meson.options ++++ b/meson.options +@@ -117,6 +117,13 @@ option( description : 'enable gallium va frontend.', ) @@ -38,10 +17,10 @@ index 8e0bf2a..1cf0e07 100644 'va-libs-path', type : 'string', diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build -index 84da951..7f950de 100644 +index 54b165d69db..8398715bf39 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build -@@ -72,7 +72,7 @@ files_libvc4 = files( +@@ -72,7 +72,7 @@ vc4_deps = [ ] libvc4_neon = [] @@ -49,9 +28,9 @@ index 84da951..7f950de 100644 +if host_machine.cpu_family() == 'arm' and not get_option('gallium-vc4-neon').disabled() libvc4_neon = static_library( 'vc4_neon', - 'vc4_tiling_lt_neon.c', + 'vc4_tiling_lt.c', @@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm' - c_args : '-mfpu=neon', + c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'], dependencies : vc4_deps, ) - vc4_c_args += '-DUSE_ARM_ASM' @@ -60,7 +39,7 @@ index 84da951..7f950de 100644 if dep_simpenrose.found() diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h -index 5afe329..919b299 100644 +index 5afe32939a8..919b2990ab1 100644 --- a/src/gallium/drivers/vc4/vc4_tiling.h +++ b/src/gallium/drivers/vc4/vc4_tiling.h @@ -89,7 +89,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride, @@ -81,6 +60,3 @@ index 5afe329..919b299 100644 if (util_get_cpu_caps()->has_neon) { vc4_store_lt_image_neon(dst, dst_stride, src, src_stride, cpp, box); --- -2.41.0 - diff --git a/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch.patch b/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch.patch index f0980ca053bc26b8dc88ad2d52bc15cd476f75dd..b120a16c62946b675b2b2bf28acb530da035ed04 100644 --- a/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch.patch +++ b/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch.patch @@ -1,47 +1,84 @@ diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch -index f3919478a6..cda792b9db 100644 +index f3919478a6..9bb0466079 100644 --- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch -@@ -9,8 +9,8 @@ to force disabling it at compile time. - - Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 - Signed-off-by: Peter Seiderer +@@ -1,29 +1,8 @@ +-From f719e942dde0a46a9ff0080001cb3466012ffcc0 Mon Sep 17 00:00:00 2001 +-From: Peter Seiderer +-Date: Mon, 9 Mar 2020 13:01:14 +0100 +-Subject: [PATCH] vc4: add meson option to disable optional neon support +- +-Not all toolchains are able to compile the runtime +-optional vc4 neon support, so add an meson option +-to force disabling it at compile time. +- +-Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 +-Signed-off-by: Peter Seiderer -Signed-off-by: Bernd Kuhls -[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0 & 23.2.0] -+Signed-off-by: Bernd Kuhls -+[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0 & 24.2.1] - Signed-off-by: Peter Seiderer - [fix syntax error after previous rebases] - --- -@@ -23,7 +23,7 @@ diff --git a/meson_options.txt b/meson_options.txt - index 8e0bf2a..1cf0e07 100644 - --- a/meson_options.txt - +++ b/meson_options.txt +-Signed-off-by: Peter Seiderer +-[fix syntax error after previous rebases] +---- +- meson_options.txt | 7 +++++++ +- src/gallium/drivers/vc4/meson.build | 4 ++-- +- src/gallium/drivers/vc4/vc4_tiling.h | 4 ++-- +- 3 files changed, 11 insertions(+), 4 deletions(-) +- +-diff --git a/meson_options.txt b/meson_options.txt +-index 8e0bf2a..1cf0e07 100644 +---- a/meson_options.txt +-+++ b/meson_options.txt -@@ -124,6 +124,13 @@ option( -+@@ -148,6 +148,13 @@ option( ++diff --git a/meson.options b/meson.options ++index 06ff1b24bd7..f613bd3de7c 100644 ++--- a/meson.options +++++ b/meson.options ++@@ -117,6 +117,13 @@ option( description : 'enable gallium va frontend.', ) -@@ -41,8 +41,8 @@ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson - index 84da951..7f950de 100644 +@@ -38,21 +17,21 @@ index 8e0bf2a..1cf0e07 100644 + 'va-libs-path', + type : 'string', + diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build +-index 84da951..7f950de 100644 ++index 54b165d69db..8398715bf39 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build -@@ -84,7 +84,7 @@ files_libvc4 = files( - vc4_c_args = [] -+@@ -72,7 +72,7 @@ files_libvc4 = files( ++@@ -72,7 +72,7 @@ vc4_deps = [ + ] libvc4_neon = [] -if host_machine.cpu_family() == 'arm' -@@ -50,9 +50,9 @@ index 84da951..7f950de 100644 + +if host_machine.cpu_family() == 'arm' and not get_option('gallium-vc4-neon').disabled() libvc4_neon = static_library( 'vc4_neon', - 'vc4_tiling_lt_neon.c', +- 'vc4_tiling_lt_neon.c', -@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm' - ], +- c_args : '-mfpu=neon', ++ 'vc4_tiling_lt.c', +@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm' - c_args : '-mfpu=neon', ++ c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'], + dependencies : vc4_deps, ) - vc4_c_args += '-DUSE_ARM_ASM' + vc4_c_args += '-DVC4_TILING_LT_NEON' +@@ -60,7 +39,7 @@ index 84da951..7f950de 100644 + + if dep_simpenrose.found() + diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h +-index 5afe329..919b299 100644 ++index 5afe32939a8..919b2990ab1 100644 + --- a/src/gallium/drivers/vc4/vc4_tiling.h + +++ b/src/gallium/drivers/vc4/vc4_tiling.h + @@ -89,7 +89,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride, +@@ -81,6 +60,3 @@ index 5afe329..919b299 100644 + if (util_get_cpu_caps()->has_neon) { + vc4_store_lt_image_neon(dst, dst_stride, src, src_stride, + cpp, box); +--- +-2.41.0 +- diff --git a/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch b/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch new file mode 100755 index 0000000000000000000000000000000000000000..63484cb6ae07f136cb0ffa985306971209a26c2f --- /dev/null +++ b/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch @@ -0,0 +1,12 @@ +diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c +index 81b64f1ea71..fcb481487fa 100644 +--- a/src/util/rand_xor.c ++++ b/src/util/rand_xor.c +@@ -25,6 +25,7 @@ + #include "detect_os.h" + + #if !DETECT_OS_WINDOWS ++#include + #if defined(HAVE_GETRANDOM) + #include + #endif diff --git a/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch.patch b/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch.patch new file mode 100644 index 0000000000000000000000000000000000000000..373860af0a3dc418197b50f5a2551966504b439b --- /dev/null +++ b/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch.patch @@ -0,0 +1,41 @@ +diff --git a/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch b/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch +old mode 100644 +new mode 100755 +index e30cb97a72..63484cb6ae +--- a/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch ++++ b/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch +@@ -1,27 +1,3 @@ +-From fdc8b5a205e2116408aeb9fd305e57f656e2e89d Mon Sep 17 00:00:00 2001 +-From: Bernd Kuhls +-Date: Sun, 9 Aug 2020 17:06:26 +0200 +-Subject: [PATCH] src/util/rand_xor: Include stddef.h to fix build error +-MIME-Version: 1.0 +-Content-Type: text/plain; charset=UTF-8 +-Content-Transfer-Encoding: 8bit +- +-Fixes +- +-In file included from ../src/util/rand_xor.c:29: +-output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: +- error: unknown type name ‘size_t’ +- extern int getrandom(void *__buf, size_t count, unsigned int flags) +- +-seen with gcc version 8.3.0 (Buildroot 2020.02) and uClibc. +- +-Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6248 +- +-Signed-off-by: Bernd Kuhls +---- +- src/util/rand_xor.c | 1 + +- 1 file changed, 1 insertion(+) +- + diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c + index 81b64f1ea71..fcb481487fa 100644 + --- a/src/util/rand_xor.c +@@ -34,6 +10,3 @@ index 81b64f1ea71..fcb481487fa 100644 + #if defined(HAVE_GETRANDOM) + #include + #endif +--- +-2.27.0 +- diff --git a/custom/package/mesa3d/0004-Fix-uClibc-build.patch b/custom/package/mesa3d/0004-Fix-uClibc-build.patch new file mode 100755 index 0000000000000000000000000000000000000000..1d703419a1dc894d1239e8f4efe64bcb46f3b5cf --- /dev/null +++ b/custom/package/mesa3d/0004-Fix-uClibc-build.patch @@ -0,0 +1,33 @@ +diff --git a/src/util/compiler.h b/src/util/compiler.h +index ddd4cfb836b..5fc23a566b6 100644 +--- a/src/util/compiler.h ++++ b/src/util/compiler.h +@@ -35,6 +35,16 @@ + + + #include ++ ++/* ++ * C11 static_assert() macro ++ * assert.h only defines that name for C11 and above ++ */ ++#if !defined(__cplusplus) ++#ifndef static_assert ++#define static_assert _Static_assert ++#endif ++#endif + #include + #include + #include +diff --git a/src/util/macros.h b/src/util/macros.h +index bb8f9b58ffa..9c4c95f3d4e 100644 +--- a/src/util/macros.h ++++ b/src/util/macros.h +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include "util/compiler.h" + + #ifdef _GAMING_XBOX + #define strdup _strdup diff --git a/custom/package/mesa3d/0004-Fix-uClibc-build.patch.patch b/custom/package/mesa3d/0004-Fix-uClibc-build.patch.patch new file mode 100644 index 0000000000000000000000000000000000000000..6a36c39732025e7f33eed03f6ee73183ab28d0be --- /dev/null +++ b/custom/package/mesa3d/0004-Fix-uClibc-build.patch.patch @@ -0,0 +1,73 @@ +diff --git a/package/mesa3d/0004-Fix-uClibc-build.patch b/package/mesa3d/0004-Fix-uClibc-build.patch +old mode 100644 +new mode 100755 +index faa86b0d1b..1d703419a1 +--- a/package/mesa3d/0004-Fix-uClibc-build.patch ++++ b/package/mesa3d/0004-Fix-uClibc-build.patch +@@ -1,43 +1,8 @@ +-From 09ce52fe375a6fc1ccf51b6b691aaa2c3f53fbd5 Mon Sep 17 00:00:00 2001 +-From: Bernd Kuhls +-Date: Fri, 3 Jun 2022 16:26:03 +0200 +-Subject: [PATCH] Fix uClibc build +-MIME-Version: 1.0 +-Content-Type: text/plain; charset=UTF-8 +-Content-Transfer-Encoding: 8bit +- +-Fixes build errors with uClibc and gcc-9.3.0: +- +-../src/gallium/drivers/lima/lima_texture.c:47:15: error: expected +- declaration specifiers or ‘...’ before ‘__builtin_offsetof’ +- 47 | static_assert(offsetof(lima_tex_desc, va) == 24, +- "lima_tex_desc->va offset isn't 24"); +- +-../src/egl/main/egldisplay.c: In function ‘_eglGetNativePlatformFromEnv’: +- ../src/egl/main/egldisplay.c:101:4: error: implicit declaration of +- function ‘static_assert’ [-Werror=implicit-function-declaration] 101 | +- static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, +- +-../src/util/macros.h:74:4: error: implicit declaration of function +- ‘static_assert’ [-Werror=implicit-function-declaration] +- 74 | static_assert(cond, #cond); \ +- | ^~~~~~~~~~~~~ +- +-Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 +- +-Signed-off-by: Bernd Kuhls +-[rebased for 23.2.0] +-Signed-off-by: Bernd Kuhls +---- +- src/util/compiler.h | 10 ++++++++++ +- src/util/macros.h | 1 + +- 2 files changed, 11 insertions(+) +- + diff --git a/src/util/compiler.h b/src/util/compiler.h +-index d184ad455af..b5c56807acc 100644 ++index ddd4cfb836b..5fc23a566b6 100644 + --- a/src/util/compiler.h + +++ b/src/util/compiler.h +-@@ -35,6 +35,17 @@ ++@@ -35,6 +35,16 @@ + + + #include +@@ -51,12 +16,11 @@ index d184ad455af..b5c56807acc 100644 + +#define static_assert _Static_assert + +#endif + +#endif +-+ + #include + #include + #include + diff --git a/src/util/macros.h b/src/util/macros.h +-index 22b18303826..8f73ee72693 100644 ++index bb8f9b58ffa..9c4c95f3d4e 100644 + --- a/src/util/macros.h + +++ b/src/util/macros.h + @@ -31,6 +31,7 @@ +@@ -67,6 +31,3 @@ index 22b18303826..8f73ee72693 100644 + + #ifdef _GAMING_XBOX + #define strdup _strdup +--- +-2.34.1 +- diff --git a/custom/package/mesa3d/mesa3d.hash b/custom/package/mesa3d/mesa3d.hash index 4e2ce8aaae02bbcb0316619313a85dc744b75d6c..aa162531a00985850df5757ff13a909aa4ad238c 100644 --- a/custom/package/mesa3d/mesa3d.hash +++ b/custom/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ # From https://lists.freedesktop.org/archives/mesa-announce/2024-October/000781.html -sha256 2b68c4a6f204c1999815a457299f81c41ba7bf48c4674b0b2d1d8864f41f3709 mesa-24.2.6.tar.xz -sha512 830a40d38200ff8b2a6bd949e1ac3bf4edc887a10d9aa92285007d138079e1fafb3568f658e777e7894e95b5ce75d2bd6836b0473fa70d32270005e482b1a2da mesa-24.2.6.tar.xz +sha256 b1c45888969ee5df997e2542654f735ab1b772924b442f3016d2293414c99c14 mesa-25.1.0.tar.xz +sha512 40298370727fa1ad6d59be8692dfef01c42e41780816e9b951a05f779c7acca127162d2d3cedfccb7bfe3834b9e917c2b9bc6cb76887488d919cb61741a1da1a mesa-24.2.6.tar.xz # License -sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst +sha256 0d1a0472ecc81830e75c20d59b0ea02841e3db21255e0ebad97ab682c54d6615 docs/license.rst diff --git a/custom/package/mesa3d/mesa3d.hash.patch b/custom/package/mesa3d/mesa3d.hash.patch index 0f6c0c79e5628ca9492535fbd537444e628851d8..489db9a4e3b482b39e593b7bad3aaf2f8f5381e8 100644 --- a/custom/package/mesa3d/mesa3d.hash.patch +++ b/custom/package/mesa3d/mesa3d.hash.patch @@ -1,5 +1,5 @@ diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash -index d506d398b8..4e2ce8aaae 100644 +index d506d398b8..aa162531a0 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ @@ -7,7 +7,8 @@ index d506d398b8..4e2ce8aaae 100644 -sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz -sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-October/000781.html -+sha256 2b68c4a6f204c1999815a457299f81c41ba7bf48c4674b0b2d1d8864f41f3709 mesa-24.2.6.tar.xz -+sha512 830a40d38200ff8b2a6bd949e1ac3bf4edc887a10d9aa92285007d138079e1fafb3568f658e777e7894e95b5ce75d2bd6836b0473fa70d32270005e482b1a2da mesa-24.2.6.tar.xz ++sha256 b1c45888969ee5df997e2542654f735ab1b772924b442f3016d2293414c99c14 mesa-25.1.0.tar.xz ++sha512 40298370727fa1ad6d59be8692dfef01c42e41780816e9b951a05f779c7acca127162d2d3cedfccb7bfe3834b9e917c2b9bc6cb76887488d919cb61741a1da1a mesa-24.2.6.tar.xz # License - sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst +-sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst ++sha256 0d1a0472ecc81830e75c20d59b0ea02841e3db21255e0ebad97ab682c54d6615 docs/license.rst diff --git a/custom/package/mesa3d/mesa3d.mk b/custom/package/mesa3d/mesa3d.mk index 68ae9c9c33a93fe4cbe67e920b23473c1526d821..333401691c6b44894dbf4fa6fcf6b7d58a46ec40 100644 --- a/custom/package/mesa3d/mesa3d.mk +++ b/custom/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.2.6 +MESA3D_VERSION = 25.1.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -27,20 +27,11 @@ MESA3D_DEPENDENCIES = \ zlib MESA3D_CONF_OPTS = \ - -Dgallium-omx=disabled \ -Dgallium-opencl=disabled \ -Dgallium-rusticl=false \ -Dmicrosoft-clc=disabled \ - -Dopencl-spirv=false \ -Dpower8=disabled -ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) -MESA3D_CONF_OPTS += -Ddri3=enabled -MESA3D_DEPENDENCIES += xlib_libxshmfence -else -MESA3D_CONF_OPTS += -Ddri3=disabled -endif - ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' @@ -90,6 +81,10 @@ else MESA3D_CONF_OPTS += -Dgallium-vc4-neon=disabled endif +ifeq ($(BR2_PACKAGE_XORG7),y) +MESA3D_DEPENDENCIES += xlib_libxshmfence +endif + # Drivers #Gallium Drivers diff --git a/custom/package/mesa3d/mesa3d.mk.patch b/custom/package/mesa3d/mesa3d.mk.patch index b6766e02caa40212a984d3050387e501ebbda7c4..8fec5081ed87fa8359e6aaf5ec5e2d1f1612d5dc 100644 --- a/custom/package/mesa3d/mesa3d.mk.patch +++ b/custom/package/mesa3d/mesa3d.mk.patch @@ -1,5 +1,5 @@ diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk -index ce460c4475..68ae9c9c33 100644 +index ce460c4475..333401691c 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ @@ -7,11 +7,11 @@ index ce460c4475..68ae9c9c33 100644 # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.9 -+MESA3D_VERSION = 24.2.6 ++MESA3D_VERSION = 25.1.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -@@ -21,12 +21,17 @@ MESA3D_DEPENDENCIES = \ +@@ -21,21 +21,17 @@ MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ host-python-mako \ @@ -21,15 +21,23 @@ index ce460c4475..68ae9c9c33 100644 zlib MESA3D_CONF_OPTS = \ - -Dgallium-omx=disabled \ +- -Dgallium-omx=disabled \ + -Dgallium-opencl=disabled \ + -Dgallium-rusticl=false \ + -Dmicrosoft-clc=disabled \ -+ -Dopencl-spirv=false \ -Dpower8=disabled - ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) -@@ -50,14 +55,9 @@ else +-ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) +-MESA3D_CONF_OPTS += -Ddri3=enabled +-MESA3D_DEPENDENCIES += xlib_libxshmfence +-else +-MESA3D_CONF_OPTS += -Ddri3=disabled +-endif +- + ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) + MESA3D_DEPENDENCIES += host-llvm llvm + MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' +@@ -50,14 +46,9 @@ else MESA3D_CONF_OPTS += -Dllvm=disabled endif @@ -44,7 +52,18 @@ index ce460c4475..68ae9c9c33 100644 endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) -@@ -99,20 +99,24 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedre +@@ -90,6 +81,10 @@ else + MESA3D_CONF_OPTS += -Dgallium-vc4-neon=disabled + endif + ++ifeq ($(BR2_PACKAGE_XORG7),y) ++MESA3D_DEPENDENCIES += xlib_libxshmfence ++endif ++ + # Drivers + + #Gallium Drivers +@@ -99,20 +94,24 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedre MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima @@ -70,7 +89,7 @@ index ce460c4475..68ae9c9c33 100644 MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) -@@ -126,6 +130,19 @@ MESA3D_CONF_OPTS += \ +@@ -126,6 +125,19 @@ MESA3D_CONF_OPTS += \ -Dgallium-extra-hud=true endif @@ -90,7 +109,7 @@ index ce460c4475..68ae9c9c33 100644 ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= -@@ -133,6 +150,9 @@ else +@@ -133,6 +145,9 @@ else MESA3D_DEPENDENCIES += host-python-glslang MESA3D_CONF_OPTS += \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) @@ -100,7 +119,7 @@ index ce460c4475..68ae9c9c33 100644 endif # APIs -@@ -251,12 +271,33 @@ endif +@@ -251,12 +266,33 @@ endif ifeq ($(BR2_PACKAGE_LIBGLVND),y) ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),) MESA3D_DEPENDENCIES += libglvnd diff --git a/custom/package/wayland-protocols/wayland-protocols.hash b/custom/package/wayland-protocols/wayland-protocols.hash new file mode 100644 index 0000000000000000000000000000000000000000..e4bd77663f64a604f23dea600eef4e45c4c27317 --- /dev/null +++ b/custom/package/wayland-protocols/wayland-protocols.hash @@ -0,0 +1,4 @@ +# From https://lists.freedesktop.org/archives/wayland-devel/2024-April/043581.html +sha256 2786b6b1b79965e313f2c289c12075b9ed700d41844810c51afda10ee329576b wayland-protocols-1.41.tar.xz +sha512 6122fe4f20a1a0908abd631ff31302b56018050e5e835c1413d5b40a527980c30859ed9cddf595213f7d5eb1d50baaf6adc312cef9279d60b8a15e447e259863 wayland-protocols-1.36.tar.xz +sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/custom/package/wayland-protocols/wayland-protocols.hash.patch b/custom/package/wayland-protocols/wayland-protocols.hash.patch new file mode 100644 index 0000000000000000000000000000000000000000..05c713b279f3bf7e28f1d3f644e32dd4a0adf078 --- /dev/null +++ b/custom/package/wayland-protocols/wayland-protocols.hash.patch @@ -0,0 +1,11 @@ +diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash +index 93d40a919c..e4bd77663f 100644 +--- a/package/wayland-protocols/wayland-protocols.hash ++++ b/package/wayland-protocols/wayland-protocols.hash +@@ -1,4 +1,4 @@ + # From https://lists.freedesktop.org/archives/wayland-devel/2024-April/043581.html +-sha256 71fd4de05e79f9a1ca559fac30c1f8365fa10346422f9fe795f74d77b9ef7e92 wayland-protocols-1.36.tar.xz +-sha512 5448b9aedc953ce6be0f378da900c195c8743cb6001f615823b5fc9cab3e3ee54271132055743278e10decef7f8e9dcdeef31593a2a12062575fb90eb0084be0 wayland-protocols-1.36.tar.xz ++sha256 2786b6b1b79965e313f2c289c12075b9ed700d41844810c51afda10ee329576b wayland-protocols-1.41.tar.xz ++sha512 6122fe4f20a1a0908abd631ff31302b56018050e5e835c1413d5b40a527980c30859ed9cddf595213f7d5eb1d50baaf6adc312cef9279d60b8a15e447e259863 wayland-protocols-1.36.tar.xz + sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/custom/package/wayland-protocols/wayland-protocols.mk b/custom/package/wayland-protocols/wayland-protocols.mk new file mode 100644 index 0000000000000000000000000000000000000000..d3ec3241e7f397090d4c4a57d69d6963e23ea329 --- /dev/null +++ b/custom/package/wayland-protocols/wayland-protocols.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# wayland-protocols +# +################################################################################ + +WAYLAND_PROTOCOLS_VERSION = 1.41 +WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads +WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz +WAYLAND_PROTOCOLS_LICENSE = MIT +WAYLAND_PROTOCOLS_LICENSE_FILES = COPYING +WAYLAND_PROTOCOLS_INSTALL_STAGING = YES +WAYLAND_PROTOCOLS_INSTALL_TARGET = NO + +WAYLAND_PROTOCOLS_CONF_OPTS = -Dtests=false + +$(eval $(meson-package)) diff --git a/custom/package/wayland-protocols/wayland-protocols.mk.patch b/custom/package/wayland-protocols/wayland-protocols.mk.patch new file mode 100644 index 0000000000000000000000000000000000000000..9379f776c48e2080551fb4a4e485d90fc2577a0d --- /dev/null +++ b/custom/package/wayland-protocols/wayland-protocols.mk.patch @@ -0,0 +1,13 @@ +diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk +index c0dfe69401..d3ec3241e7 100644 +--- a/package/wayland-protocols/wayland-protocols.mk ++++ b/package/wayland-protocols/wayland-protocols.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-WAYLAND_PROTOCOLS_VERSION = 1.36 ++WAYLAND_PROTOCOLS_VERSION = 1.41 + WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads + WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz + WAYLAND_PROTOCOLS_LICENSE = MIT