Fix variable name

arch/0-dxvk-git/PKGBUILD

@@ -36,12 +36,13 @@ makedepends=(
   'wine'
 )
 
+_dxvk_gitsrc=
 _git_branch_dxvk=master
 _dxvk_commit=HEAD
 
 provides=('dxvk')
 options=(!strip !buildflags staticlibs)
-source=(${pkgname}::"git+https://github.com/doitsujin/dxvk.git#commit=${_dxvk_commit}")
+source=(${pkgname}::"${_dxvk_gitsrc}#commit=${_dxvk_commit}")
 sha256sums=('SKIP')
 
 ##############################

arch/0-wine-staging-git/PKGBUILD

@@ -8,7 +8,7 @@ PKGDEST="${PWD}"
 enable_staging=1
 
 # Staging patchsets. Default: all patchsets. Please see Wine Staging patchinstall.sh file for individual patchset names.
-staging_patchsets=(--all) # In order to disable all patchsets, use #(--all) and add desired patchsets individually here 
+staging_patchsets=(--all) # In order to disable all patchsets, use #(--all) and add desired patchsets individually here
 
 # Enable 32-bit compilation? 1 = yes
 enable_32=1
@@ -34,6 +34,8 @@ pkgver=stg.5.15.2.r6.g663c3ba4+wine.wine.5.15.r83.g13ea90d80f
 pkgrel=1
 arch=('i686' 'x86_64')
 
+_wine_gitsrc=
+_staging_gitsrc=
 _wine_commit=HEAD
 _staging_commit=HEAD
 _git_branch_wine=master
@@ -122,7 +124,7 @@ optdepends=(
 options=('staticlibs')
 
 source=(
-  wine-git::"git://source.winehq.org/git/wine.git#commit=${_wine_commit}"
+  wine-git::"${_wine_gitsrc}#commit=${_wine_commit}"
   '30-win32-aliases.conf'
 )
 md5sums=('SKIP'
@@ -160,7 +162,7 @@ if [[ -d ${PWD}/wine-patches ]]; then
 fi
 
 if [[ enable_staging -eq 1 ]]; then
-  stagingsrc=wine-staging-git::"git://github.com/wine-staging/wine-staging.git#commit=${_staging_commit}"
+  stagingsrc=wine-staging-git::"${_staging_gitsrc}#commit=${_staging_commit}"
   source+=($stagingsrc)
 fi
 

arch/updatewine_arch.sh

@@ -51,6 +51,10 @@ git_commithash_wine=${params[3]}
 git_branch_dxvk=${params[4]}
 git_branch_wine=${params[7]}
 
+git_source_dxvk=${params[8]}
+git_source_wine=${params[11]}
+git_source_winestaging=${params[12]}
+
 ########################################################
 
 # Parse input arguments, filter user parameters
@@ -100,7 +104,7 @@ function INFO_SEP() { printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' - ;
 # If the script is interrupted (Ctrl+C/SIGINT), do the following
 
 function Arch_intCleanup() {
-  rm -rf ${ARCH_BUILDROOT}/{0-wine-staging-git/{wine-patches,*.tar.xz},0-dxvk-git/{dxvk-git,*.tar.xz}}
+  rm -rf ${ARCH_BUILDROOT}/{0-wine-staging-git/{wine-patches,*.tar.xz,*.sig},0-dxvk-git/{dxvk-git,*.tar.xz,*.sig}}
   exit 0
 }
 
@@ -369,7 +373,7 @@ function check_gitOverride_wine() {
 # Remove any existing pkg,src or tar.xz packages left by previous pacman commands
 
 function cleanUp() {
-  rm -rf ${ARCH_BUILDROOT}/*/{pkg,src,*.tar.xz,*.patch,*.diff}
+  rm -rf ${ARCH_BUILDROOT}/*/{pkg,src,*.tar.xz,*.patch,*.diff,*.sig}
 }
 
 ###########################################################
@@ -397,14 +401,23 @@ function build_pkg() {
     if [[ ${pkgname} == wine ]]; then
       check_gitOverride_wine
 
+      git_source_wine=$(echo ${git_source_wine} | sed 's/\//\\\//g; s/\./\\\./g')
+      sed -i "s/\(^_wine_gitsrc=\).*/\1\"${git_source_wine}\"/" ${pkgbuild_file}
+
       sed -i "s/\(^_wine_commit=\).*/\1${git_commithash_wine}/" ${pkgbuild_file}
       sed -i "s/\(^_git_branch_wine=\).*/\1${git_branch_wine}/" ${pkgbuild_file}
 
       if [[ ! -v NO_STAGING ]]; then
+        git_source_winestaging=$(echo ${git_source_winestaging} | sed 's/\//\\\//g; s/\./\\\./g')
+        sed -i "s/\(^_staging_gitsrc=\).*/\1\"${git_source_winestaging}\"/" ${pkgbuild_file}
+
         sed -i "s/\(^_staging_commit=\).*/\1${git_commithash_winestaging}/" ${pkgbuild_file}
       fi
 
     elif [[ ${pkgname} == dxvk ]]; then
+      git_source_dxvk=$(echo ${git_source_dxvk} | sed 's/\//\\\//g; s/\./\\\./g')
+      sed -i "s/\(^_dxvk_gitsrc=\).*/\1\"${git_source_dxvk}\"/" ${pkgbuild_file}
+
       sed -i "s/\(^_git_branch_dxvk=\).*/\1${git_branch_dxvk}/" ${pkgbuild_file}
       sed -i "s/\(^_dxvk_commit=\).*/\1${git_commithash_dxvk}/" ${pkgbuild_file}
     fi
@@ -482,7 +495,7 @@ function updatePOL() {
 # Clean these temporary folders & files
 
 # TODO Shall we remove git folders or keep them?
-dxvk_wine_cleanlist=('*.patch' '*.diff' 'pkg' 'src' '*-patches' '*.tar.xz')
+dxvk_wine_cleanlist=('*.patch' '*.diff' 'pkg' 'src' '*-patches' '*.tar.xz' '*.sig')
 
 ##########################################################
 

debian/dxvkroot/dxvk.debdata

@@ -16,7 +16,7 @@ A Vulkan-based translation layer for Direct3D 10/11 which
 allows running 3D applications on Linux using Wine.
 "
 
-pkg_giturl="https://github.com/doitsujin/dxvk"
+pkg_giturl="${git_source_dxvk}"
 pkg_homeurl="https://github.com/doitsujin/dxvk"
 pkg_gitbranch=${git_branch_dxvk}
 

debian/dxvkroot/dxvkbuild.sh

@@ -53,6 +53,10 @@ git_branch_dxvk=${params[3]}
 git_branch_glslang=${params[5]}
 git_branch_meson=${params[6]}
 
+git_source_dxvk=${params[8]}
+git_source_glslang=${params[9]}
+git_source_meson=${params[10]}
+
 ########################################################
 
 # Parse input arguments, filter user parameters
@@ -152,11 +156,11 @@ for rpp in ${remotePackagesPool[@]}; do
 
     # Fetch exact package name and associated date
     pkg_data=$(curl -s "${URL}/" | sed -rn 's/.*href="(.*(amd64|all)\.deb)">.*([0-9]{2}\-[A-Za-z]{3}\-[0-9]{4}).*/\1 \3/p' | sed 's/%2B/+/g' | grep "${rpp}")
-    
+
     if [[ ${pkg_data} = "" ]]; then
       continue
     fi
-    
+
     # Associate Unix-formatted date with the exact package name
     IFS=$'\n'
     for ps in ${pkg_data[@]}; do
@@ -165,7 +169,7 @@ for rpp in ${remotePackagesPool[@]}; do
       remotePackagesAltDate+=("${ps_date}|${ps_pkg}")
     done
     IFS=" "
-    
+
     # Sort exact package names by date
     remotePackagesAltDateSorted=($(sort <<<"${remotePackagesAltDate[*]}"))
 
@@ -185,12 +189,12 @@ for rpp in ${remotePackagesPool[@]}; do
     pkg=$(printf "%s" ${remotePackagesAltDateSorted[-1]} | sed -r 's/^[0-9]+\|(.*)/\1/')
     unset remotePackagesAltDate
     unset remotePackagesAltDateSorted
-    
+
     # Prepare and set a well-formatted value into remotePackagesAlt associative array
     if [ ! "${pkg}" == "" ]; then
       rpp_url=$(printf "%s/%s" "${URL}" "${pkg}")
       rpp_shortver=$(printf "%s" "${pkg}" | sed -r 's/.*_(.*[0-9]+)\-.*_(all|amd64).*/\1/g; s/[^0-9]//g')
-      
+
       rpp_token=$(printf "%s,%d" "${rpp}" "${rpp_shortver}")
       remotePackagesAlt+=(["${rpp_token}"]="${rpp_url}")
 
@@ -345,7 +349,7 @@ function dxvk_install_custom() {
     # Get our current directory, since we will change it during patching process below
     # We want to go back here after having applied the patches
     local CURDIR="${PWD}"
-    
+
     # Check if the following folder exists, and proceed.
     if [[ -d "${DXVKROOT}/../../${PATCHDIR}" ]]; then
       cp -r "${DXVKROOT}/../../${PATCHDIR}/"*.{patch,diff} "${DXVKROOT}/${pkg_name}/" 2>/dev/null

debian/dxvkroot/glslang.debdata

@@ -13,7 +13,7 @@ pkg_longdesc="
 Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
 "
 
-pkg_giturl="https://github.com/KhronosGroup/glslang"
+pkg_giturl="${git_source_glslang}"
 pkg_homeurl="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
 pkg_gitbranch=${git_branch_glslang}
 

debian/dxvkroot/meson.debdata

@@ -15,7 +15,7 @@ productivity. It does this by providing a fast, simple and easy to\n\
 use interface for modern software development tools and practices.
 "
 
-pkg_giturl="https://github.com/mesonbuild/meson"
+pkg_giturl="${git_source_meson}"
 pkg_homeurl="http://mesonbuild.com"
 pkg_gitbranch=${git_branch_meson}
 

debian/wineroot/winebuild.sh

@@ -316,6 +316,9 @@ done
 git_commithash_wine=${params[3]}
 git_branch_wine=${params[7]}
 
+git_source_wine=${params[11]}
+git_source_winestaging=${params[12]}
+
 ########################################################
 
 # Parse input arguments, filter user parameters
@@ -403,8 +406,8 @@ function girl_check() {
 
 function getWine() {
 
-  local winesrc_url="git://source.winehq.org/git/wine.git"
-  local winestagingsrc_url="git://github.com/wine-staging/wine-staging.git"
+  local winesrc_url="${git_source_wine}"
+  local winestagingsrc_url="${git_source_winestaging}"
 
   function cleanOldBuilds() {
     if [[ $(find "${BUILDROOT}" -type d -name "winebuild_*" | wc -l) -ne 0 ]]; then

options.conf

@@ -1,6 +1,6 @@
 ########################################################
 
-# Options for DXVK/Wine-Staging scripts dispatcher script
+# Options for DXVK/Wine-Staging scripts
 
 ########################################################
 
@@ -13,17 +13,26 @@
 # version available
 # Do NOT leave these variable empty!
 
-# Commits & branches: https://github.com/doitsujin/dxvk
+#########
+
+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"
+
+# DXVK commits & branches
 git_commithash_dxvk=HEAD
 git_branch_dxvk=master
 
-# Commits & branches: https://source.winehq.org/git/wine.git/
+# Wine commits & branches
 git_commithash_wine=HEAD
 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"
+
 # Commits & branches: https://github.com/mesonbuild/meson
 git_commithash_meson=5d6dcf8850fcc5d552f55943b6aa3582754dedf8
 git_branch_meson=master

updatewine.sh

@@ -179,20 +179,31 @@ datesuffix=$(echo $(date '+%Y-%m-%d-%H%M%S'))
 # Pass them to subscripts, as well.
 
 githash_overrides=(
-  "${git_commithash_dxvk}"
-  "${git_commithash_glslang}"
-  "${git_commithash_meson}"
-  "${git_commithash_wine}"
+  "${git_commithash_dxvk}"     # 0
+  "${git_commithash_glslang}"  # 1
+  "${git_commithash_meson}"    # 2
+  "${git_commithash_wine}"     # 3
 )
 
 # Add git branches to argument list
 # Pass them to subscripts, as well.
 
 gitbranch_overrides=(
-  "${git_branch_dxvk}"
-  "${git_branch_glslang}"
-  "${git_branch_meson}"
-  "${git_branch_wine}"
+  "${git_branch_dxvk}"         # 4
+  "${git_branch_glslang}"      # 5
+  "${git_branch_meson}"        # 6
+  "${git_branch_wine}"         # 7
+)
+
+# Add git sources to argument list
+# Pass them to subscripts, as well.
+
+gitsources=(
+  "${git_source_dxvk}"         # 8
+  "${git_source_glslang}"      # 9
+  "${git_source_meson}"        # 10
+  "${git_source_wine}"         # 11
+  "${git_source_winestaging}"  # 12
 )
 
 #############################
@@ -210,7 +221,7 @@ done
 
 ###########################################################
 
-params=(${datesuffix} ${githash_overrides[@]} ${gitbranch_overrides[@]} ${args[@]})
+params=(${datesuffix} ${githash_overrides[@]} ${gitbranch_overrides[@]} ${gitsources[@]} ${args[@]})
 
 ###########################################################