From 211dea2b75f8cf61c72177ddb9e7a2ec4ac11776 Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Mon, 29 Jul 2024 22:45:04 +0300
Subject: [PATCH] fix weird distro check

---
 .github/release-canary-v3 |  2 +-
 debian/rules              | 29 +++++++++++------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/release-canary-v3 b/.github/release-canary-v3
index 0cfbf08..00750ed 100644
--- a/.github/release-canary-v3
+++ b/.github/release-canary-v3
@@ -1 +1 @@
-2
+3
diff --git a/debian/rules b/debian/rules
index a0b9bf0..1fbea0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ else
   # Freedreno requires arm in addition
   ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
 	GALLIUM_DRIVERS += freedreno
-	# XXX: broken
+	# broken
 #	GALLIUM_DRIVERS += asahi
   endif
 
@@ -140,11 +140,7 @@ else
 
 	# Build rusticl for archs where rustc is available
 	ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
-		ifneq ($(DEB_DISTRIBUTION), xxx)
-			confflags_GALLIUM += -Dgallium-rusticl=false
-		else
-			confflags_GALLIUM += -Dgallium-rusticl=true
-		endif
+		confflags_GALLIUM += -Dgallium-rusticl=true
 	endif
 
 	# nine makes sense only on archs that build wine
@@ -201,7 +197,6 @@ confflags += \
 	$(confflags_SSE2) \
 	$(confflags_VALGRIND)
 
-
 override_dh_clean: regen_control
 	sed -i 's/-.*//' VERSION
 	rm -rf .pc
@@ -241,6 +236,7 @@ override_dh_installchangelogs:
 override_dh_install:
 	# purge .la files
 	find debian/tmp/ -name '*.la' -exec rm '{}' ';'
+	# nvk:
 	find debian/tmp/usr/bin -name 'mme_*_sim_hw_test' -exec rm '{}' ';'
 
 	# Get rid of some files which aren't installed. Do not
@@ -270,24 +266,24 @@ override_dh_install:
     endif
   endif
 
-  ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
+ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
 	install -m755 -d debian/mesa-opencl-icd-git/etc/OpenCL/vendors
 	mv debian/tmp/etc/OpenCL/vendors/rusticl.icd \
 	   debian/mesa-opencl-icd-git/etc/OpenCL/vendors
 	install -m755 -d debian/mesa-opencl-icd-git/usr/lib/${DEB_HOST_MULTIARCH}/
 	mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libRusticlOpenCL* \
 	   debian/mesa-opencl-icd-git/usr/lib/${DEB_HOST_MULTIARCH}/
-  endif
+endif
 
-  # Copy spirv2dxil and its dependencies on architectures that support WSL/Dozen (dzn)
-  ifneq (,$(filter $(DEB_HOST_ARCH), $(WSL_ARCHS)))
+# Copy spirv2dxil and its dependencies on architectures that support WSL/Dozen (dzn)
+ifneq (,$(filter $(DEB_HOST_ARCH), $(WSL_ARCHS)))
 	install -m755 -d debian/mesa-vulkan-drivers-git/usr/bin
 	mv debian/tmp/usr/bin/spirv2dxil \
-	   debian/mesa-vulkan-drivers-git/usr/bin
+		debian/mesa-vulkan-drivers-git/usr/bin
 	install -m755 -d debian/mesa-vulkan-drivers-git/usr/lib/${DEB_HOST_MULTIARCH}/
 	mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libspirv_to_dxil.* \
-	   debian/mesa-vulkan-drivers-git/usr/lib/${DEB_HOST_MULTIARCH}/
-  endif
+		debian/mesa-vulkan-drivers-git/usr/lib/${DEB_HOST_MULTIARCH}/
+endif
 
 	dh_install -a
 
@@ -298,9 +294,6 @@ override_dh_install:
 		install -m 755 debian/local/script  debian/$$p/usr/share/bug/$$p; \
 	done
 
-override_dh_missing:
-	dh_missing --fail-missing
-
 override_dh_makeshlibs:
 	dh_makeshlibs -a -- -c0
 
@@ -320,4 +313,4 @@ regen_control:
 	    -e"s,@RUSTICL_ARCHS@,$(RUSTICL_ARCHS),g" \
 	    -e"s,@VALGRIND_ARCHS@,$(VALGRIND_ARCHS),g" \
 	    -e"s,@WINE_ARCHS@,$(WINE_ARCHS),g" \
-	    debian/control.in > debian/control
+	    debian/control.in > debian/control
\ No newline at end of file