Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] mesa: update to 22.3.0.
@ 2022-12-14 13:28 ardadem
  2022-12-15  4:49 ` zlice
                   ` (57 more replies)
  0 siblings, 58 replies; 59+ messages in thread
From: ardadem @ 2022-12-14 13:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]

There is a new pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

**Draft until 22.3.1.**
Feel free to review and test it meantime.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 11325 bytes --]

From 5a6a68264f897151812ebad9f1ca02ba8eb6f112 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..6fd0b7def207 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -990,6 +990,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 6f87a7d60013c436327eca7a8409d96a3b0e3545 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.0.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/20145.patch           | 71 ++++++++++++++++++++++
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 ---------
 srcpkgs/mesa/template                      | 44 ++++++--------
 srcpkgs/removed-packages/template          |  3 +-
 5 files changed, 91 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 create mode 100644 srcpkgs/mesa/patches/20145.patch
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/20145.patch b/srcpkgs/mesa/patches/20145.patch
new file mode 100644
index 000000000000..496401658eef
--- /dev/null
+++ b/srcpkgs/mesa/patches/20145.patch
@@ -0,0 +1,71 @@
+From b3d1ae19f2f4d93cf0a5f45a598149ac4e8e05aa Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sun, 4 Dec 2022 00:17:57 +0000
+Subject: [PATCH 1/2] d3d12: Don't crash when libd3d12.so can't be found
+
+`d3d12_destroy_screen` is called by `d3d12_create_dxcore_screen` after
+`d3d12_init_screen_base` fails and attempts to call `util_dl_close` on
+a NULL pointer, leading to an abort.
+
+To fix this, only close the library after if it was actually opened.
+
+Cc: mesa-stable
+Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20145>
+---
+ src/gallium/drivers/d3d12/d3d12_screen.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
+index 7debc1f0c572..e9aca69819f0 100644
+--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
++++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
+@@ -743,7 +743,8 @@ d3d12_destroy_screen(struct d3d12_screen *screen)
+    slab_destroy_parent(&screen->transfer_pool);
+    mtx_destroy(&screen->submit_mutex);
+    mtx_destroy(&screen->descriptor_pool_mutex);
+-   util_dl_close(screen->d3d12_mod);
++   if (screen->d3d12_mod)
++      util_dl_close(screen->d3d12_mod);
+    glsl_type_singleton_decref();
+    FREE(screen);
+ }
+-- 
+GitLab
+
+
+From b5133894005720db24a8e0cc17e047a291953ff4 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sun, 4 Dec 2022 00:21:45 +0000
+Subject: [PATCH 2/2] dzn: Don't crash when libd3d12.so can't be found
+
+`dzn_instance_create` will call `dzn_instance_destroy` when the d3d12
+library fails to load. Just like the issue in `d3d12_screen`, this will
+lead to a crash because `d3d12_mod` is NULL.
+
+To fix this, only close the library after if it was actually opened.
+
+Cc: mesa-stable
+Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20145>
+---
+ src/microsoft/vulkan/dzn_device.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c
+index 16a5aca331f4..8f9b5939eb85 100644
+--- a/src/microsoft/vulkan/dzn_device.c
++++ b/src/microsoft/vulkan/dzn_device.c
+@@ -174,7 +174,8 @@ dzn_instance_destroy(struct dzn_instance *instance, const VkAllocationCallbacks
+    if (instance->factory)
+       ID3D12DeviceFactory_Release(instance->factory);
+ 
+-   util_dl_close(instance->d3d12_mod);
++   if (instance->d3d12_mod)
++      util_dl_close(instance->d3d12_mod);
+ 
+    vk_instance_finish(&instance->vk);
+    vk_free2(vk_default_allocator(), alloc, instance);
+-- 
+GitLab
+
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..d1f10d13cf0e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.0
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,18 +333,11 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
@@ -381,7 +373,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +418,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df3fdc331c84..ce8544fc1db6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20221205
+version=0.1.20221209
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -304,6 +304,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.0.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
@ 2022-12-15  4:49 ` zlice
  2022-12-15  5:11 ` [PR PATCH] [Updated] " ardadem
                   ` (56 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: zlice @ 2022-12-15  4:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1352555117

Comment:
Was just about to make a PR. 22.3.1 has a bunch of Intel fixes. Switching to that instead of git-latest but so far it's been great.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.0.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
  2022-12-15  4:49 ` zlice
@ 2022-12-15  5:11 ` ardadem
  2022-12-15  9:43 ` [PR PATCH] [Updated] mesa: update to 22.3.1 ardadem
                   ` (55 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2022-12-15  5:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

**Draft until 22.3.1.**
Feel free to review and test it meantime.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8228 bytes --]

From 8311b178180b3ca7c753f4a582f649e6d5690d86 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..6fd0b7def207 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -990,6 +990,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 05c856327503a4464aec6d1d28e7165b6b60f74d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.0.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 44 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 20 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..017a74ffefbe 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.1
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,18 +333,11 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
@@ -381,7 +373,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +418,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df3fdc331c84..ce8544fc1db6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20221205
+version=0.1.20221209
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -304,6 +304,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
  2022-12-15  4:49 ` zlice
  2022-12-15  5:11 ` [PR PATCH] [Updated] " ardadem
@ 2022-12-15  9:43 ` ardadem
  2022-12-17 13:42 ` biopsin
                   ` (54 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2022-12-15  9:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8228 bytes --]

From 8311b178180b3ca7c753f4a582f649e6d5690d86 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..6fd0b7def207 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -990,6 +990,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From d256cbb3a085ec438a550beb4671edd71412918a Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.1.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 44 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 20 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..017a74ffefbe 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.1
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,18 +333,11 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
@@ -381,7 +373,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +418,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df3fdc331c84..ce8544fc1db6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20221205
+version=0.1.20221209
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -304,6 +304,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (2 preceding siblings ...)
  2022-12-15  9:43 ` [PR PATCH] [Updated] mesa: update to 22.3.1 ardadem
@ 2022-12-17 13:42 ` biopsin
  2022-12-19 20:32 ` [PR PATCH] [Updated] " ardadem
                   ` (53 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: biopsin @ 2022-12-17 13:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1356268435

Comment:
fixes gallium issue for AMD Aruba introduced in 22.2.x

`../src/gallium/drivers/r600/r600_state_common.c:961 r600_shader_select - Failed to build shader variant (type=1) -1 EE ../src/gallium/drivers/r600/r600_shader.c:193 r600_pipe_shader_create - translation from TGSI failed !`

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (3 preceding siblings ...)
  2022-12-17 13:42 ` biopsin
@ 2022-12-19 20:32 ` ardadem
  2022-12-19 20:50 ` ardadem
                   ` (52 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2022-12-19 20:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8228 bytes --]

From d6b939e863f8fc91ef0257ccaaafe30df081e98d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index ba5c89ee3bad..ff73ebe4b21a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -987,6 +987,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 96bd8ce0bd21b693046085290354194d94e6ee70 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.1.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 44 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 20 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..017a74ffefbe 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.1
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,18 +333,11 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
@@ -381,7 +373,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +418,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..f5c074aafc0f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20221217
+version=0.1.20221219
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -304,6 +304,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (4 preceding siblings ...)
  2022-12-19 20:32 ` [PR PATCH] [Updated] " ardadem
@ 2022-12-19 20:50 ` ardadem
  2022-12-23 19:53 ` bubba-champion
                   ` (51 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2022-12-19 20:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8230 bytes --]

From d6b939e863f8fc91ef0257ccaaafe30df081e98d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index ba5c89ee3bad..ff73ebe4b21a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -987,6 +987,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 7c8ea949daa423411eaa662269b510eb31e87c9e Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.1.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 44 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 20 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..3c834f7fe419 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.1
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 post_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		find -iname "*.ninja" -exec sed -i "{}" \
+			-e "/rusticl/s; --sysroot=${XBPS_CROSS_BASE}/usr;;g" \
 			-e "s; /usr/lib/; ${XBPS_CROSS_BASE}/usr/lib/;g" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,18 +333,11 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
@@ -381,7 +373,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +418,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..f5c074aafc0f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20221217
+version=0.1.20221219
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -304,6 +304,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (5 preceding siblings ...)
  2022-12-19 20:50 ` ardadem
@ 2022-12-23 19:53 ` bubba-champion
  2022-12-23 20:15 ` vincele
                   ` (50 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: bubba-champion @ 2022-12-23 19:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

New comment by bubba-champion on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1364276189

Comment:
I think we should move `/usr/share/vulkan/icd.d/radeon_icd.i686.json` from `mesa-vulkan-radeon` to `mesa-vulkan-radeon-32bit`, and do the same with `mesa-vulkan-intel`. Also, I suppose we can move `/usr/share/drirc.d/00-radv-defaults.conf` from `mesa` to `mesa-vulkan-radeon`.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (6 preceding siblings ...)
  2022-12-23 19:53 ` bubba-champion
@ 2022-12-23 20:15 ` vincele
  2022-12-23 21:54 ` [PR PATCH] [Updated] " ardadem
                   ` (49 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: vincele @ 2022-12-23 20:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1364314160

Comment:
I tested this on x86_64, Radeon RX 550.
Desktop, browsing, glmark2, extreme tux racer.
Works OK

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (7 preceding siblings ...)
  2022-12-23 20:15 ` vincele
@ 2022-12-23 21:54 ` ardadem
  2022-12-23 21:58 ` ardadem
                   ` (48 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2022-12-23 21:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8466 bytes --]

From 803f1e757f642514b20b5742330d979c3c7f399d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..8aede7b216f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -987,6 +987,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 418f992e6d4ff15e454bc5ed136f3812bd12446e Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.1.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 45 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..6f8d7d2a55d7 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.1
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 post_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		find -iname "*.ninja" -exec sed -i "{}" \
+			-e "/rusticl/s; --sysroot=${XBPS_CROSS_BASE}/usr;;g" \
 			-e "s; /usr/lib/; ${XBPS_CROSS_BASE}/usr/lib/;g" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +333,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +374,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +419,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..f5c074aafc0f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20221217
+version=0.1.20221219
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -304,6 +304,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (8 preceding siblings ...)
  2022-12-23 21:54 ` [PR PATCH] [Updated] " ardadem
@ 2022-12-23 21:58 ` ardadem
  2022-12-24 17:56 ` bubba-champion
                   ` (47 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2022-12-23 21:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 781 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1364357617

Comment:
> I think we should move `/usr/share/vulkan/icd.d/radeon_icd.i686.json` from `mesa-vulkan-radeon` to `mesa-vulkan-radeon-32bit`, and do the same with `mesa-vulkan-intel`.

It is on purpose, there is a comment about that on the template;

```
# ensure that each eligible architecture ships its multilib icd files
# in some cases, multiple counterpart architectures may exist (aarch64)
# this allows us to not have to ship these files in the current *-32bit packages
```

> Also, I suppose we can move /usr/share/drirc.d/00-radv-defaults.conf from mesa to mesa-vulkan-radeon.

This is how it should be, thanks for the feedback.


^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (9 preceding siblings ...)
  2022-12-23 21:58 ` ardadem
@ 2022-12-24 17:56 ` bubba-champion
  2022-12-24 19:29 ` bubba-champion
                   ` (46 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: bubba-champion @ 2022-12-24 17:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New comment by bubba-champion on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1364564326

Comment:
Works well on RX 6400 (x86_64-glibc) in steam games (DXVK, Native), and with multimedia (mpv).

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (10 preceding siblings ...)
  2022-12-24 17:56 ` bubba-champion
@ 2022-12-24 19:29 ` bubba-champion
  2022-12-29 23:07 ` bubba-champion
                   ` (45 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: bubba-champion @ 2022-12-24 19:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New comment by bubba-champion on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1364564326

Comment:
Works well on RX 6400 (x86_64-glibc) in steam games (DXVK, native), and with multimedia (mpv).

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (11 preceding siblings ...)
  2022-12-24 19:29 ` bubba-champion
@ 2022-12-29 23:07 ` bubba-champion
  2022-12-30  9:15 ` [PR PATCH] [Updated] " ardadem
                   ` (44 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: bubba-champion @ 2022-12-29 23:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by bubba-champion on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1367627570

Comment:
https://gitlab.freedesktop.org/mesa/mesa/-/tags/mesa-22.3.2

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.1.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (12 preceding siblings ...)
  2022-12-29 23:07 ` bubba-champion
@ 2022-12-30  9:15 ` ardadem
  2023-01-03 22:18 ` [PR PATCH] [Updated] mesa: update to 22.3.2 ardadem
                   ` (43 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2022-12-30  9:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8464 bytes --]

From 5a97424dddf7cc7e81d27f040e524efcc3e51c54 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 1c852ef3fdff..52158a607aa2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -987,6 +987,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 35c218b3db07425b7f8fa2ce367847e01e512a16 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.2.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 45 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..2ccf2cda2555 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.2
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +333,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +374,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +419,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..f5c074aafc0f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20221217
+version=0.1.20221219
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -304,6 +304,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.2.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (13 preceding siblings ...)
  2022-12-30  9:15 ` [PR PATCH] [Updated] " ardadem
@ 2023-01-03 22:18 ` ardadem
  2023-01-03 22:19 ` ardadem
                   ` (42 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-03 22:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8464 bytes --]

From e1d560a2a5e1e33b8778ab10b26ff4d8c130aa15 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 52a6d3e6d5fb..25d8f0b719e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -991,6 +991,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From a1f63e72a8d6f7c3d4dc9c401c3e09eb93c18467 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.2.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 45 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..2ccf2cda2555 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.2
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +333,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +374,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +419,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6348bc031851..c01d42116b63 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230102
+version=0.1.20230104
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -306,6 +306,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.2.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (14 preceding siblings ...)
  2023-01-03 22:18 ` [PR PATCH] [Updated] mesa: update to 22.3.2 ardadem
@ 2023-01-03 22:19 ` ardadem
  2023-01-11 20:13 ` Seltyk
                   ` (41 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-03 22:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1370282497

Comment:
Regular rebase.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.2.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (15 preceding siblings ...)
  2023-01-03 22:19 ` ardadem
@ 2023-01-11 20:13 ` Seltyk
  2023-01-11 21:38 ` [PR PATCH] [Updated] " ardadem
                   ` (40 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: Seltyk @ 2023-01-11 20:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

New comment by Seltyk on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1379429164

Comment:
[22.3.3](https://gitlab.freedesktop.org/mesa/mesa/-/tags/mesa-22.3.3) was released today; consider bumping

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.2.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (16 preceding siblings ...)
  2023-01-11 20:13 ` Seltyk
@ 2023-01-11 21:38 ` ardadem
  2023-01-17 12:02 ` mesa: update to 22.3.3 motorto
                   ` (39 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-11 21:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8464 bytes --]

From ff9c01ab375df5f60d6694c235ff5abb46df2019 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..b9e9292a66d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From f9569b04b45daf3ccdec59b55ceb4f625086453d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.3.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 45 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..83ec539f177e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.3
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +333,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +374,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +419,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c5177fb87af9..3f9c4b4cd352 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230109
+version=0.1.20230111
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -311,6 +311,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (17 preceding siblings ...)
  2023-01-11 21:38 ` [PR PATCH] [Updated] " ardadem
@ 2023-01-17 12:02 ` motorto
  2023-01-17 12:03 ` motorto
                   ` (38 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: motorto @ 2023-01-17 12:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1385321448

Comment:
From my testing the lto is only broken currently on x86_64 so probably we could disable lto only for x86_64 and enable for all the others archs. (Yeah I was working on updating this package, wihtout looking for active PR's) also bump it to x86_64

```
# lto fails on x86 only, no need to disable on all archs
case "$XBPS_TARGET_MACHINE" in
	x86_64*) configure_args+=" -Db_lto=false" ;;
	*) configure_args+=" -Db_lto=true" ;;
esac
```

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (18 preceding siblings ...)
  2023-01-17 12:02 ` mesa: update to 22.3.3 motorto
@ 2023-01-17 12:03 ` motorto
  2023-01-17 12:33 ` JamiKettunen
                   ` (37 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: motorto @ 2023-01-17 12:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 585 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1385321448

Comment:
From my testing the lto is only broken currently on x86_64 so probably we could disable lto only for x86_64 and enable for all the others archs. (Yeah I was working on updating this package, wihtout looking for active PR's) ~also bump it to x86_64~

```
# lto fails on x86 only, no need to disable on all archs
case "$XBPS_TARGET_MACHINE" in
	x86_64*) configure_args+=" -Db_lto=false" ;;
	*) configure_args+=" -Db_lto=true" ;;
esac
```

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (19 preceding siblings ...)
  2023-01-17 12:03 ` motorto
@ 2023-01-17 12:33 ` JamiKettunen
  2023-01-17 12:34 ` JamiKettunen
                   ` (36 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: JamiKettunen @ 2023-01-17 12:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1385357759

Comment:
@motorto LTO is enabled by default by the `meson` build-style, no need to re-enable it on the non-x86_64 arches on your example: https://github.com/void-linux/void-packages/blob/cc6491d/common/build-style/meson.sh#L123

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (20 preceding siblings ...)
  2023-01-17 12:33 ` JamiKettunen
@ 2023-01-17 12:34 ` JamiKettunen
  2023-01-17 13:14 ` JamiKettunen
                   ` (35 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: JamiKettunen @ 2023-01-17 12:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1385357759

Comment:
~~@motorto LTO is enabled by default by the `meson` build-style, no need to re-enable it on the non-x86_64 arches on your example: https://github.com/void-linux/void-packages/blob/cc6491d/common/build-style/meson.sh#L123~~

nvm I just looked at the template and it sets `-Db_lto=false` in `configure_args`

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (21 preceding siblings ...)
  2023-01-17 12:34 ` JamiKettunen
@ 2023-01-17 13:14 ` JamiKettunen
  2023-01-17 13:14 ` JamiKettunen
                   ` (34 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: JamiKettunen @ 2023-01-17 13:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1385357759

Comment:
~~@motorto LTO is enabled by default by the `meson` build-style, no need to re-enable it on the non-x86_64 arches on your example: https://github.com/void-linux/void-packages/blob/cc6491d/common/build-style/meson.sh#L123~~

nvm I just looked at the template and it sets `-Db_lto=false` in `configure_args`; could still drop the `x86_64*` case though since in this case it's disabled by default already on a package level

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (22 preceding siblings ...)
  2023-01-17 13:14 ` JamiKettunen
@ 2023-01-17 13:14 ` JamiKettunen
  2023-01-17 17:07 ` [PR PATCH] [Updated] " ardadem
                   ` (33 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: JamiKettunen @ 2023-01-17 13:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1385357759

Comment:
~~@motorto LTO is enabled by default by the `meson` build-style, no need to re-enable it on the non-x86_64 arches on your example: https://github.com/void-linux/void-packages/blob/cc6491d/common/build-style/meson.sh#L123~~

nvm I just looked at the template and it sets `-Db_lto=false` in `configure_args`

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (23 preceding siblings ...)
  2023-01-17 13:14 ` JamiKettunen
@ 2023-01-17 17:07 ` ardadem
  2023-01-17 17:11 ` ardadem
                   ` (32 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-17 17:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8814 bytes --]

From 536dc5eb600c849d39e6febfe7478826a0289607 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..b9e9292a66d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From ff46cf8b3a1fdfbd4bee2e58c6d3202c8deb1e75 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.3.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 ------------
 srcpkgs/mesa/template                      | 53 +++++++++++-----------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 28 insertions(+), 58 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..7dcda2003a82 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,15 +1,15 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.3
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -39,6 +35,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -Ddraw-use-llvm=false" ;;
 esac
 
+# LTO fails on x86 only
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*) configure_args+=" -Db_lto=false";;
+	*) ;;
+esac
+
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libgbm-devel libOSMesa"
 
@@ -95,7 +97,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +146,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +193,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +292,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +311,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +339,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +380,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +425,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8febb5f0c1f4..58ff023b38e1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230109
+version=0.1.20230111
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -312,6 +312,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (24 preceding siblings ...)
  2023-01-17 17:07 ` [PR PATCH] [Updated] " ardadem
@ 2023-01-17 17:11 ` ardadem
  2023-01-17 17:12 ` [PR PATCH] [Updated] " ardadem
                   ` (31 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-17 17:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1385754175

Comment:
> From my testing the lto is only broken currently on x86_64 so probably we could disable lto only for x86_64 and enable for all the others archs. (Yeah I was working on updating this package, wihtout looking for active PR's) ~also bump it to x86_64~
> 
> ```
> # lto fails on x86 only, no need to disable on all archs
> case "$XBPS_TARGET_MACHINE" in
> 	x86_64*) configure_args+=" -Db_lto=false" ;;
> 	*) configure_args+=" -Db_lto=true" ;;
> esac
> ```

it is disabled only on x86_64 now

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (25 preceding siblings ...)
  2023-01-17 17:11 ` ardadem
@ 2023-01-17 17:12 ` ardadem
  2023-01-17 17:46 ` ardadem
                   ` (30 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-17 17:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8815 bytes --]

From 536dc5eb600c849d39e6febfe7478826a0289607 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..b9e9292a66d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From c5217f922260e29c61680d937dafe0e54bc1233b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.3.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 ------------
 srcpkgs/mesa/template                      | 53 +++++++++++-----------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 28 insertions(+), 58 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..83a118d516b7 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,15 +1,15 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.3
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -39,6 +35,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -Ddraw-use-llvm=false" ;;
 esac
 
+# LTO fails on x86 only
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*) configure_args+=" -Db_lto=false" ;;
+	*) ;;
+esac
+
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libgbm-devel libOSMesa"
 
@@ -95,7 +97,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +146,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +193,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +292,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +311,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +339,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +380,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +425,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8febb5f0c1f4..58ff023b38e1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230109
+version=0.1.20230111
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -312,6 +312,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (26 preceding siblings ...)
  2023-01-17 17:12 ` [PR PATCH] [Updated] " ardadem
@ 2023-01-17 17:46 ` ardadem
  2023-01-17 17:47 ` ardadem
                   ` (29 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-17 17:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8814 bytes --]

From 536dc5eb600c849d39e6febfe7478826a0289607 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..b9e9292a66d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From db993a59df7bc3c20734ba198ee506617fdb0e72 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.3.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 ------------
 srcpkgs/mesa/template                      | 53 +++++++++++-----------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 28 insertions(+), 58 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..844aa57cb834 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,15 +1,15 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.3
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -39,6 +35,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -Ddraw-use-llvm=false" ;;
 esac
 
+# LTO fails on i686 only
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" -Db_lto=false" ;;
+	*) ;;
+esac
+
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libgbm-devel libOSMesa"
 
@@ -95,7 +97,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +146,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +193,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +292,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +311,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +339,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +380,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +425,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8febb5f0c1f4..58ff023b38e1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230109
+version=0.1.20230111
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -312,6 +312,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (27 preceding siblings ...)
  2023-01-17 17:46 ` ardadem
@ 2023-01-17 17:47 ` ardadem
  2023-01-17 23:12 ` motorto
                   ` (28 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-17 17:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1385754175

Comment:
> From my testing the lto is only broken currently on x86_64 so probably we could disable lto only for x86_64 and enable for all the others archs. (Yeah I was working on updating this package, wihtout looking for active PR's) ~also bump it to x86_64~
> 
> ```
> # lto fails on x86 only, no need to disable on all archs
> case "$XBPS_TARGET_MACHINE" in
> 	x86_64*) configure_args+=" -Db_lto=false" ;;
> 	*) configure_args+=" -Db_lto=true" ;;
> esac
> ```

it is disabled only on ~~x86_64~~ i686 now

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (28 preceding siblings ...)
  2023-01-17 17:47 ` ardadem
@ 2023-01-17 23:12 ` motorto
  2023-01-17 23:19 ` ardadem
                   ` (27 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: motorto @ 2023-01-17 23:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1386209485

Comment:
@ardadem was there an issue with x86_64 ? 

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (29 preceding siblings ...)
  2023-01-17 23:12 ` motorto
@ 2023-01-17 23:19 ` ardadem
  2023-01-17 23:25 ` motorto
                   ` (26 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-17 23:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1386215892

Comment:
@motorto Not really, LTO works well with x86_64 but it fails on i686. I think you got confused on that.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (30 preceding siblings ...)
  2023-01-17 23:19 ` ardadem
@ 2023-01-17 23:25 ` motorto
  2023-01-18  0:40 ` JamiKettunen
                   ` (25 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: motorto @ 2023-01-17 23:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1386226642

Comment:
> @motorto Not really, LTO works well with x86_64 but it fails on i686. I think you got confused on that.

Hum weird, unless x86 on alpine only refers to i686 ... 

https://git.alpinelinux.org/aports/tree/main/mesa/APKBUILD#n107

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (31 preceding siblings ...)
  2023-01-17 23:25 ` motorto
@ 2023-01-18  0:40 ` JamiKettunen
  2023-01-21 12:24 ` lemmi
                   ` (24 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: JamiKettunen @ 2023-01-18  0:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1386293437

Comment:
> Hum weird, unless x86 on alpine only refers to i686 ...

@motorto It does, see https://wiki.alpinelinux.org/wiki/Architecture & https://dl-cdn.alpinelinux.org/alpine/edge/main/



^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (32 preceding siblings ...)
  2023-01-18  0:40 ` JamiKettunen
@ 2023-01-21 12:24 ` lemmi
  2023-01-24 23:36 ` motorto
                   ` (23 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: lemmi @ 2023-01-21 12:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1399241821

Comment:
Have been running it for about 2 days. Too bad upstream didn't merge `radeonsi` support for `rusticl` yet https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19232

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (33 preceding siblings ...)
  2023-01-21 12:24 ` lemmi
@ 2023-01-24 23:36 ` motorto
  2023-01-27 12:10 ` bubba-champion
                   ` (22 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: motorto @ 2023-01-24 23:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1402830905

Comment:
Using it the last week and it works fine on my side ! 

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (34 preceding siblings ...)
  2023-01-24 23:36 ` motorto
@ 2023-01-27 12:10 ` bubba-champion
  2023-01-27 16:53 ` [PR PATCH] [Updated] " ardadem
                   ` (21 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: bubba-champion @ 2023-01-27 12:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by bubba-champion on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1406412473

Comment:
https://gitlab.freedesktop.org/mesa/mesa/-/tags/mesa-22.3.4

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.3.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (35 preceding siblings ...)
  2023-01-27 12:10 ` bubba-champion
@ 2023-01-27 16:53 ` ardadem
  2023-01-28  4:55 ` mesa: update to 22.3.4 HadetTheUndying
                   ` (20 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-27 16:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8814 bytes --]

From e136d1a1bbca3280eecb85d36e30857e379ab33b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index f632ce9c76da..6d6b76382626 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 3b45c813ae9e842a533a67c20d5d1b4d9db4b409 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.4.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 ------------
 srcpkgs/mesa/template                      | 53 +++++++++++-----------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 28 insertions(+), 58 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..6744f6cc6228 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,15 +1,15 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.4
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -39,6 +35,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -Ddraw-use-llvm=false" ;;
 esac
 
+# LTO fails on i686 only
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" -Db_lto=false" ;;
+	*) ;;
+esac
+
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libgbm-devel libOSMesa"
 
@@ -95,7 +97,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +146,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +193,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +292,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +311,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +339,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +380,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +425,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0429a5fb4796..db3d60cd2259 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230120
+version=0.1.20230127
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -316,6 +316,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (36 preceding siblings ...)
  2023-01-27 16:53 ` [PR PATCH] [Updated] " ardadem
@ 2023-01-28  4:55 ` HadetTheUndying
  2023-01-28  8:41 ` ardadem
                   ` (19 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: HadetTheUndying @ 2023-01-28  4:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1407292880

Comment:
This update caused `gnome` to break in a number of ways. I'm going to take some disk snapshots tomorrow and then I'll post screenshots. I verified it was this update by rolling back mesa. If someone else that has more time than i do would like to test I would appreciate it. 


^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (37 preceding siblings ...)
  2023-01-28  4:55 ` mesa: update to 22.3.4 HadetTheUndying
@ 2023-01-28  8:41 ` ardadem
  2023-01-28  9:11 ` [PR PATCH] [Updated] " ardadem
                   ` (18 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-28  8:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1407341900

Comment:
@HadetTheUndying by "this update" you mean 22.3.4? Can you also try build with `-Db_lto=false`.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (38 preceding siblings ...)
  2023-01-28  8:41 ` ardadem
@ 2023-01-28  9:11 ` ardadem
  2023-01-28  9:14 ` ardadem
                   ` (17 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-28  9:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8464 bytes --]

From 73a02ff0483485e908843887835a9365d74df13b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index f632ce9c76da..6d6b76382626 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 3978da49b4cc6712d72a673b0da718d1175da751 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.4.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 45 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..7dc95800b751 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.4
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +333,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +374,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +419,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0429a5fb4796..db3d60cd2259 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230120
+version=0.1.20230127
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -316,6 +316,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (39 preceding siblings ...)
  2023-01-28  9:11 ` [PR PATCH] [Updated] " ardadem
@ 2023-01-28  9:14 ` ardadem
  2023-01-28 10:13 ` bubba-champion
                   ` (16 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-01-28  9:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1407341900

Comment:
@HadetTheUndying by "this update" you mean 22.3.4? ~~Can you also try build with `-Db_lto=false`.<~~ Can you try now?

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (40 preceding siblings ...)
  2023-01-28  9:14 ` ardadem
@ 2023-01-28 10:13 ` bubba-champion
  2023-01-28 12:20 ` motorto
                   ` (15 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: bubba-champion @ 2023-01-28 10:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

New comment by bubba-champion on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1407366139

Comment:
I can confirm with `-Db_lto=false` all works fine, but without it gnome interface completely broken.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (41 preceding siblings ...)
  2023-01-28 10:13 ` bubba-champion
@ 2023-01-28 12:20 ` motorto
  2023-01-28 18:41 ` HadetTheUndying
                   ` (14 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: motorto @ 2023-01-28 12:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1407387695

Comment:
Don't use gnome myself, but that's weird, going to spin a vm to check why, meanwhile it looks okay to disable lto 

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (42 preceding siblings ...)
  2023-01-28 12:20 ` motorto
@ 2023-01-28 18:41 ` HadetTheUndying
  2023-01-31 22:14 ` Piraty
                   ` (13 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: HadetTheUndying @ 2023-01-28 18:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1407461008

Comment:
> @HadetTheUndying by "this update" you mean 22.3.4? ~Can you also try build with `-Db_lto=false`.<~ Can you try now?

I won't have a chance to test until Monday. I hadn't done any system maintenance in awhile so unfortunately i didn't do a very good test case when I rolled back since i also reinstalled gnome, xorg and all that jazz. I'll take a snapshot of my disk Sunday night and then do the upgrade again. 

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (43 preceding siblings ...)
  2023-01-28 18:41 ` HadetTheUndying
@ 2023-01-31 22:14 ` Piraty
  2023-01-31 22:15 ` Piraty
                   ` (12 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: Piraty @ 2023-01-31 22:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1411140777

Comment:
@JamiKettunen @jcgruenhage might be interested to know that there is a bug in 22.3.4 affecting the pinephone (bug first appeared in mesa-22.3.3 with 2adab724e59c662a046cb1da8bfb3177330e01da )

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (44 preceding siblings ...)
  2023-01-31 22:14 ` Piraty
@ 2023-01-31 22:15 ` Piraty
  2023-02-01  0:36 ` HadetTheUndying
                   ` (11 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: Piraty @ 2023-01-31 22:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1411140777

Comment:
@JamiKettunen @jcgruenhage might be interested to know that mesa-22.3.3 and mesa-22.3.4 have a [bug affecting the pinephone](https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198)

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (45 preceding siblings ...)
  2023-01-31 22:15 ` Piraty
@ 2023-02-01  0:36 ` HadetTheUndying
  2023-02-02 16:03 ` bubba-champion
                   ` (10 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: HadetTheUndying @ 2023-02-01  0:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1411269380

Comment:




> I can confirm with `-Db_lto=false` all works fine, but without it gnome interface completely broken.

Just for reference you experienced the font rendering problems and just general black display blocks? I haven't had time to do any testing since my initial report.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (46 preceding siblings ...)
  2023-02-01  0:36 ` HadetTheUndying
@ 2023-02-02 16:03 ` bubba-champion
  2023-02-08 20:48 ` HadetTheUndying
                   ` (9 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: bubba-champion @ 2023-02-02 16:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

New comment by bubba-champion on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1413981226

Comment:
> > I can confirm with `-Db_lto=false` all works fine, but without it gnome interface completely broken.
> 
> Just for reference you experienced the font rendering problems and just general black display blocks? I haven't had time to do any testing since my initial report.

I experienced problems with font rendering, and also artifacts in the steam overlay while playing.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (47 preceding siblings ...)
  2023-02-02 16:03 ` bubba-champion
@ 2023-02-08 20:48 ` HadetTheUndying
  2023-02-10 12:44 ` bubba-champion
                   ` (8 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: HadetTheUndying @ 2023-02-08 20:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 698 bytes --]

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1423220494

Comment:
> > > I can confirm with `-Db_lto=false` all works fine, but without it gnome interface completely broken.
> > 
> > 
> > Just for reference you experienced the font rendering problems and just general black display blocks? I haven't had time to do any testing since my initial report.
> 
> I experienced problems with font rendering, and also artifacts in the steam overlay while playing.

Just to clarify, disabling LTO fixed that? I'll have some time to test over the weekend. Mesa 23 is likely just around the corner at this point though.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (48 preceding siblings ...)
  2023-02-08 20:48 ` HadetTheUndying
@ 2023-02-10 12:44 ` bubba-champion
  2023-02-14  9:21 ` [PR PATCH] [Updated] " ardadem
                   ` (7 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: bubba-champion @ 2023-02-10 12:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 793 bytes --]

New comment by bubba-champion on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1425760752

Comment:
> > > > I can confirm with `-Db_lto=false` all works fine, but without it gnome interface completely broken.
> > > 
> > > 
> > > Just for reference you experienced the font rendering problems and just general black display blocks? I haven't had time to do any testing since my initial report.
> > 
> > 
> > I experienced problems with font rendering, and also artifacts in the steam overlay while playing.
> 
> Just to clarify, disabling LTO fixed that? I'll have some time to test over the weekend. Mesa 23 is likely just around the corner at this point though.

Yes, as I wrote earlier, `-Db_lto=false` fixes all the above problems.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.4.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (49 preceding siblings ...)
  2023-02-10 12:44 ` bubba-champion
@ 2023-02-14  9:21 ` ardadem
  2023-02-14 12:02 ` mesa: update to 22.3.5 motorto
                   ` (6 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-02-14  9:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 8464 bytes --]

From 023d2055abf6ba1122567dd60b0301d132f1074a Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index d441c901f619..5949d74179a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -991,6 +991,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From ad261faa5a51fb900f6661e0defbeec1e3296c42 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.5.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                          |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch | 29 --------------
 srcpkgs/mesa/template                      | 45 +++++++++-------------
 srcpkgs/removed-packages/template          |  3 +-
 4 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..d9ff0b2ff23d 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.5
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +333,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +374,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +419,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c1bbab871e8..f29e6489c826 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230213
+version=0.1.20230214
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -319,6 +319,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.5.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (50 preceding siblings ...)
  2023-02-14  9:21 ` [PR PATCH] [Updated] " ardadem
@ 2023-02-14 12:02 ` motorto
  2023-02-14 20:56 ` ardadem
                   ` (5 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: motorto @ 2023-02-14 12:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1429632603

Comment:
Fedora has this patch: https://src.fedoraproject.org/rpms/mesa/blob/rawhide/f/gnome-shell-glthread-disable.patch 

Can you enable lto again with this patch ?

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.5.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (51 preceding siblings ...)
  2023-02-14 12:02 ` mesa: update to 22.3.5 motorto
@ 2023-02-14 20:56 ` ardadem
  2023-02-14 21:09 ` ardadem
                   ` (4 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-02-14 20:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1430366279

Comment:
> Fedora has this patch: https://src.fedoraproject.org/rpms/mesa/blob/rawhide/f/gnome-shell-glthread-disable.patch
> 
> Can you enable lto again with this patch ?

It is not gnome related, i've also experienced it on WM.

Also Fedora keeps LTO disabled. See https://src.fedoraproject.org/rpms/mesa/blob/rawhide/f/mesa.spec#_341.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.5.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (52 preceding siblings ...)
  2023-02-14 20:56 ` ardadem
@ 2023-02-14 21:09 ` ardadem
  2023-02-14 21:10 ` ardadem
                   ` (3 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-02-14 21:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1430381994

Comment:
https://gitlab.freedesktop.org/mesa/mesa/-/issues/7743

It is actually broken but sometimes it is not.

> Given that the commits which (un)break things with LTO tend to be not directly related to any code actually used on the affected setup, there seem to be other bigger factors than the specific commit. I'd say any commit which exists today has to be assumed to be potentially affected.

Anyways, we should keep disabled.

> Mesa is known to hit various issues with LTO, I'd recommend disabling it for now.



^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.5.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (53 preceding siblings ...)
  2023-02-14 21:09 ` ardadem
@ 2023-02-14 21:10 ` ardadem
  2023-02-19 17:33 ` [PR PATCH] [Updated] " ardadem
                   ` (2 subsequent siblings)
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-02-14 21:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 666 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1430381994

Comment:
https://gitlab.freedesktop.org/mesa/mesa/-/issues/7743

It is actually broken but sometimes it is not.

> Given that the commits which (un)break things with LTO tend to be not directly related to any code actually used on the affected setup, there seem to be other bigger factors than the specific commit. I'd say any commit which exists today has to be assumed to be potentially affected.

Anyways, we should keep it disabled.

> Mesa is known to hit various issues with LTO, I'd recommend disabling it for now.



^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Updated] mesa: update to 22.3.5.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (54 preceding siblings ...)
  2023-02-14 21:10 ` ardadem
@ 2023-02-19 17:33 ` ardadem
  2023-02-19 17:36 ` ardadem
  2023-02-21  8:43 ` [PR PATCH] [Closed]: " Piraty
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-02-19 17:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-mesa-22.3
https://github.com/void-linux/void-packages/pull/41084

mesa: update to 22.3.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-mesa-22.3-41084.patch --]
[-- Type: text/x-diff, Size: 11547 bytes --]

From 502613d63324f6a5021db5e6b7c2cb894c27b7f9 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Dec 2022 11:25:47 +0300
Subject: [PATCH 1/2] common/shlibs: add libLLVMSPIRVLib.so.12

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 0c1d545fbe27..2028226606bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -990,6 +990,7 @@ libclang.so.12 libclang-12.0.0_1
 libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
+libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1

From 9ab677091d6684beee62da70fc2a0ee0004038e0 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 9 Dec 2022 13:09:05 +0300
Subject: [PATCH 2/2] mesa: update to 22.3.5.

* remove obsolete add-elf-use-tls patch
* remove xvmc
* build intel_hasvk vulkan driver for older intel GPUs
* build rusticl opencl implementation
---
 srcpkgs/mesa-XvMC                             |  1 -
 srcpkgs/mesa/patches/add-elf-use-tls.patch    | 29 -------
 ...e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch | 77 +++++++++++++++++++
 srcpkgs/mesa/template                         | 45 +++++------
 srcpkgs/removed-packages/template             |  3 +-
 5 files changed, 98 insertions(+), 57 deletions(-)
 delete mode 120000 srcpkgs/mesa-XvMC
 delete mode 100644 srcpkgs/mesa/patches/add-elf-use-tls.patch
 create mode 100644 srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
deleted file mode 120000
index 1ad1bbec7ab3..000000000000
--- a/srcpkgs/mesa-XvMC
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/add-elf-use-tls.patch b/srcpkgs/mesa/patches/add-elf-use-tls.patch
deleted file mode 100644
index c9a154e4ccea..000000000000
--- a/srcpkgs/mesa/patches/add-elf-use-tls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson.build	2022-10-04 16:17:45.905483957 -0400
-@@ -504,6 +504,11 @@
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = get_option('use-elf-tls')
-+if use_elf_tls
-+  pre_args += '-DUSE_ELF_TLS'
-+endif
-+
- if with_platform_android and get_option('platform-sdk-version') >= 29
-   # By default the NDK compiler, at least, emits emutls references instead of
-   # ELF TLS, even when building targeting newer API levels.  Make it actually do
---- a/meson_options.txt	2022-09-20 17:01:37.000000000 -0400
-+++ b/meson_options.txt	2022-10-04 16:21:30.469304615 -0400
-@@ -472,6 +472,12 @@
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
- option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model'
-+)
-+option(
-   'zstd',
-   type : 'combo',
-   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
diff --git a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch b/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
new file mode 100644
index 000000000000..f56327367526
--- /dev/null
+++ b/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
@@ -0,0 +1,77 @@
+From c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47 Mon Sep 17 00:00:00 2001
+From: Erico Nunes <nunes.erico@gmail.com>
+Date: Sun, 12 Feb 2023 22:33:30 +0100
+Subject: [PATCH] lima: don't use resource_from_handle while creating scanout
+
+resource_from_handle implementations create an additional reference to
+the scanout resource, which caused lima to leak those resources after
+commit ad4d7ca8332488be8a75aff001f00306a9f6402e.
+
+Do as the other drivers do and import the bo directly while creating
+the scanount resource.
+
+Cc: 22.3 mesa-stable
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198
+Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
+Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21330>
+---
+ src/gallium/drivers/lima/lima_resource.c | 26 ++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
+index 54869ec03d24..0b7691f2b46f 100644
+--- a/src/gallium/drivers/lima/lima_resource.c
++++ b/src/gallium/drivers/lima/lima_resource.c
+@@ -59,7 +59,10 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
+    struct lima_screen *screen = lima_screen(pscreen);
+    struct renderonly_scanout *scanout;
+    struct winsys_handle handle;
+-   struct pipe_resource *pres;
++
++   struct lima_resource *res = CALLOC_STRUCT(lima_resource);
++   if (!res)
++      return NULL;
+ 
+    struct pipe_resource scanout_templat = *templat;
+    scanout_templat.width0 = width;
+@@ -71,20 +74,31 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
+    if (!scanout)
+       return NULL;
+ 
++   res->base = *templat;
++   res->base.screen = pscreen;
++   pipe_reference_init(&res->base.reference, 1);
++   res->levels[0].offset = handle.offset;
++   res->levels[0].stride = handle.stride;
++
+    assert(handle.type == WINSYS_HANDLE_TYPE_FD);
+-   pres = pscreen->resource_from_handle(pscreen, templat, &handle,
+-                                        PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
++   res->bo = lima_bo_import(screen, &handle);
++   if (!res->bo) {
++      FREE(res);
++      return NULL;
++   }
++
++   res->modifier_constant = true;
+ 
+    close(handle.handle);
+-   if (!pres) {
++   if (!res->bo) {
+       renderonly_scanout_destroy(scanout, screen->ro);
++      FREE(res);
+       return NULL;
+    }
+ 
+-   struct lima_resource *res = lima_resource(pres);
+    res->scanout = scanout;
+ 
+-   return pres;
++   return &res->base;
+ }
+ 
+ static uint32_t
+-- 
+GitLab
+
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 4c3c9ec6039e..d9ff0b2ff23d 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.2.4
-revision=2
+version=22.3.5
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
-makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
+makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
  $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
@@ -22,15 +22,11 @@ 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=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
+checksum=3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
 
 build_options="wayland"
 build_options_default="wayland"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -Duse-elf-tls=false"
-fi
-
 # only use llvmpipe on targets where it's supported and reliable
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
@@ -95,7 +91,7 @@ fi
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",crocus,iris,i915"
-	_vulkan_drivers+=",intel"
+	_vulkan_drivers+=",intel,intel_hasvk"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -144,17 +140,17 @@ fi
 
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
-	hostmakedepends+=" clang"
-	makedepends+=" clang libclc"
+	hostmakedepends+=" clang rust rust-bindgen"
+	makedepends+=" clang libclc rust SPIRV-LLVM-Translator-devel SPIRV-Tools-devel"
 	subpackages+=" mesa-opencl"
-	configure_args+=" -Dgallium-opencl=icd"
+	configure_args+=" -Dgallium-opencl=icd -Dgallium-rusticl=true -Drust_std=2021"
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
-	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled"
+	subpackages+=" mesa-vaapi mesa-vdpau"
 else
-	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -191,6 +187,7 @@ esac
 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" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
@@ -289,6 +286,7 @@ MesaLib-devel_package() {
 		fi
 		if [ "$_have_opencl" ]; then
 			vmove usr/lib/libMesaOpenCL.so
+			vmove usr/lib/libRusticlOpenCL.so
 		fi
 	}
 }
@@ -307,6 +305,7 @@ mesa-opencl_package() {
 		vmove etc/OpenCL
 		vmove usr/lib/gallium-pipe
 		vmove "usr/lib/libMesaOpenCL.so.*"
+		vmove "usr/lib/libRusticlOpenCL.so.*"
 	}
 }
 
@@ -334,24 +333,18 @@ mesa-vdpau_package() {
 	}
 }
 
-mesa-XvMC_package() {
-	short_desc="Mesa XvMC drivers"
-	pkg_install() {
-		vmove "usr/lib/libXvMC*"
-	}
-}
-
 mesa-vulkan-intel_package() {
 	short_desc="Mesa Intel Vulkan driver"
 	pkg_install() {
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/share/vulkan/icd.d/intel*.json"
+		vmove "usr/lib/libvulkan_intel*.so"
 	}
 }
 
 mesa-vulkan-radeon_package() {
 	short_desc="Mesa Radeon Vulkan driver"
 	pkg_install() {
+		vmove "usr/share/drirc.d/00-radv-defaults.conf"
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
 	}
@@ -381,7 +374,7 @@ mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
@@ -426,7 +419,7 @@ mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
-		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
+		depends+=" mesa-vaapi mesa-vdpau"
 	fi
 }
 
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7a01cf67e4fc..f3248a852a28 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230213
+version=0.1.20230214
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -319,6 +319,7 @@ replaces="
  masterpassword-cli<=2.6_5
  mattermost-desktop<=4.6.0_1
  mdds0<=0.12.1_3
+ mesa-XvMC<=22.2.4_2
  mimms<=3.2.1_4
  miro-video-converter<=3.0.2_3
  mirrorbits<=0.5.1_1

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: mesa: update to 22.3.5.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (55 preceding siblings ...)
  2023-02-19 17:33 ` [PR PATCH] [Updated] " ardadem
@ 2023-02-19 17:36 ` ardadem
  2023-02-21  8:43 ` [PR PATCH] [Closed]: " Piraty
  57 siblings, 0 replies; 59+ messages in thread
From: ardadem @ 2023-02-19 17:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/41084#issuecomment-1436048004

Comment:
> @JamiKettunen @jcgruenhage might be interested to know that mesa-22.3.3 and mesa-22.3.4 have a [bug affecting the pinephone](https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198)

Should be fixed now.

^ permalink raw reply	[flat|nested] 59+ messages in thread

* Re: [PR PATCH] [Closed]: mesa: update to 22.3.5.
  2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
                   ` (56 preceding siblings ...)
  2023-02-19 17:36 ` ardadem
@ 2023-02-21  8:43 ` Piraty
  57 siblings, 0 replies; 59+ messages in thread
From: Piraty @ 2023-02-21  8:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1158 bytes --]

There's a closed pull request on the void-packages repository

mesa: update to 22.3.5.
https://github.com/void-linux/void-packages/pull/41084

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~**Draft until 22.3.1.**
Feel free to review and test it meantime.~~

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 59+ messages in thread

end of thread, other threads:[~2023-02-21  8:43 UTC | newest]

Thread overview: 59+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-14 13:28 [PR PATCH] mesa: update to 22.3.0 ardadem
2022-12-15  4:49 ` zlice
2022-12-15  5:11 ` [PR PATCH] [Updated] " ardadem
2022-12-15  9:43 ` [PR PATCH] [Updated] mesa: update to 22.3.1 ardadem
2022-12-17 13:42 ` biopsin
2022-12-19 20:32 ` [PR PATCH] [Updated] " ardadem
2022-12-19 20:50 ` ardadem
2022-12-23 19:53 ` bubba-champion
2022-12-23 20:15 ` vincele
2022-12-23 21:54 ` [PR PATCH] [Updated] " ardadem
2022-12-23 21:58 ` ardadem
2022-12-24 17:56 ` bubba-champion
2022-12-24 19:29 ` bubba-champion
2022-12-29 23:07 ` bubba-champion
2022-12-30  9:15 ` [PR PATCH] [Updated] " ardadem
2023-01-03 22:18 ` [PR PATCH] [Updated] mesa: update to 22.3.2 ardadem
2023-01-03 22:19 ` ardadem
2023-01-11 20:13 ` Seltyk
2023-01-11 21:38 ` [PR PATCH] [Updated] " ardadem
2023-01-17 12:02 ` mesa: update to 22.3.3 motorto
2023-01-17 12:03 ` motorto
2023-01-17 12:33 ` JamiKettunen
2023-01-17 12:34 ` JamiKettunen
2023-01-17 13:14 ` JamiKettunen
2023-01-17 13:14 ` JamiKettunen
2023-01-17 17:07 ` [PR PATCH] [Updated] " ardadem
2023-01-17 17:11 ` ardadem
2023-01-17 17:12 ` [PR PATCH] [Updated] " ardadem
2023-01-17 17:46 ` ardadem
2023-01-17 17:47 ` ardadem
2023-01-17 23:12 ` motorto
2023-01-17 23:19 ` ardadem
2023-01-17 23:25 ` motorto
2023-01-18  0:40 ` JamiKettunen
2023-01-21 12:24 ` lemmi
2023-01-24 23:36 ` motorto
2023-01-27 12:10 ` bubba-champion
2023-01-27 16:53 ` [PR PATCH] [Updated] " ardadem
2023-01-28  4:55 ` mesa: update to 22.3.4 HadetTheUndying
2023-01-28  8:41 ` ardadem
2023-01-28  9:11 ` [PR PATCH] [Updated] " ardadem
2023-01-28  9:14 ` ardadem
2023-01-28 10:13 ` bubba-champion
2023-01-28 12:20 ` motorto
2023-01-28 18:41 ` HadetTheUndying
2023-01-31 22:14 ` Piraty
2023-01-31 22:15 ` Piraty
2023-02-01  0:36 ` HadetTheUndying
2023-02-02 16:03 ` bubba-champion
2023-02-08 20:48 ` HadetTheUndying
2023-02-10 12:44 ` bubba-champion
2023-02-14  9:21 ` [PR PATCH] [Updated] " ardadem
2023-02-14 12:02 ` mesa: update to 22.3.5 motorto
2023-02-14 20:56 ` ardadem
2023-02-14 21:09 ` ardadem
2023-02-14 21:10 ` ardadem
2023-02-19 17:33 ` [PR PATCH] [Updated] " ardadem
2023-02-19 17:36 ` ardadem
2023-02-21  8:43 ` [PR PATCH] [Closed]: " Piraty

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).