From 2f2f17cb443d6d703740bc6c29a444a028adf3e4 Mon Sep 17 00:00:00 2001
From: Pekka Helenius <pekka.helenius@fjordtek.com>
Date: Sun, 30 Oct 2022 21:44:37 +0200
Subject: [PATCH] Add debian-specific variables

---
 options.conf  | 21 ++++++++++++++-------
 updatewine.sh | 21 ++++++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/options.conf b/options.conf
index 5c86c10..c10c24d 100644
--- a/options.conf
+++ b/options.conf
@@ -15,11 +15,18 @@
 
 #########
 
-git_source_dxvknvapi="git://github.com/jp7677/dxvk-nvapi.git"
-git_source_vkd3dproton="git://github.com/HansKristian-Work/vkd3d-proton.git"
-git_source_dxvk="git://github.com/doitsujin/dxvk.git"
-git_source_wine="git://source.winehq.org/git/wine.git"
-git_source_winestaging="git://github.com/wine-staging/wine-staging.git"
+git_source_dxvknvapi="git+https://github.com/jp7677/dxvk-nvapi.git"
+git_source_vkd3dproton="git+https://github.com/HansKristian-Work/vkd3d-proton.git"
+git_source_dxvk="git+https://github.com/doitsujin/dxvk.git"
+git_source_wine="git://source.winehq.org/git/wine"
+git_source_winestaging="git+https://github.com/wine-staging/wine-staging.git"
+
+# Debian versions
+git_source_dxvknvapi_debian="https://github.com/jp7677/dxvk-nvapi"
+git_source_vkd3dproton_debian="https://github.com/HansKristian-Work/vkd3d-proton"
+git_source_dxvk_debian="https://github.com/doitsujin/dxvk"
+git_source_wine_debian="git://source.winehq.org/git/wine"
+git_source_winestaging_debian="https://github.com/wine-staging/wine-staging"
 
 # DXVK commits & branches
 git_commithash_dxvk=HEAD
@@ -40,8 +47,8 @@ git_branch_wine=master
 ##########
 # These apply only on Debian/Ubuntu/Mint
 
-git_source_meson="git://github.com/mesonbuild/meson.git"
-git_source_glslang="git://github.com/KhronosGroup/glslang.git"
+git_source_meson_debian="git://github.com/mesonbuild/meson.git"
+git_source_glslang_debian="git://github.com/KhronosGroup/glslang.git"
 
 # Commits & branches: https://github.com/mesonbuild/meson
 git_commithash_meson=5d6dcf8850fcc5d552f55943b6aa3582754dedf8
diff --git a/updatewine.sh b/updatewine.sh
index 9723cfd..4f02a71 100755
--- a/updatewine.sh
+++ b/updatewine.sh
@@ -219,13 +219,20 @@ gitbranch_overrides=(
 # Pass them to subscripts, as well.
 
 gitsources=(
-  "${git_source_dxvknvapi}"    # 12
-  "${git_source_vkd3dproton}"  # 13
-  "${git_source_dxvk}"         # 14
-  "${git_source_glslang}"      # 15
-  "${git_source_meson}"        # 16
-  "${git_source_wine}"         # 17
-  "${git_source_winestaging}"  # 18
+  "${git_source_dxvknvapi}"      # 12
+  "${git_source_vkd3dproton}"    # 13
+  "${git_source_dxvk}"           # 14
+  "${git_source_glslang_debian}" # 15
+  "${git_source_meson_debian}"   # 16
+  "${git_source_wine}"           # 17
+  "${git_source_winestaging}"    # 18
+
+  # Debian
+  "${git_source_dxvknvapi_debian}"   # 19
+  "${git_source_vkd3dproton_debian}" # 20
+  "${git_source_dxvk_debian}"        # 21
+  "${git_source_wine_debian}"        # 22
+  "${git_source_winestaging_debian}" # 23
 )
 
 #############################