[PR PATCH] mesa: generate nostrip_files dynamically

[PR PATCH] mesa: generate nostrip_files dynamically

[voidlinux-github]

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

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

https://github.com/st3r4g/void-packages mesa-nostrip-dynamic
https://github.com/void-linux/void-packages/pull/18523

mesa: generate nostrip_files dynamically
This is functionally equivalent as before, but now the `nostrip_files` list is generated dynamically rather than hard-coded into the template. It has the benefit that one doesn't have to worry about forgetting to add new drivers to the list (which would break the debug stripping once again).

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

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

From 6993e572e84810e76088b5bda55c5dd1a46368a8 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Fri, 24 Jan 2020 00:44:45 +0100
Subject: [PATCH] mesa: generate nostrip_files dynamically

---
 srcpkgs/mesa/template | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index c4a3fba8131..b14d43fcf2d 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -200,16 +200,11 @@ mesa-dri_package() {
 	short_desc="Mesa DRI drivers"
 	depends="mesa-${version}_${revision}"
 	shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
-	nostrip_files="armada-drm_dri.so etnaviv_dri.so exynos_dri.so
-	 hx8357d_dri.so i915_dri.so i965_dri.so ili9225_dri.so ili9341_dri.so
-	 imx-drm_dri.so kgsl_dri.so kms_swrast_dri.so lima_dri.so meson_dri.so
-	 mi0283qt_dri.so msm_dri.so mxsfb-drm_dri.so nouveau_dri.so
-	 nouveau_vieux_dri.so panfrost_dri.so pl111_dri.so r200_dri.so
-	 r300_dri.so r600_dri.so radeon_dri.so radeonsi_dri.so repaper_dri.so
-	 rockchip_dri.so st7586_dri.so st7735r_dri.so stm_dri.so
-	 sun4i-drm_dri.so swrast_dri.so tegra_dri.so v3d_dri.so vc4_dri.so
-	 virtio_gpu_dri.so vmwgfx_dri.so"
 	pkg_install() {
+		# Only strip each megadriver once, via its master filename
+		nostrip_files=$(find "${DESTDIR}/usr/lib/xorg/modules/drivers" \
+		 ! -name 'libmesa_dri_drivers.so' ! -name 'libgallium_dri.so'  \
+		  -type f -printf '%f ')
 		vmove "usr/lib/xorg/modules/drivers";
 		if [ -d "$DESTDIR/usr/lib/gallium-pipe" ]; then
 			vmove "usr/lib/gallium-pipe/pipe_*.so"
@@ -220,25 +215,27 @@ mesa-dri_package() {
 mesa-vaapi_package() {
 	short_desc="Mesa VA-API drivers"
 	shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
-	nostrip_files="nouveau_drv_video.so r600_drv_video.so radeonsi_drv_video.so"
 	pkg_install() {
+		nostrip_files=$(find "${DESTDIR}/usr/lib/dri" \
+		 ! -name 'libgallium_drv_video.so' -type f -printf '%f ')
 		vmove "usr/lib/dri/*_drv_video.so"
 	}
 }
 
 mesa-vdpau_package() {
 	short_desc="Mesa VDPAU drivers"
-	nostrip_files="libvdpau_r300.so.1.0.0 libvdpau_r600.so.1.0.0
-	 libvdpau_radeonsi.so.1.0.0 libvdpau_nouveau.so.1.0.0"
 	pkg_install() {
+		nostrip_files=$(find "${DESTDIR}/usr/lib/vdpau" \
+		 ! -name 'libvdpau_gallium.so*' -type f -printf '%f ')
 		vmove "usr/lib/vdpau/libvdpau_*"
 	}
 }
 
 mesa-XvMC_package() {
 	short_desc="Mesa XvMC drivers"
-	nostrip_files="libXvMCnouveau.so.1.0.0 libXvMCr600.so.1.0.0"
 	pkg_install() {
+		nostrip_files=$(find "${DESTDIR}/usr/lib/libXvMC"* \
+		 ! -name 'libXvMCgallium.so' -type f -printf '%f ')
 		vmove "usr/lib/libXvMC*"
 	}
 }

Re: [PR PATCH] [Merged]: mesa: generate nostrip_files dynamically

[voidlinux-github]

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

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

mesa: generate nostrip_files dynamically
https://github.com/void-linux/void-packages/pull/18523

Description:
This is functionally equivalent as before, but now the `nostrip_files` list is generated dynamically rather than hard-coded into the template. It has the benefit that one doesn't have to worry about forgetting to add new drivers to the list (which would break the debug stripping once again).