* [PR PATCH] mesa: update to version 24.0.0.
@ 2024-02-01 18:11 SpidFightFR
2024-02-01 18:15 ` SpidFightFR
` (50 more replies)
0 siblings, 51 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-01 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
There is a new pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2885 bytes --]
From 9e3f339c4df45581756b1d9c77d06a7414bb33ff Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Thu, 1 Feb 2024 18:53:55 +0100
Subject: [PATCH] mesa: update to version 24.0.0.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 6 ++---
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c..0000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 05a35dce0d1a9..acc63a78ea6f7 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.2
+version=24.0.0
revision=1
build_style=meson
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -15,7 +15,7 @@ makedepends="elfutils-devel expat-devel libXdamage-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
$(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
- libarchive-devel"
+ libarchive-devel libdrm"
depends="libglvnd"
short_desc="Open source implementation of OpenGL and Vulkan"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,7 +23,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=3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc
+checksum=dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36
build_options="wayland"
build_options_default="wayland"
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
@ 2024-02-01 18:15 ` SpidFightFR
2024-02-02 6:42 ` classabbyamp
` (49 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-01 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1921935608
Comment:
Note: the builds (currently) fail because of libdrm, don't mind them, i'll force a push to re-try those when libdrm will be updated.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
2024-02-01 18:15 ` SpidFightFR
@ 2024-02-02 6:42 ` classabbyamp
2024-02-02 8:02 ` SpidFightFR
` (48 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: classabbyamp @ 2024-02-02 6:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1923024015
Comment:
just put libdrm in this pr
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
2024-02-01 18:15 ` SpidFightFR
2024-02-02 6:42 ` classabbyamp
@ 2024-02-02 8:02 ` SpidFightFR
2024-02-03 17:24 ` SpidFightFR
` (47 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-02 8:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1923278130
Comment:
> just put libdrm in this pr
But there's already another PR opened for that (https://github.com/void-linux/void-packages/pull/48170)...
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (2 preceding siblings ...)
2024-02-02 8:02 ` SpidFightFR
@ 2024-02-03 17:24 ` SpidFightFR
2024-02-09 12:13 ` [PR PATCH] [Updated] " SpidFightFR
` (46 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-03 17:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 670 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1925401130
Comment:
@classabbyamp hey sorry for the ping, but in either cases, we should integrate the [23 branch latest patches](https://github.com/void-linux/void-packages/pull/48172) before getting our hands in mesa 24, void still runs 23.3.2 as of now, and thus misses a lot of bugfixes from upstream. :sweat_smile:
As for libdrm, i can add it in this PR if you want to, it's up to you to tell me if maintainers want to merge [lbdrm](https://github.com/void-linux/void-packages/pull/48170) PR then mesa 24 or both all together. :smile:
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (3 preceding siblings ...)
2024-02-03 17:24 ` SpidFightFR
@ 2024-02-09 12:13 ` SpidFightFR
2024-02-09 12:15 ` SpidFightFR
` (45 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-09 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2449 bytes --]
From 359ec5853c913ed6b119ded8e056e7e146f92e65 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Fri, 9 Feb 2024 13:07:06 +0100
Subject: [PATCH] mesa: update to version 24.0.0.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 6 ++---
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c..0000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index f763b99e58098..ccde6ccc00eb3 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=2
+version=24.0.0
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36
build_options="wayland"
build_options_default="wayland"
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (4 preceding siblings ...)
2024-02-09 12:13 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-02-09 12:15 ` SpidFightFR
2024-02-15 2:37 ` zlice
` (44 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-09 12:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1935824566
Comment:
Updated the template to include changes made [here](https://github.com/void-linux/void-packages/commit/78bd2012335012841c016ac88a0d813ec6760fc9).
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (5 preceding siblings ...)
2024-02-09 12:15 ` SpidFightFR
@ 2024-02-15 2:37 ` zlice
2024-02-15 12:32 ` SpidFightFR
` (43 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-15 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1945273021
Comment:
hey, 24.0.1 hit - f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (6 preceding siblings ...)
2024-02-15 2:37 ` zlice
@ 2024-02-15 12:32 ` SpidFightFR
2024-02-15 12:35 ` zlice
` (42 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-15 12:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1946007790
Comment:
> hey, 24.0.1 hit - f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
Working on it, we still need that [libdrm](https://github.com/void-linux/void-packages/pull/48170).
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (7 preceding siblings ...)
2024-02-15 12:32 ` SpidFightFR
@ 2024-02-15 12:35 ` zlice
2024-02-15 12:36 ` SpidFightFR
` (41 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-15 12:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1946014734
Comment:
if it's easier to put in here, w/e i'll close mine
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (8 preceding siblings ...)
2024-02-15 12:35 ` zlice
@ 2024-02-15 12:36 ` SpidFightFR
2024-02-15 12:46 ` [PR PATCH] [Updated] " SpidFightFR
` (40 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-15 12:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1946016285
Comment:
> if it's easier to put in here, w/e i'll close mine
Copy that.
I'll port your changes here.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (9 preceding siblings ...)
2024-02-15 12:36 ` SpidFightFR
@ 2024-02-15 12:46 ` SpidFightFR
2024-02-15 12:47 ` SpidFightFR
` (39 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-15 12:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 3335 bytes --]
From 5059a3391edea1e164576d9873f6e7cbee3a411d Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Thu, 15 Feb 2024 13:38:22 +0100
Subject: [PATCH] mesa: update to version 24.0.1.
---
srcpkgs/libdrm/template | 4 ++--
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 6 ++---
3 files changed, 5 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 5c7578cef7450..ffbd8bcab7195 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
# Template file for 'libdrm'
pkgname=libdrm
-version=2.4.115
+version=2.4.119
revision=1
build_style=meson
configure_args="-Dudev=true -Dvalgrind=disabled -Dinstall-test-programs=true"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://dri.freedesktop.org/"
distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
-checksum=fd8b7c6e4e40d13c32ab67ace2cb6c71e08c9ca53124ff33ccadd74f604117e3
+checksum=6e798976e175f1f6e83706681644d0ce0527855b95a471479875ae3c1ef9870a
case "$XBPS_TARGET_MACHINE" in
aarch64*) configure_args+=" -Dvc4=enabled";;
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c..0000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b2..949a4ed3ffc17 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.1
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
build_options="wayland"
build_options_default="wayland"
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (10 preceding siblings ...)
2024-02-15 12:46 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-02-15 12:47 ` SpidFightFR
2024-02-15 21:11 ` dkwo
` (38 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-15 12:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1946033233
Comment:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
Modified PR for mesa 24.0.1.
I kept the removal of the patch to fix meson builds as it isn't necessary anymore.
Also thank you @zlice for your libdrm fix.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (11 preceding siblings ...)
2024-02-15 12:47 ` SpidFightFR
@ 2024-02-15 21:11 ` dkwo
2024-02-15 23:55 ` SpidFightFR
` (37 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: dkwo @ 2024-02-15 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1947345562
Comment:
libdrm is now at 120, maybe you can rebase?
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (12 preceding siblings ...)
2024-02-15 21:11 ` dkwo
@ 2024-02-15 23:55 ` SpidFightFR
2024-02-16 10:15 ` [PR PATCH] [Updated] " SpidFightFR
` (36 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-15 23:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1947526000
Comment:
> libdrm is now at 120, maybe you can rebase?
Yeah imma do this tomorrow, it's 1 AM at my place and i didn't get much sleep lately 🥲
Thanks for reminding me tho 👌
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (13 preceding siblings ...)
2024-02-15 23:55 ` SpidFightFR
@ 2024-02-16 10:15 ` SpidFightFR
2024-02-16 10:15 ` SpidFightFR
` (35 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 10:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2454 bytes --]
From b2bdff07ac4c6eb5a640f4d2d73a69f28bf3372a Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Fri, 16 Feb 2024 11:14:50 +0100
Subject: [PATCH] mesa: update to version 24.0.1.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 6 ++---
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c2..00000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b21..949a4ed3ffc178 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.1
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
build_options="wayland"
build_options_default="wayland"
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (14 preceding siblings ...)
2024-02-16 10:15 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-02-16 10:15 ` SpidFightFR
2024-02-16 12:22 ` [PR PATCH] [Updated] " SpidFightFR
` (34 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 10:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1947526000
Comment:
> libdrm is now at 120, maybe you can rebase?
Yeah imma do this tomorrow, it's 1 AM at my place and i didn't get much sleep lately 🥲
Thanks for reminding me tho 👌
Update: it's done.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (15 preceding siblings ...)
2024-02-16 10:15 ` SpidFightFR
@ 2024-02-16 12:22 ` SpidFightFR
2024-02-16 12:25 ` SpidFightFR
` (33 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 12:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2696 bytes --]
From d8c5b744e56dccfadf3164e30bc6118e98f36b8d Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Fri, 16 Feb 2024 13:07:24 +0100
Subject: [PATCH] mesa: update to version 24.0.1.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 7 +++---
2 files changed, 4 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c2..00000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b21..7922be46f852ac 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.1
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
build_options="wayland"
build_options_default="wayland"
@@ -188,6 +188,7 @@ post_configure() {
if [ "$CROSS_BUILD" ]; then
find -iname "*.ninja" -exec sed -i "{}" \
-e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
+ -e "s; /usr/lib/; ${XBPS_CROSS_BASE}/usr/lib/;g" \
\;
fi
}
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.0.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (16 preceding siblings ...)
2024-02-16 12:22 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-02-16 12:25 ` SpidFightFR
2024-02-16 12:26 ` mesa: update to version 24.0.1 SpidFightFR
` (32 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 12:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948295344
Comment:
Just testing stuff...
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (17 preceding siblings ...)
2024-02-16 12:25 ` SpidFightFR
@ 2024-02-16 12:26 ` SpidFightFR
2024-02-16 12:27 ` [PR PATCH] [Updated] " SpidFightFR
` (31 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948297558
Comment:
Nope, the aarch64 and arm builds are still broken, that reminds me of mesa 23...
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (18 preceding siblings ...)
2024-02-16 12:26 ` mesa: update to version 24.0.1 SpidFightFR
@ 2024-02-16 12:27 ` SpidFightFR
2024-02-16 13:41 ` zlice
` (30 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 12:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2450 bytes --]
From ef124905357f16bf5eb37a031f0672905b8ecdc4 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Fri, 16 Feb 2024 13:27:34 +0100
Subject: [PATCH] mesa: update to version 24.0.1.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 6 ++---
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c..0000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b2..949a4ed3ffc17 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.1
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
build_options="wayland"
build_options_default="wayland"
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (19 preceding siblings ...)
2024-02-16 12:27 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-02-16 13:41 ` zlice
2024-02-16 13:41 ` zlice
` (29 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1036 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948405859
Comment:
i see `build-helper/rust.sh : 28` has `export BINDGEN_EXTRA_CLANG_ARGS+=" --sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"`
not sure how or where that's used? 1 or 2 other templates seem to have the var.
try this in mesa template? idk rust really but quick search points to the bindgen cross build var
```sh
if [ "$CROSS_BUILD" ]; then
BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
sed -n '/#include <...> search starts here:/,/End of search list./p' | \
sed '1,1d;$d' | sed 's/^ /-I/' | paste -s )
# fix compiler detection for botan:
# https://github.com/randombit/botan/blob/63d51cb1ab08849d8ece329811b61f8c9abebbcf/configure.py#L2888
export CXX="${XBPS_CROSS_TRIPLET}-g++"
export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
--sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
```
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (20 preceding siblings ...)
2024-02-16 13:41 ` zlice
@ 2024-02-16 13:41 ` zlice
2024-02-16 13:42 ` zlice
` (28 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948405859
Comment:
i see `build-helper/rust.sh : 28` has `export BINDGEN_EXTRA_CLANG_ARGS+=" --sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"`
not sure how or where that's used? 1 or 2 other templates seem to have the var.
try this in mesa template? idk rust really but quick search points to the bindgen cross build var (may want to do for only musl??? dont think it would matter but)
```sh
if [ "$CROSS_BUILD" ]; then
BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
sed -n '/#include <...> search starts here:/,/End of search list./p' | \
sed '1,1d;$d' | sed 's/^ /-I/' | paste -s )
# fix compiler detection for botan:
# https://github.com/randombit/botan/blob/63d51cb1ab08849d8ece329811b61f8c9abebbcf/configure.py#L2888
export CXX="${XBPS_CROSS_TRIPLET}-g++"
export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
--sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
```
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (21 preceding siblings ...)
2024-02-16 13:41 ` zlice
@ 2024-02-16 13:42 ` zlice
2024-02-16 13:50 ` dkwo
` (27 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 13:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948405859
Comment:
i see `build-helper/rust.sh : 28` has `export BINDGEN_EXTRA_CLANG_ARGS+=" --sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"`
not sure how or where that's used? 1 or 2 other templates seem to have the var.
try this in mesa template? idk rust really but quick search points to the bindgen cross build var (may want to do for only musl??? dont think it would matter but)
```sh
post_configure() {
if [ "$CROSS_BUILD" ]; then
find -iname "*.ninja" -exec sed -i "{}" \
-e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
\;
BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
--sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
fi
}
```
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (22 preceding siblings ...)
2024-02-16 13:42 ` zlice
@ 2024-02-16 13:50 ` dkwo
2024-02-16 13:54 ` zlice
` (26 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: dkwo @ 2024-02-16 13:50 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/48480#issuecomment-1948421918
Comment:
Strangely `aarch64-musl` builds, but `aarch64-glibc` fails with
```
r/include/gnu/stubs.h:7:11: fatal error: 'gnu/stubs-32.h' file not found
clang diag: /usr/include/features.h:414:4: warning: _FORTIFY_SOURCE requires compiling with optimization (-O) [-W#warnings]
panicked at bindgen-cli/main.rs:52:36:
Unable to generate bindings: ClangDiagnostic("/usr/include/gnu/stubs.h:7:11: fatal error: 'gnu/stubs-32.h' file not found\n")
[2687/2874]
```
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (23 preceding siblings ...)
2024-02-16 13:50 ` dkwo
@ 2024-02-16 13:54 ` zlice
2024-02-16 13:55 ` [PR PATCH] [Updated] " SpidFightFR
` (25 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 13:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948428544
Comment:
> Strangely `aarch64-musl` builds, but `aarch64-glibc` fails with
oh ya, that is weird. i only looked at 1 of the errors but saw the last 1 was musl. fun
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (24 preceding siblings ...)
2024-02-16 13:54 ` zlice
@ 2024-02-16 13:55 ` SpidFightFR
2024-02-16 13:56 ` SpidFightFR
` (24 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 13:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2454 bytes --]
From 7594920cdf1285da17d83345ee53e48e14193a76 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Fri, 16 Feb 2024 14:49:26 +0100
Subject: [PATCH] mesa: update to version 24.0.1.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 6 ++---
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c2..00000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b21..949a4ed3ffc178 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.1
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
build_options="wayland"
build_options_default="wayland"
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (25 preceding siblings ...)
2024-02-16 13:55 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-02-16 13:56 ` SpidFightFR
2024-02-16 13:57 ` zlice
` (23 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 13:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 922 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948430796
Comment:
> i see `build-helper/rust.sh : 28` has `export BINDGEN_EXTRA_CLANG_ARGS+=" --sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"`
>
> not sure how or where that's used? 1 or 2 other templates seem to have the var.
>
> try this in mesa template? idk rust really but quick search points to the bindgen cross build var (may want to do for only musl??? dont think it would matter but)
>
> ```shell
> post_configure() {
> if [ "$CROSS_BUILD" ]; then
> find -iname "*.ninja" -exec sed -i "{}" \
> -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
> \;
> BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
> --sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
> fi
> }
> ```
trying that... let's see how this turns out.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (26 preceding siblings ...)
2024-02-16 13:56 ` SpidFightFR
@ 2024-02-16 13:57 ` zlice
2024-02-16 16:34 ` zlice
` (22 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 13:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948432878
Comment:
naw it wont like dkwo just pointed out...thinking right above that checking for musl and unsetting or something
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (27 preceding siblings ...)
2024-02-16 13:57 ` zlice
@ 2024-02-16 16:34 ` zlice
2024-02-16 16:34 ` zlice
` (21 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948832094
Comment:
ok so this works for x86, a64, a7l
```sh
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
}
```
it looks like ninja.build has `-isystem/usr/include` for everything, so aarch64 gets x86_64's gnu stub.h ... which wants -32, which a64 doesn't have.
<details>
<summary>screenshot ninja build llvm_bindings</summary>
![systeminclude](https://github.com/void-linux/void-packages/assets/8009811/649fd673-0cf8-46ac-98a6-42afa7d417ed)
</details>
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (28 preceding siblings ...)
2024-02-16 16:34 ` zlice
@ 2024-02-16 16:34 ` zlice
2024-02-16 16:57 ` SpidFightFR
` (20 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948832094
Comment:
ok so this works for x86, a64, a7l
```sh
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
}
```
it looks like ninja build has `-isystem/usr/include` for everything, so aarch64 gets x86_64's gnu stub.h ... which wants -32, which a64 doesn't have.
<details>
<summary>screenshot ninja build llvm_bindings</summary>
![systeminclude](https://github.com/void-linux/void-packages/assets/8009811/649fd673-0cf8-46ac-98a6-42afa7d417ed)
</details>
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (29 preceding siblings ...)
2024-02-16 16:34 ` zlice
@ 2024-02-16 16:57 ` SpidFightFR
2024-02-16 17:00 ` zlice
` (19 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 16:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948880739
Comment:
> ok so this works for x86, a64, a7l
>
> ```shell
> 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
> }
> ```
>
> it looks like ninja build has `-isystem/usr/include` for everything, so aarch64 gets x86_64's gnu stub.h ... which wants -32, which a64 doesn't have.
> screenshot ninja build llvm_bindings
>
> ![systeminclude](https://private-user-images.githubusercontent.com/8009811/305479670-649fd673-0cf8-46ac-98a6-42afa7d417ed.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MDgxMDI4NzQsIm5iZiI6MTcwODEwMjU3NCwicGF0aCI6Ii84MDA5ODExLzMwNTQ3OTY3MC02NDlmZDY3My0wY2Y4LTQ2YWMtOThhNi00MmFmYTdkNDE3ZWQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDAyMTZUMTY1NjE0WiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NWI0YjYxMjJhMWNkMzkyNDE5ZGNlYjNiOWQxODBmNjJhOTQ1ZmRlNDJhY2FhMDcwNGQ3ZjhhMzM1YmFmZDhkZiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.TQ9gjQzBnQKJHbMtw7GSd3BBP4hWtMeCX6Iov3ei9mQ)
Noice imma try that once back at home.
How do you manage to see all that? 😅
Like how do you do to make these patches and stuff?
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (30 preceding siblings ...)
2024-02-16 16:57 ` SpidFightFR
@ 2024-02-16 17:00 ` zlice
2024-02-16 17:02 ` SpidFightFR
` (18 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948884124
Comment:
i was looking at rust related stuff and cross args but none of that made a difference. then i saw `-isystem...` and thought it looked out of place just from doing build stuff over the years.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (31 preceding siblings ...)
2024-02-16 17:00 ` zlice
@ 2024-02-16 17:02 ` SpidFightFR
2024-02-16 17:39 ` dkwo
` (17 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948890488
Comment:
> i was looking at rust related stuff and cross args but none of that made a difference. then i saw `-isystem...` and thought it looked out of place just from doing build stuff over the years.
Wow...
I'm a noob at compiling stuff, it's always impressive to see other's experience, not gonna lie.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (32 preceding siblings ...)
2024-02-16 17:02 ` SpidFightFR
@ 2024-02-16 17:39 ` dkwo
2024-02-16 17:45 ` zlice
` (16 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: dkwo @ 2024-02-16 17:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948965954
Comment:
@zlice Do you think this line in https://github.com/void-linux/void-packages/blob/2f4a8ac961862e0e31d60d532f0d31429ef434fb/common/build-helper/meson.sh#L68 is ignored, or somehow not passed over from meson to ninja?
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (33 preceding siblings ...)
2024-02-16 17:39 ` dkwo
@ 2024-02-16 17:45 ` zlice
2024-02-16 18:17 ` [PR PATCH] [Updated] " SpidFightFR
` (15 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-16 17:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1948973542
Comment:
> @zlice Do you think this line in
> is ignored, or somehow not passed over from meson to ninja?
there's sysroot and targets to aarch64 after configure. maybe the system includes happened to work last time? or the new rust update to 69 is just doing stuff different idk rust enough
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (34 preceding siblings ...)
2024-02-16 17:45 ` zlice
@ 2024-02-16 18:17 ` SpidFightFR
2024-02-16 18:22 ` SpidFightFR
` (14 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2904 bytes --]
From c49576ce057f351bd8ad457598e40a9d8f59a6d1 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Fri, 16 Feb 2024 19:10:09 +0100
Subject: [PATCH] mesa: update to version 24.0.1.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 17 ++++++-------
2 files changed, 9 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c2..00000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b21..55160805649912 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.1
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
build_options="wayland"
build_options_default="wayland"
@@ -185,11 +185,12 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_configure() {
- if [ "$CROSS_BUILD" ]; then
- find -iname "*.ninja" -exec sed -i "{}" \
- -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
- \;
- fi
+ 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() {
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (35 preceding siblings ...)
2024-02-16 18:17 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-02-16 18:22 ` SpidFightFR
2024-02-16 18:43 ` SpidFightFR
` (13 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2687 bytes --]
From 90ffd78c42972e9b3e292d48cca3dfff8a133108 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Fri, 16 Feb 2024 19:10:09 +0100
Subject: [PATCH] mesa: update to version 24.0.1.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 9 +++----
2 files changed, 5 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c2..00000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b21..c08ef6b920d11f 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.1
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613
build_options="wayland"
build_options_default="wayland"
@@ -188,7 +188,8 @@ 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
}
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (36 preceding siblings ...)
2024-02-16 18:22 ` SpidFightFR
@ 2024-02-16 18:43 ` SpidFightFR
2024-02-16 19:39 ` dkwo
` (12 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1949097346
Comment:
> ok so this works for x86, a64, a7l
>
> ```shell
> 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
> }
> ```
>
> it looks like ninja build has `-isystem/usr/include` for everything, so aarch64 gets x86_64's gnu stub.h ... which wants -32, which a64 doesn't have.
> screenshot ninja build llvm_bindings
You just fixed mesa 24 on void, thanks !
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (37 preceding siblings ...)
2024-02-16 18:43 ` SpidFightFR
@ 2024-02-16 19:39 ` dkwo
2024-02-16 22:44 ` SpidFightFR
` (11 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: dkwo @ 2024-02-16 19:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1949213395
Comment:
can this be https://github.com/mesonbuild/meson/pull/9993 ?
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (38 preceding siblings ...)
2024-02-16 19:39 ` dkwo
@ 2024-02-16 22:44 ` SpidFightFR
2024-02-28 19:51 ` [PR PATCH] [Updated] " SpidFightFR
` (10 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-16 22:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1949439133
Comment:
If by chance a maintainer sees this, we should push [23.3.6](https://github.com/void-linux/void-packages/pull/48767) first before mesa 24.0.1, as it's the last bugfix release of the 23 branch according to the calendar, it's a 90%+ guarantee of it just working. :smile:
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (39 preceding siblings ...)
2024-02-16 22:44 ` SpidFightFR
@ 2024-02-28 19:51 ` SpidFightFR
2024-02-28 20:02 ` SpidFightFR
` (9 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-28 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 2687 bytes --]
From 9320e889505a76249d94d5542e7799d3843fb38f Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Wed, 28 Feb 2024 20:44:19 +0100
Subject: [PATCH] mesa: update to version 24.0.2.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 ----------------------
srcpkgs/mesa/template | 9 +++----
2 files changed, 5 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c2..00000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b21..27630148b641c9 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.2
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8
build_options="wayland"
build_options_default="wayland"
@@ -188,7 +188,8 @@ 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
}
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (40 preceding siblings ...)
2024-02-28 19:51 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-02-28 20:02 ` SpidFightFR
2024-02-28 20:20 ` zlice
` (8 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-28 20:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1969738640
Comment:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
Modified PR for mesa 24.0.2.
Same as the previous edits.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.1.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (41 preceding siblings ...)
2024-02-28 20:02 ` SpidFightFR
@ 2024-02-28 20:20 ` zlice
2024-02-28 20:24 ` mesa: update to version 24.0.2 SpidFightFR
` (7 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: zlice @ 2024-02-28 20:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1969845012
Comment:
looks the same on A770 for me :+1:
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.2.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (42 preceding siblings ...)
2024-02-28 20:20 ` zlice
@ 2024-02-28 20:24 ` SpidFightFR
2024-02-28 20:25 ` SpidFightFR
` (6 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-28 20:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1969856774
Comment:
Hello, @classabbyamp, i hope you're doing great. :smile:
Looks good on our sides, please, may you take a look at the PR ? :pray:
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.2.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (43 preceding siblings ...)
2024-02-28 20:24 ` mesa: update to version 24.0.2 SpidFightFR
@ 2024-02-28 20:25 ` SpidFightFR
2024-03-04 19:44 ` SpidFightFR
` (5 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-02-28 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1969856774
Comment:
Hello, @classabbyamp, i hope you're doing great. :smile:
Looks good on our sides, please, may you take a look at the PR ? :pray:
Edit: My apologies for the ping, i thought mesa 24 got underwhelmed by newer PRs.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.2.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (44 preceding siblings ...)
2024-02-28 20:25 ` SpidFightFR
@ 2024-03-04 19:44 ` SpidFightFR
2024-03-09 9:06 ` Daxot
` (4 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-03-04 19:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1977333604
Comment:
@Duncaen Hello, my apologizes for the ping, i feel like an a-hole, pinging you and bothering you all the time. :sweat:
I'm unsure what to do what to do in such a case, is everything good with this PR ? nothing missing ? :sweat_smile:
Welp, sorry again for the ping, may you take a look at it please ? :pray:
Wish you, and the maintainer team, a great day!
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.2.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (45 preceding siblings ...)
2024-03-04 19:44 ` SpidFightFR
@ 2024-03-09 9:06 ` Daxot
2024-03-09 10:50 ` SpidFightFR
` (3 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: Daxot @ 2024-03-09 9:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
New comment by Daxot on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1986801432
Comment:
> @Duncaen Hello, my apologizes for the ping, i feel like an a-hole, pinging you and bothering you all the time. 😓 I'm unsure what to do what to do in such a case, is everything good with this PR ? nothing missing ? 😅
>
> Welp, sorry again for the ping, may you take a look at it please ? 🙏 Wish you, and the maintainer team, a great day!
i think you will get a better luck to get maintainers attention to this PR in #xbps IRC-channel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.2.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (46 preceding siblings ...)
2024-03-09 9:06 ` Daxot
@ 2024-03-09 10:50 ` SpidFightFR
2024-03-09 15:03 ` [PR PATCH] [Updated] " SpidFightFR
` (2 subsequent siblings)
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-03-09 10:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 625 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1986823102
Comment:
> > @Duncaen Hello, my apologizes for the ping, i feel like an a-hole, pinging you and bothering you all the time. 😓 I'm unsure what to do what to do in such a case, is everything good with this PR ? nothing missing ? 😅
> > Welp, sorry again for the ping, may you take a look at it please ? 🙏 Wish you, and the maintainer team, a great day!
>
> i think you will get a better luck to get maintainers attention to this PR in #xbps IRC-channel
Agreed, i'll try here.
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to version 24.0.2.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (47 preceding siblings ...)
2024-03-09 10:50 ` SpidFightFR
@ 2024-03-09 15:03 ` SpidFightFR
2024-03-09 15:05 ` SpidFightFR
2024-03-10 13:08 ` [PR PATCH] [Merged]: " Johnnynator
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-03-09 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]
There is an updated pull request by SpidFightFR against master on the void-packages repository
https://github.com/SpidFightFR/void-packages update-mesa-24
https://github.com/void-linux/void-packages/pull/48480
mesa: update to version 24.0.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
A patch file from https://github.com/void-linux/void-packages/pull/48480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-24-48480.patch --]
[-- Type: text/x-diff, Size: 3755 bytes --]
From f45be09988f897184bee2b16165e934d7773d5f2 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Sat, 9 Mar 2024 15:53:33 +0100
Subject: [PATCH] mesa: update to version 24.0.2.
---
srcpkgs/mesa/patches/fix-meson-build.patch | 28 -------------------
...fix_crash_radeon_bo_can_reclaim_slab.patch | 13 +++++++++
srcpkgs/mesa/template | 9 +++---
3 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/fix-meson-build.patch
create mode 100644 srcpkgs/mesa/patches/fix_crash_radeon_bo_can_reclaim_slab.patch
diff --git a/srcpkgs/mesa/patches/fix-meson-build.patch b/srcpkgs/mesa/patches/fix-meson-build.patch
deleted file mode 100644
index 01d203366000c2..00000000000000
--- a/srcpkgs/mesa/patches/fix-meson-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index 4bde074..41df740 100644
---- a/src/gallium/frontends/rusticl/meson.build
-+++ b/src/gallium/frontends/rusticl/meson.build
-@@ -342,6 +342,7 @@ rusticl_proc_macros = shared_library(
- 'rusticl_proc_macros',
- [rusticl_proc_macros_files],
- rust_crate_type : 'proc-macro',
-+ native: true,
- rust_args : [
- rusticl_args,
- ],
-@@ -353,6 +354,7 @@ librusticl = static_library(
- gnu_symbol_visibility : 'hidden',
- rust_crate_type : 'staticlib',
- rust_args : [
-+ '--extern', 'rusticl_proc_macros=' + meson.current_build_dir() / 'librusticl_proc_macros.so',
- rusticl_args,
- ],
- link_with : [
-@@ -360,7 +362,6 @@ librusticl = static_library(
- libmesa_rust_gen,
- libmesa_rust_util,
- rusticl_opencl_gen,
-- rusticl_proc_macros,
- ],
- dependencies : [
- idep_rusticl_gen,
diff --git a/srcpkgs/mesa/patches/fix_crash_radeon_bo_can_reclaim_slab.patch b/srcpkgs/mesa/patches/fix_crash_radeon_bo_can_reclaim_slab.patch
new file mode 100644
index 00000000000000..34bb2d835a548d
--- /dev/null
+++ b/srcpkgs/mesa/patches/fix_crash_radeon_bo_can_reclaim_slab.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+index 2e1d9c4..7979cad 100644
+--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
++++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+@@ -729,7 +729,7 @@ bool radeon_bo_can_reclaim_slab(void *priv, struct pb_slab_entry *entry)
+ {
+ struct radeon_bo *bo = container_of(entry, struct radeon_bo, u.slab.entry);
+
+- return radeon_bo_can_reclaim(NULL, &bo->base);
++ return radeon_bo_can_reclaim(priv, &bo->base);
+ }
+
+ static void radeon_bo_slab_destroy(void *winsys, struct pb_buffer_lean *_buf)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8613d434f71b21..27630148b641c9 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
-version=23.3.5
-revision=3
+version=24.0.2
+revision=1
build_style=meson
_llvmver=17
#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -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=69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f
+checksum=94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8
build_options="wayland"
build_options_default="wayland"
@@ -188,7 +188,8 @@ 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
}
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: mesa: update to version 24.0.2.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (48 preceding siblings ...)
2024-03-09 15:03 ` [PR PATCH] [Updated] " SpidFightFR
@ 2024-03-09 15:05 ` SpidFightFR
2024-03-10 13:08 ` [PR PATCH] [Merged]: " Johnnynator
50 siblings, 0 replies; 52+ messages in thread
From: SpidFightFR @ 2024-03-09 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/48480#issuecomment-1986879820
Comment:
Just added a patch as advised [here](https://gitlab.freedesktop.org/mesa/mesa/-/issues/10613#note_2290167).
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PR PATCH] [Merged]: mesa: update to version 24.0.2.
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
` (49 preceding siblings ...)
2024-03-09 15:05 ` SpidFightFR
@ 2024-03-10 13:08 ` Johnnynator
50 siblings, 0 replies; 52+ messages in thread
From: Johnnynator @ 2024-03-10 13:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]
There's a merged pull request on the void-packages repository
mesa: update to version 24.0.2.
https://github.com/void-linux/void-packages/pull/48480
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
This is it, the new version of mesa, 24.0.0.
Do keep in mind that it requires [libdrm-2.4.119](https://github.com/void-linux/void-packages/pull/48170) to work.
**As a consequence, this PR will stay as draft for as long as libdrm hasn't been updated.**
Edit: Also please check out the [23 branch](https://github.com/void-linux/void-packages/pull/48172) as Void lacks several bugfixes for this branch.
I removed the patch to fix meson builds as it doesn't seem to be necessary anymore.
This version of mesa brings a lot of good stuff, Ray tracing performance improvements and such !
^ permalink raw reply [flat|nested] 52+ messages in thread
end of thread, other threads:[~2024-03-10 13:08 UTC | newest]
Thread overview: 52+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-01 18:11 [PR PATCH] mesa: update to version 24.0.0 SpidFightFR
2024-02-01 18:15 ` SpidFightFR
2024-02-02 6:42 ` classabbyamp
2024-02-02 8:02 ` SpidFightFR
2024-02-03 17:24 ` SpidFightFR
2024-02-09 12:13 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-09 12:15 ` SpidFightFR
2024-02-15 2:37 ` zlice
2024-02-15 12:32 ` SpidFightFR
2024-02-15 12:35 ` zlice
2024-02-15 12:36 ` SpidFightFR
2024-02-15 12:46 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-15 12:47 ` SpidFightFR
2024-02-15 21:11 ` dkwo
2024-02-15 23:55 ` SpidFightFR
2024-02-16 10:15 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-16 10:15 ` SpidFightFR
2024-02-16 12:22 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-16 12:25 ` SpidFightFR
2024-02-16 12:26 ` mesa: update to version 24.0.1 SpidFightFR
2024-02-16 12:27 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-16 13:41 ` zlice
2024-02-16 13:41 ` zlice
2024-02-16 13:42 ` zlice
2024-02-16 13:50 ` dkwo
2024-02-16 13:54 ` zlice
2024-02-16 13:55 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-16 13:56 ` SpidFightFR
2024-02-16 13:57 ` zlice
2024-02-16 16:34 ` zlice
2024-02-16 16:34 ` zlice
2024-02-16 16:57 ` SpidFightFR
2024-02-16 17:00 ` zlice
2024-02-16 17:02 ` SpidFightFR
2024-02-16 17:39 ` dkwo
2024-02-16 17:45 ` zlice
2024-02-16 18:17 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-16 18:22 ` SpidFightFR
2024-02-16 18:43 ` SpidFightFR
2024-02-16 19:39 ` dkwo
2024-02-16 22:44 ` SpidFightFR
2024-02-28 19:51 ` [PR PATCH] [Updated] " SpidFightFR
2024-02-28 20:02 ` SpidFightFR
2024-02-28 20:20 ` zlice
2024-02-28 20:24 ` mesa: update to version 24.0.2 SpidFightFR
2024-02-28 20:25 ` SpidFightFR
2024-03-04 19:44 ` SpidFightFR
2024-03-09 9:06 ` Daxot
2024-03-09 10:50 ` SpidFightFR
2024-03-09 15:03 ` [PR PATCH] [Updated] " SpidFightFR
2024-03-09 15:05 ` SpidFightFR
2024-03-10 13:08 ` [PR PATCH] [Merged]: " Johnnynator
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).