Skip to content

Commit ac3ed95

Browse files
onlylunixonlylunix
committed
mesa: update to 25.2.3
1 parent 15e58ef commit ac3ed95

File tree

5 files changed

+202
-100
lines changed

5 files changed

+202
-100
lines changed

‎srcpkgs/mesa/files/gen_template.add‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/bin/bash
2+
3+
_distfiles=
4+
_checksum=
5+
_skip_extraction=
6+
7+
_crates=()
8+
9+
while read -r f; do
10+
grep crates.io "$f" > /dev/null || continue
11+
12+
_items=$(grep '=' "$f" | tr -d " \t")
13+
14+
#./subprojects/syn.wrap
15+
# directory=syn-2.0.87
16+
# source_url=https://crates.io/api/v1/crates/syn/2.0.87/download
17+
# source_filename=syn-2.0.87.tar.gz
18+
# source_hash=25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d
19+
# patch_directory=syn
20+
21+
_source_url=$(grep 'source_url=' <<< "$_items"); _source_url=${_source_url#*=}
22+
[ -n "${_source_url}" ] || continue
23+
_source_filename=$(grep 'source_filename=' <<< "$_items"); _source_filename=${_source_filename#*=}
24+
_source_hash=$(grep 'source_hash=' <<< "$_items"); _source_hash=${_source_hash#*=}
25+
26+
_distfiles+=$'\n'" ${_source_url}>${_source_filename}"
27+
_checksum+=$'\n'" $_source_hash"
28+
_skip_extraction+=$'\n'" ${_source_filename}"
29+
30+
__subname=$(sed -r 's|.*crates/([^/]+)/([0-9.]+)/download|\1|' <<< "$_source_url")
31+
__subversion=$(sed -r 's|.*crates/([^/]+)/([0-9.]+)/download|\2|' <<< "$_source_url")
32+
_crates+=(" _prepare_subproject ${__subname} ${__subversion}")
33+
done < <(find ./subprojects -maxdepth 1 -type f -name '*.wrap' -printf '%p\n')
34+
35+
printf 'distfiles+="%s"\n' "$_distfiles"
36+
printf 'checksum+="%s"\n' "$_checksum"
37+
printf 'skip_extraction+="%s"\n' "$_skip_extraction"
38+
39+
echo '
40+
_prepare_subproject() {
41+
local subname=$1
42+
local subversion=$2
43+
vsrcextract -C subprojects/${subname}-${subversion} ${subname}-${subversion}.tar.gz
44+
cp subprojects/packagefiles/${subname}/meson.build subprojects/${subname}-${subversion}
45+
}
46+
'
47+
48+
echo 'post_extract() {'
49+
printf "%s\n" "${_crates[@]}"
50+
echo '}'

‎srcpkgs/mesa/files/template.add‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
distfiles+="
2+
https://crates.io/api/v1/crates/zerocopy/0.8.13/download>zerocopy-0.8.13.tar.gz
3+
https://crates.io/api/v1/crates/zerocopy-derive/0.8.13/download>zerocopy-derive-0.8.13.tar.gz
4+
https://crates.io/api/v1/crates/unicode-ident/1.0.12/download>unicode-ident-1.0.12.tar.gz
5+
https://crates.io/api/v1/crates/ucd-trie/0.1.6/download>ucd-trie-0.1.6.tar.gz
6+
https://crates.io/api/v1/crates/thiserror/2.0.11/download>thiserror-2.0.11.tar.gz
7+
https://crates.io/api/v1/crates/thiserror-impl/2.0.11/download>thiserror-impl-2.0.11.tar.gz
8+
https://crates.io/api/v1/crates/syn/2.0.87/download>syn-2.0.87.tar.gz
9+
https://crates.io/api/v1/crates/rustix/1.0.7/download>rustix-1.0.7.tar.gz
10+
https://crates.io/api/v1/crates/rustc-hash/2.1.1/download>rustc-hash-2.1.1.tar.gz
11+
https://crates.io/api/v1/crates/roxmltree/0.20.0/download>roxmltree-0.20.0.tar.gz
12+
https://crates.io/api/v1/crates/remain/0.2.12/download>remain-0.2.12.tar.gz
13+
https://crates.io/api/v1/crates/quote/1.0.35/download>quote-1.0.35.tar.gz
14+
https://crates.io/api/v1/crates/proc-macro2/1.0.86/download>proc-macro2-1.0.86.tar.gz
15+
https://crates.io/api/v1/crates/pest_meta/2.8.0/download>pest_meta-2.8.0.tar.gz
16+
https://crates.io/api/v1/crates/pest_generator/2.8.0/download>pest_generator-2.8.0.tar.gz
17+
https://crates.io/api/v1/crates/pest_derive/2.8.0/download>pest_derive-2.8.0.tar.gz
18+
https://crates.io/api/v1/crates/pest/2.8.0/download>pest-2.8.0.tar.gz
19+
https://crates.io/api/v1/crates/paste/1.0.14/download>paste-1.0.14.tar.gz
20+
https://crates.io/api/v1/crates/once_cell/1.8.0/download>once_cell-1.8.0.tar.gz
21+
https://crates.io/api/v1/crates/log/0.4.27/download>log-0.4.27.tar.gz
22+
https://crates.io/api/v1/crates/libc/0.2.168/download>libc-0.2.168.tar.gz
23+
https://crates.io/api/v1/crates/indexmap/2.2.6/download>indexmap-2.2.6.tar.gz
24+
https://crates.io/api/v1/crates/hashbrown/0.14.1/download>hashbrown-0.14.1.tar.gz
25+
https://crates.io/api/v1/crates/errno/0.3.12/download>errno-0.3.12.tar.gz
26+
https://crates.io/api/v1/crates/equivalent/1.0.1/download>equivalent-1.0.1.tar.gz
27+
https://crates.io/api/v1/crates/cfg-if/1.0.0/download>cfg-if-1.0.0.tar.gz
28+
https://crates.io/api/v1/crates/bitflags/2.9.1/download>bitflags-2.9.1.tar.gz"
29+
checksum+="
30+
67914ab451f3bfd2e69e5e9d2ef3858484e7074d63f204fd166ec391b54de21d
31+
7988d73a4303ca289df03316bc490e934accf371af6bc745393cf3c2c5c4f25d
32+
3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
33+
ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9
34+
d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc
35+
26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2
36+
25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d
37+
c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266
38+
357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d
39+
6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97
40+
1ad5e011230cad274d0532460c5ab69828ea47ae75681b42a841663efffaf794
41+
291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
42+
5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
43+
7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0
44+
db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841
45+
d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5
46+
198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6
47+
de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
48+
692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56
49+
13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
50+
5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d
51+
168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
52+
7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12
53+
cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18
54+
5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
55+
baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
56+
1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
57+
skip_extraction+="
58+
zerocopy-0.8.13.tar.gz
59+
zerocopy-derive-0.8.13.tar.gz
60+
unicode-ident-1.0.12.tar.gz
61+
ucd-trie-0.1.6.tar.gz
62+
thiserror-2.0.11.tar.gz
63+
thiserror-impl-2.0.11.tar.gz
64+
syn-2.0.87.tar.gz
65+
rustix-1.0.7.tar.gz
66+
rustc-hash-2.1.1.tar.gz
67+
roxmltree-0.20.0.tar.gz
68+
remain-0.2.12.tar.gz
69+
quote-1.0.35.tar.gz
70+
proc-macro2-1.0.86.tar.gz
71+
pest_meta-2.8.0.tar.gz
72+
pest_generator-2.8.0.tar.gz
73+
pest_derive-2.8.0.tar.gz
74+
pest-2.8.0.tar.gz
75+
paste-1.0.14.tar.gz
76+
once_cell-1.8.0.tar.gz
77+
log-0.4.27.tar.gz
78+
libc-0.2.168.tar.gz
79+
indexmap-2.2.6.tar.gz
80+
hashbrown-0.14.1.tar.gz
81+
errno-0.3.12.tar.gz
82+
equivalent-1.0.1.tar.gz
83+
cfg-if-1.0.0.tar.gz
84+
bitflags-2.9.1.tar.gz"
85+
86+
_prepare_subproject() {
87+
local subname=$1
88+
local subversion=$2
89+
vsrcextract -C subprojects/${subname}-${subversion} ${subname}-${subversion}.tar.gz
90+
cp subprojects/packagefiles/${subname}/meson.build subprojects/${subname}-${subversion}
91+
}
92+
93+
post_extract() {
94+
_prepare_subproject zerocopy 0.8.13
95+
_prepare_subproject zerocopy-derive 0.8.13
96+
_prepare_subproject unicode-ident 1.0.12
97+
_prepare_subproject ucd-trie 0.1.6
98+
_prepare_subproject thiserror 2.0.11
99+
_prepare_subproject thiserror-impl 2.0.11
100+
_prepare_subproject syn 2.0.87
101+
_prepare_subproject rustix 1.0.7
102+
_prepare_subproject rustc-hash 2.1.1
103+
_prepare_subproject roxmltree 0.20.0
104+
_prepare_subproject remain 0.2.12
105+
_prepare_subproject quote 1.0.35
106+
_prepare_subproject proc-macro2 1.0.86
107+
_prepare_subproject pest_meta 2.8.0
108+
_prepare_subproject pest_generator 2.8.0
109+
_prepare_subproject pest_derive 2.8.0
110+
_prepare_subproject pest 2.8.0
111+
_prepare_subproject paste 1.0.14
112+
_prepare_subproject once_cell 1.8.0
113+
_prepare_subproject log 0.4.27
114+
_prepare_subproject libc 0.2.168
115+
_prepare_subproject indexmap 2.2.6
116+
_prepare_subproject hashbrown 0.14.1
117+
_prepare_subproject errno 0.3.12
118+
_prepare_subproject equivalent 1.0.1
119+
_prepare_subproject cfg-if 1.0.0
120+
_prepare_subproject bitflags 2.9.1
121+
}

‎srcpkgs/mesa/patches/musl-endian.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
--- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
2-
+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
3-
@@ -68,6 +68,16 @@
4-
5-
#define PIPE_ARCH_LITTLE_ENDIAN
1+
--- a/src/util/u_endian.h 2025-09-30 15:31:39.114657163 +0300
2+
+++ b/src/util/u_endian.h 2025-09-30 15:22:18.962576906 +0300
3+
@@ -92,6 +92,16 @@
4+
#define UTIL_ARCH_LITTLE_ENDIAN 1
5+
#define UTIL_ARCH_BIG_ENDIAN 0
66

77
+#else
88
+/* Musl libc */
@@ -16,4 +16,4 @@
1616
+
1717
#endif
1818

19-
#endif
19+
#if !defined(UTIL_ARCH_LITTLE_ENDIAN) || !defined(UTIL_ARCH_BIG_ENDIAN)

‎srcpkgs/mesa/patches/musl.patch‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
2-
+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
1+
--- a/src/util/rand_xor.c 2025-09-30 15:31:17.368731386 +0300
2+
+++ b/src/util/rand_xor.c 2025-09-30 15:24:46.938064862 +0300
33
@@ -28,6 +28,7 @@
44
#if defined(HAVE_GETRANDOM)
55
#include <sys/random.h>
@@ -8,33 +8,13 @@
88
#include <unistd.h>
99
#include <fcntl.h>
1010
#endif
11-
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
12-
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
13-
@@ -30,6 +30,7 @@
11+
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h 2025-09-30 15:31:17.368731386 +0300
12+
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h 2025-09-30 15:24:46.938064862 +0300
13+
@@ -13,6 +13,7 @@
1414

1515
#include <amdgpu.h>
1616
#include <pthread.h>
1717
+#include <sys/types.h>
1818
#include "util/list.h"
1919
#include "util/rwlock.h"
2020
#include "ac_gpu_info.h"
21-
--- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
22-
+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
23-
@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
24-
{
25-
static boolean first = TRUE;
26-
static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
27-
- unsigned long tid = 0;
28-
+ pthread_t tid = 0;
29-
30-
if (first) {
31-
first = FALSE;
32-
@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
33-
34-
#if defined(HAVE_PTHREAD)
35-
if (dbg_flags & DBG_TID)
36-
- tid = (unsigned long)pthread_self();
37-
+ tid = pthread_self();
38-
#endif
39-
40-
if (dbg_flags & flag) {

0 commit comments

Comments
 (0)