From a191c1df758a6ca180d421e74c765e119701e6da Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 31 Jan 2020 11:31:24 +0000
Subject: user/mesa: Split DRI drivers correctly

---
 user/mesa/APKBUILD | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'user/mesa/APKBUILD')

diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index c1f74e159..b6d37ceab 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=mesa
 pkgver=19.3.3
 _llvmver=8
-pkgrel=0
+pkgrel=1
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
 arch="all"
@@ -138,12 +138,15 @@ dri() {
 	mesa-dri-nouveau mesa-dri-swrast mesa-dri-tegra mesa-dri-vc4
 	mesa-dri-virtio mesa-dri-vmwgfx"
 	provides="$replaces"
-	install -d "$subpkgdir"/usr/lib
+	install -d "$subpkgdir"/usr/lib/xorg/modules
 	install -d "$subpkgdir"/usr/share/vulkan
-	install -d "$subpkgdir"/$_dri_driverdir
 	mv "$pkgdir"/usr/lib/dri "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/xorg/modules/dri "$subpkgdir"/usr/lib/xorg/modules/
+	mv "$pkgdir"/usr/share/drirc.d "$subpkgdir"/usr/share/
 	# XvMC drivers
 	mv "$pkgdir"/usr/lib/libXvMC*.so* "$subpkgdir"/usr/lib/
+	# support non-Vulkan arches
+	mv "$pkgdir"/usr/lib/libvulkan*.so* "$subpkgdir"/usr/lib/ || true
 	mv "$pkgdir"/usr/lib/vdpau "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/
 }
-- 
cgit v1.2.3-60-g2f50