* [PR PATCH] mesa: update to 25.0.1
@ 2025-03-06 2:10 zlice
2025-03-06 15:39 ` zlice
` (77 more replies)
0 siblings, 78 replies; 79+ messages in thread
From: zlice @ 2025-03-06 2:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
There is a new pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 2938 bytes --]
From 472c2c7313916f112cdfb1473f6a7f7bb11c7b4e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.1
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 19 +++----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 4 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..29fe0fb80651fb 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.1
revision=1
build_style=meson
_llvmver=19
@@ -24,7 +24,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+checksum=49eb55ba5acccae91deb566573a6a73144a0f39014be1982d78c21c5b6b0bb3f
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..a7f8d50d0cd36c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -399,6 +399,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
@ 2025-03-06 15:39 ` zlice
2025-03-06 22:25 ` oreo639
` (76 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-03-06 15:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2704211157
Comment:
looks like a repo or something not sync'd ? `libwayland-egl` was moved to `wayland` https://github.com/void-linux/void-packages/commit/69b59e3eac260e8d79528b36daf4c7d61c5b5ed6
similar to `mlt` for the ffmpeg-meta pr
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
2025-03-06 15:39 ` zlice
@ 2025-03-06 22:25 ` oreo639
2025-03-06 22:26 ` oreo639
` (75 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: oreo639 @ 2025-03-06 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2705079147
Comment:
> similar to `mlt` for the ffmpeg-meta pr
When packages are added to removed-packages, they don't immediately get removed from the repos, that has to be done manually.
```
$ XBPS_TARGET_ARCH=x86_64-musl xbps-query -MRs libwayland-egl -p run_depends --repository=https://repo-default.voidlinux.org/current/musl
wlc-0.0.11_1: libwayland-egl>=9.0.1_4 (https://repo-default.voidlinux.org/current/musl)
```
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
2025-03-06 15:39 ` zlice
2025-03-06 22:25 ` oreo639
@ 2025-03-06 22:26 ` oreo639
2025-03-06 22:29 ` zlice
` (74 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: oreo639 @ 2025-03-06 22:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 588 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2705079147
Comment:
> similar to `mlt` for the ffmpeg-meta pr
When packages are added to removed-packages, they don't immediately get removed from the repos, that has to be done manually.
In this case the package is wlc:
```
$ XBPS_TARGET_ARCH=x86_64-musl xbps-query -MRs libwayland-egl -p run_depends --repository=https://repo-default.voidlinux.org/current/musl
wlc-0.0.11_1: libwayland-egl>=9.0.1_4 (https://repo-default.voidlinux.org/current/musl)
```
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (2 preceding siblings ...)
2025-03-06 22:26 ` oreo639
@ 2025-03-06 22:29 ` zlice
2025-03-15 3:05 ` tm512
` (73 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-03-06 22:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2705084824
Comment:
thx, figured it was something like that
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (3 preceding siblings ...)
2025-03-06 22:29 ` zlice
@ 2025-03-15 3:05 ` tm512
2025-03-26 12:18 ` [PR PATCH] [Updated] " zlice
` (72 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: tm512 @ 2025-03-15 3:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
New comment by tm512 on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2726161422
Comment:
For what it's worth, I've been testing this PR for the last week, and it's been smooth sailing here on an RX 6650 XT.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (4 preceding siblings ...)
2025-03-15 3:05 ` tm512
@ 2025-03-26 12:18 ` zlice
2025-04-04 1:33 ` mesa: update to 25.0.2 shara-k
` (71 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-03-26 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 2938 bytes --]
From 47493c5be249123605f913a845d938ca96a102a2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.2
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 19 +++----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 4 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..e62f6febb77434 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.2
revision=1
build_style=meson
_llvmver=19
@@ -24,7 +24,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+checksum=adf904d083b308df95898600ffed435f4b5c600d95fb6ec6d4c45638627fdc97
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1bda568711478c..204c05c2011150 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -400,6 +400,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.2
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (5 preceding siblings ...)
2025-03-26 12:18 ` [PR PATCH] [Updated] " zlice
@ 2025-04-04 1:33 ` shara-k
2025-04-04 1:46 ` shara-k
` (70 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: shara-k @ 2025-04-04 1:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
New comment by shara-k on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2777340338
Comment:
Both `libxml2` and `ncurses` were updated within the last week; when I attempted to build this PR today, xbps-src failed due to conflicting packages being present within the masterdir
```
=> ERROR: libxml2-2.13.6_1: failed to install target dependencies! (error 19)
ncurses-libs-6.5_1 in transaction breaks installed pkg 'ncurses-6.5_2'
Transaction aborted due to unresolved dependencies.
```
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.2
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (6 preceding siblings ...)
2025-04-04 1:33 ` mesa: update to 25.0.2 shara-k
@ 2025-04-04 1:46 ` shara-k
2025-04-04 21:23 ` [PR PATCH] [Updated] " zlice
` (69 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: shara-k @ 2025-04-04 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
New comment by shara-k on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2777340338
Comment:
Both `libxml2` and `ncurses` were updated within the last week; when I attempted to build this PR today, xbps-src failed due to conflicting packages being present within the masterdir
```
=> ERROR: libxml2-2.13.6_1: failed to install target dependencies! (error 19)
ncurses-libs-6.5_1 in transaction breaks installed pkg 'ncurses-6.5_2'
Transaction aborted due to unresolved dependencies.
```
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.2
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (7 preceding siblings ...)
2025-04-04 1:46 ` shara-k
@ 2025-04-04 21:23 ` zlice
2025-04-17 11:42 ` [PR PATCH] [Updated] mesa: update to 25.0.3 zlice
` (68 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-04-04 21:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 2938 bytes --]
From 81660028594b5c4d8f9bea620eed5c2f6fef3b7f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.3
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 19 +++----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 4 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..fc4e96b2697a39 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.3
revision=1
build_style=meson
_llvmver=19
@@ -24,7 +24,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+checksum=5ff426ed6ce0588fd96d18975bdff451ae2ab2fe98b5d1528842ee71ec66711b
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 470582d364c76f..be7fd72c872959 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -402,6 +402,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (8 preceding siblings ...)
2025-04-04 21:23 ` [PR PATCH] [Updated] " zlice
@ 2025-04-17 11:42 ` zlice
2025-04-17 19:28 ` mesa: update to 25.0.4 zlice
` (67 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-04-17 11:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.3
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 2938 bytes --]
From c7ccde2d047c0c0096bd959f510fa29f6378a148 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.4
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 19 +++----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 4 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..858a2c045e0b50 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.4
revision=1
build_style=meson
_llvmver=19
@@ -24,7 +24,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+checksum=76293cf4372ca4e4e73fd6c36c567b917b608a4db9d11bd2e33068199a7df04d
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..fda7f2f8141856 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -404,6 +404,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.4
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (9 preceding siblings ...)
2025-04-17 11:42 ` [PR PATCH] [Updated] mesa: update to 25.0.3 zlice
@ 2025-04-17 19:28 ` zlice
2025-04-21 21:38 ` [PR PATCH] [Updated] " zlice
` (66 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-04-17 19:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2813840705
Comment:
just had a hard system freeze watching a video that got choppy when it shouldn't really be. but also updated intel-media-drivers. rolled this back to test
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.4
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (10 preceding siblings ...)
2025-04-17 19:28 ` mesa: update to 25.0.4 zlice
@ 2025-04-21 21:38 ` zlice
2025-04-21 21:39 ` zlice
` (65 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-04-21 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.4
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 2938 bytes --]
From adf4d617e8df88542d144a8efc0d8b820997d1c6 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.3
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 19 +++----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 4 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..fc4e96b2697a39 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.3
revision=1
build_style=meson
_llvmver=19
@@ -24,7 +24,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+checksum=5ff426ed6ce0588fd96d18975bdff451ae2ab2fe98b5d1528842ee71ec66711b
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..fda7f2f8141856 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -404,6 +404,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.4
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (11 preceding siblings ...)
2025-04-21 21:38 ` [PR PATCH] [Updated] " zlice
@ 2025-04-21 21:39 ` zlice
2025-05-02 3:05 ` mesa: update to 25.0.3 ericonr
` (64 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-04-21 21:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2819558553
Comment:
went back to 25.0.3
had another crash with 25.0.4 while playing a game. was at least able to ssh and restart but everything has been fine on 25.0.3
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (12 preceding siblings ...)
2025-04-21 21:39 ` zlice
@ 2025-05-02 3:05 ` ericonr
2025-05-02 12:12 ` zlice
` (63 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2025-05-02 3:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2846214855
Comment:
Have you managed to test https://docs.mesa3d.org/relnotes/25.0.5.html ?
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (13 preceding siblings ...)
2025-05-02 3:05 ` mesa: update to 25.0.3 ericonr
@ 2025-05-02 12:12 ` zlice
2025-05-04 15:25 ` chilledfrogs
` (62 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-02 12:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2847064721
Comment:
> Have you managed to test https://docs.mesa3d.org/relnotes/25.0.5.html ?
no. no one replied to my issue about the crashing. only see 1 thing in there that may be related to it so it wasnt a high priority. rather have this merged since it's working for ppl.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (14 preceding siblings ...)
2025-05-02 12:12 ` zlice
@ 2025-05-04 15:25 ` chilledfrogs
2025-05-04 23:05 ` [PR PATCH] [Updated] " zlice
` (61 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: chilledfrogs @ 2025-05-04 15:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New comment by chilledfrogs on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2849276037
Comment:
Alpine merged 25.0.5 recently, so I'd say that it would be worth a check actually
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (15 preceding siblings ...)
2025-05-04 15:25 ` chilledfrogs
@ 2025-05-04 23:05 ` zlice
2025-05-04 23:05 ` mesa: update to 25.0.5 zlice
` (60 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-04 23:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.3
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 2938 bytes --]
From 9a4f85aa63a142a26dd8d438500a6a72a353221a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.3
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 19 +++----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 4 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..fc4e96b2697a39 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.3
revision=1
build_style=meson
_llvmver=19
@@ -24,7 +24,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+checksum=5ff426ed6ce0588fd96d18975bdff451ae2ab2fe98b5d1528842ee71ec66711b
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..fda7f2f8141856 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -404,6 +404,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (16 preceding siblings ...)
2025-05-04 23:05 ` [PR PATCH] [Updated] " zlice
@ 2025-05-04 23:05 ` zlice
2025-05-04 23:08 ` [PR PATCH] [Updated] " zlice
` (59 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-04 23:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2849487183
Comment:
well so far so good for 25.0.5. '4 was crapping out in hours and it's been about all day
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (17 preceding siblings ...)
2025-05-04 23:05 ` mesa: update to 25.0.5 zlice
@ 2025-05-04 23:08 ` zlice
2025-05-05 0:45 ` [PR REVIEW] " ericonr
` (58 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-04 23:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.5
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 3124 bytes --]
From 66d0801fbe13a5aa295921f8228fb7017abb15e1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.5
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 22 +++++-----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 6 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..6d3bab60773677 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.5
revision=1
build_style=meson
_llvmver=19
@@ -23,8 +23,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+#distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=c0d245dea0aa4b49f74b3d474b16542e4a8799791cd33d676c69f650ad4378d0
build_helper="qemu"
build_options="wayland"
@@ -40,7 +41,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +242,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +283,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..fda7f2f8141856 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -404,6 +404,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (18 preceding siblings ...)
2025-05-04 23:08 ` [PR PATCH] [Updated] " zlice
@ 2025-05-05 0:45 ` ericonr
2025-05-05 1:19 ` ericonr
` (57 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2025-05-05 0:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2072758532
Comment:
Why did you change the distfiles URL?
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (19 preceding siblings ...)
2025-05-05 0:45 ` [PR REVIEW] " ericonr
@ 2025-05-05 1:19 ` ericonr
2025-05-05 1:45 ` [PR PATCH] [Updated] " zlice
` (56 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2025-05-05 1:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2072766922
Comment:
Ok, tested it here. The old link can simply be removed entirely, no reason to leave it commented out.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (20 preceding siblings ...)
2025-05-05 1:19 ` ericonr
@ 2025-05-05 1:45 ` zlice
2025-05-05 1:46 ` zlice
` (55 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-05 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.5
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 3049 bytes --]
From 2313c232a8091e6a26c0fb5a59cfef68fcae1141 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.5
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 21 ++++-----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 5 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..b351bf0fd6fb14 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.5
revision=1
build_style=meson
_llvmver=19
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=c0d245dea0aa4b49f74b3d474b16542e4a8799791cd33d676c69f650ad4378d0
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..fda7f2f8141856 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -404,6 +404,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (21 preceding siblings ...)
2025-05-05 1:45 ` [PR PATCH] [Updated] " zlice
@ 2025-05-05 1:46 ` zlice
2025-05-05 1:47 ` zlice
` (54 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-05 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.5
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 3141 bytes --]
From cf181e9da37218a549aafac1c293cd632e5e7a37 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.5
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 21 ++++-----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 5 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..b351bf0fd6fb14 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.5
revision=1
build_style=meson
_llvmver=19
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=c0d245dea0aa4b49f74b3d474b16542e4a8799791cd33d676c69f650ad4378d0
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..fda7f2f8141856 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -404,6 +404,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (22 preceding siblings ...)
2025-05-05 1:46 ` zlice
@ 2025-05-05 1:47 ` zlice
2025-05-05 11:39 ` [PR PATCH] [Updated] " zlice
` (53 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-05 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2849724863
Comment:
> > libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
>
> I think it would be nice to include this info in the commit message :)
added this. removed the commented distfile since it permanently moved
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (23 preceding siblings ...)
2025-05-05 1:47 ` zlice
@ 2025-05-05 11:39 ` zlice
2025-05-06 15:19 ` zlice
` (52 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-05 11:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.5
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 3141 bytes --]
From fffbe6f6af917e2db5319d9fdc20a90c29085868 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.5
libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 21 ++++-----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 5 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..b351bf0fd6fb14 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.5
revision=1
build_style=meson
_llvmver=19
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=c0d245dea0aa4b49f74b3d474b16542e4a8799791cd33d676c69f650ad4378d0
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..fda7f2f8141856 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -404,6 +404,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (24 preceding siblings ...)
2025-05-05 11:39 ` [PR PATCH] [Updated] " zlice
@ 2025-05-06 15:19 ` zlice
2025-05-06 16:32 ` [PR PATCH] [Updated] " zlice
` (51 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-06 15:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2854991766
Comment:
well, i was fine for a day and then updated discord and started getting crashes and oom today. turned off hwaccel launching discord to see if that helps anything. closed my mesa issue which may have been premature. if anyone else has issues with 25.0.5 or similar freezes/oom where you need to hold power to reboot lmk.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.5
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (25 preceding siblings ...)
2025-05-06 15:19 ` zlice
@ 2025-05-06 16:32 ` zlice
2025-05-06 16:33 ` mesa: update to 25.0.3 zlice
` (50 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-06 16:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.5
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 3190 bytes --]
From 00332b3b3ee4951ca0c7124dde398296b1a2e133 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH] mesa: update to 25.0.3
libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
distfiles changed to https://mesa3d.org/archive
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 21 ++++-----------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 5 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 69c45a93b55362..45e5ab0d2c51ea 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
+version=25.0.3
revision=1
build_style=meson
_llvmver=19
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=5ff426ed6ce0588fd96d18975bdff451ae2ab2fe98b5d1528842ee71ec66711b
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -241,18 +241,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -294,7 +282,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..fda7f2f8141856 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -404,6 +404,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (26 preceding siblings ...)
2025-05-06 16:32 ` [PR PATCH] [Updated] " zlice
@ 2025-05-06 16:33 ` zlice
2025-05-24 8:00 ` dkwo
` (49 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-06 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2855229619
Comment:
moved back to 25.0.3 and haven't had any issues with all of the same things open (browser and discord are really it sitting there while i made food).
reopened my mesa issue. there seems to be something wrong with 25.0.4 at least for Intel GPUs
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (27 preceding siblings ...)
2025-05-06 16:33 ` mesa: update to 25.0.3 zlice
@ 2025-05-24 8:00 ` dkwo
2025-05-24 13:34 ` zlice
` (48 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: dkwo @ 2025-05-24 8:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2906608535
Comment:
Not sure if it makes sense to do it here, but if you plan to update mesa to 25.1.1 or later, it should be possible to add `asahi`, as in the mesa-asahi package, which can then be dropped. Happy to test if you ping me.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (28 preceding siblings ...)
2025-05-24 8:00 ` dkwo
@ 2025-05-24 13:34 ` zlice
2025-05-24 14:37 ` LangleyAsuka
` (47 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-24 13:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2906836114
Comment:
i am testing 25.1.1 but it's only been a couple days. havent seen any crashes yet but the most ive done on the computer is debug some wine bugs. i know your last pr the asahi stuff touched kernel, lmk what all needs thrown in and i can add it for when i push 25.1.1
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (29 preceding siblings ...)
2025-05-24 13:34 ` zlice
@ 2025-05-24 14:37 ` LangleyAsuka
2025-05-24 14:48 ` zlice
` (46 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: LangleyAsuka @ 2025-05-24 14:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
New comment by LangleyAsuka on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2906866117
Comment:
Bringing any version of mesa 25.X into the repos would be great, as especially mesa 25.0.0 had some crucial fixes for AMD cards. There were some issues with especially Chromium programs but also random other graphical applications leading to random freezes. There was also a whole discussion on the Arch forums of mesa 24.3.X being the bunch of versions with the most issues regarding this matter.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (30 preceding siblings ...)
2025-05-24 14:37 ` LangleyAsuka
@ 2025-05-24 14:48 ` zlice
2025-05-24 14:49 ` zlice
` (45 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-24 14:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2906872256
Comment:
ah so they fixed 1 set of cards and fuked another lol. great
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (31 preceding siblings ...)
2025-05-24 14:48 ` zlice
@ 2025-05-24 14:49 ` zlice
2025-05-24 14:51 ` [PR PATCH] [Updated] " zlice
` (44 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-24 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2906872256
Comment:
ah so they fixed 1 set of cards and fuked another lol. great
tbf, there's probably like a whole 5 ppl using intel cards so im sure amd has more coverage
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (32 preceding siblings ...)
2025-05-24 14:49 ` zlice
@ 2025-05-24 14:51 ` zlice
2025-05-24 14:51 ` zlice
` (43 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-24 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.0.3
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 8694 bytes --]
From 884f2c13a40884a025b4ab710e8cd9853566343a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/4] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 43 ++++++++-----------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 12 insertions(+), 33 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..ee2ca2ff5443a6 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,12 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# previously swrast, softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -241,18 +242,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +259,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +274,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..7ba7cf59822d29 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From da0bb08ae90d663d29c307cddb6080d6cbd68753 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/4] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index ab12d8228f6fe1..d6621a3dc1554c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1231,7 +1231,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ba7cf59822d29..a84cb6a4c0b83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=25.1.0
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 1fc972876405fdeb6079897ca32034c7d0f73342 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/4] mesa-demos: revbump for libOSMesa removal
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..eb202c6ca08851 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
From f9a659b54a68222341311e7d541890f2e353ec8d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/4] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.0.3
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (33 preceding siblings ...)
2025-05-24 14:51 ` [PR PATCH] [Updated] " zlice
@ 2025-05-24 14:51 ` zlice
2025-05-24 15:53 ` mesa: update to 25.1.1 LangleyAsuka
` (42 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-24 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2906873546
Comment:
@dkwo lmk about the asahi stuff, if you wana do that with or after this
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (34 preceding siblings ...)
2025-05-24 14:51 ` zlice
@ 2025-05-24 15:53 ` LangleyAsuka
2025-05-25 14:23 ` [PR PATCH] [Updated] " zlice
` (41 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: LangleyAsuka @ 2025-05-24 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
New comment by LangleyAsuka on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2906902442
Comment:
Furthermore, in another issue I made here there was also a person with a rdna2 card, they were running a Rx 6600 XT, who was also reporting multiple system freezes with this mesa version, so its not a one off thing (I am glad its not a hardware issue on my side at least)
They also mentioned that this issue is kind of alleviated with higher mesa/linux-firmware-amd versions.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (35 preceding siblings ...)
2025-05-24 15:53 ` mesa: update to 25.1.1 LangleyAsuka
@ 2025-05-25 14:23 ` zlice
2025-05-25 15:31 ` zlice
` (40 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-25 14:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 8694 bytes --]
From f69b0f5dedcc82def16221f1ade73f70647b8a71 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/4] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 43 ++++++++-----------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 12 insertions(+), 33 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..ee2ca2ff5443a6 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,12 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# previously swrast, softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -241,18 +242,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +259,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +274,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..7ba7cf59822d29 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From a1d93fd71d737f60e0a366918dfe3a09addd5c6b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/4] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 55d1d09cd629ff..d9d0c392b7a585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1231,7 +1231,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ba7cf59822d29..a84cb6a4c0b83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=25.1.0
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From fa0af5f9ee8c6eb9bd8a4b09004e0b93e1717d83 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/4] mesa-demos: revbump for libOSMesa removal
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..eb202c6ca08851 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
From 78f8ab7459568fc831b1a646d8c15dfc45875a17 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/4] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (36 preceding siblings ...)
2025-05-25 14:23 ` [PR PATCH] [Updated] " zlice
@ 2025-05-25 15:31 ` zlice
2025-05-25 15:33 ` zlice
` (39 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-25 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 9199 bytes --]
From f69b0f5dedcc82def16221f1ade73f70647b8a71 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/4] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 43 ++++++++-----------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 12 insertions(+), 33 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..ee2ca2ff5443a6 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,12 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# previously swrast, softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -241,18 +242,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +259,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +274,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..7ba7cf59822d29 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From a1d93fd71d737f60e0a366918dfe3a09addd5c6b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/4] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 55d1d09cd629ff..d9d0c392b7a585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1231,7 +1231,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ba7cf59822d29..a84cb6a4c0b83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=25.1.0
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 66b7f93f7c2ae9ed90c11162b6ef91197714051e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/4] mesa-demos: revbump for libOSMesa removal
distfiles changed tohttps://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
---
srcpkgs/mesa-demos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..36c2f6da16f7bc 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,7 +12,7 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
From ffb4c37039ca2a8b8f4663984141598880bb3e7c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/4] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (37 preceding siblings ...)
2025-05-25 15:31 ` zlice
@ 2025-05-25 15:33 ` zlice
2025-05-26 8:41 ` dkwo
` (38 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-25 15:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 9200 bytes --]
From f69b0f5dedcc82def16221f1ade73f70647b8a71 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/4] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 43 ++++++++-----------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 12 insertions(+), 33 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..ee2ca2ff5443a6 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,12 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# previously swrast, softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -241,18 +242,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +259,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +274,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..7ba7cf59822d29 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From a1d93fd71d737f60e0a366918dfe3a09addd5c6b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/4] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 55d1d09cd629ff..d9d0c392b7a585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1231,7 +1231,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ba7cf59822d29..a84cb6a4c0b83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=25.1.0
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From caf25829541c906ce7715be29c51258a85323192 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/4] mesa-demos: revbump for libOSMesa removal
distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
---
srcpkgs/mesa-demos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..36c2f6da16f7bc 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,7 +12,7 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
From 49d0e85df760f909eb12dcc9428edceab8c889b9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/4] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (38 preceding siblings ...)
2025-05-25 15:33 ` zlice
@ 2025-05-26 8:41 ` dkwo
2025-05-26 15:33 ` [PR PATCH] [Updated] " zlice
` (37 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: dkwo @ 2025-05-26 8:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2908978672
Comment:
Thanks, I think it can be done here.
By diff with `mesa-asahi`, could you add to the `_have_arm` conditional the following:
- `asahi` to `_vulkan_drivers` and `_gallium_drivers`
- `_have_opencl` set to `yes`
(Also, maybe drop double space before `python3-yaml`.)
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (39 preceding siblings ...)
2025-05-26 8:41 ` dkwo
@ 2025-05-26 15:33 ` zlice
2025-05-26 15:44 ` zlice
` (36 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-26 15:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 17229 bytes --]
From 84a5484113e1e5e3db2969bb40f9d62b56499140 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..1feb51f1a94457 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# previously swrast, softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..7ba7cf59822d29 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From c3e5526dc022af27b50ec1231ab842ab546ddacf Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 55d1d09cd629ff..d9d0c392b7a585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1231,7 +1231,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ba7cf59822d29..a84cb6a4c0b83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=25.1.0
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 98651798e3dd6cb08644ad4c3143fe943e0ec8d0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From ebc77d8e8d9942b843fc8bc1928951d7a2646254 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 4b25b3ddbc6bf729f1fae72bca4b3d97cb16db89 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/template | 144 +++++-------------------------------
1 file changed, 19 insertions(+), 125 deletions(-)
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..42861a42cbd8e7 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,62 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
-revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+build_style=meta
+depends="mesa"
+short_desc="transitional dummy package for mesa-asahi to mesa"
maintainer="dkwo <npiazza@disroot.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ build_style=meta
+ depends="${source-pkg/asahi-} ${source-pkg/asahi-devel-}"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ build_style=meta
+ depends="${source-pkg/asahi-} ${source-pkg/asahi-devel-}"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (40 preceding siblings ...)
2025-05-26 15:33 ` [PR PATCH] [Updated] " zlice
@ 2025-05-26 15:44 ` zlice
2025-05-26 16:54 ` zlice
` (35 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-26 15:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 17262 bytes --]
From 84a5484113e1e5e3db2969bb40f9d62b56499140 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..1feb51f1a94457 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# previously swrast, softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..7ba7cf59822d29 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From c3e5526dc022af27b50ec1231ab842ab546ddacf Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 55d1d09cd629ff..d9d0c392b7a585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1231,7 +1231,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ba7cf59822d29..a84cb6a4c0b83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=25.1.0
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 98651798e3dd6cb08644ad4c3143fe943e0ec8d0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From ebc77d8e8d9942b843fc8bc1928951d7a2646254 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 587f6e201179f99ed2717f5b67c6a95dff684d68 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/template | 146 ++++++------------------------------
1 file changed, 21 insertions(+), 125 deletions(-)
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..7b5231a745c1c3 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+build_style=meta
+depends="mesa"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ build_style=meta
+ depends="${source-pkg/asahi-} ${source-pkg/asahi-devel-}"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ build_style=meta
+ depends="${source-pkg/asahi-} ${source-pkg/asahi-devel-}"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ build_style=meta
+ depends="${source-pkg/asahi_}"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (41 preceding siblings ...)
2025-05-26 15:44 ` zlice
@ 2025-05-26 16:54 ` zlice
2025-05-26 19:14 ` zlice
` (34 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-26 16:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 17143 bytes --]
From 84a5484113e1e5e3db2969bb40f9d62b56499140 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..1feb51f1a94457 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# previously swrast, softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..7ba7cf59822d29 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From c3e5526dc022af27b50ec1231ab842ab546ddacf Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 55d1d09cd629ff..d9d0c392b7a585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1231,7 +1231,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ba7cf59822d29..a84cb6a4c0b83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=25.1.0
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 98651798e3dd6cb08644ad4c3143fe943e0ec8d0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From ebc77d8e8d9942b843fc8bc1928951d7a2646254 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 8ba5ea9db49f6c7e6837af281fdb825452863d01 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/template | 146 ++++++------------------------------
1 file changed, 21 insertions(+), 125 deletions(-)
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..df4038cea40add 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+build_style=meta
+depends="mesa"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ build_style=meta
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ build_style=meta
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ build_style=meta
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ build_style=meta
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ build_style=meta
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ build_style=meta
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ build_style=meta
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ build_style=meta
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (42 preceding siblings ...)
2025-05-26 16:54 ` zlice
@ 2025-05-26 19:14 ` zlice
2025-05-28 3:01 ` [PR REVIEW] " classabbyamp
` (33 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-26 19:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 21323 bytes --]
From 84a5484113e1e5e3db2969bb40f9d62b56499140 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..1feb51f1a94457 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# previously swrast, softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..7ba7cf59822d29 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=25.0.0
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From c3e5526dc022af27b50ec1231ab842ab546ddacf Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 55d1d09cd629ff..d9d0c392b7a585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1231,7 +1231,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ba7cf59822d29..a84cb6a4c0b83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=25.1.0
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 98651798e3dd6cb08644ad4c3143fe943e0ec8d0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From ebc77d8e8d9942b843fc8bc1928951d7a2646254 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From b0f2ba6c9e92040ee32211d602c8887f6f91561d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..df4038cea40add 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+build_style=meta
+depends="mesa"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ build_style=meta
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ build_style=meta
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ build_style=meta
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ build_style=meta
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ build_style=meta
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ build_style=meta
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ build_style=meta
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ build_style=meta
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (43 preceding siblings ...)
2025-05-26 19:14 ` zlice
@ 2025-05-28 3:01 ` classabbyamp
2025-05-28 3:01 ` classabbyamp
` (32 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 3:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110787206
Comment:
needs revision
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (44 preceding siblings ...)
2025-05-28 3:01 ` [PR REVIEW] " classabbyamp
@ 2025-05-28 3:01 ` classabbyamp
2025-05-28 3:01 ` classabbyamp
` (31 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 3:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110784546
Comment:
the depends on regular mesa should be `>=${version}_1`
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (47 preceding siblings ...)
2025-05-28 3:01 ` classabbyamp
@ 2025-05-28 3:01 ` classabbyamp
2025-05-28 3:03 ` classabbyamp
` (28 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 3:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110785804
Comment:
```suggestion
# softpipe always present
```
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (46 preceding siblings ...)
2025-05-28 3:01 ` classabbyamp
@ 2025-05-28 3:01 ` classabbyamp
2025-05-28 3:01 ` classabbyamp
` (29 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 3:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110786199
Comment:
tabs not spaces
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (45 preceding siblings ...)
2025-05-28 3:01 ` classabbyamp
@ 2025-05-28 3:01 ` classabbyamp
2025-05-28 3:01 ` classabbyamp
` (30 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 3:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110787305
Comment:
needs revision
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (48 preceding siblings ...)
2025-05-28 3:01 ` classabbyamp
@ 2025-05-28 3:03 ` classabbyamp
2025-05-28 4:02 ` [PR REVIEW] " classabbyamp
` (27 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 3:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2914748100
Comment:
the musl patches might be able to be made conditional to `"$XBPS_TARGET_WORDSIZE" -eq 32 -a "$XBPS_TARGET_LIBC" = musl`
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (49 preceding siblings ...)
2025-05-28 3:03 ` classabbyamp
@ 2025-05-28 4:02 ` classabbyamp
2025-05-28 4:02 ` classabbyamp
` (26 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 4:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110846545
Comment:
also should be `<=24.3.4_2`
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (50 preceding siblings ...)
2025-05-28 4:02 ` [PR REVIEW] " classabbyamp
@ 2025-05-28 4:02 ` classabbyamp
2025-05-28 4:03 ` classabbyamp
` (25 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 4:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110846578
Comment:
also should be `<=24.3.4_2`
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (51 preceding siblings ...)
2025-05-28 4:02 ` classabbyamp
@ 2025-05-28 4:03 ` classabbyamp
2025-05-28 4:04 ` classabbyamp
` (24 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 4:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110846578
Comment:
also should be `<=24.3.4_2` (last packaged version)
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (52 preceding siblings ...)
2025-05-28 4:03 ` classabbyamp
@ 2025-05-28 4:04 ` classabbyamp
2025-05-28 4:14 ` classabbyamp
` (23 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 4:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110846545
Comment:
also should be `<=24.3.4_2` (last packaged version)
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (53 preceding siblings ...)
2025-05-28 4:04 ` classabbyamp
@ 2025-05-28 4:14 ` classabbyamp
2025-05-28 12:26 ` [PR PATCH] [Updated] " zlice
` (22 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 4:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2110862298
Comment:
bump the revision or version of this package too
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (54 preceding siblings ...)
2025-05-28 4:14 ` classabbyamp
@ 2025-05-28 12:26 ` zlice
2025-05-28 12:26 ` [PR REVIEW] " zlice
` (21 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-28 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 22082 bytes --]
From d875026956ef0dcf9779fcc2241e42d375f33ebb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/6] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..a9b1b00152f48c 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..dbe6e5308e8028 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From 5f14b0b25dbd13b83bea41feb37adca777ae36f9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/6] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index fe12b5485bf204..bf25a596bcd59b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,7 +1233,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbe6e5308e8028..4bc4fa618b9c7e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=24.3.4_2
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From bd593f7d5f62478f7556dd18db1e00e9e1d617e4 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/6] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From 337136b7e95fc1a8bbf996c97e1721e38ad2a551 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/6] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 65d0872e136feba657e14f0939acd25b243e6a40 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/6] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..bfdeb5a40e91b1 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+build_style=meta
+depends="mesa>=${version}_1"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ build_style=meta
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ build_style=meta
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ build_style=meta
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ build_style=meta
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ build_style=meta
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ build_style=meta
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ build_style=meta
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ build_style=meta
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
From 1520aa7d196964535c4ca438ce6a4cd1fe690756 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 28 May 2025 08:21:40 -0400
Subject: [PATCH 6/6] removed-packages: revbump for mesa changes
---
srcpkgs/removed-packages/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4bc4fa618b9c7e..9ce160aeb383c9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1.20250519
-revision=1
+revision=2
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (55 preceding siblings ...)
2025-05-28 12:26 ` [PR PATCH] [Updated] " zlice
@ 2025-05-28 12:26 ` zlice
2025-05-28 12:26 ` zlice
` (20 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-28 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New review comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2111722892
Comment:
usually that's picked up by xlint, know why it wasn't?
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (56 preceding siblings ...)
2025-05-28 12:26 ` [PR REVIEW] " zlice
@ 2025-05-28 12:26 ` zlice
2025-05-28 13:31 ` classabbyamp
` (19 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-05-28 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2916117821
Comment:
> the musl patches might be able to be made conditional to `"$XBPS_TARGET_WORDSIZE" -eq 32 -a "$XBPS_TARGET_LIBC" = musl`
think i got everything you mentioned except this, not sure what you meant
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (57 preceding siblings ...)
2025-05-28 12:26 ` zlice
@ 2025-05-28 13:31 ` classabbyamp
2025-05-28 13:31 ` [PR REVIEW] " classabbyamp
` (18 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2916376785
Comment:
armv*-musl are still on musl 1.1, so they will fail to build
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (58 preceding siblings ...)
2025-05-28 13:31 ` classabbyamp
@ 2025-05-28 13:31 ` classabbyamp
2025-05-29 6:19 ` dkwo
` (17 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-05-28 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2111934085
Comment:
comment lines are ignored
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (59 preceding siblings ...)
2025-05-28 13:31 ` [PR REVIEW] " classabbyamp
@ 2025-05-29 6:19 ` dkwo
2025-05-30 4:29 ` chibiace
` (16 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: dkwo @ 2025-05-29 6:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 591 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2918425735
Comment:
Built and tested on `aarch64-glibc` (asahi): GPU acceleration works fine.
This looks good to me.
Note:
```
DEPRECATION: Option 'glvnd' value 'true' is replaced by 'enabled'
DEPRECATION: Option 'gallium-xa' is deprecated
DEPRECATION: Option 'gallium-opencl' is deprecated
WARNING: Build target etnaviv_isa_rs has no sources. This was never supposed to be allowed but did because of a bug, support will be removed in a future release of Meson
```
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (60 preceding siblings ...)
2025-05-29 6:19 ` dkwo
@ 2025-05-30 4:29 ` chibiace
2025-06-01 12:15 ` [PR PATCH] [Updated] " zlice
` (15 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: chibiace @ 2025-05-30 4:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New comment by chibiace on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2921195758
Comment:
ive been on 25.1.1 for a week with my 9070xt, havent had any problems. learnt alot about how to build packages for void too.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (61 preceding siblings ...)
2025-05-30 4:29 ` chibiace
@ 2025-06-01 12:15 ` zlice
2025-06-04 14:31 ` LangleyAsuka
` (14 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-01 12:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 22082 bytes --]
From d959a1700844235f4fc7fc930d2d0d77b75b2f28 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/6] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..a9b1b00152f48c 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..dbe6e5308e8028 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From 3f3f36f98bda19142b56390dcc082f3e20ce616e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/6] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index aabf2439dc7545..f5ccaec627e099 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,7 +1233,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbe6e5308e8028..4bc4fa618b9c7e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=24.3.4_2
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 2e9d32e23f0a516e3bdfda76ae36bdf4984cd37c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/6] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From 4cfb13c4ea705212728110209b4336dba300b056 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/6] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index db312a33e90adb..c6c0ff3086d55d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.8
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From f17496ac82c52a93c1a6df031dee14f03c7c791a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/6] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..bfdeb5a40e91b1 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+build_style=meta
+depends="mesa>=${version}_1"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ build_style=meta
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ build_style=meta
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ build_style=meta
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ build_style=meta
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ build_style=meta
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ build_style=meta
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ build_style=meta
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ build_style=meta
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
From 51d81fe2de7ad46fb9f5c798cf6dec561468823e Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 28 May 2025 08:21:40 -0400
Subject: [PATCH 6/6] removed-packages: revbump for mesa changes
---
srcpkgs/removed-packages/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4bc4fa618b9c7e..9ce160aeb383c9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1.20250519
-revision=1
+revision=2
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (62 preceding siblings ...)
2025-06-01 12:15 ` [PR PATCH] [Updated] " zlice
@ 2025-06-04 14:31 ` LangleyAsuka
2025-06-04 14:42 ` [PR PATCH] [Updated] " zlice
` (13 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: LangleyAsuka @ 2025-06-04 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
New comment by LangleyAsuka on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2940273160
Comment:
I have now been using mesa 25.1.1 for a couple of days now and it seems to work perfectly fine on my Rx 6800.
The freezes I was talking about earlier were caused by a regression in the kernel which has now been patched so it has been smooth sailing here for me.
Are there any further roadblocks for getting this merged? So for example users with a Rx 9XXX series card will have a decent experience?
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (63 preceding siblings ...)
2025-06-04 14:31 ` LangleyAsuka
@ 2025-06-04 14:42 ` zlice
2025-06-04 19:39 ` zlice
` (12 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-04 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 22082 bytes --]
From e11c7c61b783a2afd976ecae74e24a754d0f73bc Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/6] mesa: update to 25.1.1
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cc091d4a25f204..a9b1b00152f48c 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.1
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0c660f1df251f2..dbe6e5308e8028 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From 461adf8dfe348fc7ae2226e52bb87a6cc201ebb7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/6] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 861e45aa83b46a..6062bcfd208286 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,7 +1233,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbe6e5308e8028..4bc4fa618b9c7e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=24.3.4_2
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From a2fa2446443e3407594103d8c0d2297f8bd7dd0c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/6] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From f0ada835c62a5a25c4181caa1ef23b842841406b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/6] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2c9989411f1f..da6508aeb22ca0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.9
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 02d00e3dbf42b60c582d0b6d6068c57536d88887 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/6] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..bfdeb5a40e91b1 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+build_style=meta
+depends="mesa>=${version}_1"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ build_style=meta
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ build_style=meta
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ build_style=meta
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ build_style=meta
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ build_style=meta
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ build_style=meta
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ build_style=meta
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ build_style=meta
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
From 6632f6cb5c50d4a70abd8964887400f5d139cc26 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 28 May 2025 08:21:40 -0400
Subject: [PATCH 6/6] removed-packages: revbump for mesa changes
---
srcpkgs/removed-packages/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4bc4fa618b9c7e..9ce160aeb383c9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1.20250519
-revision=1
+revision=2
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (64 preceding siblings ...)
2025-06-04 14:42 ` [PR PATCH] [Updated] " zlice
@ 2025-06-04 19:39 ` zlice
2025-06-05 13:47 ` dkwo
` (11 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-04 19:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2941245928
Comment:
.2 is out, since ppl are running fine with 25.1.1 and this has been going for a bit, push or wait? :+1: :-1: ?
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (65 preceding siblings ...)
2025-06-04 19:39 ` zlice
@ 2025-06-05 13:47 ` dkwo
2025-06-13 1:43 ` classabbyamp
` (10 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: dkwo @ 2025-06-05 13:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2944452297
Comment:
Since this is working fine, if there are no breakage reports, I am for merging it as is.
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (66 preceding siblings ...)
2025-06-05 13:47 ` dkwo
@ 2025-06-13 1:43 ` classabbyamp
2025-06-13 3:22 ` zlice
` (9 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-06-13 1:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2968728378
Comment:
would probably be good to get this fix: https://www.phoronix.com/news/Mesa-25.1.3-Released
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (67 preceding siblings ...)
2025-06-13 1:43 ` classabbyamp
@ 2025-06-13 3:22 ` zlice
2025-06-13 3:32 ` [PR PATCH] [Updated] " zlice
` (8 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-13 3:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2968900948
Comment:
ya i saw 2 botched and 3 fixed but phoronix bit makes it sound it it was a fix just a bad 1
`25.1.1 = cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce`
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (68 preceding siblings ...)
2025-06-13 3:22 ` zlice
@ 2025-06-13 3:32 ` zlice
2025-06-13 3:36 ` zlice
` (7 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-13 3:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 21321 bytes --]
From c127c626a223d6abc01f4dbd4374db599f8d70bb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.3
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e6e830b46229c5..72a40093eab7a2 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.3
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fce62e07bbce1c..351762552b400c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From 75620ff8a3f6e94a3548ff9d9869b3423daa00ad Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 38b118ac3c81e9..5dfbc6f18e4e39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1235,7 +1235,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 351762552b400c..ed0ef16aa627d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=24.3.4_2
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From f3324a7e366521a7970b44193c0bcb049e02d650 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From ec197f7636d8905f6cd6b7abd4ad2ce946d647de Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2c9989411f1f..da6508aeb22ca0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.9
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 36a5cefdc9bd8bf0a98c70ce8f01d965f9babb92 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..bfdeb5a40e91b1 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+build_style=meta
+depends="mesa>=${version}_1"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ build_style=meta
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ build_style=meta
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ build_style=meta
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ build_style=meta
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ build_style=meta
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ build_style=meta
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ build_style=meta
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ build_style=meta
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (69 preceding siblings ...)
2025-06-13 3:32 ` [PR PATCH] [Updated] " zlice
@ 2025-06-13 3:36 ` zlice
2025-06-13 3:37 ` zlice
` (6 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-13 3:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 21313 bytes --]
From c127c626a223d6abc01f4dbd4374db599f8d70bb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.3
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e6e830b46229c5..72a40093eab7a2 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.3
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fce62e07bbce1c..351762552b400c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From 75620ff8a3f6e94a3548ff9d9869b3423daa00ad Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 38b118ac3c81e9..5dfbc6f18e4e39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1235,7 +1235,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 351762552b400c..ed0ef16aa627d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=24.3.4_2
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From f3324a7e366521a7970b44193c0bcb049e02d650 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From ec197f7636d8905f6cd6b7abd4ad2ce946d647de Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2c9989411f1f..da6508aeb22ca0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.9
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 5d37c95742b28fbf8d6cf88bf679e3566157ec98 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..b317ab50ee1aba 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+depends="mesa>=${version}_1"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
+_metapackage=yes
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ metapackage=yes
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ metapackage=yes
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ metapackage=yes
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ metapackage=yes
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ metapackage=yes
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ metapackage=yes
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ metapackage=yes
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ metapackage=yes
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (70 preceding siblings ...)
2025-06-13 3:36 ` zlice
@ 2025-06-13 3:37 ` zlice
2025-06-13 3:37 ` [PR REVIEW] " classabbyamp
` (5 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-13 3:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#issuecomment-2968920508
Comment:
ik you changed metapackage string recently. whys asahi need **_**metapackage ?
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (71 preceding siblings ...)
2025-06-13 3:37 ` zlice
@ 2025-06-13 3:37 ` classabbyamp
2025-06-13 3:37 ` [PR PATCH] [Updated] " zlice
` (4 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-06-13 3:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2144142552
Comment:
xlint is wrong atm, `metapackage=yes` is correct
https://github.com/leahneukirchen/xtools/pull/340
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (72 preceding siblings ...)
2025-06-13 3:37 ` [PR REVIEW] " classabbyamp
@ 2025-06-13 3:37 ` zlice
2025-06-13 3:41 ` zlice
` (3 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-13 3:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 21312 bytes --]
From c127c626a223d6abc01f4dbd4374db599f8d70bb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.3
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e6e830b46229c5..72a40093eab7a2 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.3
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fce62e07bbce1c..351762552b400c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From 75620ff8a3f6e94a3548ff9d9869b3423daa00ad Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 38b118ac3c81e9..5dfbc6f18e4e39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1235,7 +1235,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 351762552b400c..ed0ef16aa627d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=24.3.4_2
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From f3324a7e366521a7970b44193c0bcb049e02d650 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From ec197f7636d8905f6cd6b7abd4ad2ce946d647de Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2c9989411f1f..da6508aeb22ca0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.9
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From b02ba105e0a1cfb5244846b91c34af95f8ed7f5b Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..0c773f4c6e838e 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+depends="mesa>=${version}_1"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
+metapackage=yes
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ metapackage=yes
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ metapackage=yes
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ metapackage=yes
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ metapackage=yes
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ metapackage=yes
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ metapackage=yes
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ metapackage=yes
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ metapackage=yes
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (73 preceding siblings ...)
2025-06-13 3:37 ` [PR PATCH] [Updated] " zlice
@ 2025-06-13 3:41 ` zlice
2025-06-13 3:55 ` [PR REVIEW] " classabbyamp
` (2 subsequent siblings)
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-13 3:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 21621 bytes --]
From c127c626a223d6abc01f4dbd4374db599f8d70bb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.3
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e6e830b46229c5..72a40093eab7a2 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.3
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fce62e07bbce1c..351762552b400c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From ff28cd8ceeb829d47bb62056b449b1332a7a0920 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 3 ++-
3 files changed, 2 insertions(+), 3 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 38b118ac3c81e9..5dfbc6f18e4e39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1235,7 +1235,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 351762552b400c..fd7b383021d32f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -2,11 +2,11 @@
pkgname=removed-packages
version=0.1.20250612
revision=1
-metapackage=yes
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="Public Domain"
homepage="https://voidlinux.org"
+metapackage=yes
replaces="
6cord<=9.6_1
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=24.3.4_2
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 1da6e9996828c07ccedbec236dd74bc8f4c1a106 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From 2b9427f91c173e7105191759aac0e95b02c1d125 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2c9989411f1f..da6508aeb22ca0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.9
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 7bdbcd6eb6f47e17d990d0cf78284f3d6307dca2 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..0c773f4c6e838e 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+depends="mesa>=${version}_1"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
+metapackage=yes
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ metapackage=yes
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ metapackage=yes
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ metapackage=yes
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ metapackage=yes
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ metapackage=yes
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ metapackage=yes
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ metapackage=yes
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ metapackage=yes
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR REVIEW] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (74 preceding siblings ...)
2025-06-13 3:41 ` zlice
@ 2025-06-13 3:55 ` classabbyamp
2025-06-13 11:45 ` [PR PATCH] [Updated] " zlice
2025-06-13 15:12 ` [PR PATCH] [Merged]: " classabbyamp
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-06-13 3:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54596#discussion_r2144154944
Comment:
it was in the correct place already
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (75 preceding siblings ...)
2025-06-13 3:55 ` [PR REVIEW] " classabbyamp
@ 2025-06-13 11:45 ` zlice
2025-06-13 15:12 ` [PR PATCH] [Merged]: " classabbyamp
77 siblings, 0 replies; 79+ messages in thread
From: zlice @ 2025-06-13 11:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages mesa-25
https://github.com/void-linux/void-packages/pull/54596
mesa: update to 25.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
A patch file from https://github.com/void-linux/void-packages/pull/54596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-25-54596.patch --]
[-- Type: text/x-diff, Size: 21312 bytes --]
From c127c626a223d6abc01f4dbd4374db599f8d70bb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 5 Mar 2025 21:08:18 -0500
Subject: [PATCH 1/5] mesa: update to 25.1.3
- libglapi moved into gallium
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
- distfiles changed to https://mesa3d.org/archive
- 25.1.0 removes deprecated libOSMesa
- 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers)
- build mesa-asahi in mesa proper
---
srcpkgs/libglapi | 1 -
srcpkgs/mesa/template | 50 ++++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 16 insertions(+), 36 deletions(-)
delete mode 120000 srcpkgs/libglapi
diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libglapi
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e6e830b46229c5..72a40093eab7a2 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,16 +1,16 @@
# Template file for 'mesa'
pkgname=mesa
-version=24.3.4
-revision=2
+version=25.1.3
+revision=1
build_style=meson
_llvmver=19
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled
+ -Dgles1=enabled -Dgles2=enabled -Dglx=dri
-Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
-Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
+ $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml"
makedepends="elfutils-devel expat-devel libXdamage-devel
libXxf86vm-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,8 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz"
+checksum=ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f
build_helper="qemu"
build_options="wayland"
@@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa"
+subpackages="mesa-libgallium libgbm libgbm-devel"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# Check for correctness on major mesa version updates
# Particularly, check if any new worthwhile drivers were added
-# swrast always present
-_gallium_drivers=" -Dgallium-drivers=swrast"
+# softpipe always present
+_gallium_drivers=" -Dgallium-drivers=softpipe"
_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
@@ -81,6 +81,7 @@ esac
if [ "$_have_llvmpipe" ]; then
subpackages+=" mesa-vulkan-lavapipe"
_vulkan_drivers+=",swrast"
+ # note: swrast IS valid for vulkan drivers still, not gallium
else
configure_args+=" -Ddraw-use-llvm=false"
fi
@@ -119,8 +120,9 @@ fi
if [ "$_have_arm" ]; then
_have_vulkan=yes
- _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost"
- _vulkan_drivers+=",broadcom,freedreno"
+ _have_opencl=yes
+ _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi"
+ _vulkan_drivers+=",broadcom,freedreno,asahi"
subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"
# transitional dummy packages
subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri"
@@ -241,18 +243,6 @@ mesa-libgallium_package() {
}
}
-libglapi_package() {
- # this dependency is wrong, it was added as a hack to allow updating
- # systems with libglapi-32bit after the switch to glvnd
- # see 927f17347f9c646047c65312c8e8ce1ad88b7832
- # it can be removed when glibc multilib (with *-32bit packages) is removed
- depends="libglvnd"
- short_desc="Free implementation of the GL API - shared library"
- pkg_install() {
- vmove "usr/lib/libglapi.so.*"
- }
-}
-
libgbm_package() {
short_desc="Mesa Generic buffer management API - runtime"
pkg_install() {
@@ -270,16 +260,8 @@ libgbm-devel_package() {
}
}
-libOSMesa_package() {
- short_desc="Mesa Off-Screen interface library"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-devel_package() {
- depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision}
- libgbm-devel>=${version}_${revision}"
+ depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
fi
@@ -293,8 +275,6 @@ MesaLib-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
- vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fce62e07bbce1c..351762552b400c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -405,6 +405,7 @@ replaces="
libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
+ libglapi<=24.3.4_2
libglib-static<=2.58.3_5
libgnome-keyring-devel<=3.12.0_5
libgnome-keyring<=3.12.0_5
From 69f0ad841489c3fd6c0debc535b00fdf9e05e3d1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:20:20 -0400
Subject: [PATCH 2/5] libOSMesa: remove package
---
common/shlibs | 1 -
srcpkgs/libOSMesa | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
delete mode 120000 srcpkgs/libOSMesa
diff --git a/common/shlibs b/common/shlibs
index 38b118ac3c81e9..5dfbc6f18e4e39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1235,7 +1235,6 @@ libbluray.so.2 libbluray-1.0.0_1
libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
-libOSMesa.so.8 libOSMesa-9.1_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa
deleted file mode 120000
index 1ad1bbec7ab303..00000000000000
--- a/srcpkgs/libOSMesa
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 351762552b400c..ed0ef16aa627d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -353,6 +353,7 @@ replaces="
libArcus<=4.13.1_8
libCharon<=4.13.0_3
libOSMesa-asahi<=25.1.0+20250221_1
+ libOSMesa<=24.3.4_2
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
From 2339e069c3a7f53e4ae19a8c260cf35d625f0d57 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 20 May 2025 16:19:53 -0400
Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal
- distfiles changed to
https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz
- move new 'identity' binary to 'mesa-identity'
it conflicts with the 'identity' package
---
srcpkgs/mesa-demos/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index 9b680f62cb5022..badd029d82cd20 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=9.0.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith-system-data-files=true"
hostmakedepends="pkg-config glslang wayland-devel"
@@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://gitlab.freedesktop.org/mesa/demos"
-distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz"
+distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz"
checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b
post_install() {
sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT
+ mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity
vlicense LICENSE.MIT
}
From 2928fc5249ead83b626feb5edcfa348340049fd4 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 24 May 2025 10:49:54 -0400
Subject: [PATCH 4/5] wine: revbump for libOSMesa remove
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2c9989411f1f..da6508aeb22ca0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=10.9
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel
SDL2-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
+depends="libXi libXinerama libXcomposite libXcursor
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
gnutls SDL2 wine-common>=${version}_${revision}"
lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
- libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
+ libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
wine-common>=${version}_${revision}"
replaces="libwine>=0"
From 5b8b36e9b0c5d32e298ba719b35952e835ac2a1f Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 26 May 2025 11:32:49 -0400
Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa
---
srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 ---
.../mesa-asahi/patches/musl-stacksize.patch | 37 -----
srcpkgs/mesa-asahi/patches/musl.patch | 40 -----
srcpkgs/mesa-asahi/template | 146 +++---------------
srcpkgs/mesa-asahi/update | 1 -
5 files changed, 21 insertions(+), 222 deletions(-)
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch
delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch
delete mode 100644 srcpkgs/mesa-asahi/update
diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch
deleted file mode 100644
index 57b3cc3d09f8ee..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-endian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
-+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
-@@ -68,6 +68,16 @@
-
- #define PIPE_ARCH_LITTLE_ENDIAN
-
-+#else
-+/* Musl libc */
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define PIPE_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+# define PIPE_ARCH_BIG_ENDIAN
-+#endif
-+
- #endif
-
- #endif
diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
deleted file mode 100644
index cf5b2cd1fb914f..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
-+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
-@@ -255,18 +255,33 @@
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-
-+
- // 7.25.5.2
- thrd_t
- thrd_current(void)
diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch
deleted file mode 100644
index d50221dee72a34..00000000000000
--- a/srcpkgs/mesa-asahi/patches/musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
-+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
-@@ -28,6 +28,7 @@
- #if defined(HAVE_GETRANDOM)
- #include <sys/random.h>
- #endif
-+#include <sys/types.h> /* size_t, ssize_t */
- #include <unistd.h>
- #include <fcntl.h>
- #endif
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -30,6 +30,7 @@
-
- #include <amdgpu.h>
- #include <pthread.h>
-+#include <sys/types.h>
- #include "util/list.h"
- #include "util/rwlock.h"
- #include "ac_gpu_info.h"
---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
-+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
-@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
- {
- static boolean first = TRUE;
- static unsigned long dbg_flags = DBG_ERROR | DBG_WARN;
-- unsigned long tid = 0;
-+ pthread_t tid = 0;
-
- if (first) {
- first = FALSE;
-@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag,
-
- #if defined(HAVE_PTHREAD)
- if (dbg_flags & DBG_TID)
-- tid = (unsigned long)pthread_self();
-+ tid = pthread_self();
- #endif
-
- if (dbg_flags & flag) {
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 676dcf8dd32035..0c773f4c6e838e 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,168 +1,64 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250425
+version=25.1.1
revision=1
-_llvmver=19
-_mesaver=${version%+*}
-archs="aarch64*"
-build_style=meson
-build_helper="qemu"
-#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
-configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled
- -Dgles1=enabled -Dgles2=enabled -Dglx=dri
- -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17
- -Dgallium-vdpau=enabled -Dgallium-va=enabled
- -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay
- -Dgallium-drivers=asahi,virgl,zink,llvmpipe
- -Dgallium-rusticl=true -Drust_std=2021"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
- $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml
- clang${_llvmver} rust rust-bindgen"
-makedepends="elfutils-devel expat-devel libXdamage-devel
- libXxf86vm-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel
- libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust
- SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel"
-depends="libglvnd"
-short_desc="Open source implementation of OpenGL and Vulkan - Asahi"
+depends="mesa>=${version}_1"
+short_desc="Mesa - Asahi (transitional dummy package)"
maintainer="dkwo <npiazza@disroot.org>"
-license="MIT, LGPL-2.1-or-later"
+license="Public Domain"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes.html"
-distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz"
-checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da
-replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0"
-provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}"
-shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so"
+metapackage=yes
# alphabetical order is not good
subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel
mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer
mesa-asahi-dri"
-build_options="wayland"
-build_options_default="wayland"
-
-# Replace old mesa pkgs, superseded by libglvnd.
-replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
-
-post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- -e "s|-isystem/usr/include||g" \
- \;
- fi
-}
-
-post_install() {
- vlicense docs/license.rst
-
- # ensure that each eligible architecture ships its multilib icd files
- # in some cases, multiple counterpart architectures may exist (aarch64)
- # this allows us to not have to ship these files in the current *-32bit packages
- local arch=${XBPS_TARGET_MACHINE%-*}
- local oarchs
- local olibdir="/usr/lib32/"
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- olibdir="/usr/lib64/"
- fi
- oarchs="armv6l armv7l"
- for oarch in $oarchs; do
- for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do
- sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \
- ${icd} > ${icd/.${arch}/.${oarch}}
- done
- done
-}
-
libgbm-asahi_package() {
+ metapackage=yes
+ depends="libgbm"
short_desc="Mesa Generic buffer management API - runtime"
- replaces="libgbm>=0"
- provides="libgbm-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libgbm.so.*"
- }
}
libgbm-asahi-devel_package() {
+ metapackage=yes
+ depends="libgbm-devel"
short_desc="Mesa Generic buffer management API - development files"
- depends="libgbm-asahi>=${version}_${revision}"
- replaces="libgbm-devel>=0"
- provides="libgbm-devel-${_mesaver}_${revision}"
- pkg_install() {
- vmove usr/include/gbm.h
- vmove usr/lib/libgbm.so
- vmove usr/lib/pkgconfig/gbm.pc
- }
}
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
- replaces="MesaLib-devel>=0"
- provides="MesaLib-devel-${_mesaver}_${revision}"
+ metapackage=yes
+ depends="MesaLib-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libEGL_mesa.so
- vmove usr/lib/libGLX_mesa.so
- }
}
mesa-asahi-dri_package() {
+ metapackage=yes
+ depends="mesa-dri"
short_desc="Mesa DRI drivers"
- depends="mesa-asahi-${version}_${revision}"
- replaces="mesa-dri>=0"
- provides="mesa-dri-${_mesaver}_${revision}"
- shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
- pkg_install() {
- vmove usr/lib/dri
- }
}
mesa-asahi-opencl_package() {
+ metapackage=yes
+ depends="mesa-opencl"
short_desc="Mesa implementation of OpenCL (r600+ only)"
- depends="libclc${_llvmver}"
- replaces="mesa-opencl>=0"
- provides="mesa-opencl-${_mesaver}_${revision}"
- pkg_install() {
- vmove etc/OpenCL
- vmove "usr/lib/libRusticlOpenCL.so.*"
- }
}
mesa-asahi-vaapi_package() {
+ metapackage=yes
+ depends="mesa-vaapi"
short_desc="Mesa VA-API drivers"
- replaces="mesa-vaapi>=0"
- provides="mesa-vaapi-${_mesaver}_${revision}"
- shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
- pkg_install() {
- vmove "usr/lib/dri/*_drv_video.so"
- }
}
mesa-asahi-vdpau_package() {
+ metapackage=yes
+ depends="mesa-vdpau"
short_desc="Mesa VDPAU drivers"
- replaces="mesa-vdpau>=0"
- provides="mesa-vdpau-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/vdpau/libvdpau_*"
- }
}
mesa-asahi-vulkan-overlay-layer_package() {
+ metapackage=yes
+ depends="mesa-vulkan-overlay-layer"
short_desc="Vulkan layer to display information about the running application"
- replaces="mesa-vulkan-overlay-layer>=0"
- provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json"
- vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json"
- vmove "usr/bin/mesa-overlay-control.py"
- vmove "usr/lib/libVkLayer_*.so"
- }
}
diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update
deleted file mode 100644
index de8448d05b2b90..00000000000000
--- a/srcpkgs/mesa-asahi/update
+++ /dev/null
@@ -1 +0,0 @@
-version=${version#*+}
^ permalink raw reply related [flat|nested] 79+ messages in thread
* Re: [PR PATCH] [Merged]: mesa: update to 25.1.1
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
` (76 preceding siblings ...)
2025-06-13 11:45 ` [PR PATCH] [Updated] " zlice
@ 2025-06-13 15:12 ` classabbyamp
77 siblings, 0 replies; 79+ messages in thread
From: classabbyamp @ 2025-06-13 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 610 bytes --]
There's a merged pull request on the void-packages repository
mesa: update to 25.1.1
https://github.com/void-linux/void-packages/pull/54596
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
#### Comments
libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789
glxinfo and glxgears work fine. tested kotor which is opengl, tried portal with `-gl` but i'm not sure if it was using opengl or not, kept trying to build vulkan shaders (A770)
^ permalink raw reply [flat|nested] 79+ messages in thread
end of thread, other threads:[~2025-06-13 15:12 UTC | newest]
Thread overview: 79+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-06 2:10 [PR PATCH] mesa: update to 25.0.1 zlice
2025-03-06 15:39 ` zlice
2025-03-06 22:25 ` oreo639
2025-03-06 22:26 ` oreo639
2025-03-06 22:29 ` zlice
2025-03-15 3:05 ` tm512
2025-03-26 12:18 ` [PR PATCH] [Updated] " zlice
2025-04-04 1:33 ` mesa: update to 25.0.2 shara-k
2025-04-04 1:46 ` shara-k
2025-04-04 21:23 ` [PR PATCH] [Updated] " zlice
2025-04-17 11:42 ` [PR PATCH] [Updated] mesa: update to 25.0.3 zlice
2025-04-17 19:28 ` mesa: update to 25.0.4 zlice
2025-04-21 21:38 ` [PR PATCH] [Updated] " zlice
2025-04-21 21:39 ` zlice
2025-05-02 3:05 ` mesa: update to 25.0.3 ericonr
2025-05-02 12:12 ` zlice
2025-05-04 15:25 ` chilledfrogs
2025-05-04 23:05 ` [PR PATCH] [Updated] " zlice
2025-05-04 23:05 ` mesa: update to 25.0.5 zlice
2025-05-04 23:08 ` [PR PATCH] [Updated] " zlice
2025-05-05 0:45 ` [PR REVIEW] " ericonr
2025-05-05 1:19 ` ericonr
2025-05-05 1:45 ` [PR PATCH] [Updated] " zlice
2025-05-05 1:46 ` zlice
2025-05-05 1:47 ` zlice
2025-05-05 11:39 ` [PR PATCH] [Updated] " zlice
2025-05-06 15:19 ` zlice
2025-05-06 16:32 ` [PR PATCH] [Updated] " zlice
2025-05-06 16:33 ` mesa: update to 25.0.3 zlice
2025-05-24 8:00 ` dkwo
2025-05-24 13:34 ` zlice
2025-05-24 14:37 ` LangleyAsuka
2025-05-24 14:48 ` zlice
2025-05-24 14:49 ` zlice
2025-05-24 14:51 ` [PR PATCH] [Updated] " zlice
2025-05-24 14:51 ` zlice
2025-05-24 15:53 ` mesa: update to 25.1.1 LangleyAsuka
2025-05-25 14:23 ` [PR PATCH] [Updated] " zlice
2025-05-25 15:31 ` zlice
2025-05-25 15:33 ` zlice
2025-05-26 8:41 ` dkwo
2025-05-26 15:33 ` [PR PATCH] [Updated] " zlice
2025-05-26 15:44 ` zlice
2025-05-26 16:54 ` zlice
2025-05-26 19:14 ` zlice
2025-05-28 3:01 ` [PR REVIEW] " classabbyamp
2025-05-28 3:01 ` classabbyamp
2025-05-28 3:01 ` classabbyamp
2025-05-28 3:01 ` classabbyamp
2025-05-28 3:01 ` classabbyamp
2025-05-28 3:03 ` classabbyamp
2025-05-28 4:02 ` [PR REVIEW] " classabbyamp
2025-05-28 4:02 ` classabbyamp
2025-05-28 4:03 ` classabbyamp
2025-05-28 4:04 ` classabbyamp
2025-05-28 4:14 ` classabbyamp
2025-05-28 12:26 ` [PR PATCH] [Updated] " zlice
2025-05-28 12:26 ` [PR REVIEW] " zlice
2025-05-28 12:26 ` zlice
2025-05-28 13:31 ` classabbyamp
2025-05-28 13:31 ` [PR REVIEW] " classabbyamp
2025-05-29 6:19 ` dkwo
2025-05-30 4:29 ` chibiace
2025-06-01 12:15 ` [PR PATCH] [Updated] " zlice
2025-06-04 14:31 ` LangleyAsuka
2025-06-04 14:42 ` [PR PATCH] [Updated] " zlice
2025-06-04 19:39 ` zlice
2025-06-05 13:47 ` dkwo
2025-06-13 1:43 ` classabbyamp
2025-06-13 3:22 ` zlice
2025-06-13 3:32 ` [PR PATCH] [Updated] " zlice
2025-06-13 3:36 ` zlice
2025-06-13 3:37 ` zlice
2025-06-13 3:37 ` [PR REVIEW] " classabbyamp
2025-06-13 3:37 ` [PR PATCH] [Updated] " zlice
2025-06-13 3:41 ` zlice
2025-06-13 3:55 ` [PR REVIEW] " classabbyamp
2025-06-13 11:45 ` [PR PATCH] [Updated] " zlice
2025-06-13 15:12 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).