Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] xbps-src, libGL: fix debug symbols generation for mesa libraries
@ 2019-10-21 23:34 voidlinux-github
  2019-10-22  9:20 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (71 more replies)
  0 siblings, 72 replies; 74+ messages in thread
From: voidlinux-github @ 2019-10-21 23:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/st3r4g/void-packages mesa-fix-dbg
https://github.com/void-linux/void-packages/pull/15683

[WIP] xbps-src, libGL: fix debug symbols generation for mesa libraries
Aims to fix #12760 and #15104
I believe that two things must be changed in order to fix the issue:

1. `xbps-src` must be aware of hard links when stripping debug symbols.
2. `libGL` must be reorganized by creating a subpackage for each "megadriver" that creates hard links (hard links to the same megadriver must be together in the same subpackage).

This is currently just a first step, I moved all the hard links to `libmesa_dri_drivers.so` to a new subpackage `mesa-dri` as a first example. The final result is going to be a pretty big change in the template structure, so let me know whether it's a good idea or not before I go on.


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

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

From fb9cc86cc393bd0d39dc55583d405e2b82abace3 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 22 Oct 2019 00:44:41 +0200
Subject: [PATCH 1/2] xbps-src: strip hard links once

---
 common/hooks/post-install/06-strip-and-debug-pkgs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index a15dd1a96c3..34ed3553aef 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -65,7 +65,7 @@ hook() {
 
 	STRIPCMD=/usr/bin/$STRIP
 
-	find ${PKGDESTDIR} -type f | while read f; do
+	find ${PKGDESTDIR} -type f -printf '%p %i\n' | awk '!seen[$2]++' | cut -d ' ' -f1 | while read f; do
 		if [[ $f =~ ^${PKGDESTDIR}/usr/lib/debug/ ]]; then
 			continue
 		fi

From d2b44c0dfe42a436c1c9117f204cf4cdac0c6f4a Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 22 Oct 2019 00:50:52 +0200
Subject: [PATCH 2/2] libGL: reorganize subpackages by megadrivers

[ci skip]
Many Mesa libraries are hard links to the same file, called a
`megadriver`, so they should be grouped in the same subpackage.
---
 srcpkgs/libGL/template | 18 ++++++++++++------
 srcpkgs/mesa-dri       |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/mesa-dri

diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index 3ce62fe073f..cee770fef0a 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -1,7 +1,7 @@
 # Template file for 'libGL'
 pkgname=libGL
 version=19.2.1
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true
@@ -90,7 +90,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # -devel must be the last one for proper order.
-subpackages+=" MesaLib-devel"
+subpackages+=" mesa-dri MesaLib-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/xorg/modules/drivers";;
@@ -175,6 +175,16 @@ libxatracker_package() {
 	}
 }
 
+mesa-dri_package() {
+	short_desc="Mesa DRI drivers"
+	pkg_install() {
+		vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.so"
+		vmove "usr/lib/xorg/modules/drivers/nouveau_vieux_dri.so"
+		vmove "usr/lib/xorg/modules/drivers/r200_dri.so"
+		vmove "usr/lib/xorg/modules/drivers/radeon_dri.so"
+	}
+}
+
 mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs"
 	lib32files="/usr/share/vulkan/icd.d/radeon_icd.i686.json"
@@ -182,8 +192,6 @@ mesa-ati-dri_package() {
 		vmove "usr/lib/libXvMCr[36]00.so.*"
 		vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
 		vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
-		vmove "usr/lib/xorg/modules/drivers/radeon*"
-		vmove "usr/lib/xorg/modules/drivers/r[236]00*"
 		vmove usr/lib/dri/r*
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
@@ -196,7 +204,6 @@ mesa-intel-dri_package() {
 	short_desc="Mesa DRI drivers for Intel GPUs"
 	lib32files="/usr/share/vulkan/icd.d/intel_icd.i686.json"
 	pkg_install() {
-		vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*"
 		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
 		vmove "usr/lib/libvulkan_intel.so"
 	}
@@ -207,7 +214,6 @@ mesa-nouveau-dri_package() {
 	pkg_install() {
 		vmove "usr/lib/libXvMCnouveau.so.*"
 		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
-		vmove "usr/lib/xorg/modules/drivers/nouveau*"
 		vmove "usr/lib/dri/nouveau*"
 		case "$XBPS_TARGET_MACHINE" in
 			aarch64*) ;;
diff --git a/srcpkgs/mesa-dri b/srcpkgs/mesa-dri
new file mode 120000
index 00000000000..5ef01dc565e
--- /dev/null
+++ b/srcpkgs/mesa-dri
@@ -0,0 +1 @@
+libGL
\ No newline at end of file

^ permalink raw reply	[flat|nested] 74+ messages in thread
* [PR PATCH] [RFC] mesa: reorganize dri drivers subpkgs (fixes debug info)
@ 2019-12-27 18:42 voidlinux-github
  2019-12-27 18:47 ` voidlinux-github
  0 siblings, 1 reply; 74+ messages in thread
From: voidlinux-github @ 2019-12-27 18:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/st3r4g/void-packages mesa-fix-dbg
https://github.com/void-linux/void-packages/pull/17820

[RFC] mesa: reorganize dri drivers subpkgs (fixes debug info)
Opening a new PR as https://github.com/void-linux/void-packages/pull/15683 was closed by mistake.

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

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

From 6e72edc63179ddf66525834d70a41117f1d7af49 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 11 Nov 2019 20:55:57 +0100
Subject: [PATCH 1/9] mesa: reorganize dri subpackages by megadrivers instead
 of vendors

Mesa dri drivers for different vendors are actually hard links to
the same file, called a `megadriver`, so they are better grouped
in the same subpackage. This solves issues when stripping debug info.
---
 srcpkgs/mesa-XvMC                             |   1 +
 srcpkgs/mesa-dri                              |   1 +
 srcpkgs/mesa-vaapi                            |   1 +
 srcpkgs/mesa-vdpau                            |   1 +
 srcpkgs/mesa-vulkan-intel                     |   1 +
 srcpkgs/mesa-vulkan-radeon                    |   1 +
 .../mesa/patches/no-unlink-megadrivers.patch  |  15 ++
 srcpkgs/mesa/template                         | 232 +++++++++---------
 8 files changed, 143 insertions(+), 110 deletions(-)
 create mode 120000 srcpkgs/mesa-XvMC
 create mode 120000 srcpkgs/mesa-dri
 create mode 120000 srcpkgs/mesa-vaapi
 create mode 120000 srcpkgs/mesa-vdpau
 create mode 120000 srcpkgs/mesa-vulkan-intel
 create mode 120000 srcpkgs/mesa-vulkan-radeon
 create mode 100644 srcpkgs/mesa/patches/no-unlink-megadrivers.patch

diff --git a/srcpkgs/mesa-XvMC b/srcpkgs/mesa-XvMC
new file mode 120000
index 00000000000..1ad1bbec7ab
--- /dev/null
+++ b/srcpkgs/mesa-XvMC
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-dri b/srcpkgs/mesa-dri
new file mode 120000
index 00000000000..1ad1bbec7ab
--- /dev/null
+++ b/srcpkgs/mesa-dri
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-vaapi b/srcpkgs/mesa-vaapi
new file mode 120000
index 00000000000..1ad1bbec7ab
--- /dev/null
+++ b/srcpkgs/mesa-vaapi
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-vdpau b/srcpkgs/mesa-vdpau
new file mode 120000
index 00000000000..1ad1bbec7ab
--- /dev/null
+++ b/srcpkgs/mesa-vdpau
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-vulkan-intel b/srcpkgs/mesa-vulkan-intel
new file mode 120000
index 00000000000..1ad1bbec7ab
--- /dev/null
+++ b/srcpkgs/mesa-vulkan-intel
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-vulkan-radeon b/srcpkgs/mesa-vulkan-radeon
new file mode 120000
index 00000000000..1ad1bbec7ab
--- /dev/null
+++ b/srcpkgs/mesa-vulkan-radeon
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/patches/no-unlink-megadrivers.patch b/srcpkgs/mesa/patches/no-unlink-megadrivers.patch
new file mode 100644
index 00000000000..3f904abe802
--- /dev/null
+++ b/srcpkgs/mesa/patches/no-unlink-megadrivers.patch
@@ -0,0 +1,15 @@
+This patch is needed to retain the master .so, so that only that filename is
+stripped while the related hard links are excluded.
+diff --git bin/install_megadrivers.py bin/install_megadrivers.py
+index 470137e..7d56def 100644
+--- bin/install_megadrivers.py
++++ bin/install_megadrivers.py
+@@ -71,7 +71,7 @@ def main():
+             os.chdir(ret)
+ 
+     # Remove meson-created master .so and symlinks
+-    os.unlink(master)
++    #os.unlink(master)
+     name, ext = os.path.splitext(master)
+     while ext != '.so':
+         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 92fb254e402..884aa3eac21 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=19.3.1
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -46,8 +46,10 @@ i686*|x86_64*)
 	configure_args+=" -Dvulkan-overlay-layer=true"
 	hostmakedepends+=" clang"
 	makedepends+=" libclc-git"
-	subpackages+=" libxatracker mesa-ati-dri mesa-intel-dri mesa-nouveau-dri"
-	subpackages+=" mesa-vmwgfx-dri mesa-opencl mesa-vulkan-overlay-layer"
+	subpackages+=" libxatracker mesa-opencl mesa-dri mesa-vaapi mesa-vdpau"
+	subpackages+=" mesa-XvMC mesa-vulkan-intel mesa-vulkan-radeon mesa-vulkan-overlay-layer"
+	# Transitional dummy packages
+	subpackages+=" mesa-ati-dri mesa-intel-dri mesa-nouveau-dri mesa-vmwgfx-dri"
 	;;
 ppc*)
 	# Enable all ppc drivers.
@@ -63,14 +65,18 @@ ppc*)
 	esac
 	hostmakedepends+=" clang"
 	makedepends+=" libclc-git"
+	subpackages+=" mesa-opencl mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon"
+	subpackages+=" mesa-vulkan-overlay-layer"
+	# Transitional dummy packages
 	subpackages+=" mesa-ati-dri mesa-nouveau-dri"
-	subpackages+=" mesa-opencl mesa-vulkan-overlay-layer"
 	;;
 aarch64*)
 	# Enable all ARM drivers
 	configure_args+=" -Dgallium-drivers=etnaviv,freedreno,kmsro,lima,panfrost,nouveau,swrast,tegra,v3d,vc4"
 	configure_args+=" -Dvulkan-drivers= -Ddri-drivers="
 	configure_args+=" -Dgallium-xa=false -Ddri3=true"
+	subpackages+=" mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC"
+	# Transitional dummy packages
 	subpackages+=" mesa-kmsro-dri mesa-tegra-dri mesa-nouveau-dri mesa-v3d-dri mesa-vc4-dri"
 	subpackages+=" mesa-etnaviv-dri mesa-freedreno-dri mesa-lima-dri mesa-panfrost-dri"
 	;;
@@ -78,6 +84,8 @@ armv7l*)
 	configure_args+=" -Dgallium-drivers=etnaviv,freedreno,kmsro,lima,panfrost,swrast,vc4"
 	configure_args+=" -Dvulkan-drivers= -Ddri-drivers= -Dgallium-xvmc=false"
 	configure_args+=" -Dgallium-xa=false -Dgallium-vdpau=false -Dgallium-va=false"
+	subpackages+=" mesa-dri"
+	# Transitional dummy packages
 	subpackages+=" mesa-etnaviv-dri mesa-freedreno-dri mesa-kmsro-dri mesa-lima-dri mesa-panfrost-dri mesa-vc4-dri"
 	;;
 *)
@@ -86,6 +94,7 @@ armv7l*)
 	configure_args+=" -Ddri-drivers= -Dvulkan-drivers= -Dgallium-va=false"
 	configure_args+=" -Dgallium-vdpau=false -Dgallium-xvmc=false"
 	configure_args+=" -Dgallium-xa=false"
+	subpackages+=" mesa-dri"
 	;;
 esac
 
@@ -107,7 +116,6 @@ esac
 
 case "$XBPS_TARGET_MACHINE" in
 	# Disable TLS with musl: https://gitlab.freedesktop.org/mesa/mesa/issues/966
-	# TODO: maybe this is handled by libglvnd now
 	*-musl) configure_args+=" -Duse-elf-tls=false";;
 	*) configure_args+=" -Dglx=dri";;
 esac
@@ -179,152 +187,156 @@ libxatracker_package() {
 	}
 }
 
-mesa-ati-dri_package() {
-	short_desc="Mesa DRI drivers for ATI GPUs"
-	depends="mesa-${version}_${revision}"
-	lib32files="/usr/share/vulkan/icd.d/radeon_icd.i686.json"
+mesa-opencl_package() {
+	short_desc="Mesa implementation of OpenCL (r600+ only)"
+	depends="libclc libOpenCL"
 	pkg_install() {
-		vmove "usr/lib/libXvMCr[36]00.so.*"
-		vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
-		vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
-		vmove "usr/lib/xorg/modules/drivers/radeon*"
-		vmove "usr/lib/xorg/modules/drivers/r[236]00*"
-		vmove usr/lib/dri/r*
-		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
-		vmove "usr/lib/libvulkan_radeon.so"
-		vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
-		vmove usr/lib/gallium-pipe/pipe_radeonsi.so
+		vmove etc/OpenCL
+		vmove "usr/lib/libMesaOpenCL.so.*"
 	}
 }
 
-mesa-etnaviv-dri_package() {
-	short_desc="Mesa DRI drivers for Vivante GPUs"
-	depends="mesa-${verison}_${revision}"
+mesa-dri_package() {
+	short_desc="Mesa DRI drivers"
+	depends="mesa-${version}_${revision}"
+	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() {
-		vmove "usr/lib/xorg/modules/drivers/etnaviv*"
+		vmove "usr/lib/xorg/modules/drivers";
+		if [ -d "$DESTDIR/usr/lib/gallium-pipe" ]; then
+			vmove "usr/lib/gallium-pipe/pipe_*.so"
+		fi
 	}
 }
 
-mesa-freedreno-dri_package() {
-	short_desc="Mesa DRI drivers for Adreno GPUs"
-	depends="mesa-${verison}_${revision}"
+mesa-vaapi_package() {
+	short_desc="Mesa VA-API drivers"
+	nostrip_files="nouveau_drv_video.so r600_drv_video.so radeonsi_drv_video.so"
 	pkg_install() {
-		vmove "usr/lib/xorg/modules/drivers/msm*"
-		vmove "usr/lib/xorg/modules/drivers/kgsl*"
+		vmove "usr/lib/dri/*_drv_video.so"
 	}
 }
 
-mesa-intel-dri_package() {
-	short_desc="Mesa DRI drivers for Intel GPUs"
-	depends="mesa-${version}_${revision}"
-	lib32files="/usr/share/vulkan/icd.d/intel_icd.i686.json"
+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/xorg/modules/drivers/i9[16]5_dri.*"
-		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
-		vmove "usr/lib/libvulkan_intel.so"
+		vmove "usr/lib/vdpau/libvdpau_*"
 	}
 }
 
-mesa-kmsro-dri_package() {
-	short_desc="KMS Render-only Mesa DRI drivers"
-	depends="mesa-${version}_${revision}"
+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/xorg/modules/drivers/armada*"
-		vmove "usr/lib/xorg/modules/drivers/exynos*"
-		vmove "usr/lib/xorg/modules/drivers/hx8357d*"
-		vmove "usr/lib/xorg/modules/drivers/ili9225*"
-		vmove "usr/lib/xorg/modules/drivers/ili9341*"
-		vmove "usr/lib/xorg/modules/drivers/imx*"
-		vmove "usr/lib/xorg/modules/drivers/meson*"
-		vmove "usr/lib/xorg/modules/drivers/mi0283qt*"
-		vmove "usr/lib/xorg/modules/drivers/mxsfb*"
-		vmove "usr/lib/xorg/modules/drivers/pl111*"
-		vmove "usr/lib/xorg/modules/drivers/repaper*"
-		vmove "usr/lib/xorg/modules/drivers/rockchip*"
-		vmove "usr/lib/xorg/modules/drivers/st7586*"
-		vmove "usr/lib/xorg/modules/drivers/st7735r*"
-		vmove "usr/lib/xorg/modules/drivers/stm*"
-		vmove "usr/lib/xorg/modules/drivers/sun4i*"
+		vmove "usr/lib/libXvMC*"
 	}
 }
 
-mesa-lima-dri_package() {
-	short_desc="Mesa DRI drivers for ARM Mali GPUs (Utgard)"
-	depends="mesa-${verison}_${revision}"
+mesa-vulkan-intel_package() {
+	short_desc="Mesa Intel Vulkan driver"
+	lib32files="/usr/share/vulkan/icd.d/intel_icd.i686.json"
 	pkg_install() {
-		vmove "usr/lib/xorg/modules/drivers/lima*"
+		vmove "usr/share/vulkan/icd.d/intel_icd*.json"
+		vmove "usr/lib/libvulkan_intel.so"
 	}
 }
 
-mesa-nouveau-dri_package() {
-	short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
-	depends="mesa-${version}_${revision}"
+mesa-vulkan-radeon_package() {
+	short_desc="Mesa Radeon Vulkan driver"
+	lib32files="/usr/share/vulkan/icd.d/radeon_icd.i686.json"
 	pkg_install() {
-		vmove "usr/lib/libXvMCnouveau.so.*"
-		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
-		vmove "usr/lib/xorg/modules/drivers/nouveau*"
-		vmove "usr/lib/dri/nouveau*"
-		case "$XBPS_TARGET_MACHINE" in
-			aarch64*) ;;
-			*) vmove usr/lib/gallium-pipe/pipe_nouveau.so ;;
-		esac
+		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
+		vmove "usr/lib/libvulkan_radeon.so"
 	}
 }
 
-mesa-panfrost-dri_package() {
-	short_desc="Mesa DRI drivers for ARM Mali GPUs (Midgard/Bifrost)"
-	depends="mesa-${verison}_${revision}"
+mesa-vulkan-overlay-layer_package() {
+	short_desc="Vulkan layer to display information about the running application"
 	pkg_install() {
-		vmove "usr/lib/xorg/modules/drivers/panfrost*"
+		vmove usr/lib/libVkLayer_MESA_overlay.so
+		vmove usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
 	}
 }
 
-mesa-vmwgfx-dri_package() {
-	short_desc="Mesa DRI drivers for VMware"
-	depends="mesa-${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/xorg/modules/drivers/vmwgfx*"
-		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
-	}
+mesa-ati-dri_package() {
+	build_style=meta
+	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
+	depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon"
 }
 
-mesa-v3d-dri_package() {
-	short_desc="Mesa DRI drivers for Videocore VI GPU"
-	depends="mesa-${verison}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/xorg/modules/drivers/v3d*"
-	}
+mesa-etnaviv-dri_package() {
+	build_style=meta
+	short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)"
+	depends="mesa-dri"
 }
 
-mesa-vc4-dri_package() {
-	short_desc="Mesa DRI drivers for Videocore IV GPU"
-	depends="mesa-${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/xorg/modules/drivers/vc4*"
-	}
+mesa-freedreno-dri_package() {
+	build_style=meta
+	short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)"
+	depends="mesa-dri"
 }
 
-mesa-opencl_package() {
-	short_desc="Mesa implementation of OpenCL (r600+ only)"
-	depends="libclc libOpenCL mesa-${version}_${revision}"
-	pkg_install() {
-		vmove etc/OpenCL
-		vmove "usr/lib/libMesaOpenCL*"
-	}
+mesa-intel-dri_package() {
+	build_style=meta
+	short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
+	depends="mesa-dri mesa-vulkan-intel"
+}
+
+mesa-kmsro-dri_package() {
+	build_style=meta
+	short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)"
+	depends="mesa-dri"
+}
+
+mesa-lima-dri_package() {
+	build_style=meta
+	short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)"
+	depends="mesa-dri"
+}
+
+mesa-nouveau-dri_package() {
+	build_style=meta
+	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
+	short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)"
+	depends="mesa-dri"
 }
 
 mesa-tegra-dri_package() {
-	short_desc="Mesa DRI drivers for Tegra GPU"
-	depends="mesa-nouveau-dri-${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/xorg/modules/drivers/tegra*"
-	}
+	build_style=meta
+	short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)"
+	depends="mesa-dri"
 }
 
-mesa-vulkan-overlay-layer_package() {
-	short_desc="Vulkan layer to display information about the running application"
-	pkg_install() {
-		vmove usr/lib/libVkLayer_MESA_overlay.so
-		vmove usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
-	}
+mesa-v3d-dri_package() {
+	build_style=meta
+	short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)"
+	depends="mesa-dri"
+}
+
+mesa-vmwgfx-dri_package() {
+	build_style=meta
+	short_desc="Mesa DRI drivers for VMware (transitional dummy package)"
+	depends="mesa-dri"
+}
+
+mesa-vc4-dri_package() {
+	build_style=meta
+	short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)"
+	depends="mesa-dri"
 }

From c512cacdaf6282b0e9ec2167c23795fc901aace2 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 11 Nov 2019 21:08:54 +0100
Subject: [PATCH 2/9] common/shlibs: remove unused mesa XvMC libs

---
 common/shlibs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8a605e4f2e4..8b1c87a98aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -309,8 +309,6 @@ libXfontcache.so.1 libXfontcache-1.0.4_1
 libXv.so.1 libXv-1.0.4_1
 libXvMC.so.1 libXvMC-1.0.4_1
 libXvMCW.so.1 libXvMC-1.0.4_1
-libXvMCr600.so.1 mesa-ati-dri-10.1.0_1
-libXvMCnouveau.so.1 mesa-nouveau-dri-10.1.0_1
 libxcb-errors.so.0 xcb-util-errors-1.0_1
 libxcb-icccm.so.4 xcb-util-wm-0.3.9_1
 libxcb-ewmh.so.2 xcb-util-wm-0.3.9_1

From 5f9727edc9795c2b0b04b31d02c33bf83f65bee6 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 19 Nov 2019 19:56:59 +0100
Subject: [PATCH 3/9] rpi-firmware: mesa-dri pkgs reorganization

---
 srcpkgs/rpi-firmware/files/config.txt | 2 +-
 srcpkgs/rpi-firmware/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index fc2b042f092..a5b8eb245bb 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -74,7 +74,7 @@
 
 
 ## Enable/Disable experimental desktop GL driver
-## requires package: mesa-vc4-dri
+## requires package: mesa-dri
 
 ## with full kms
 #dtoverlay=vc4-kms-v3d
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 4d31e05152b..3b99c21ac45 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,7 +4,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20191118
-revision=1
+revision=2
 archs=noarch
 wrksrc="firmware-${_githash}"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"

From f2a9b3c3a46ea2856ae54a8567a387f410684b15 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 19 Nov 2019 19:57:19 +0100
Subject: [PATCH 4/9] steam: mesa-dri pkgs reorganization

---
 srcpkgs/steam/INSTALL.msg | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/steam/INSTALL.msg b/srcpkgs/steam/INSTALL.msg
index 483402b52ce..b94c26fe537 100644
--- a/srcpkgs/steam/INSTALL.msg
+++ b/srcpkgs/steam/INSTALL.msg
@@ -7,9 +7,7 @@ Generic:
 
 For users of the open source drivers:
 
-	- mesa-ati-dri-32bit (AMD)
-	- mesa-intel-dri-32bit (Intel)
-	- mesa-nouveau-dri-32bit (NVIDIA)
+	- mesa-32bit
 
 For users of the proprietary NVIDIA driver:
 

From fcddcbe8728cbd0e07b1276973b49f38ae800cbe Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 19 Nov 2019 19:58:32 +0100
Subject: [PATCH 5/9] xf86-video-amdgpu: mesa-dri pkgs reorganization

---
 srcpkgs/xf86-video-amdgpu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8488f26a931..7b50bcd9951 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,13 +1,13 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
 version=19.1.0
-revision=1
+revision=2
 archs="i686* x86_64* ppc64* ppc ppc-musl"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
  libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
-depends="virtual?xserver-abi-video-24_1 mesa-ati-dri"
+depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From cbd2e523e752aa893ca70fb8eaf7c6a382c8f72c Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 19 Nov 2019 19:58:44 +0100
Subject: [PATCH 6/9] xf86-video-ati: mesa-dri pkgs reorganization

---
 srcpkgs/xf86-video-ati/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template
index 6cff9e0ca8e..825b2076023 100644
--- a/srcpkgs/xf86-video-ati/template
+++ b/srcpkgs/xf86-video-ati/template
@@ -1,13 +1,13 @@
 # Template file for 'xf86-video-ati'
 pkgname=xf86-video-ati
 version=19.1.0
-revision=1
+revision=2
 archs="i686* x86_64* ppc ppc-musl ppc64*"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
  libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
-depends="virtual?xserver-abi-video-24_1 mesa-ati-dri"
+depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg ATI Radeon video driver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 8e9b74d4372764d71a481082d34e223713bca406 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 19 Nov 2019 19:58:57 +0100
Subject: [PATCH 7/9] xf86-video-intel: mesa-dri pkgs reorganization

---
 srcpkgs/xf86-video-intel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index 8f0b071b218..1d722450d4c 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -1,7 +1,7 @@
 # Template file for 'xf86-video-intel'
 pkgname=xf86-video-intel
 version=2.99.917.899
-revision=1
+revision=2
 _commit=f66d39544bb8339130c96d282a80f87ca1606caf
 archs="i686* x86_64*"
 build_style=gnu-configure
@@ -9,7 +9,7 @@ configure_args="--with-default-dri=3"
 hostmakedepends="git automake libtool pkg-config xorg-util-macros"
 makedepends="libXScrnSaver-devel libXcursor-devel libXinerama-devel
  libXrandr-devel libXvMC-devel xorg-server-devel"
-depends="virtual?xserver-abi-video-24_1 mesa-intel-dri"
+depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg DDX Intel video driver"
 maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="MIT"

From 9b25721bd6b136b2a98d4e361b2c4172410113df Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 19 Nov 2019 19:59:12 +0100
Subject: [PATCH 8/9] xf86-video-nouveau: mesa-dri pkgs reorganization

---
 srcpkgs/xf86-video-nouveau/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index 73b56ab443c..81129aa30f4 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -1,18 +1,22 @@
 # Template file for 'xf86-video-nouveau'
 pkgname=xf86-video-nouveau
 version=1.0.16
-revision=1
-build_style=gnu-configure
+revision=2
 archs="i686* x86_64* ppc ppc-musl ppc64*"
+build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel"
-depends="virtual?xserver-abi-video-24_1 mesa-nouveau-dri"
+depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg opensource NVIDIA video driver"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="MIT"
 homepage="http://nouveau.freedesktop.org/wiki/"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.gz"
 checksum=83553d4625e2990e569312e26540bebbdb2de14896ad4e9a9c872eda1df6cc7d
 lib32disabled=yes
 
 LDFLAGS="-Wl,-z,lazy"
+
+post_install() {
+	vlicense COPYING
+}

From e99fd508e06e0a6e8535d208b8c25f2807ac8ad2 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 19 Nov 2019 19:59:33 +0100
Subject: [PATCH 9/9] xf86-video-vmware: mesa-dri pkgs reorganization

---
 srcpkgs/xf86-video-vmware/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template
index 441bcdb58e9..1da7f33d8ef 100644
--- a/srcpkgs/xf86-video-vmware/template
+++ b/srcpkgs/xf86-video-vmware/template
@@ -1,14 +1,13 @@
-# Template build file for 'xf86-video-vmware'
+# Template file for 'xf86-video-vmware'
 pkgname=xf86-video-vmware
 version=13.3.0
-revision=1
-lib32disabled=yes
+revision=2
 archs="i686* x86_64*"
 build_style=gnu-configure
 configure_args="--enable-vmwarectrl-client"
 hostmakedepends="pkg-config"
 makedepends="libdrm-devel MesaLib-devel xorg-server-devel"
-depends="virtual?xserver-abi-video-24_1 mesa-vmwgfx-dri"
+depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Modular Xorg VMware virtual video driver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -16,6 +15,8 @@ homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 checksum=47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c
 
+lib32disabled=yes
+
 LDFLAGS="-Wl,-z,lazy"
 
 post_install() {

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

end of thread, other threads:[~2019-12-27 18:47 UTC | newest]

Thread overview: 74+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-21 23:34 [PR PATCH] [WIP] xbps-src, libGL: fix debug symbols generation for mesa libraries voidlinux-github
2019-10-22  9:20 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-22  9:20 ` voidlinux-github
2019-10-22  9:30 ` voidlinux-github
2019-10-22  9:30 ` voidlinux-github
2019-10-22 10:15 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-22 10:15 ` voidlinux-github
2019-10-22 15:17 ` voidlinux-github
2019-10-22 15:17 ` voidlinux-github
2019-10-22 22:30 ` voidlinux-github
2019-10-22 22:30 ` voidlinux-github
2019-10-22 23:32 ` voidlinux-github
2019-10-22 23:34 ` voidlinux-github
2019-10-22 23:39 ` voidlinux-github
2019-10-23 11:39 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-23 11:39 ` voidlinux-github
2019-10-23 11:47 ` [WIP] " voidlinux-github
2019-10-23 11:48 ` voidlinux-github
2019-10-23 11:49 ` voidlinux-github
2019-10-23 11:55 ` voidlinux-github
2019-10-23 11:57 ` voidlinux-github
2019-10-23 15:19 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-23 15:19 ` voidlinux-github
2019-10-23 15:26 ` voidlinux-github
2019-10-24 12:41 ` voidlinux-github
2019-10-24 12:41 ` voidlinux-github
2019-10-24 13:47 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-24 13:47 ` voidlinux-github
2019-10-24 13:47 ` voidlinux-github
2019-10-26 12:56 ` [PR PATCH] [Updated] [RFC] libGL: reorganize dri drivers subpkgs (fixes debug info) voidlinux-github
2019-10-26 12:56 ` voidlinux-github
2019-10-26 13:01 ` voidlinux-github
2019-10-26 13:01 ` voidlinux-github
2019-10-26 13:03 ` voidlinux-github
2019-10-26 13:16 ` voidlinux-github
2019-10-26 13:17 ` voidlinux-github
2019-10-26 13:18 ` voidlinux-github
2019-10-27  6:17 ` voidlinux-github
2019-10-27 10:55 ` voidlinux-github
2019-10-27 10:58 ` voidlinux-github
2019-10-27 10:58 ` voidlinux-github
2019-10-27 11:00 ` voidlinux-github
2019-10-27 11:04 ` voidlinux-github
2019-10-27 11:07 ` voidlinux-github
2019-10-27 11:10 ` voidlinux-github
2019-10-27 11:23 ` voidlinux-github
2019-10-27 11:24 ` voidlinux-github
2019-10-27 11:34 ` voidlinux-github
2019-10-27 11:36 ` voidlinux-github
2019-10-27 11:51 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-27 11:51 ` voidlinux-github
2019-10-27 12:00 ` voidlinux-github
2019-10-27 15:24 ` voidlinux-github
2019-11-02 10:14 ` voidlinux-github
2019-11-02 12:55 ` voidlinux-github
2019-11-10 10:15 ` voidlinux-github
2019-11-10 10:17 ` voidlinux-github
2019-11-10 10:36 ` voidlinux-github
2019-11-11 20:13 ` [PR PATCH] [Updated] " voidlinux-github
2019-11-11 20:19 ` voidlinux-github
2019-11-11 20:20 ` voidlinux-github
2019-11-11 20:21 ` voidlinux-github
2019-12-25  7:40 ` [RFC] mesa: " voidlinux-github
2019-12-25  7:41 ` voidlinux-github
2019-12-25 15:48 ` voidlinux-github
2019-12-25 19:05 ` [PR PATCH] [Closed]: " voidlinux-github
2019-12-27 17:03 ` voidlinux-github
2019-12-27 17:06 ` voidlinux-github
2019-12-27 17:06 ` voidlinux-github
2019-12-27 17:09 ` voidlinux-github
2019-12-27 17:53 ` voidlinux-github
2019-12-27 18:42 ` voidlinux-github
2019-12-27 18:42 ` voidlinux-github
2019-12-27 18:42 [PR PATCH] " voidlinux-github
2019-12-27 18:47 ` voidlinux-github

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