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