From 5da941e2ce71daeb1a3c1d5430c2020a2dd3e48f Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 29 Sep 2026 15:13:13 +0200
Subject: [PATCH] manyfold: use upstream f3d for headless renders on amd64
 (#17583)

---
 ct/manyfold.sh              | 15 +++++++++++++--
 install/manyfold-install.sh | 10 +++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ct/manyfold.sh b/ct/manyfold.sh
index 42726ba98..06ef549fe 100644
--- a/ct/manyfold.sh
+++ b/ct/manyfold.sh
@@ -32,8 +32,19 @@ function update_script() {
   fi
 
   NODE_VERSION="24" NODE_MODULE="corepack,yarn" setup_nodejs
-  ensure_dependencies f3d
-  
+  if [[ "$(arch_resolve)" == "amd64" ]]; then
+    if check_for_gh_release "f3d" "f3d-app/f3d"; then
+      $STD apt install -y libegl1 libx11-6
+      CLEAN_INSTALL=1 fetch_and_deploy_gh_release "f3d" "f3d-app/f3d" "prebuild" "latest" "/opt/f3d" "F3D-*-Linux-x86_64.tar.gz"
+      ln -sf /opt/f3d/bin/f3d /usr/local/bin/f3d
+      if dpkg -s f3d &>/dev/null; then
+        $STD apt purge -y f3d
+      fi
+    fi
+  else
+    ensure_dependencies f3d
+  fi
+
   if check_for_gh_release "manyfold" "manyfold3d/manyfold"; then
     msg_info "Stopping Services"
     systemctl stop manyfold.target manyfold-rails.1 manyfold-default_worker.1 manyfold-performance_worker.1
diff --git a/install/manyfold-install.sh b/install/manyfold-install.sh
index fb8c5b68f..7f5d78a7f 100644
--- a/install/manyfold-install.sh
+++ b/install/manyfold-install.sh
@@ -15,15 +15,23 @@ update_os
 
 msg_info "Installing Dependencies"
 $STD apt install -y \
-  f3d \
   git \
   libarchive-dev \
   libassimp-dev \
+  libegl1 \
   libmariadb-dev \
+  libx11-6 \
   nginx \
   redis-server
 msg_ok "Installed Dependencies"
 
+if [[ "$(arch_resolve)" == "amd64" ]]; then
+  fetch_and_deploy_gh_release "f3d" "f3d-app/f3d" "prebuild" "latest" "/opt/f3d" "F3D-*-Linux-x86_64.tar.gz"
+  ln -sf /opt/f3d/bin/f3d /usr/local/bin/f3d
+else
+  $STD apt install -y f3d
+fi
+
 setup_imagemagick
 PG_VERSION="16" setup_postgresql
 PG_DB_NAME="manyfold" PG_DB_USER="manyfold" setup_postgresql_db