[PR PATCH] mesa: fix mesa-*-dri 32bit pkg generation

[PR PATCH] mesa: fix mesa-*-dri 32bit pkg generation

[voidlinux-github]

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

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

https://github.com/st3r4g/void-packages fix-mesa-dri-32bit
https://github.com/void-linux/void-packages/pull/17825

mesa: fix mesa-*-dri 32bit pkg generation
User reported:
```
sudo xbps-install -Syu                                              
[*] Updating `https://alpha.de.repo.voidlinux.org/current/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/nonfree/x86_64-repodata' ...
libglapi-32bit-19.3.1_2 (update) breaks installed pkg `mesa-intel-dri-32bit-19.3.1_1'
mesa-32bit-19.3.1_2 (update) breaks installed pkg `mesa-intel-dri-32bit-19.3.1_1'
Transaction aborted due to unresolved dependencies.
exit 19
```
This is because mesa-intel-dri-32bit-19.3.1_**2** was not generated. This should fix it.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-mesa-dri-32bit-17825.patch --]
[-- Type: text/x-diff, Size: 3275 bytes --]

From a465e336f7d978a0e1a5a7c4bd7bcaa057f290b8 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Fri, 27 Dec 2019 23:26:58 +0100
Subject: [PATCH] mesa: fix mesa-*-dri 32bit pkg generation

---
 srcpkgs/mesa/template | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 884aa3eac21..c302e7c32c6 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=19.3.1
-revision=2
+revision=3
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -199,6 +199,7 @@ mesa-opencl_package() {
 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
@@ -271,72 +272,84 @@ mesa-vulkan-overlay-layer_package() {
 
 mesa-ati-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon"
 }
 
 mesa-etnaviv-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-freedreno-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-intel-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-intel"
 }
 
 mesa-kmsro-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-lima-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-nouveau-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC"
 }
 
 mesa-panfrost-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-tegra-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-v3d-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-vmwgfx-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for VMware (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-vc4-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)"
 	depends="mesa-dri"
 }

Re: mesa: fix mesa-*-dri 32bit pkg generation

[voidlinux-github]

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

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/17825#issuecomment-569357119

Comment:
@xtraeme 

Re: mesa: fix mesa-*-dri 32bit pkg generation

[voidlinux-github]

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

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/17825#issuecomment-569359578

Comment:
Hmm I think the `shlib_provides` trick must also be done for `mesa-vaapi mesa-vdpau mesa-XvMC` (``nouveau` and `ati` deps)

Re: mesa: fix mesa-*-dri 32bit pkg generation

[voidlinux-github]

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

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/17825#issuecomment-569359578

Comment:
Hmm I think the `shlib_provides` trick must also be done for `mesa-vaapi mesa-vdpau mesa-XvMC` (`nouveau` and `ati` deps)

Re: [PR PATCH] [Updated] mesa: fix mesa-*-dri 32bit pkg generation

[voidlinux-github]

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

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

https://github.com/st3r4g/void-packages fix-mesa-dri-32bit
https://github.com/void-linux/void-packages/pull/17825

mesa: fix mesa-*-dri 32bit pkg generation
User reported:
```
sudo xbps-install -Syu                                              
[*] Updating `https://alpha.de.repo.voidlinux.org/current/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/nonfree/x86_64-repodata' ...
libglapi-32bit-19.3.1_2 (update) breaks installed pkg `mesa-intel-dri-32bit-19.3.1_1'
mesa-32bit-19.3.1_2 (update) breaks installed pkg `mesa-intel-dri-32bit-19.3.1_1'
Transaction aborted due to unresolved dependencies.
exit 19
```
This is because mesa-intel-dri-32bit-19.3.1_**2** was not generated. This should fix it.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-mesa-dri-32bit-17825.patch --]
[-- Type: text/x-diff, Size: 4192 bytes --]

From b5a62ca61f81183e900db7ff98dfa11ccdf7abe3 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Fri, 27 Dec 2019 23:26:58 +0100
Subject: [PATCH] mesa: fix mesa-*-dri 32bit pkg generation

---
 srcpkgs/mesa/template | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 884aa3eac21..7319eecb504 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=19.3.1
-revision=2
+revision=3
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -199,6 +199,7 @@ mesa-opencl_package() {
 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
@@ -218,6 +219,7 @@ 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() {
 		vmove "usr/lib/dri/*_drv_video.so"
@@ -228,7 +230,6 @@ 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"
-	noshlibprovides=yes # manually set them in case they are needed
 	pkg_install() {
 		vmove "usr/lib/vdpau/libvdpau_*"
 	}
@@ -237,7 +238,6 @@ mesa-vdpau_package() {
 mesa-XvMC_package() {
 	short_desc="Mesa XvMC drivers"
 	nostrip_files="libXvMCnouveau.so.1.0.0 libXvMCr600.so.1.0.0"
-	noshlibprovides=yes # manually set them in case they are needed
 	pkg_install() {
 		vmove "usr/lib/libXvMC*"
 	}
@@ -271,72 +271,84 @@ mesa-vulkan-overlay-layer_package() {
 
 mesa-ati-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon"
 }
 
 mesa-etnaviv-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-freedreno-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-intel-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vulkan-intel"
 }
 
 mesa-kmsro-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-lima-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-nouveau-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
 	depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC"
 }
 
 mesa-panfrost-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-tegra-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-v3d-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-vmwgfx-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for VMware (transitional dummy package)"
 	depends="mesa-dri"
 }
 
 mesa-vc4-dri_package() {
 	build_style=meta
+	lib32mode=full
 	short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)"
 	depends="mesa-dri"
 }

Re: mesa: fix mesa-*-dri 32bit pkg generation

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/17825#issuecomment-569363371

Comment:
lgtm, anything else?

Re: mesa: fix mesa-*-dri 32bit pkg generation

[voidlinux-github]

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

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/17825#issuecomment-569363847

Comment:
should be good to go

Re: [PR PATCH] [Merged]: mesa: fix mesa-*-dri 32bit pkg generation

[voidlinux-github]

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

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

mesa: fix mesa-*-dri 32bit pkg generation
https://github.com/void-linux/void-packages/pull/17825

Description:
User reported:
```
sudo xbps-install -Syu                                              
[*] Updating `https://alpha.de.repo.voidlinux.org/current/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/nonfree/x86_64-repodata' ...
libglapi-32bit-19.3.1_2 (update) breaks installed pkg `mesa-intel-dri-32bit-19.3.1_1'
mesa-32bit-19.3.1_2 (update) breaks installed pkg `mesa-intel-dri-32bit-19.3.1_1'
Transaction aborted due to unresolved dependencies.
exit 19
```
This is because mesa-intel-dri-32bit-19.3.1_**2** was not generated. This should fix it.