From 543d55be898ec4ea151b50a9710e1d0123217309 Mon Sep 17 00:00:00 2001
From: Kron4ek <kron4ek@gmail.com>
Date: Sun, 12 May 2024 18:54:17 +0300
Subject: [PATCH] Add ntsync builds to Actions

---
 .github/workflows/wine-ntsync.yml | 30 ++++++++++++++++++++++++++++++
 build_wine.sh                     | 12 ++++++++----
 create_ubuntu_bootstraps.sh       |  1 +
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/wine-ntsync.yml

diff --git a/.github/workflows/wine-ntsync.yml b/.github/workflows/wine-ntsync.yml
new file mode 100644
index 0000000..1b98c9c
--- /dev/null
+++ b/.github/workflows/wine-ntsync.yml
@@ -0,0 +1,30 @@
+name: Wine NTSYNC CI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download artifact
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: bootstraps.yml
+          workflow_conclusion: success
+          path: /opt
+      - name: Build Wine
+        run: |
+          sudo apt update
+          sudo apt install debootstrap perl git wget xz-utils bubblewrap autoconf
+          sudo tar -C /opt -xpf /opt/Bootstraps/bootstraps.tar.xz
+          chmod +x build_wine.sh
+          WINE_BRANCH=staging-tkg-ntsync ./build_wine.sh
+          sha256sum *.tar.xz
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Wine-Staging-TkG-ntsync
+          path: ./*.tar.xz
diff --git a/build_wine.sh b/build_wine.sh
index 7738e7b..468ade4 100755
--- a/build_wine.sh
+++ b/build_wine.sh
@@ -30,7 +30,7 @@ fi
 # use their own versions.
 export WINE_VERSION="${WINE_VERSION:-latest}"
 
-# Available branches: vanilla, staging, staging-tkg, proton
+# Available branches: vanilla, staging, proton, staging-tkg, staging-tkg-ntsync
 export WINE_BRANCH="${WINE_BRANCH:-staging}"
 
 # Available proton branches: proton_3.7, proton_3.16, proton_4.2, proton_4.11
@@ -206,11 +206,15 @@ if [ -n "${CUSTOM_SRC_PATH}" ]; then
 
 	WINE_VERSION="$(cat wine/VERSION | tail -c +14)"
 	BUILD_NAME="${WINE_VERSION}"-custom
-elif [ "$WINE_BRANCH" = "staging-tkg" ]; then
-	git clone https://github.com/Kron4ek/wine-tkg wine
+elif [ "$WINE_BRANCH" = "staging-tkg" ] || [ "$WINE_BRANCH" = "staging-tkg-ntsync" ]; then
+	if [ "$WINE_BRANCH" = "staging-tkg" ]; then
+		git clone https://github.com/Kron4ek/wine-tkg wine
+	else
+		git clone https://github.com/Kron4ek/wine-tkg wine -b ntsync
+	fi
 
 	WINE_VERSION="$(cat wine/VERSION | tail -c +14)"
-	BUILD_NAME="${WINE_VERSION}"-staging-tkg
+	BUILD_NAME="${WINE_VERSION}"-"${WINE_BRANCH}"
 elif [ "$WINE_BRANCH" = "proton" ]; then
 	if [ -z "${PROTON_BRANCH}" ]; then
 		git clone https://github.com/ValveSoftware/wine
diff --git a/create_ubuntu_bootstraps.sh b/create_ubuntu_bootstraps.sh
index c5e438a..8729b7a 100755
--- a/create_ubuntu_bootstraps.sh
+++ b/create_ubuntu_bootstraps.sh
@@ -117,6 +117,7 @@ wget -O vulkan-headers.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/arc
 wget -O spirv-headers.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/${spirv_headers_version}.tar.gz
 wget -O libpcap.tar.gz https://www.tcpdump.org/release/libpcap-${libpcap_version}.tar.gz
 wget -O libxkbcommon.tar.xz https://xkbcommon.org/download/libxkbcommon-${libxkbcommon_version}.tar.xz
+wget -O /usr/include/linux/ntsync.h https://raw.githubusercontent.com/zen-kernel/zen-kernel/f787614c40519eb2c8ebdc116b2cd09d46e5ec85/include/uapi/linux/ntsync.h
 if [ -d /usr/lib/i386-linux-gnu ]; then wget -O wine.deb https://dl.winehq.org/wine-builds/ubuntu/dists/bionic/main/binary-i386/wine-stable_4.0.3~bionic_i386.deb; fi
 if [ -d /usr/lib/x86_64-linux-gnu ]; then wget -O wine.deb https://dl.winehq.org/wine-builds/ubuntu/dists/bionic/main/binary-amd64/wine-stable_4.0.3~bionic_amd64.deb; fi
 git clone git://source.winehq.org/git/vkd3d.git