* [PR PATCH] asahi: mesa and kernel
@ 2025-04-30 17:18 dkwo
2025-04-30 18:19 ` [PR PATCH] [Updated] " dkwo
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: dkwo @ 2025-04-30 17:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 539 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages asahi-mesa
https://github.com/void-linux/void-packages/pull/55215
asahi: mesa and kernel
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)
They should be updated together, since asahi-mesa uses the newest userspace api.
Mesa: dropped deprecated config options.
A patch file from https://github.com/void-linux/void-packages/pull/55215.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-asahi-mesa-55215.patch --]
[-- Type: text/x-diff, Size: 7082 bytes --]
From 7b43523874795ad4f728b4185e7c822e1b3188f3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 22 Apr 2025 11:23:28 -0400
Subject: [PATCH 1/2] linux-asahi: update to 6.14.4+1
---
srcpkgs/linux-asahi/files/arm64-dotconfig | 8 +++++---
srcpkgs/linux-asahi/template | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/linux-asahi/files/arm64-dotconfig b/srcpkgs/linux-asahi/files/arm64-dotconfig
index a45592ded5d659..2b62fc67610817 100755
--- a/srcpkgs/linux-asahi/files/arm64-dotconfig
+++ b/srcpkgs/linux-asahi/files/arm64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.14.2 Kernel Configuration
+# Linux/arm64 6.14.4 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
CONFIG_CC_IS_GCC=y
@@ -23,7 +23,7 @@ CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
CONFIG_RUSTC_HAS_COERCE_POINTEE=y
-CONFIG_PAHOLE_VERSION=129
+CONFIG_PAHOLE_VERSION=130
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -34,7 +34,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="+2-asahi_1"
+CONFIG_LOCALVERSION="+1-asahi_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
CONFIG_DEFAULT_INIT=""
@@ -422,6 +422,7 @@ CONFIG_ARM64_ERRATUM_3194386=y
# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
# CONFIG_QCOM_FALKOR_ERRATUM_E1041 is not set
# CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set
+# CONFIG_ROCKCHIP_ERRATUM_3568002 is not set
# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
# end of ARM errata workarounds via the alternatives framework
@@ -5610,6 +5611,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_UDRAW_PS3=m
CONFIG_HID_U2FZERO=m
+# CONFIG_HID_UNIVERSAL_PIDFF is not set
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
# CONFIG_HID_WINWING is not set
diff --git a/srcpkgs/linux-asahi/template b/srcpkgs/linux-asahi/template
index 4abc803bbc92d2..8867cce9a4ea43 100644
--- a/srcpkgs/linux-asahi/template
+++ b/srcpkgs/linux-asahi/template
@@ -1,13 +1,13 @@
# Template file for 'linux-asahi'
pkgname=linux-asahi
-version=6.14.2+2
+version=6.14.4+1
revision=1
short_desc="Linux kernel and modules for Apple Silicon"
maintainer="Will Springer <skirmisher@protonmail.com>, dkwo <npiazza@disroot.org>"
license="GPL-2.0-only"
homepage="https://asahilinux.org"
distfiles="https://github.com/AsahiLinux/linux/archive/asahi-${version/+/-}.tar.gz"
-checksum=874cabc922acb547f5fd322ff500c3bbc6c0316231cc8c647f8f1bedaf3694c2
+checksum=30cfe2e97b456fef4ab4a9134bc3aee3734e1daecfc2758f7a8318861479b595
python_version=3
From 8b940fe0317d3f566febb3a750630c0ce780d810 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 30 Apr 2025 09:17:16 -0400
Subject: [PATCH 2/2] mesa-asahi: update to 25.1.0+20250425
---
srcpkgs/libOSMesa-asahi | 1 -
srcpkgs/mesa-asahi/template | 24 ++++++------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/libOSMesa-asahi
diff --git a/srcpkgs/libOSMesa-asahi b/srcpkgs/libOSMesa-asahi
deleted file mode 120000
index 643f3dbeebace7..00000000000000
--- a/srcpkgs/libOSMesa-asahi
+++ /dev/null
@@ -1 +0,0 @@
-mesa-asahi
\ No newline at end of file
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 51d4392279c8ba..24c73021d4e4f9 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,6 +1,6 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250221
+version=25.1.0+20250425
revision=1
_llvmver=19
_mesaver=${version%+*}
@@ -8,14 +8,14 @@ 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 -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+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-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
+ -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"
@@ -33,13 +33,13 @@ 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=3d8c4ca48b8cc420059968badc45141d68af762f57cac5bdb56a6af6d7ed9369
+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 libOSMesa-asahi MesaLib-asahi-devel
+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"
@@ -100,15 +100,6 @@ libgbm-asahi-devel_package() {
}
}
-libOSMesa-asahi_package() {
- short_desc="Mesa Off-Screen interface library"
- replaces="libOSMesa>=0"
- provides="libOSMesa-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-asahi-devel_package() {
depends="mesa-asahi>=${version}_${revision} libOSMesa-asahi>=${version}_${revision}
libgbm-asahi-devel>=${version}_${revision}"
@@ -121,7 +112,6 @@ MesaLib-asahi-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
}
}
@@ -143,8 +133,6 @@ mesa-asahi-opencl_package() {
provides="mesa-opencl-${_mesaver}_${revision}"
pkg_install() {
vmove etc/OpenCL
- vmove usr/lib/gallium-pipe
- vmove "usr/lib/libMesaOpenCL.so.*"
vmove "usr/lib/libRusticlOpenCL.so.*"
}
}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..cb7e07f944339a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,7 @@ replaces="
libArcus-python3<=4.13.1_8
libArcus<=4.13.1_8
libCharon<=4.13.0_3
+ libOSMesa-asahi<=25.1.0+20250221_1
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] asahi: mesa and kernel
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
@ 2025-04-30 18:19 ` dkwo
2025-05-04 23:06 ` zlice
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: dkwo @ 2025-04-30 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages asahi-mesa
https://github.com/void-linux/void-packages/pull/55215
asahi: mesa and kernel
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)
They should be updated together, since asahi-mesa uses the newest userspace api.
Mesa: dropped deprecated config options.
A patch file from https://github.com/void-linux/void-packages/pull/55215.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-asahi-mesa-55215.patch --]
[-- Type: text/x-diff, Size: 7368 bytes --]
From 7b43523874795ad4f728b4185e7c822e1b3188f3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 22 Apr 2025 11:23:28 -0400
Subject: [PATCH 1/2] linux-asahi: update to 6.14.4+1
---
srcpkgs/linux-asahi/files/arm64-dotconfig | 8 +++++---
srcpkgs/linux-asahi/template | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/linux-asahi/files/arm64-dotconfig b/srcpkgs/linux-asahi/files/arm64-dotconfig
index a45592ded5d659..2b62fc67610817 100755
--- a/srcpkgs/linux-asahi/files/arm64-dotconfig
+++ b/srcpkgs/linux-asahi/files/arm64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.14.2 Kernel Configuration
+# Linux/arm64 6.14.4 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
CONFIG_CC_IS_GCC=y
@@ -23,7 +23,7 @@ CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
CONFIG_RUSTC_HAS_COERCE_POINTEE=y
-CONFIG_PAHOLE_VERSION=129
+CONFIG_PAHOLE_VERSION=130
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -34,7 +34,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="+2-asahi_1"
+CONFIG_LOCALVERSION="+1-asahi_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
CONFIG_DEFAULT_INIT=""
@@ -422,6 +422,7 @@ CONFIG_ARM64_ERRATUM_3194386=y
# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
# CONFIG_QCOM_FALKOR_ERRATUM_E1041 is not set
# CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set
+# CONFIG_ROCKCHIP_ERRATUM_3568002 is not set
# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
# end of ARM errata workarounds via the alternatives framework
@@ -5610,6 +5611,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_UDRAW_PS3=m
CONFIG_HID_U2FZERO=m
+# CONFIG_HID_UNIVERSAL_PIDFF is not set
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
# CONFIG_HID_WINWING is not set
diff --git a/srcpkgs/linux-asahi/template b/srcpkgs/linux-asahi/template
index 4abc803bbc92d2..8867cce9a4ea43 100644
--- a/srcpkgs/linux-asahi/template
+++ b/srcpkgs/linux-asahi/template
@@ -1,13 +1,13 @@
# Template file for 'linux-asahi'
pkgname=linux-asahi
-version=6.14.2+2
+version=6.14.4+1
revision=1
short_desc="Linux kernel and modules for Apple Silicon"
maintainer="Will Springer <skirmisher@protonmail.com>, dkwo <npiazza@disroot.org>"
license="GPL-2.0-only"
homepage="https://asahilinux.org"
distfiles="https://github.com/AsahiLinux/linux/archive/asahi-${version/+/-}.tar.gz"
-checksum=874cabc922acb547f5fd322ff500c3bbc6c0316231cc8c647f8f1bedaf3694c2
+checksum=30cfe2e97b456fef4ab4a9134bc3aee3734e1daecfc2758f7a8318861479b595
python_version=3
From 49472104f18b534f6e6a19e9c1f7702cfc5546a4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 30 Apr 2025 09:17:16 -0400
Subject: [PATCH 2/2] mesa-asahi: update to 25.1.0+20250425
---
srcpkgs/libOSMesa-asahi | 1 -
srcpkgs/mesa-asahi/template | 29 ++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 9 insertions(+), 22 deletions(-)
delete mode 120000 srcpkgs/libOSMesa-asahi
diff --git a/srcpkgs/libOSMesa-asahi b/srcpkgs/libOSMesa-asahi
deleted file mode 120000
index 643f3dbeebace7..00000000000000
--- a/srcpkgs/libOSMesa-asahi
+++ /dev/null
@@ -1 +0,0 @@
-mesa-asahi
\ No newline at end of file
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 51d4392279c8ba..676dcf8dd32035 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,6 +1,6 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250221
+version=25.1.0+20250425
revision=1
_llvmver=19
_mesaver=${version%+*}
@@ -8,14 +8,14 @@ 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 -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+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-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
+ -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"
@@ -33,13 +33,13 @@ 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=3d8c4ca48b8cc420059968badc45141d68af762f57cac5bdb56a6af6d7ed9369
+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 libOSMesa-asahi MesaLib-asahi-devel
+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"
@@ -100,19 +100,9 @@ libgbm-asahi-devel_package() {
}
}
-libOSMesa-asahi_package() {
- short_desc="Mesa Off-Screen interface library"
- replaces="libOSMesa>=0"
- provides="libOSMesa-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision} libOSMesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision}"
- depends+=" libdrm-devel libglvnd-devel"
+ depends="mesa-asahi>=${version}_${revision}
+ libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
replaces="MesaLib-devel>=0"
provides="MesaLib-devel-${_mesaver}_${revision}"
short_desc+=" - development files"
@@ -121,7 +111,6 @@ MesaLib-asahi-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
}
}
@@ -143,8 +132,6 @@ mesa-asahi-opencl_package() {
provides="mesa-opencl-${_mesaver}_${revision}"
pkg_install() {
vmove etc/OpenCL
- vmove usr/lib/gallium-pipe
- vmove "usr/lib/libMesaOpenCL.so.*"
vmove "usr/lib/libRusticlOpenCL.so.*"
}
}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..cb7e07f944339a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,7 @@ replaces="
libArcus-python3<=4.13.1_8
libArcus<=4.13.1_8
libCharon<=4.13.0_3
+ libOSMesa-asahi<=25.1.0+20250221_1
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: asahi: mesa and kernel
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
2025-04-30 18:19 ` [PR PATCH] [Updated] " dkwo
@ 2025-05-04 23:06 ` zlice
2025-05-04 23:07 ` zlice
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zlice @ 2025-05-04 23:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/55215#issuecomment-2849487424
Comment:
https://github.com/void-linux/void-packages/pull/54596
tracking
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: asahi: mesa and kernel
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
2025-04-30 18:19 ` [PR PATCH] [Updated] " dkwo
2025-05-04 23:06 ` zlice
@ 2025-05-04 23:07 ` zlice
2025-05-04 23:50 ` dkwo
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zlice @ 2025-05-04 23:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/55215#issuecomment-2849487424
Comment:
https://github.com/void-linux/void-packages/pull/54596
tracking
edit: ig these are pretty separate but i still wana know .-. sry for ping in that case
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: asahi: mesa and kernel
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
` (2 preceding siblings ...)
2025-05-04 23:07 ` zlice
@ 2025-05-04 23:50 ` dkwo
2025-05-05 0:06 ` zlice
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: dkwo @ 2025-05-04 23:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55215#issuecomment-2849531646
Comment:
Is there something specific you'd like me to test?
Note this is specific to apple silicon (asahi).
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: asahi: mesa and kernel
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
` (3 preceding siblings ...)
2025-05-04 23:50 ` dkwo
@ 2025-05-05 0:06 ` zlice
2025-05-08 19:41 ` dkwo
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zlice @ 2025-05-05 0:06 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/55215#issuecomment-2849600897
Comment:
no, should of just hit the notif button
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: asahi: mesa and kernel
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
` (4 preceding siblings ...)
2025-05-05 0:06 ` zlice
@ 2025-05-08 19:41 ` dkwo
2025-05-13 14:02 ` [PR PATCH] [Updated] " dkwo
2025-05-15 19:51 ` [PR PATCH] [Merged]: " classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: dkwo @ 2025-05-08 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55215#issuecomment-2864095851
Comment:
Although you're right that in a future update we may be able to drop mesa-asahi.
cc @classabbyamp Can you take a look?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] asahi: mesa and kernel
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
` (5 preceding siblings ...)
2025-05-08 19:41 ` dkwo
@ 2025-05-13 14:02 ` dkwo
2025-05-15 19:51 ` [PR PATCH] [Merged]: " classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: dkwo @ 2025-05-13 14:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages asahi-mesa
https://github.com/void-linux/void-packages/pull/55215
asahi: mesa and kernel
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)
They should be updated together, since asahi-mesa uses the newest userspace api.
Mesa: dropped deprecated config options.
A patch file from https://github.com/void-linux/void-packages/pull/55215.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-asahi-mesa-55215.patch --]
[-- Type: text/x-diff, Size: 8564 bytes --]
From 51bb33439e8623bf0cdf7089da6559b42511b5aa Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 22 Apr 2025 11:23:28 -0400
Subject: [PATCH 1/2] linux-asahi: update to 6.14.6+1
---
srcpkgs/linux-asahi/files/arm64-dotconfig | 19 ++++++++++++-------
srcpkgs/linux-asahi/template | 4 ++--
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/linux-asahi/files/arm64-dotconfig b/srcpkgs/linux-asahi/files/arm64-dotconfig
index a45592ded5d659..cf61301e462964 100755
--- a/srcpkgs/linux-asahi/files/arm64-dotconfig
+++ b/srcpkgs/linux-asahi/files/arm64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.14.2 Kernel Configuration
+# Linux/arm64 6.14.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
CONFIG_CC_IS_GCC=y
@@ -23,7 +23,7 @@ CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
CONFIG_RUSTC_HAS_COERCE_POINTEE=y
-CONFIG_PAHOLE_VERSION=129
+CONFIG_PAHOLE_VERSION=130
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -34,7 +34,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="+2-asahi_1"
+CONFIG_LOCALVERSION="+1-asahi_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
CONFIG_DEFAULT_INIT=""
@@ -422,6 +422,7 @@ CONFIG_ARM64_ERRATUM_3194386=y
# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
# CONFIG_QCOM_FALKOR_ERRATUM_E1041 is not set
# CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set
+# CONFIG_ROCKCHIP_ERRATUM_3568002 is not set
# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
# end of ARM errata workarounds via the alternatives framework
@@ -5610,6 +5611,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_UDRAW_PS3=m
CONFIG_HID_U2FZERO=m
+# CONFIG_HID_UNIVERSAL_PIDFF is not set
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
# CONFIG_HID_WINWING is not set
@@ -8062,13 +8064,13 @@ CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_CRYPTO_CHACHA20_NEON=m
+CONFIG_CRYPTO_CHACHA20_NEON=y
#
# Accelerated Cryptographic Algorithms for CPU (arm64)
#
CONFIG_CRYPTO_GHASH_ARM64_CE=m
-CONFIG_CRYPTO_POLY1305_NEON=m
+CONFIG_CRYPTO_POLY1305_NEON=y
CONFIG_CRYPTO_SHA1_ARM64_CE=m
CONFIG_CRYPTO_SHA256_ARM64=m
CONFIG_CRYPTO_SHA2_ARM64_CE=m
@@ -8145,15 +8147,18 @@ CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_GF128MUL=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_INTERNAL=y
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519_INTERNAL=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
+CONFIG_CRYPTO_LIB_POLY1305_INTERNAL=y
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA1=y
diff --git a/srcpkgs/linux-asahi/template b/srcpkgs/linux-asahi/template
index 4abc803bbc92d2..8ef06640c84dd3 100644
--- a/srcpkgs/linux-asahi/template
+++ b/srcpkgs/linux-asahi/template
@@ -1,13 +1,13 @@
# Template file for 'linux-asahi'
pkgname=linux-asahi
-version=6.14.2+2
+version=6.14.6+1
revision=1
short_desc="Linux kernel and modules for Apple Silicon"
maintainer="Will Springer <skirmisher@protonmail.com>, dkwo <npiazza@disroot.org>"
license="GPL-2.0-only"
homepage="https://asahilinux.org"
distfiles="https://github.com/AsahiLinux/linux/archive/asahi-${version/+/-}.tar.gz"
-checksum=874cabc922acb547f5fd322ff500c3bbc6c0316231cc8c647f8f1bedaf3694c2
+checksum=40580d3408560f903de04d2bf6d75c29bf62c08b29e5f044ba4247cf206a2bba
python_version=3
From 34409382d439bef1285c91d22c9b344244955b20 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 30 Apr 2025 09:17:16 -0400
Subject: [PATCH 2/2] mesa-asahi: update to 25.1.0+20250425
---
srcpkgs/libOSMesa-asahi | 1 -
srcpkgs/mesa-asahi/template | 29 ++++++++---------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 9 insertions(+), 22 deletions(-)
delete mode 120000 srcpkgs/libOSMesa-asahi
diff --git a/srcpkgs/libOSMesa-asahi b/srcpkgs/libOSMesa-asahi
deleted file mode 120000
index 643f3dbeebace7..00000000000000
--- a/srcpkgs/libOSMesa-asahi
+++ /dev/null
@@ -1 +0,0 @@
-mesa-asahi
\ No newline at end of file
diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template
index 51d4392279c8ba..676dcf8dd32035 100644
--- a/srcpkgs/mesa-asahi/template
+++ b/srcpkgs/mesa-asahi/template
@@ -1,6 +1,6 @@
# Template file for 'mesa-asahi'
pkgname=mesa-asahi
-version=25.1.0+20250221
+version=25.1.0+20250425
revision=1
_llvmver=19
_mesaver=${version%+*}
@@ -8,14 +8,14 @@ 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 -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
- -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri
+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-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
+ -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"
@@ -33,13 +33,13 @@ 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=3d8c4ca48b8cc420059968badc45141d68af762f57cac5bdb56a6af6d7ed9369
+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 libOSMesa-asahi MesaLib-asahi-devel
+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"
@@ -100,19 +100,9 @@ libgbm-asahi-devel_package() {
}
}
-libOSMesa-asahi_package() {
- short_desc="Mesa Off-Screen interface library"
- replaces="libOSMesa>=0"
- provides="libOSMesa-${_mesaver}_${revision}"
- pkg_install() {
- vmove "usr/lib/libOSMesa.so.*"
- }
-}
-
MesaLib-asahi-devel_package() {
- depends="mesa-asahi>=${version}_${revision} libOSMesa-asahi>=${version}_${revision}
- libgbm-asahi-devel>=${version}_${revision}"
- depends+=" libdrm-devel libglvnd-devel"
+ depends="mesa-asahi>=${version}_${revision}
+ libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel"
replaces="MesaLib-devel>=0"
provides="MesaLib-devel-${_mesaver}_${revision}"
short_desc+=" - development files"
@@ -121,7 +111,6 @@ MesaLib-asahi-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
- vmove usr/lib/libOSMesa.so
}
}
@@ -143,8 +132,6 @@ mesa-asahi-opencl_package() {
provides="mesa-opencl-${_mesaver}_${revision}"
pkg_install() {
vmove etc/OpenCL
- vmove usr/lib/gallium-pipe
- vmove "usr/lib/libMesaOpenCL.so.*"
vmove "usr/lib/libRusticlOpenCL.so.*"
}
}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..cb7e07f944339a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,7 @@ replaces="
libArcus-python3<=4.13.1_8
libArcus<=4.13.1_8
libCharon<=4.13.0_3
+ libOSMesa-asahi<=25.1.0+20250221_1
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
libSavitar<=4.13.1_3
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: asahi: mesa and kernel
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
` (6 preceding siblings ...)
2025-05-13 14:02 ` [PR PATCH] [Updated] " dkwo
@ 2025-05-15 19:51 ` classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2025-05-15 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There's a merged pull request on the void-packages repository
asahi: mesa and kernel
https://github.com/void-linux/void-packages/pull/55215
Description:
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (aarch64-glibc)
They should be updated together, since asahi-mesa uses the newest userspace api.
Mesa: dropped deprecated config options.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-05-15 19:51 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-30 17:18 [PR PATCH] asahi: mesa and kernel dkwo
2025-04-30 18:19 ` [PR PATCH] [Updated] " dkwo
2025-05-04 23:06 ` zlice
2025-05-04 23:07 ` zlice
2025-05-04 23:50 ` dkwo
2025-05-05 0:06 ` zlice
2025-05-08 19:41 ` dkwo
2025-05-13 14:02 ` [PR PATCH] [Updated] " dkwo
2025-05-15 19:51 ` [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).