Browse Source

Un-hardcode git sources

master
Pekka Helenius 2 years ago
parent
commit
f2b619454b
10 changed files with 58 additions and 21 deletions
  1. +2
    -1
      arch/0-dxvk-git/PKGBUILD
  2. +5
    -3
      arch/0-wine-staging-git/PKGBUILD
  3. +7
    -0
      arch/updatewine_arch.sh
  4. +1
    -1
      debian/dxvkroot/dxvk.debdata
  5. +4
    -0
      debian/dxvkroot/dxvkbuild.sh
  6. +1
    -1
      debian/dxvkroot/glslang.debdata
  7. +1
    -1
      debian/dxvkroot/meson.debdata
  8. +5
    -2
      debian/wineroot/winebuild.sh
  9. +12
    -3
      options.conf
  10. +20
    -9
      updatewine.sh

+ 2
- 1
arch/0-dxvk-git/PKGBUILD View File

@ -36,12 +36,13 @@ makedepends=(
'wine' 'wine'
) )
_dxvk_gitsrc=
_git_branch_dxvk=master _git_branch_dxvk=master
_dxvk_commit=HEAD _dxvk_commit=HEAD
provides=('dxvk') provides=('dxvk')
options=(!strip !buildflags staticlibs) 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') sha256sums=('SKIP')
############################## ##############################


+ 5
- 3
arch/0-wine-staging-git/PKGBUILD View File

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


+ 7
- 0
arch/updatewine_arch.sh View File

@ -51,6 +51,10 @@ git_commithash_wine=${params[3]}
git_branch_dxvk=${params[4]} git_branch_dxvk=${params[4]}
git_branch_wine=${params[7]} git_branch_wine=${params[7]}
git_source_dxvk=${params[8]}
git_source_wine=${params[11]}
git_source_wine-staging=${params[12]}
######################################################## ########################################################
# Parse input arguments, filter user parameters # Parse input arguments, filter user parameters
@ -397,14 +401,17 @@ function build_pkg() {
if [[ ${pkgname} == wine ]]; then if [[ ${pkgname} == wine ]]; then
check_gitOverride_wine check_gitOverride_wine
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/\(^_wine_commit=\).*/\1${git_commithash_wine}/" ${pkgbuild_file}
sed -i "s/\(^_git_branch_wine=\).*/\1${git_branch_wine}/" ${pkgbuild_file} sed -i "s/\(^_git_branch_wine=\).*/\1${git_branch_wine}/" ${pkgbuild_file}
if [[ ! -v NO_STAGING ]]; then if [[ ! -v NO_STAGING ]]; then
sed -i "s/\(^_staging_gitsrc=\).*/\1${git_source_wine-staging}/" ${pkgbuild_file}
sed -i "s/\(^_staging_commit=\).*/\1${git_commithash_winestaging}/" ${pkgbuild_file} sed -i "s/\(^_staging_commit=\).*/\1${git_commithash_winestaging}/" ${pkgbuild_file}
fi fi
elif [[ ${pkgname} == dxvk ]]; then elif [[ ${pkgname} == dxvk ]]; then
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/\(^_git_branch_dxvk=\).*/\1${git_branch_dxvk}/" ${pkgbuild_file}
sed -i "s/\(^_dxvk_commit=\).*/\1${git_commithash_dxvk}/" ${pkgbuild_file} sed -i "s/\(^_dxvk_commit=\).*/\1${git_commithash_dxvk}/" ${pkgbuild_file}
fi fi


+ 1
- 1
debian/dxvkroot/dxvk.debdata View File

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


+ 4
- 0
debian/dxvkroot/dxvkbuild.sh View File

@ -53,6 +53,10 @@ git_branch_dxvk=${params[3]}
git_branch_glslang=${params[5]} git_branch_glslang=${params[5]}
git_branch_meson=${params[6]} 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 # Parse input arguments, filter user parameters


+ 1
- 1
debian/dxvkroot/glslang.debdata View File

@ -13,7 +13,7 @@ pkg_longdesc="
Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator 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_homeurl="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
pkg_gitbranch=${git_branch_glslang} pkg_gitbranch=${git_branch_glslang}


+ 1
- 1
debian/dxvkroot/meson.debdata View File

@ -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. 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_homeurl="http://mesonbuild.com"
pkg_gitbranch=${git_branch_meson} pkg_gitbranch=${git_branch_meson}


+ 5
- 2
debian/wineroot/winebuild.sh View File

@ -316,6 +316,9 @@ done
git_commithash_wine=${params[3]} git_commithash_wine=${params[3]}
git_branch_wine=${params[7]} git_branch_wine=${params[7]}
git_source_wine=${params[11]}
git_source_wine-staging=${params[12]}
######################################################## ########################################################
# Parse input arguments, filter user parameters # Parse input arguments, filter user parameters
@ -403,8 +406,8 @@ function girl_check() {
function getWine() { 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_wine-staging}"
function cleanOldBuilds() { function cleanOldBuilds() {
if [[ $(find "${BUILDROOT}" -type d -name "winebuild_*" | wc -l) -ne 0 ]]; then if [[ $(find "${BUILDROOT}" -type d -name "winebuild_*" | wc -l) -ne 0 ]]; then


+ 12
- 3
options.conf View File

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


+ 20
- 9
updatewine.sh View File

@ -179,20 +179,31 @@ datesuffix=$(echo $(date '+%Y-%m-%d-%H%M%S'))
# Pass them to subscripts, as well. # Pass them to subscripts, as well.
githash_overrides=( 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 # Add git branches to argument list
# Pass them to subscripts, as well. # Pass them to subscripts, as well.
gitbranch_overrides=( 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_wine-staging}" # 12
) )
############################# #############################
@ -210,7 +221,7 @@ done
########################################################### ###########################################################
params=(${datesuffix} ${githash_overrides[@]} ${gitbranch_overrides[@]} ${args[@]})
params=(${datesuffix} ${githash_overrides[@]} ${gitbranch_overrides[@]} ${gitsources[@]} ${args[@]})
########################################################### ###########################################################


Loading…
Cancel
Save