user/mesa-be: Split like user/mesa

1 files changed, 13 insertions, 48 deletions

diff --git a/user/mesa-be/APKBUILD b/user/mesa-be/APKBUILD
index 7e6cf9ccf..edb7383f8 100644
--- a/user/mesa-be/APKBUILD
+++ b/user/mesa-be/APKBUILD
@@ -15,35 +15,18 @@ makedepends="$depends_dev bison eudev-dev expat-dev flex libelf-dev libglvnd-dev
 	libva-dev libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev
 	libxv-dev libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend meson
 	ninja python3 py3-libxml2 py3-mako py3-pygments py3-markupsafe
-	py3-pyyaml wayland-dev wayland-protocols glslang-dev
-	zlib-dev zstd-dev"
-subpackages="$pkgname-dev $pkgname-dri $pkgname-vulkan-overlay $pkgname-egl
-	$pkgname-glapi $pkgname-gbm $pkgname-d3d $pkgname-xatracker
-	$pkgname-osmesa"
+	py3-pyyaml rust wayland-dev wayland-protocols glslang-dev
+	zlib-dev zstd-dev bindgen-cli cbindgen clang-dev"
+replaces="mesa-egl mesa-gl mesa-glapi mesa-gles"
+subpackages="$pkgname-dev $pkgname-dri $pkgname-vulkan-overlay $pkgname-gbm
+	$pkgname-d3d $pkgname-xatracker $pkgname-osmesa"
 source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
-_gallium_drivers="r300,r600,radeonsi,nouveau,swrast,virgl"
-_vulkan_drivers="amd,swrast,virtio"
+_gallium_drivers="kmsro,r300,r600,radeonsi,nouveau,swrast,virgl,zink"
+_vulkan_drivers="amd,nouveau,swrast,virtio"
 
 case "$CARCH" in
-x86_64)
-	_gallium_drivers="${_gallium_drivers},i915,svga,iris,crocus"
-	_vulkan_drivers="${_vulkan_drivers},intel,intel_hasvk,microsoft-experimental"
-	_arch_conf="-Dintel-rt=enabled"
-	;;
-x86* | pmmx)
-	_gallium_drivers="${_gallium_drivers},i915,svga,iris,crocus"
-	_vulkan_drivers="${_vulkan_drivers},intel,intel_hasvk"
-	_arch_conf="-Dsse2=false"
-	;;
-aarch64 | arm*)
-	_gallium_drivers="${_gallium_drivers},vc4,freedreno,tegra,kmsro,v3d,lima,panfrost,etnaviv"
-	_vulkan_drivers="${_vulkan_drivers},freedreno,panfrost,broadcom"
-	case "$CARCH" in
-	armhf) CFLAGS="$CFLAGS -mfpu=neon";;
-	esac
-	;;
 ppc64)
 	_arch_conf="-Dpower8=disabled"
 	;;
@@ -64,11 +47,15 @@ EOF
 		-Ddri-drivers-path=$_dri_driverdir \
 		-Dgallium-drivers=$_gallium_drivers \
 		-Dgallium-nine=true \
+		-Dgallium-opencl=disabled \
+		-Dgallium-rusticl=false \
 		-Dgallium-va=enabled \
 		-Dgallium-vdpau=enabled \
 		-Dgallium-xa=enabled \
 		-Dglvnd=enabled \
 		-Dglx=dri \
+		-Dmicrosoft-clc=disabled \
+		-Dopencl-spirv=false \
 		-Dosmesa=true \
 		-Dplatforms=x11,wayland \
 		-Dvideo-codecs=all_free \
@@ -84,30 +71,6 @@ package() {
 	DESTDIR="$pkgdir" ninja -C build install
 }
 
-egl() {
-	replaces="mesa"
-	pkgdesc="Mesa libEGL runtime libraries"
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libEGL*.so* \
-		"$subpkgdir"/usr/lib/
-}
-
-gl() {
-	replaces="mesa"
-	pkgdesc="Mesa libGL runtime libraries"
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libGL*.so* \
-		"$subpkgdir"/usr/lib/
-}
-
-glapi() {
-	replaces="$pkgname-gles"
-	pkgdesc="Mesa OpenGL API"
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libglapi.so.* \
-		"$subpkgdir"/usr/lib/
-}
-
 d3d() {
 	replaces="mesa"
 	pkgdesc="Mesa Direct3D adaptor libraries"
@@ -155,12 +118,14 @@ dri() {
 	replaces="mesa-dri-ati mesa-dri-freedreno mesa-dri-intel
 	mesa-dri-nouveau mesa-dri-swrast mesa-dri-tegra mesa-dri-vc4
 	mesa-dri-virtio mesa-dri-vmwgfx"
+	depends="mesa=$pkgver-r$pkgrel"
 	provides="$replaces"
 	install -d "$subpkgdir"/usr/lib/xorg/modules
 	install -d "$subpkgdir"/usr/share/vulkan
 	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/
+	mv "$pkgdir"/usr/share/glvnd "$subpkgdir"/usr/share/
 	mv "$pkgdir"/usr/lib/libgallium*.so* "$subpkgdir"/usr/lib/ || true
 	# support non-Vulkan arches
 	mv "$pkgdir"/usr/lib/libvulkan*.so* "$subpkgdir"/usr/lib/ || true