From f2dc76006460717f985212f4db85ca838b9c0496 Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:06:29 +0100
Subject: [PATCH] Update tools.func

---
 misc/tools.func | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/misc/tools.func b/misc/tools.func
index 7f810a744..48f406d90 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -3692,20 +3692,22 @@ _setup_intel_arc() {
     # Add non-free repos
     _add_debian_nonfree "$os_codename"
 
-    # Arc requires latest drivers - fetch from GitHub
-    # Order matters: libigdgmm first (dependency), then IGC, then compute-runtime
-    msg_info "Fetching Intel compute-runtime for Arc support"
+    # For Trixie/Sid: Fetch latest drivers from GitHub (Debian repo packages may be too old or missing)
+    # For Bookworm: Use repo packages (GitHub latest requires libstdc++6 >= 13.1, unavailable on Bookworm)
+    if [[ "$os_codename" == "trixie" || "$os_codename" == "sid" ]]; then
+      msg_info "Fetching Intel compute-runtime from GitHub for Arc support"
 
-    # libigdgmm - bundled in compute-runtime releases (Debian version often too old)
-    fetch_and_deploy_gh_release "libigdgmm12" "intel/compute-runtime" "binary" "latest" "" "libigdgmm12_*_amd64.deb" || true
+      # libigdgmm - bundled in compute-runtime releases
+      fetch_and_deploy_gh_release "libigdgmm12" "intel/compute-runtime" "binary" "latest" "" "libigdgmm12_*_amd64.deb" || true
 
-    # Intel Graphics Compiler (note: packages have -2 suffix)
-    fetch_and_deploy_gh_release "intel-igc-core" "intel/intel-graphics-compiler" "binary" "latest" "" "intel-igc-core-2_*_amd64.deb" || true
-    fetch_and_deploy_gh_release "intel-igc-opencl" "intel/intel-graphics-compiler" "binary" "latest" "" "intel-igc-opencl-2_*_amd64.deb" || true
+      # Intel Graphics Compiler (note: packages have -2 suffix)
+      fetch_and_deploy_gh_release "intel-igc-core" "intel/intel-graphics-compiler" "binary" "latest" "" "intel-igc-core-2_*_amd64.deb" || true
+      fetch_and_deploy_gh_release "intel-igc-opencl" "intel/intel-graphics-compiler" "binary" "latest" "" "intel-igc-opencl-2_*_amd64.deb" || true
 
-    # Compute Runtime (depends on IGC and gmmlib)
-    fetch_and_deploy_gh_release "intel-opencl-icd" "intel/compute-runtime" "binary" "latest" "" "intel-opencl-icd_*_amd64.deb" || true
-    fetch_and_deploy_gh_release "intel-level-zero-gpu" "intel/compute-runtime" "binary" "latest" "" "libze-intel-gpu1_*_amd64.deb" || true
+      # Compute Runtime (depends on IGC and gmmlib)
+      fetch_and_deploy_gh_release "intel-opencl-icd" "intel/compute-runtime" "binary" "latest" "" "intel-opencl-icd_*_amd64.deb" || true
+      fetch_and_deploy_gh_release "intel-level-zero-gpu" "intel/compute-runtime" "binary" "latest" "" "libze-intel-gpu1_*_amd64.deb" || true
+    fi
 
     $STD apt -y install \
       intel-media-va-driver-non-free \
@@ -3714,6 +3716,9 @@ _setup_intel_arc() {
       libmfx-gen1.2 \
       vainfo \
       intel-gpu-tools 2>/dev/null || msg_warn "Some Intel Arc packages failed"
+
+    # Bookworm has compatible versions of these packages in repos
+    [[ "$os_codename" == "bookworm" ]] && $STD apt -y install intel-opencl-icd libigdgmm12 2>/dev/null || true
   fi
 
   msg_ok "Intel Arc GPU configured"