diff --git a/winetricks b/winetricks
index d1988ce..34a3959 100755
--- a/winetricks
+++ b/winetricks
@@ -6,7 +6,7 @@
# Name of this version of winetricks (YYYYMMDD)
# (This doesn't change often, use the sha256sum of the file when reporting problems)
-WINETRICKS_VERSION=20240105-next
+WINETRICKS_VERSION=20250102-next
# This is a UTF-8 file
# You should see an o with two dots over it here [ö]
@@ -26,12 +26,9 @@ WINETRICKS_VERSION=20240105-next
#
# Uses the following non-POSIX system tools:
# - wine is used to execute Win32 apps except on Cygwin.
-# - ar, cabextract, unrar, unzip, and 7z are needed by some verbs.
+# - cabextract, unrar, unzip, and 7z are needed by some verbs.
# - aria2c, wget, curl, or fetch is needed for downloading.
-# - fuseiso, archivemount (Linux), or hdiutil (macOS) is used to mount .iso images.
# - perl is used for displaying download progress for wget when using zenity
-# - pkexec, sudo, or kdesu (gksu/gksudo/kdesudo are deprecated upstream but also still supported)
-# are used to mount .iso images if the user cached them with -k option.
# - sha256sum, sha256, or shasum (OSX 10.5 does not support these, 10.6+ is required)
# - torify is used with option "--torify" if sites are blocked in single countries.
# - xdg-open (if present) or open (for OS X) is used to open download pages
@@ -40,14 +37,14 @@ WINETRICKS_VERSION=20240105-next
# - zenity is needed by the GUI, though it can limp along somewhat with kdialog/xmessage.
#
# On Ubuntu (23.04 and newer), the following line can be used to install all the prerequisites:
-# sudo apt install 7zip aria2 binutils cabextract fuseiso pkexec tor unrar-free unzip wine xdg-utils xz-utils zenity
+# sudo apt install 7zip aria2 binutils cabextract pkexec tor unrar-free unzip wine xdg-utils xz-utils zenity
#
# On older Ubuntu, the following line can be used to install all the prerequisites:
-# sudo apt install aria2 binutils cabextract fuseiso p7zip-full policykit-1 tor unrar-free unzip wine xdg-utils xz-utils zenity
+# sudo apt install aria2 binutils cabextract p7zip-full policykit-1 tor unrar-free unzip wine xdg-utils xz-utils zenity
#
# On Fedora, these commands can be used (RPM Fusion is used to install unrar):
# sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-# sudo dnf install binutils cabextract fuseiso p7zip-plugins polkit tor unrar unzip wget wine xdg-utils xz zenity
+# sudo dnf install binutils cabextract p7zip-plugins polkit tor unrar unzip wget wine xdg-utils xz zenity
#
# See https://github.com/Winetricks/winetricks for documentation and tutorials,
# including how to contribute changes to winetricks.
@@ -56,7 +53,7 @@ WINETRICKS_VERSION=20240105-next
#
# Copyright:
# Copyright (C) 2007-2014 Dan Kegel <dank!kegel.com>
-# Copyright (C) 2008-2024 Austin English <austinenglish!gmail.com>
+# Copyright (C) 2008-2025 Austin English <austinenglish!gmail.com>
# Copyright (C) 2010-2011 Phil Blankenship <phillip.e.blankenship!gmail.com>
# Copyright (C) 2010-2015 Shannon VanWagner <shannon.vanwagner!gmail.com>
# Copyright (C) 2010 Belhorma Bendebiche <amro256!gmail.com>
@@ -723,27 +720,6 @@ w_try_7z()
fi
}
-w_try_ar()
-{
- # $1 - ar file (.deb) to extract (keeping internal paths, in cwd)
- # $2 - file to extract (optional)
-
- # Not always installed, use Windows 7-zip as a fallback:
- if [ -z "${WINETRICKS_FORCE_WIN_7Z}" ] && [ -x "$(command -v ar 2>/dev/null)" ]; then
- w_try ar x "$@"
- else
- w_warn "Cannot find ar. Using Windows 7-zip instead. (You can avoid this by installing binutils, e.g. 'sudo apt install binutils' or 'sudo yum install binutils')."
- WINETRICKS_OPT_SHAREDPREFIX=1 w_call 7zip
-
- # w_call above will wipe $W_TMP; if that's the CWD, things will break. So forcefully reset the directory:
- w_try_cd "${PWD}"
-
- # -t* prevents 7-zip from decompressing .tar.xz to .tar, see
- # https://sourceforge.net/p/sevenzip/discussion/45798/thread/8cd16946/?limit=25
- w_try "${WINE}" "${W_PROGRAMS_X86_WIN}\\7-Zip\\7z.exe" -t* x "$(w_pathconv -w "$1")"
- fi
-}
-
w_try_cabextract()
{
# Not always installed, but shouldn't be fatal unless it's being used
@@ -1075,7 +1051,7 @@ w_pathconv()
# Expand an environment variable and print it to stdout
w_expand_env()
{
- winetricks_early_wine_arch cmd.exe /c echo "%$1%"
+ winetricks_early_wine_arch cmd.exe /c "chcp 65001 > nul & echo %$1%"
}
# Determine what architecture a binary file is built for, silently continue in case of failure.
@@ -1113,6 +1089,9 @@ w_get_github_latest_release()
org="$1"
repo="$2"
+ # release.json might still exists from the previous verb
+ w_try rm -f "${W_TMP_EARLY}/release.json"
+
WINETRICKS_SUPER_QUIET=1 w_download_to "${W_TMP_EARLY}" "https://api.github.com/repos/${org}/${repo}/releases/latest" "" "release.json" >/dev/null 2>&1
# aria2c condenses the json (https://github.com/aria2/aria2/issues/1389)
@@ -1461,9 +1440,13 @@ w_download_to()
w_try_mkdir "${_W_cache}"
fi
- # Try download twice
+ # Try download twice, unless ${WINETRICKS_NO_ARCHIVE_ORG} is set (e.g., by winetricks-test)
checksum_ok=""
- tries=0
+ if [ -n "${WINETRICKS_NO_ARCHIVE_ORG}" ]; then
+ tries=1
+ else
+ tries=0
+ fi
# Set olddir before entering the loop, otherwise second try will overwrite
_W_dl_olddir=$(pwd)
while test ${tries} -lt 2 ; do
@@ -1797,105 +1780,6 @@ w_question()
#----------------------------------------------------------------
-
-# Usage: w_mount "volume name" [filename-to-check [discnum]]
-# Some games have two volumes with identical volume names.
-# For these, please specify discnum 1 for first disc, discnum 2 for 2nd, etc.,
-# else caching can't work.
-# FIXME: should take mount option 'unhide' for poorly mastered discs
-w_mount()
-{
- if test "$3"; then
- WINETRICKS_IMG="${W_CACHE}/${W_PACKAGE}/$1-$3.iso"
- else
- WINETRICKS_IMG="${W_CACHE}/${W_PACKAGE}/$1.iso"
- fi
- w_try_mkdir "${W_CACHE}/${W_PACKAGE}"
-
- if test -f "${WINETRICKS_IMG}"; then
- winetricks_mount_cached_iso
- else
- if test "${WINETRICKS_OPT_KEEPISOS}" = 0 || test "$2"; then
- while true; do
- winetricks_mount_real_volume "$1"
- if test "$2" = "" || test -f "${W_ISO_MOUNT_ROOT}/$2"; then
- break
- else
- w_warn "Wrong disc inserted, $2 not found."
- fi
- done
- fi
-
- case "${WINETRICKS_OPT_KEEPISOS}" in
- 1)
- winetricks_cache_iso "$1"
- winetricks_mount_cached_iso
- ;;
- esac
- fi
-}
-
-w_umount()
-{
- if test "${WINE}" = ""; then
- # Windows
- winetricks_load_vcdmount
- w_try_cd "${VCD_DIR}"
- w_try vcdmount.exe /u
- else
- if test "${W_USE_USERMOUNT}"; then
- # FUSE-based tools or hdiutil
- if test -d "${W_ISO_USER_MOUNT_ROOT}"; then
- "${WINE}" eject "${W_ISO_MOUNT_LETTER}:"
- cat > "${W_TMP}"/unset_type_cdrom.reg <<_EOF_
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\\Software\\Wine\\Drives]
-"${W_ISO_MOUNT_LETTER}:"=-
-_EOF_
- w_try_regedit "${W_TMP}"/unset_type_cdrom.reg
- rm -f "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}:"
- rm -f "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}::"
-
- case "${WINETRICKS_ISO_MOUNT}" in
- hdiutil)
- "${WINETRICKS_ISO_MOUNT}" detach "${W_ISO_USER_MOUNT_ROOT}"
- ;;
- *)
- # -uz lazy unmount in case executable still running
- fusermount -uz "${W_ISO_USER_MOUNT_ROOT}"
- ;;
- esac
- w_try rmdir "${W_ISO_USER_MOUNT_ROOT}"
- fi
- W_ISO_MOUNT_ROOT=/mnt/winetricks
- else
- # sudo + umount
- echo "Running ${WINETRICKS_SUDO} umount ${W_ISO_MOUNT_ROOT}"
-
- case "${WINETRICKS_SUDO}" in
- gksu*|kdesudo)
- # -l lazy unmount in case executable still running
- "${WINETRICKS_SUDO}" "umount -l ${W_ISO_MOUNT_ROOT}"
- w_try "${WINETRICKS_SUDO}" "rm -rf ${W_ISO_MOUNT_ROOT}"
- ;;
- kdesu)
- "${WINETRICKS_SUDO}" -c "umount -l ${W_ISO_MOUNT_ROOT}"
- w_try "${WINETRICKS_SUDO}" -c "rm -rf ${W_ISO_MOUNT_ROOT}"
- ;;
- *)
- "${WINETRICKS_SUDO}" umount -l "${W_ISO_MOUNT_ROOT}"
- w_try "${WINETRICKS_SUDO}" rm -rf "${W_ISO_MOUNT_ROOT}"
- ;;
- esac
-
- "${WINE}" eject "${W_ISO_MOUNT_LETTER}:"
- rm -f "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}:"
- rm -f "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}::"
- fi
- fi
-}
-
w_ahk_do()
{
if ! test -f "${W_CACHE}/ahk/AutoHotkeyU32.exe"; then
@@ -2861,9 +2745,6 @@ w_do_call()
test "${W_OPT_NOCLEAN}" = 1 || rm -rf "${W_TMP}"
w_try_mkdir -q "${W_TMP}"
- # Reset whether use of user mount tool
- unset W_USE_USERMOUNT
-
# Calling subshell must explicitly propagate error code with exit $?
) || exit $?
}
@@ -3253,71 +3134,6 @@ winetricks_detect_gui()
fi
}
-# Detect which sudo to use
-winetricks_detect_sudo()
-{
- WINETRICKS_SUDO=sudo
- if test "${WINETRICKS_GUI}" = "none"; then
- return
- fi
-
- if test x"${DISPLAY}" != x""; then
- # This should be the default option because some of GUI sudo programs are unmaintained
- # See https://github.com/Winetricks/winetricks/issues/912
- if test -x "$(command -v pkexec 2>/dev/null)"; then
- # Maintained and recommended, part of Polkit, desktop-independent
- # Usage: pkexec command ...
- WINETRICKS_SUDO=pkexec
- # Austin said "gksu*/kdesu* should stay (at least for a while)" in Feb 2018
- # See https://github.com/Winetricks/winetricks/pull/915#issuecomment-362984379
- elif test -x "$(command -v gksudo 2>/dev/null)"; then
- # Unmaintained [2009], part of gksu
- # Usage: gksudo "command ..."
- WINETRICKS_SUDO=gksudo
- elif test -x "$(command -v kdesudo 2>/dev/null)"; then
- # Unmaintained [2015] (latest is for KDE4, no KF5 version available)
- # https://cgit.kde.org/kdesudo.git/
- # Usage: kdesudo "command ..."
- WINETRICKS_SUDO=kdesudo
- # fall back to the su versions if sudo isn't available (Fedora, etc.):
- elif test -x "$(command -v gksu 2>/dev/null)"; then
- # Unmaintained [2009]
- # Usage: gksu "command ..."
- WINETRICKS_SUDO=gksu
- elif test -x "$(command -v kdesu 2>/dev/null)"; then
- # Maintained, KF5 version available
- # https://cgit.kde.org/kdesu.git/
- # Usage: kdesu -c "command ..."
- WINETRICKS_SUDO=kdesu
- fi
- fi
-}
-
-# Detect which iso mount tool to use
-winetricks_detect_iso_mount()
-{
- if test -x "$(command -v fuseiso 2>/dev/null)"; then
- # File/dir names are converted to lowercase
- WINETRICKS_ISO_MOUNT=fuseiso
- elif test -x "$(command -v archivemount 2>/dev/null)"; then
- # File/dir names may be uppercase and we may need
- # case-insensitive operations
- # e.g. w_try "$WINE" cmd /c "copy $W_ISO_MOUNT_LETTER:\\DOC.PDF C:\\doc.pdf"
- # This tool had path issue in 0.8.8 or older versions
- # e.g. office2013pro works in 0.8.9 or later but doesn't work in 0.8.8
- WINETRICKS_ISO_MOUNT=archivemount
- elif test -x "$(command -v hdiutil 2>/dev/null)"; then
- # File/dir names may be uppercase (same as archivemount)
- WINETRICKS_ISO_MOUNT=hdiutil
- else
- WINETRICKS_ISO_MOUNT=none
- fi
- # Notes about other tools:
- # fuseiso9660: may append ";1" to filenames
- # unar: the drive icon is not "optical drive + disc" in Wine Explorer
- # and "wine eject" command fails
-}
-
winetricks_get_prefix_var()
{
(
@@ -4479,502 +4295,6 @@ winetricks_die_if_user_not_dirowner()
fi
}
-# See
-# https://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf (iso9660)
-# https://www.ecma-international.org/publications/files/ECMA-ST/Ecma-167.pdf
-# http://www.osta.org/specs/pdf/udf102.pdf
-# https://www.ecma-international.org/publications/techreports/E-TR-071.htm
-
-# Usage: read_bytes offset count device
-winetricks_read_bytes()
-{
- dd status=noxfer if="$3" bs=1 skip="$1" count="$2" 2>/dev/null
-}
-
-# Usage: read_hex offset count device
-winetricks_read_hex()
-{
- od -j "$1" -N "$2" -t x1 "$3" | # offset $1, count $2, single byte hex format, file $3
- sed 's/^[^ ]* //' | # remove address
- sed '$d' # remove final line which is just final offset
-}
-
-# Usage: read_decimal offset device
-# Reads single four byte word, outputs in decimal.
-# Uses default endianness.
-# udf uses little endian words, so this only works on little endian machines.
-winetricks_read_decimal()
-{
- od -j "$1" -N 4 -t u4 "$2" | # offset $1, byte count 4, four byte decimal format, file $2
- sed 's/^[^ ]* //' | # remove address
- sed '$d' # remove final line which is just final offset
-}
-
-winetricks_read_udf_volume_name()
-{
- # "Anchor volume descriptor pointer" starts at sector 256
-
- # AVDP Layout (ECMA-167 3/10.2):
- # size offset contents
- # 16 0 descriptor tag (id = 2)
- # 16 8 main (primary?) volume descriptor sequence extent
- # ...
-
- # descriptor tag layout (ECMA-167 3/7.2):
- # size offset contents
- # 2 0 TagIdentifier
- # ...
-
- # extent layout (ECMA-167 3/7.1):
- # size offset contents
- # 4 0 length (in bytes)
- # 8 4 location (in 2k sectors)
-
- # primary volume descriptor layout (ECMA-167 3/10.1):
- # size offset contents
- # 16 0 descriptor tag (id = 1)
- # ...
- # 32 24 volume identifier (dstring)
-
- # 1. check the 16 bit TagIdentifier of the descriptor tag, make sure it's 2
- tagid=$(winetricks_read_hex 524288 2 "$1")
- : echo "tagid is ${tagid}"
- case "${tagid}" in
- "02 00") : echo "Found AVDP" ;;
- *) echo "Did not find AVDP (tagid was ${tagid})"; exit 1;;
- esac
-
- # 2. read the location of the main volume descriptor:
- offset=$(winetricks_read_decimal 524308 "$1")
- : echo "MVD is at sector ${offset}"
- offset=$((offset * 2048))
- : echo "MVD is at byte ${offset}"
-
- # 3. check the TagIdentifier of the MVD's descriptor tag, make sure it's 1
- tagid=$(winetricks_read_hex ${offset} 2 "$1")
- : echo "tagid is ${tagid}"
- case "${tagid}" in
- "01 00") : echo Found MVD ;;
- *) echo Did not find MVD; exit 1;;
- esac
-
- # 4. Read whether the name is in 8 or 16 bit chars
- offset=$((offset + 24))
- width=$(winetricks_read_hex ${offset} 1 "$1")
-
- offset=$((offset + 1))
-
- # 5. Profit!
- case ${width} in
- 08) winetricks_read_bytes ${offset} 30 "$1" | sed 's/ *$//' ;;
- 10) winetricks_read_bytes ${offset} 30 "$1" | tr -d '\000' | sed 's/ *$//' ;;
- *) echo "Unhandled dvd volname character width '${width}'"; exit 1;;
- esac
-
- echo ""
-}
-
-winetricks_read_iso9660_volume_name()
-{
- winetricks_read_bytes 32808 30 "$1" | sed 's/ *$//'
-}
-
-winetricks_read_volume_name()
-{
- # ECMA-119 says that CD-ROMs have sector size 2k, and at sector 16 have:
- # size offset contents
- # 1 0 Volume descriptor type (1 for primary volume descriptor)
- # 5 1 Standard identifier ("CD001" for iso9660)
- # ECMA-167, section 9.1.2, has a table of standard identifiers:
- # "BEA01": ecma-167 9.2, Beginning Extended Area Descriptor
- # "CD001": ecma-119
- # "CDW02": ecma-168
-
- std_id=$(winetricks_read_bytes 32769 5 "$1")
- : echo "std_id is ${std_id}"
-
- case ${std_id} in
- CD001) winetricks_read_iso9660_volume_name "$1" ;;
- BEA01) winetricks_read_udf_volume_name "$1" ;;
- *) echo "Unrecognized disk type ${std_id}"; exit 1 ;;
- esac
-}
-
-winetricks_volname()
-{
- x=$(volname "$1" 2> /dev/null| sed 's/ *$//')
- if test -z "${x}"; then
- # UDF? See https://bugs.launchpad.net/bugs/678419
- x=$(winetricks_read_volume_name "$1")
- fi
- echo "${x}"
-}
-
-# Really, should take a volume name as argument, and use 'mount' to get
-# mount point if system automounted it.
-winetricks_detect_optical_drive()
-{
- case "${WINETRICKS_DEV}" in
- "") ;;
- *) return ;;
- esac
-
- for WINETRICKS_DEV in /dev/cdrom /dev/dvd /dev/sr0; do
- test -b ${WINETRICKS_DEV} && break
- done
-
- case "${WINETRICKS_DEV}" in
- "x") w_die "can't find cd/dvd drive" ;;
- esac
-}
-
-winetricks_cache_iso()
-{
- # WINETRICKS_IMG has already been set by w_mount
- _W_expected_volname="$1"
-
- winetricks_die_if_user_not_dirowner "${W_CACHE}"
- winetricks_detect_optical_drive
-
- # Horrible hack for Gentoo - make sure we can read from the drive
- if ! test -r "${WINETRICKS_DEV}"; then
- case "${WINETRICKS_SUDO}" in
- gksu*|kdesudo) ${WINETRICKS_SUDO} chmod 666 "${WINETRICKS_DEV}" ;;
- kdesu) ${WINETRICKS_SUDO} -c "chmod 666 ${WINETRICKS_DEV}" ;;
- *) ${WINETRICKS_SUDO} chmod 666 "${WINETRICKS_DEV}" ;;
- esac
- fi
-
- while true; do
- # Wait for user to insert disc.
- # Sleep long to make it less likely to close the drive during insertion.
- while ! dd if="${WINETRICKS_DEV}" of=/dev/null count=1; do
- sleep 5
- done
-
- # Some distributions automount discs in /media, take advantage of that
- if test -d "/media/_W_expected_volname"; then
- break
- fi
- # Otherwise try and read it straight from unmounted volume
- _W_volname="$(winetricks_volname "${WINETRICKS_DEV}")"
- if test "${_W_expected_volname}" != "${_W_volname}"; then
- case ${LANG} in
- bg*) w_warn "Дискът [${_W_volname}] е неправилен. Моля, използвайте [${_W_expected_volname}]" ;;
- da*) w_warn "Forkert disk [${_W_volname}] indsat. Indsæt venligst disken [${_W_expected_volname}]" ;;
- de*) w_warn "Falsche Disk [${_W_volname}] eingelegt. Bitte legen Sie Disk [${_W_expected_volname}] ein!" ;;
- pl*) w_warn "Umieszczono zły dysk [${_W_volname}]. Proszę włożyć dysk [${_W_expected_volname}]" ;;
- pt*) w_warn "Disco errado [${_W_volname}] inserido. Por favor insira o disco [${_W_expected_volname}]" ;;
- ru*) w_warn "Неверный диск [${_W_volname}]. Пожалуйста, вставьте диск [${_W_expected_volname}]" ;;
- uk*) w_warn "Неправильний диск [${_W_volname}]. Будь ласка, вставте диск [${_W_expected_volname}]" ;;
- zh_CN*) w_warn " [${_W_volname}] 光盘插入错误，请插入光盘 [${_W_expected_volname}]" ;;
- zh_TW*|zh_HK*) w_warn " [${_W_volname}] 光碟插入錯誤，請插入光碟 [${_W_expected_volname}]" ;;
- *) w_warn "Wrong disc [${_W_volname}] inserted. Please insert disc [${_W_expected_volname}]" ;;
- esac
-
- sleep 10
- else
- break
- fi
- done
-
- # Copy disc to .iso file, display progress every 5 seconds
- # Use conv=noerror,sync to replace unreadable blocks with zeroes
- case "${WINETRICKS_OPT_DD}" in
- dd)
- "${WINETRICKS_OPT_DD}" if="${WINETRICKS_DEV}" of="${W_CACHE}"/temp.iso bs=2048 conv=noerror,sync &
- WINETRICKS_DD_PID=$!
- ;;
- ddrescue)
- if [ ! -x "$(command -v ddrescue)" ]; then
- w_die "Please install ddrescue first."
- fi
-
- "${WINETRICKS_OPT_DD}" -v -b 2048 "${WINETRICKS_DEV}" "${W_CACHE}"/temp.iso &
- WINETRICKS_DD_PID=$!
- ;;
- esac
-
- echo "${WINETRICKS_DD_PID}" > "${WINETRICKS_WORKDIR}"/dd-pid
-
- # Note: if user presses ^C, winetricks_cleanup will call winetricks_iso_cleanup
- # FIXME: add progress bar for kde, too
- case ${WINETRICKS_GUI} in
- none|kdialog)
- while ps -p "${WINETRICKS_DD_PID}" > /dev/null 2>&1; do
- sleep 5
- ls -l "${W_CACHE}"/temp.iso
- done
- ;;
- zenity)
- while ps -p "${WINETRICKS_DD_PID}" > /dev/null 2>&1; do
- echo 1
- sleep 2
- done | ${WINETRICKS_GUI} --title "Copying to ${_W_expected_volname}.iso" --progress --pulsate --auto-kill
- ;;
- esac
- rm "${WINETRICKS_WORKDIR}"/dd-pid
-
- mv "${W_CACHE}"/temp.iso "${WINETRICKS_IMG}"
-
- eject "${WINETRICKS_DEV}" || true # punt if eject not found (as on cygwin)
-}
-
-winetricks_load_vcdmount()
-{
- if test "${WINE}" != ""; then
- return
- fi
-
- # Call only on real Windows.
- # Sets VCD_DIR and W_ISO_MOUNT_ROOT
-
- # The only free mount tool I know for Windows Vista is Virtual CloneDrive,
- # which can be downloaded at
- # http://www.slysoft.com/en/virtual-clonedrive.html
- # FIXME: actually install it here
-
- # Locate vcdmount.exe.
- VCD_DIR="Elaborate Bytes/VirtualCloneDrive"
- if test ! -x "${W_PROGRAMS_UNIX}/${VCD_DIR}/vcdmount.exe" && test ! -x "${W_PROGRAMS_X86_UNIX}/${VCD_DIR}/vcdmount.exe"; then
- w_warn "Installing Virtual CloneDrive"
- w_download_to vcd http://static.slysoft.com/SetupVirtualCloneDrive.exe
- # have to use cmd else vista won't let cygwin run .exe's?
- chmod +x "${W_CACHE}"/vcd/SetupVirtualCloneDrive.exe
- w_try_cd "${W_CACHE}/vcd"
- cmd /c SetupVirtualCloneDrive.exe
- fi
- if test -x "${W_PROGRAMS_UNIX}/${VCD_DIR}/vcdmount.exe"; then
- VCD_DIR="${W_PROGRAMS_UNIX}/${VCD_DIR}"
- elif test -x "${W_PROGRAMS_X86_UNIX}/${VCD_DIR}/vcdmount.exe"; then
- VCD_DIR="${W_PROGRAMS_X86_UNIX}/${VCD_DIR}"
- else
- w_die "can't find Virtual CloneDrive?"
- fi
- # FIXME: Use WMI to locate the drive named
- # "ELBY CLONEDRIVE..." using WMI as described in
- # https://delphihaven.wordpress.com/2009/07/05/using-wmi-to-get-a-drive-friendly-name/
-}
-
-winetricks_mount_cached_iso()
-{
- # On entry, WINETRICKS_IMG is already set
- w_umount
-
- if test "${WINE}" = ""; then
- winetricks_load_vcdmount
- my_img_win="$(w_pathconv -w "${WINETRICKS_IMG}" | tr '\012' ' ' | sed 's/ $//')"
- w_try_cd "${VCD_DIR}"
- w_try vcdmount.exe /l="${letter}" "${my_img_win}"
-
- tries=0
- while test ${tries} -lt 20; do
- for W_ISO_MOUNT_LETTER in e f g h i j k; do
- # let user blacklist drive letters
- echo "${WINETRICKS_MOUNT_LETTER_IGNORE}" | grep -q "${W_ISO_MOUNT_LETTER}" && continue
- W_ISO_MOUNT_ROOT=/cygdrive/${W_ISO_MOUNT_LETTER}
- if find ${W_ISO_MOUNT_ROOT} -iname 'setup*' -o -iname '*.exe' -o -iname '*.msi'; then
- break 2
- fi
- done
- tries=$((tries + 1))
- echo "Waiting for mount to finish mounting"
- sleep 1
- done
- else
- if test "${W_USE_USERMOUNT}"; then
- # Linux (FUSE-based tools), macOS (hdiutil)
- if test "${WINETRICKS_ISO_MOUNT}" = "none"; then
- # If no tools found, fall back to sudo + mount
- w_warn "No user mount tools detected, using sudo + mount"
- unset W_USE_USERMOUNT
- winetricks_mount_cached_iso
- return
- fi
- echo "Running mkdir -p ${W_ISO_USER_MOUNT_ROOT}"
- mkdir -p "${W_ISO_USER_MOUNT_ROOT}"
- if test $? -ne 0; then
- w_warn "mkdir -p ${W_ISO_USER_MOUNT_ROOT} failed, falling back to sudo + mount"
- unset W_USE_USERMOUNT
- winetricks_mount_cached_iso
- return
- fi
- case "${WINETRICKS_ISO_MOUNT}" in
- fuseiso)
- echo "Running ${WINETRICKS_ISO_MOUNT} ${WINETRICKS_IMG} ${W_ISO_USER_MOUNT_ROOT}"
- ${WINETRICKS_ISO_MOUNT} "${WINETRICKS_IMG}" "${W_ISO_USER_MOUNT_ROOT}"
- ;;
- archivemount)
- echo "Running ${WINETRICKS_ISO_MOUNT} ${WINETRICKS_IMG} ${W_ISO_USER_MOUNT_ROOT} -o readonly"
- ${WINETRICKS_ISO_MOUNT} "${WINETRICKS_IMG}" "${W_ISO_USER_MOUNT_ROOT}" -o readonly
- ;;
- hdiutil)
- echo "Running ${WINETRICKS_ISO_MOUNT} attach -mountpoint ${W_ISO_USER_MOUNT_ROOT} ${WINETRICKS_IMG}"
- ${WINETRICKS_ISO_MOUNT} attach -mountpoint "${W_ISO_USER_MOUNT_ROOT}" "${WINETRICKS_IMG}"
- ;;
- *)
- w_warn "Unknown ISO mount tool ${WINETRICKS_ISO_MOUNT}, using sudo + mount"
- unset W_USE_USERMOUNT
- winetricks_mount_cached_iso
- return
- ;;
- esac
- if test $? -ne 0; then
- w_warn "${WINETRICKS_ISO_MOUNT} failed, falling back to sudo + mount"
- unset W_USE_USERMOUNT
- winetricks_mount_cached_iso
- return
- fi
-
- echo "Mounting as drive ${W_ISO_MOUNT_LETTER}:"
- # Gotta provide a symlink to the raw disc, else installers that check volume names will fail
- rm -f "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}:"*
- ln -sf "${WINETRICKS_IMG}" "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}::"
- ln -sf "${W_ISO_USER_MOUNT_ROOT}" "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}:"
- # Gotta set the type to "cdrom", else "wine eject" will fail
- cat > "${W_TMP}"/set_type_cdrom.reg <<_EOF_
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\\Software\\Wine\\Drives]
-"${W_ISO_MOUNT_LETTER}:"="cdrom"
-_EOF_
- w_try_regedit "${W_TMP}"/set_type_cdrom.reg
- # The new drive is not recognized without waiting
- # FIXME: not sure if the duration is appropriate
- sleep 5
-
- W_ISO_MOUNT_ROOT="${W_ISO_USER_MOUNT_ROOT}"
- else
- # Linux (sudo + mount)
- _W_USERID=$(id -u)
- # WINETRICKS_IMG may contain spaces and needs to be quoted
- case "${WINETRICKS_SUDO}" in
- gksu*|kdesudo)
- w_try "${WINETRICKS_SUDO}" "mkdir -p ${W_ISO_MOUNT_ROOT}"
- w_try "${WINETRICKS_SUDO}" "mount -o ro,loop,uid=${_W_USERID},unhide '${WINETRICKS_IMG}' ${W_ISO_MOUNT_ROOT}"
- ;;
- kdesu)
- w_try "${WINETRICKS_SUDO}" -c "mkdir -p ${W_ISO_MOUNT_ROOT}"
- w_try "${WINETRICKS_SUDO}" -c "mount -o ro,loop,uid=${_W_USERID},unhide '${WINETRICKS_IMG}' ${W_ISO_MOUNT_ROOT}"
- ;;
- *)
- w_try "${WINETRICKS_SUDO}" mkdir -p "${W_ISO_MOUNT_ROOT}"
- w_try "${WINETRICKS_SUDO}" mount -o ro,loop,uid="${_W_USERID}",unhide "${WINETRICKS_IMG}" "${W_ISO_MOUNT_ROOT}"
- ;;
- esac
-
- echo "Mounting as drive ${W_ISO_MOUNT_LETTER}:"
- # Gotta provide a symlink to the raw disc, else installers that check volume names will fail
- rm -f "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}:"*
- ln -sf "${WINETRICKS_IMG}" "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}::"
- ln -sf "${W_ISO_MOUNT_ROOT}" "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}:"
- unset _W_USERID
- fi
- fi
-}
-
-# List the currently mounted UDF or iso9660 filesystems that match the given pattern
-# Output format:
-# dev mountpoint
-# dev mountpoint
-# ...
-# Mount points may contain spaces.
-
-winetricks_list_mounts()
-{
- mount | grep -E 'udf|iso9660' | sed 's,^\([^ ]*\) on \(.*\) type .*,\1 \2,'| grep "$1\$"
-}
-
-# Return success and set _W_dev _W_mountpoint if volume $1 is mounted
-# Note: setting variables as a way of returning results from a
-# shell function exposed several bugs in most shells (except ksh!)
-# related to implicit subshells. It would be better to output
-# one string to stdout instead.
-winetricks_is_mounted()
-{
- # First, check for matching mountpoint
- _W_tmp="$(winetricks_list_mounts "$1")"
- if test "${_W_tmp}"; then
- _W_dev=$(echo "${_W_tmp}" | sed 's/ .*//')
- _W_mountpoint="$(echo "${_W_tmp}" | sed 's/^[^ ]* //')"
- # Volume found!
- return "${TRUE}"
- fi
-
- # If that fails, read volume name the hard way for each volume
- # Have to use file to return results from implicit subshell
- rm -f "${W_TMP_EARLY}/_W_tmp.${LOGNAME}"
- winetricks_list_mounts . | while true; do
- IFS= read -r _W_tmp
-
- _W_dev=$(echo "${_W_tmp}" | sed 's/ .*//')
- test "${_W_dev}" || break
- _W_mountpoint="$(echo "${_W_tmp}" | sed 's/^[^ ]* //')"
- _W_volname=$(winetricks_volname "${_W_dev}")
- if test "$1" = "${_W_volname}"; then
- # Volume found! Want to return from function here, but can't
- echo "${_W_tmp}" > "${W_TMP_EARLY}/_W_tmp.${LOGNAME}"
- break
- fi
- done
-
- if test -f "${W_TMP_EARLY}/_W_tmp.${LOGNAME}"; then
- # Volume found! Return from function.
- _W_dev=$(sed 's/ .*//' "${W_TMP_EARLY}/_W_tmp.${LOGNAME}")
- _W_mountpoint="$(sed 's/^[^ ]* //' "${W_TMP_EARLY}/_W_tmp.${LOGNAME}")"
- rm -f "${W_TMP_EARLY}/_W_tmp.${LOGNAME}"
- return "${TRUE}"
- fi
-
- # Volume not found
- unset _W_dev _W_mountpoint _W_volname
- return "${FALSE}"
-}
-
-winetricks_mount_real_volume()
-{
- _W_expected_volname="$1"
-
- # Wait for user to insert disc.
-
- case ${LANG} in
- bg*) _W_mountmsg="Моля, използвайте ${_W_expected_volname} (изисква се от пакета ${W_PACKAGE})" ;;
- da*)_W_mountmsg="Indsæt venligst disken '${_W_expected_volname}' (krævet af pakken '${W_PACKAGE}')" ;;
- de*)_W_mountmsg="Bitte Disk '${_W_expected_volname}' einlegen (für Paket '${W_PACKAGE}')" ;;
- pl*) _W_mountmsg="Proszę włożyć dysk '${_W_expected_volname}' (potrzebny paczce '${W_PACKAGE}')" ;;
- pt*) _W_mountmsg="Por favor insira o volume '${_W_expected_volname}' (necessário para o pacote '${W_PACKAGE}')" ;;
- ru*) _W_mountmsg="Пожалуйста, вставьте том '${_W_expected_volname}' (требуется для пакета '${W_PACKAGE}')" ;;
- uk*) _W_mountmsg="Будь ласка, вставте том '${_W_expected_volname}' (потрібний для пакунка '${W_PACKAGE}')" ;;
- zh_CN*) _W_mountmsg="请插入卷 '${_W_expected_volname}' (为包 '${W_PACKAGE} 所需')" ;;
- zh_TW*|zh_HK*) _W_mountmsg="請插入卷 '${_W_expected_volname}' (為包 '${W_PACKAGE} 所需')" ;;
- *) _W_mountmsg="Please insert volume '${_W_expected_volname}' (needed for package '${W_PACKAGE}')" ;;
- esac
-
- if test "${WINE}" = ""; then
- # Assume already mounted, just get drive letter
- W_ISO_MOUNT_LETTER=$(awk '/iso/ {print $1}' < /proc/mounts | tr -d :)
- W_ISO_MOUNT_ROOT=$(awk '/iso/ {print $2}' < /proc/mounts)
- else
- while ! winetricks_is_mounted "${_W_expected_volname}"; do
- w_try w_warn_cancel "${_W_mountmsg}"
- # In non-gui case, give user two seconds to futz with disc drive before spamming him again
- sleep 2
- done
- WINETRICKS_DEV=${_W_dev}
- W_ISO_MOUNT_ROOT="${_W_mountpoint}"
-
- # Gotta provide a symlink to the raw disc, else installers that check volume names will fail
- rm -f "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}:"*
- ln -sf "${WINETRICKS_DEV}" "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}::"
- ln -sf "${W_ISO_MOUNT_ROOT}" "${WINEPREFIX}/dosdevices/${W_ISO_MOUNT_LETTER}:"
- fi
-
- # FIXME: need to remount some discs with unhide option,
- # add that as option to w_mount
-
- unset _W_mountmsg
-}
-
winetricks_cleanup()
{
# We don't want to run this multiple times, so unfortunately we have to run it here:
@@ -5046,6 +4366,12 @@ winetricks_set_wineprefix()
WINEPREFIX="${W_PREFIXES_ROOT}/$1"
fi
+ if test "${WINEPREFIX}" = "${LAST_WINEPREFIX}"; then
+ # A previous verb already set the prefix
+ return
+ fi
+
+ LAST_WINEPREFIX="${WINEPREFIX}"
export WINEPREFIX
w_try_mkdir "$(dirname "${WINEPREFIX}")"
@@ -5082,7 +4408,13 @@ winetricks_set_wineprefix()
if test -d "${W_DRIVE_C}/windows/syswow64"; then
# Check the bitness of wineserver + wine binary, used later to determine if we're on a WOW setup (no wine64)
# https://github.com/Winetricks/winetricks/issues/2030
- WINESERVER_BIN="$(command -v "${WINESERVER}")"
+ # WINE_BIN and WINESERVER_BIN can be set outside Winetricks in case
+ # the `wine` and `wineserver` executables and the actual Wine binaries
+ # are located in different locations (usually the case for wrappers);
+ # this helps to avoid spurious "unknown file arch" warnings.
+ if [ -z "${WINESERVER_BIN}" ]; then
+ WINESERVER_BIN="$(command -v "${WINESERVER}")"
+ fi
# wineboot often is a link pointing to wineapploader in Wine's bindir. If we don't find binaries we may look for them there later
if [ -n "${READLINK_F}" ]; then
@@ -5116,7 +4448,9 @@ winetricks_set_wineprefix()
w_warn "Unknown file arch of ${WINESERVER_BIN}."
fi
- WINE_BIN="$(command -v "${WINE}")"
+ if [ -z "${WINE_BIN}" ]; then
+ WINE_BIN="$(command -v "${WINE}")"
+ fi
_W_wine_binary_arch="$(winetricks_get_file_arch "${WINE_BIN}")"
if [ -z "${_W_wine_binary_arch}" ]; then
# wine might be a script calling a binary in Wine's bindir.
@@ -5401,13 +4735,6 @@ winetricks_init()
# Delete work directory after each run, on exit either graceful or abrupt
trap winetricks_cleanup EXIT HUP INT QUIT ABRT
- # Whether to always cache cached iso's (1) or only use cache if present (0)
- # Can be inherited from environment or set via -k, defaults to off
- WINETRICKS_OPT_KEEPISOS=${WINETRICKS_OPT_KEEPISOS:-0}
-
- # what program to use to make disc image (dd or ddrescue)
- WINETRICKS_OPT_DD=${WINETRICKS_OPT_DD:-dd}
-
# whether to use shared wineprefix (1) or unique wineprefix for each app (0)
WINETRICKS_OPT_SHAREDPREFIX=${WINETRICKS_OPT_SHAREDPREFIX:-0}
@@ -5493,11 +4820,6 @@ winetricks_wine_setup()
winetricks_latest_version_check
- # Overridden for windows
- W_ISO_MOUNT_ROOT=/mnt/winetricks
- W_ISO_USER_MOUNT_ROOT="${HOME}"/winetricks-iso
- W_ISO_MOUNT_LETTER=i
-
######################
# System-specific variables
case "${W_PLATFORM}" in
@@ -5605,12 +4927,10 @@ winetricks_usage()
--isolate Инсталира всяко приложение или игра в отделна бутилка (ПАПКА)
--self-update Обновява това приложение
--update-rollback Отменя последното обновяване на това приложение
--k, --keep_isos Кешира .iso файловете (позволява инсталация без диск)
--no-clean Не изтрива временните директории (полезно е за отстраняване на неизправности)
--optin Включва докладването за използваните глаголи към разработчиците на Winetricks
--optout Изключва докладването за използваните глаголи към разработчиците на Winetricks
-q, --unattended Не задава въпроси, инсталира автоматично
--r, --ddrescue Повтаря опитите за кеширане на одраскани дискове
-t --torify Стартира изтегляне с torify, ако е налично
--verify Стартира автоматични графични тестове за глаголи, ако е налично
-v, --verbose Изписва всички изпълнени команди
@@ -5647,10 +4967,8 @@ Tilvalg:
--isolate Install each app or game in its own bottle (WINEPREFIX)
--self-update Update this application to the last version
--update-rollback Rollback the last self update
--k, --keep_isos lagr iso'er lokalt (muliggør senere installation uden disk)
--no-clean Don't delete temp directories (useful during debugging)
-q, --unattended stil ingen spørgsmål, installér bare automatisk
--r, --ddrescue brug alternativ disk-tilgangsmetode (hjælper i tilfælde af en ridset disk)
-t, --torify Run downloads under torify, if available
--verify Run (automated) GUI tests for verbs, if available
-v, --verbose vis alle kommandoer som de bliver udført
@@ -5689,10 +5007,8 @@ Optionen:
--isolate Jedes Programm oder Spiel in eigener Bottle (WINEPREFIX) installieren
--self-update Dieses Programm auf die neueste Version aktualisieren
--update-rollback Rollback des letzten Self Update
--k, --keep_isos ISOs local speichern (erlaubt spätere Installation ohne Disk)
--no-clean Temp Verzeichnisse nicht löschen (nützlich beim debuggen)
-q, --unattended Keine Fragen stellen, alles automatisch installieren
--r, --ddrescue Alternativer Zugriffsmodus (hilft bei zerkratzten Disks)
-t --torify Wenn möglich Downloads unter torify ausführen
--verify Wenn möglich automatische GUI Tests für Verben starten
-v, --verbose Alle ausgeführten Kommandos anzeigen
@@ -5731,12 +5047,10 @@ Options:
--isolate Install each app or game in its own bottle (WINEPREFIX)
--self-update Update this application to the last version
--update-rollback Rollback the last self update
--k, --keep_isos Cache isos (allows later installation without disc)
--no-clean Don't delete temp directories (useful during debugging)
--optin Opt in to reporting which verbs you use to the Winetricks maintainers
--optout Opt out of reporting which verbs you use to the Winetricks maintainers
-q, --unattended Don't ask any questions, just install automatically
--r, --ddrescue Retry hard when caching scratched discs
-t --torify Run downloads under torify, if available
--verify Run (automated) GUI tests for verbs, if available
-v, --verbose Echo all commands as they are executed
@@ -5773,13 +5087,11 @@ winetricks_handle_option()
--gui*) winetricks_detect_gui "${1##--gui=}";;
-h|--help) winetricks_usage ; exit 0 ;;
--isolate) WINETRICKS_OPT_SHAREDPREFIX=0 ;;
- -k|--keep_isos) WINETRICKS_OPT_KEEPISOS=1 ;;
--no-clean) W_OPT_NOCLEAN=1 ;;
--no-isolate) WINETRICKS_OPT_SHAREDPREFIX=1 ;;
--optin) WINETRICKS_STATS_REPORT=1;;
--optout) WINETRICKS_STATS_REPORT=0;;
-q|--unattended) winetricks_set_unattended 1 ;;
- -r|--ddrescue) WINETRICKS_OPT_DD=ddrescue ;;
--self-update) winetricks_selfupdate;;
-t|--torify) WINETRICKS_OPT_TORIFY=1 ;;
--update-rollback) winetricks_selfupdate_rollback;;
@@ -6149,7 +5461,7 @@ w_metadata cnc_ddraw dlls \
publisher="CnCNet" \
year="2021" \
media="download" \
- file1="cnc-ddraw-v6.2.0.0.zip" \
+ file1="cnc-ddraw-v7.0.0.0.zip" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/Shaders/readme.txt"
load_cnc_ddraw()
@@ -6169,9 +5481,19 @@ load_cnc_ddraw()
# 2023/11/04 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.0.0.0/cnc-ddraw.zip
# 2024/02/03 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.1.0.0d/cnc-ddraw.zip
# 2024/02/21 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.2.0.0/cnc-ddraw.zip
+ # 2024/03/11 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.3.0.0/cnc-ddraw.zip
+ # 2024/05/13 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.4.0.0/cnc-ddraw.zip
+ # 2024/05/24 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.5.0.0/cnc-ddraw.zip
+ # 2024/06/06 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.6.0.0/cnc-ddraw.zip
+ # 2024/07/11 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.7.0.0/cnc-ddraw.zip
+ # 2024/08/20 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.8.0.0/cnc-ddraw.zip
+ # 2024/09/21 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.9.0.0/cnc-ddraw.zip
+ # 2024/11/02 https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v7.0.0.0/cnc-ddraw.zip
- w_download https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v6.2.0.0/cnc-ddraw.zip e5677ba52c31ffa93421a16edacff0c4d1f03e107aea6fc860861b43e3356119 cnc-ddraw-v6.2.0.0.zip
- w_try_unzip "${W_SYSTEM32_DLLS}" "${W_CACHE}/${W_PACKAGE}/${file1}"
+ w_download https://github.com/FunkyFr3sh/cnc-ddraw/releases/download/v7.0.0.0/cnc-ddraw.zip f9640f69c2b8c012b97720ce0a9aac483989563908fc19446b9d1ba16e7239d6 "${file1}"
+ w_try_unzip "${W_TMP}" "${W_CACHE}/${W_PACKAGE}/${file1}"
+ w_try_cp_dll "${W_TMP}/ddraw.dll" "${W_SYSTEM32_DLLS}/ddraw.dll"
+ w_try cp -R "${W_TMP}"/* "${W_SYSTEM32_DLLS}/"
w_override_dlls native,builtin ddraw
}
@@ -7288,23 +6610,22 @@ load_dxtrans()
# $1 - dxvk archive name (required)
# $2 - minimum Wine version (required)
# $3 - minimum Vulkan API version (required)
-# $4 - [dxgi,][d3d9,][d3d10core,][d3d10,]d3d11 (required)
+# $4 - [dxgi,][d3d8,][d3d9,][d3d10core,]d3d11 (required)
helper_dxvk()
{
_W_package_archive="${1}"
_W_min_wine_version="${2}"
_W_min_vulkan_version="${3}"
_W_dll_overrides="$(echo "${4}" | sed 's/,/ /g')"
- # dxvk repository, for d3d9/d3d10/d3d11 support
+ # dxvk repository, for d3d8/d3d9/d3d10/d3d11 support
_W_repository="doitsujin/dxvk"
- _W_supported_overrides="dxgi d3d9 d3d10core d3d10 d3d11"
+ _W_supported_overrides="dxgi d3d8 d3d9 d3d10core d3d11"
_W_invalid_overrides="$(echo "${_W_dll_overrides}" | awk -vvalid_overrides_regex="$(echo "${_W_supported_overrides}" | sed 's/ /|/g')" '{ gsub(valid_overrides_regex,""); sub("[ ]*",""); print $0 }')"
if [ "${_W_invalid_overrides}" != "" ]; then
w_die "parameter (4) unsupported dll override: '${_W_invalid_overrides}' ; supported dll overrides: ${_W_supported_overrides}"
fi
- _W_dll_overrides="$(echo "${_W_dll_overrides}" | sed 's/d3d10 /&d3d10_1 /')"
_W_package_dir="${_W_package_archive%.tar.gz}"
_W_package_version="${_W_package_dir#*-}"
w_warn "Please refer to ${_W_repository#*/} version ${_W_package_version} release notes... See: https://github.com/${_W_repository}/releases/tag/v${_W_package_version}"
@@ -7325,7 +6646,6 @@ helper_dxvk()
for _W_dll in ${_W_dll_overrides}; do
w_try mv "${W_TMP}/${_W_package_dir}/x32/${_W_dll}.dll" "${W_SYSTEM32_DLLS}/"
- [ "${_W_dll}" = "d3d9" ] && _W_d3d9_support="1"
done
if test "${W_ARCH}" = "win64"; then
@@ -7335,13 +6655,8 @@ helper_dxvk()
fi
# shellcheck disable=SC2086
w_override_dlls native ${_W_dll_overrides}
- if [ -n "${_W_d3d9_support}" ]; then
- w_call d3dcompiler_43
- w_call d3dx9
- fi
- w_call d3dcompiler_47
- unset _W_d3d9_support _W_dll _W_dll_overrides _W_invalid_overrides _W_min_vulkan_version _W_min_wine_version \
+ unset _W_dll _W_dll_overrides _W_invalid_overrides _W_min_vulkan_version _W_min_wine_version \
_W_package_archive _W_package_dir _W_package_version \
_W_repository _W_supported_overrides
}
@@ -7349,357 +6664,12 @@ helper_dxvk()
#----------------------------------------------------------------
-w_metadata dxvk0054 dlls \
- title="Vulkan-based D3D11 implementation for Linux / Wine (0.54)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.54.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0054()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640
- helper_dxvk "${file1}" "3.10" "1.1.72" "dxgi,d3d11"
-}
-
-w_metadata dxvk0060 dlls \
- title="Vulkan-based D3D11 implementation for Linux / Wine (0.60)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.60.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0060()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.60/dxvk-0.60.tar.gz" 27d6f700241d3ec3b6c002c3d739bb0e3f210ec916ecb5a62d9204e9e50f2c4a
- helper_dxvk "${file1}" "3.10" "1.1.72" "dxgi,d3d11"
-}
-
-w_metadata dxvk0061 dlls \
- title="Vulkan-based D3D11 implementation for Linux / Wine (0.61)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.61.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0061()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.61/dxvk-0.61.tar.gz" d04388f026dc0d8b276b08f7db74fb3556cbbc8f762401eb5ef52629ee39ded1
- helper_dxvk "${file1}" "3.10" "1.1.72" "dxgi,d3d11"
-}
-
-w_metadata dxvk0062 dlls \
- title="Vulkan-based D3D11 implementation for Linux / Wine (0.62)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.62.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0062()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.62/dxvk-0.62.tar.gz" b9dbb57908e24b094b68f665ad729b6ee277eecc8ba04a6e6e4f8a4d2dfd94e3
- helper_dxvk "${file1}" "3.10" "1.1.72" "dxgi,d3d11"
-}
-
-w_metadata dxvk0063 dlls \
- title="Vulkan-based D3D11 implementation for Linux / Wine (0.63)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.63.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0063()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.63/dxvk-0.63.tar.gz" 696df816bd9640770dee14f932bc641a16261fccf76be7c28d812a64ca6040fa
- helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d11"
-}
-
-w_metadata dxvk0064 dlls \
- title="Vulkan-based D3D11 implementation for Linux / Wine (0.64)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.64.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0064()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.64/dxvk-0.64.tar.gz" 2e03e40ff0a9d36f96a06137f3fa9110ebaea230d0bf6c22cf6399e16e97fb9c
- helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d11"
-}
-
-w_metadata dxvk0065 dlls \
- title="Vulkan-based D3D11 implementation for Linux / Wine (0.65)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.65.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0065()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.65/dxvk-0.65.tar.gz" 7b4eb42e693f925d0aff90bae261b20c50428602382ee94a3e3860b2ad1ebad0
- helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d11"
-}
-
-w_metadata dxvk0070 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.70)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.70.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0070()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.70/dxvk-0.70.tar.gz" 310546d530be494a35cae49b707fef4b073269d811aac25bdf72899ed1df4e9f
- helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0071 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.71)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.71.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0071()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.71/dxvk-0.71.tar.gz" fbe66337d1450f366961a7699253cd7a96c12a88c2fcda64b79be1cbb13d37d5
- helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0072 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.72)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.72.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0072()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.72/dxvk-0.72.tar.gz" bc84f48f99cf5add3c8919a43d7a9c0bf208c994dc58326a636b56b8db650c52
- helper_dxvk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0080 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.80)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.80.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0080()
-{
- # https://github.com/doitsujin/dxvk
- # 2017/09/23: f9e736cdbf1e83e45ca748652a94a3a189fc5accde1eac549b2ba5af8f7acacb
- # 2017/11/17: 7058a834bb006cad5462933110449b434df561e67d83f68d3965ecc74e2e1cbc
- # See: https://github.com/doitsujin/dxvk/issues/773
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.80/dxvk-0.80.tar.gz" 7058a834bb006cad5462933110449b434df561e67d83f68d3965ecc74e2e1cbc
- helper_dxvk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0081 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.81)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.81.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0081()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.81/dxvk-0.81.tar.gz" 9bf6eda9ae4ee74b509e07dfe9cc003dfa4bba192b519dacdd542a57f6a43869
- helper_dxvk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0090 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.90)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.90.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0090()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.90/dxvk-0.90.tar.gz" 15bce7b282065054ff9233b33738bf1d2c74b16829361cbd6843bc2f5dfe4509
- helper_dxvk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0091 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.91)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.91.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0091()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.91/dxvk-0.91.tar.gz" 5296106ac3a8c631d7f26fa46dbff4be1332cda14fa493fd89ccf97e050c4855
- helper_dxvk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0092 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.92)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.92.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0092()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.92/dxvk-0.92.tar.gz" e22c0ae4693aac88562c7a9a97b3316e086b9048c9f8f9e128923ac1611a5c49
- helper_dxvk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0093 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.93)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.93.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0093()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.93/dxvk-0.93.tar.gz" 4d964e4e10e67ba7705312496e472ae9859520a78d8742d6d377886318c95e53
- helper_dxvk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0094 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.94)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.94.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0094()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.94/dxvk-0.94.tar.gz" 1f06bfac5b435b62b972806fb3bbd86f7ccae2399b4451e85ae414e03d3712a3
- helper_dxvk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0095 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.95)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.95.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0095()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.95/dxvk-0.95.tar.gz" 1eea48149f6e94c3c74ecddd92df4f9daa67ab28d0fca548bde5cd40f0e486bf
- helper_dxvk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
-}
-
-w_metadata dxvk0096 dlls \
- title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.96)" \
- publisher="Philip Rebohle" \
- year="2017" \
- media="download" \
- file1="dxvk-0.96.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
-
-load_dxvk0096()
-{
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.96/dxvk-0.96.tar.gz" 9d054c1e7a4f59825c651b14d3cfbf0d8c724763f485b3d59c89f1d7194b2206
- helper_dxvk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
-}
-
w_metadata dxvk1000 dlls \
title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.0)" \
publisher="Philip Rebohle" \
year="2017" \
media="download" \
file1="dxvk-1.0.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7708,7 +6678,7 @@ load_dxvk1000()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0/dxvk-1.0.tar.gz" 8c8d26544609532201c10e6f5309bf5e913b5ca5b985932928ef9ab238de6dc2
- helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1001 dlls \
@@ -7717,8 +6687,6 @@ w_metadata dxvk1001 dlls \
year="2017" \
media="download" \
file1="dxvk-1.0.1.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7727,7 +6695,7 @@ load_dxvk1001()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0.1/dxvk-1.0.1.tar.gz" 739847cdd14b302dac600c66bc6617d7814945df6d4d7b6c91fecfa910e3b1b1
- helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1002 dlls \
@@ -7736,8 +6704,6 @@ w_metadata dxvk1002 dlls \
year="2017" \
media="download" \
file1="dxvk-1.0.2.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7746,7 +6712,7 @@ load_dxvk1002()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0.2/dxvk-1.0.2.tar.gz" f9504b188488d1102cba7e82c28681708f39e151af1c1ef7ebeac82d729c01ac
- helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1003 dlls \
@@ -7755,8 +6721,6 @@ w_metadata dxvk1003 dlls \
year="2017" \
media="download" \
file1="dxvk-1.0.3.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7765,7 +6729,7 @@ load_dxvk1003()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0.3/dxvk-1.0.3.tar.gz" 984d28ab3a112be207d6339da19113d1117e56731ed413d0e202e6fd1391a6ae
- helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1011 dlls \
@@ -7774,8 +6738,6 @@ w_metadata dxvk1011 dlls \
year="2017" \
media="download" \
file1="dxvk-1.1.1.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7784,7 +6746,7 @@ load_dxvk1011()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.1.1/dxvk-1.1.1.tar.gz" 346c523953f72ac5885071c4384039faf01f6f43a88d5b0c12d94bfaa9598c1d
- helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1020 dlls \
@@ -7793,8 +6755,6 @@ w_metadata dxvk1020 dlls \
year="2017" \
media="download" \
file1="dxvk-1.2.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7803,7 +6763,7 @@ load_dxvk1020()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.2/dxvk-1.2.tar.gz" 414751a810143ced34d1f4f0eb2a40e79b4c9726318994b244b70d1b3a6f8b32
- helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1021 dlls \
@@ -7812,8 +6772,6 @@ w_metadata dxvk1021 dlls \
year="2017" \
media="download" \
file1="dxvk-1.2.1.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7822,7 +6780,7 @@ load_dxvk1021()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.2.1/dxvk-1.2.1.tar.gz" 192beca0a34d13f101e9c2545d9533cf84830a23b566bed185c022ed754c3daa
- helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1022 dlls \
@@ -7831,8 +6789,6 @@ w_metadata dxvk1022 dlls \
year="2017" \
media="download" \
file1="dxvk-1.2.2.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7841,7 +6797,7 @@ load_dxvk1022()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.2.2/dxvk-1.2.2.tar.gz" dfe620a387222dc117a6722171e0bca400755a3e1c6459350c710dfda40b6701
- helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1023 dlls \
@@ -7850,8 +6806,6 @@ w_metadata dxvk1023 dlls \
year="2017" \
media="download" \
file1="dxvk-1.2.3.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7860,7 +6814,7 @@ load_dxvk1023()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.2.3/dxvk-1.2.3.tar.gz" 29ce345b3d962dbd8ec8bfda190635a21f62124e3e46f06e89aa2f3b1e230321
- helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1030 dlls \
@@ -7869,8 +6823,6 @@ w_metadata dxvk1030 dlls \
year="2017" \
media="download" \
file1="dxvk-1.3.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7879,7 +6831,7 @@ load_dxvk1030()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3/dxvk-1.3.tar.gz" d15fac6503ea614986237052d554d7cbd2dbf5f3486feb6217e64bae83cfc2cf
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1031 dlls \
@@ -7888,8 +6840,6 @@ w_metadata dxvk1031 dlls \
year="2017" \
media="download" \
file1="dxvk-1.3.1.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7898,7 +6848,7 @@ load_dxvk1031()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3.1/dxvk-1.3.1.tar.gz" 2f6636dbd591ea9de20b30a33c9c8c0985a4939f6503f90ca5c7edafd01524a3
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1032 dlls \
@@ -7907,8 +6857,6 @@ w_metadata dxvk1032 dlls \
year="2017" \
media="download" \
file1="dxvk-1.3.2.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7917,7 +6865,7 @@ load_dxvk1032()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3.2/dxvk-1.3.2.tar.gz" aa70890a17b48be27648d15cb837b5167c99f75ee32ae0c94a85ec1f1fdc4675
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1033 dlls \
@@ -7926,8 +6874,6 @@ w_metadata dxvk1033 dlls \
year="2017" \
media="download" \
file1="dxvk-1.3.3.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7936,7 +6882,7 @@ load_dxvk1033()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3.3/dxvk-1.3.3.tar.gz" 828171ad1dbb6b51f367fa46cf33f8db4a0b1b990cd2e95654d6a65500d230b7
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1034 dlls \
@@ -7945,8 +6891,6 @@ w_metadata dxvk1034 dlls \
year="2017" \
media="download" \
file1="dxvk-1.3.4.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7955,7 +6899,7 @@ load_dxvk1034()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3.4/dxvk-1.3.4.tar.gz" 4683e2ad4221b16572b0d939da5a05ab9a16b2b62c2f4e0c8bf3b2cdb27918ff
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1040 dlls \
@@ -7964,8 +6908,6 @@ w_metadata dxvk1040 dlls \
year="2017" \
media="download" \
file1="dxvk-1.4.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7974,7 +6916,7 @@ load_dxvk1040()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4/dxvk-1.4.tar.gz" bf22785de1ce728bbdcfb4615035924112b4718049ca2cade5861b03735181de
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1041 dlls \
@@ -7983,8 +6925,6 @@ w_metadata dxvk1041 dlls \
year="2017" \
media="download" \
file1="dxvk-1.4.1.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -7993,7 +6933,7 @@ load_dxvk1041()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.1/dxvk-1.4.1.tar.gz" 574ec4dc5201e45d70472228f0c6695426f0392503ec7a47d6092600aac53a07
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1042 dlls \
@@ -8002,8 +6942,6 @@ w_metadata dxvk1042 dlls \
year="2017" \
media="download" \
file1="dxvk-1.4.2.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8012,7 +6950,7 @@ load_dxvk1042()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.2/dxvk-1.4.2.tar.gz" 5adfd71ee0299798af4402f09f113f88929af429b6889af334cff5b84b84dbe6
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1043 dlls \
@@ -8021,8 +6959,6 @@ w_metadata dxvk1043 dlls \
year="2017" \
media="download" \
file1="dxvk-1.4.3.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8031,7 +6967,7 @@ load_dxvk1043()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.3/dxvk-1.4.3.tar.gz" e4b9e7fc8faf2dd1ddf5206e14939a822034a85778d54a6950767d68909726f7
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1044 dlls \
@@ -8040,8 +6976,6 @@ w_metadata dxvk1044 dlls \
year="2017" \
media="download" \
file1="dxvk-1.4.4.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8050,7 +6984,7 @@ load_dxvk1044()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.4/dxvk-1.4.4.tar.gz" a845285c8dfc63c7d00c14520b58fc6048796fef69fea49617edb46662a0ba31
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1045 dlls \
@@ -8059,8 +6993,6 @@ w_metadata dxvk1045 dlls \
year="2017" \
media="download" \
file1="dxvk-1.4.5.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8069,7 +7001,7 @@ load_dxvk1045()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.5/dxvk-1.4.5.tar.gz" 566c93dce84c3c2f39938428ddcca27a5bb2f5068eb4f868ff2126389b965cd1
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1046 dlls \
@@ -8078,8 +7010,6 @@ w_metadata dxvk1046 dlls \
year="2017" \
media="download" \
file1="dxvk-1.4.6.tar.gz" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8090,7 +7020,7 @@ load_dxvk1046()
# Original sha256sum: 1aa069f5ea7d3d6e374bda332d12f9207f1a21e9811c4d4d82487416420ee73e
# Upstream later rebuilt with commit 1ae7d4b30283d2eb06b467c581aafdbbd9d36cdf: c9e3a96d8c5e693e20f69f27ac3f8b55198449fddd24205195476d6af7e8a339
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.6/dxvk-1.4.6.tar.gz" c9e3a96d8c5e693e20f69f27ac3f8b55198449fddd24205195476d6af7e8a339
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d11"
}
w_metadata dxvk1050 dlls \
@@ -8100,8 +7030,6 @@ w_metadata dxvk1050 dlls \
media="download" \
file1="dxvk-1.5.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8110,7 +7038,7 @@ load_dxvk1050()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5/dxvk-1.5.tar.gz" 90cfae0bb43fed1e46442d20e2ab3bf448ebdff1e9f4f59841dc922aa3a36d3b
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1051 dlls \
@@ -8120,8 +7048,6 @@ w_metadata dxvk1051 dlls \
media="download" \
file1="dxvk-1.5.1.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8130,7 +7056,7 @@ load_dxvk1051()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.1/dxvk-1.5.1.tar.gz" 474ce9995edd47a3bd347a8f3263f35cf8df2676f5b16668bf38efa298d75c01
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1052 dlls \
@@ -8140,8 +7066,6 @@ w_metadata dxvk1052 dlls \
media="download" \
file1="dxvk-1.5.2.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8150,7 +7074,7 @@ load_dxvk1052()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.2/dxvk-1.5.2.tar.gz" 684ba886b5ed922c2417753d8178f923c695258c69cc8f778bb59b99bbf62477
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1053 dlls \
@@ -8160,8 +7084,6 @@ w_metadata dxvk1053 dlls \
media="download" \
file1="dxvk-1.5.3.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8170,7 +7092,7 @@ load_dxvk1053()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.3/dxvk-1.5.3.tar.gz" b845c9c492e32648dee44d058c189eff8534e5490a80a3b2a921248bc72e33bd
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1054 dlls \
@@ -8180,8 +7102,6 @@ w_metadata dxvk1054 dlls \
media="download" \
file1="dxvk-1.5.4.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8190,7 +7110,7 @@ load_dxvk1054()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.4/dxvk-1.5.4.tar.gz" 8e4fd15525def9bcaa9cc1b4496f76a2664ba4806b02a5ac0eddd703d7bbdea7
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1055 dlls \
@@ -8200,8 +7120,6 @@ w_metadata dxvk1055 dlls \
media="download" \
file1="dxvk-1.5.5.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8210,7 +7128,7 @@ load_dxvk1055()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.5/dxvk-1.5.5.tar.gz" f4c57274ac85d71b192e2a0ac095f285e26cc054c87c6c34c081f919147539eb
- helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1060 dlls \
@@ -8220,8 +7138,6 @@ w_metadata dxvk1060 dlls \
media="download" \
file1="dxvk-1.6.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8230,7 +7146,7 @@ load_dxvk1060()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.6/dxvk-1.6.tar.gz" a493e0802e02629244672c44ad92c40fa0813b38908677ae14ee07feefcf7227
- helper_dxvk "${file1}" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1061 dlls \
@@ -8240,8 +7156,6 @@ w_metadata dxvk1061 dlls \
media="download" \
file1="dxvk-1.6.1.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8250,7 +7164,7 @@ load_dxvk1061()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.6.1/dxvk-1.6.1.tar.gz" cdef8735313ed9ccb7af23b37bcceaad54553e29505c269246d5e347f1359136
- helper_dxvk "${file1}" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1070 dlls \
@@ -8260,8 +7174,6 @@ w_metadata dxvk1070 dlls \
media="download" \
file1="dxvk-1.7.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8270,7 +7182,7 @@ load_dxvk1070()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7/dxvk-1.7.tar.gz" 67d78239906c24bd50a5ecbc2fd792c1721e274a7a60dd22f74b21b08ca4c7a1
- helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1071 dlls \
@@ -8280,8 +7192,6 @@ w_metadata dxvk1071 dlls \
media="download" \
file1="dxvk-1.7.1.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8290,7 +7200,7 @@ load_dxvk1071()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7.1/dxvk-1.7.1.tar.gz" 6ce66c4e01196ed022604e90383593aea02c9016bde92c6840aa58805d5fc588
- helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1072 dlls \
@@ -8300,8 +7210,6 @@ w_metadata dxvk1072 dlls \
media="download" \
file1="dxvk-1.7.2.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8310,7 +7218,7 @@ load_dxvk1072()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7.2/dxvk-1.7.2.tar.gz" 1662f6bda93faf4f6c8b57d656779b08925889dd6b794114be874d6deb97e15b
- helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1073 dlls \
@@ -8320,8 +7228,6 @@ w_metadata dxvk1073 dlls \
media="download" \
file1="dxvk-1.7.3.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8330,7 +7236,7 @@ load_dxvk1073()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7.3/dxvk-1.7.3.tar.gz" e4c2444256b7ad63455fa6329638e3f42900ec7462dc9c26da56187a2040aba0
- helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1080 dlls \
@@ -8340,8 +7246,6 @@ w_metadata dxvk1080 dlls \
media="download" \
file1="dxvk-1.8.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8350,7 +7254,7 @@ load_dxvk1080()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.8/dxvk-1.8.tar.gz" e84f7ac494ac7f5013976744470899226d145e29617c407ff52870055bda476e
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1081 dlls \
@@ -8360,8 +7264,6 @@ w_metadata dxvk1081 dlls \
media="download" \
file1="dxvk-1.8.1.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8370,7 +7272,7 @@ load_dxvk1081()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.8.1/dxvk-1.8.1.tar.gz" 756a09c46f8279ade84456e3af038f64613a51e00a2d4cfffa4c91c10ede60e8
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1090 dlls \
@@ -8380,8 +7282,6 @@ w_metadata dxvk1090 dlls \
media="download" \
file1="dxvk-1.9.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8390,7 +7290,7 @@ load_dxvk1090()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9/dxvk-1.9.tar.gz" 433868f8783887192a04b788203d6b4effe3168be762dd60df1c1b564421a6ed
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1091 dlls \
@@ -8400,8 +7300,6 @@ w_metadata dxvk1091 dlls \
media="download" \
file1="dxvk-1.9.1.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8410,7 +7308,7 @@ load_dxvk1091()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9.1/dxvk-1.9.1.tar.gz" ef7591d6effcca8a8352cea4fa50fe73aa1f10fd89cb475f2f14236e4340a007
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1092 dlls \
@@ -8420,8 +7318,6 @@ w_metadata dxvk1092 dlls \
media="download" \
file1="dxvk-1.9.2.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8430,7 +7326,7 @@ load_dxvk1092()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9.2/dxvk-1.9.2.tar.gz" 24bcee655767f4731b8d3883dd93ba4edc7f1e87421e15fab19499d57236b8e9
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1093 dlls \
@@ -8440,8 +7336,6 @@ w_metadata dxvk1093 dlls \
media="download" \
file1="dxvk-1.9.3.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8450,7 +7344,7 @@ load_dxvk1093()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9.3/dxvk-1.9.3.tar.gz" cfcf4fac1f6bfc5a09183e77362a0af7fead4e54961bb548aef3e6cddadbe9bf
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1094 dlls \
@@ -8460,8 +7354,6 @@ w_metadata dxvk1094 dlls \
media="download" \
file1="dxvk-1.9.4.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8470,7 +7362,7 @@ load_dxvk1094()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9.4/dxvk-1.9.4.tar.gz" 854f564c3b58a4cdf7b16eb9a4b6bc6ddc0f83d68c4f979a529fc23f7a770502
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1100 dlls \
@@ -8480,8 +7372,6 @@ w_metadata dxvk1100 dlls \
media="download" \
file1="dxvk-1.10.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8490,7 +7380,7 @@ load_dxvk1100()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.10/dxvk-1.10.tar.gz" a15bc7c1df66158a205c498883b0b216390d58f4a128657990af357431b9ce77
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1101 dlls \
@@ -8500,8 +7390,6 @@ w_metadata dxvk1101 dlls \
media="download" \
file1="dxvk-1.10.1.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8510,7 +7398,7 @@ load_dxvk1101()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.10.1/dxvk-1.10.1.tar.gz" dc349482cb0a73d4e29c82f8e9ff6031e09e176e84a97ffe91eac64422b307aa
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1102 dlls \
@@ -8520,8 +7408,6 @@ w_metadata dxvk1102 dlls \
media="download" \
file1="dxvk-1.10.2.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8530,7 +7416,7 @@ load_dxvk1102()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.10.2/dxvk-1.10.2.tar.gz" bf97df2b8923cd8e6c646bd66bdb3d0894da1be05a6498c2dbc15b4d2e530c83
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk1103 dlls \
@@ -8540,8 +7426,6 @@ w_metadata dxvk1103 dlls \
media="download" \
file1="dxvk-1.10.3.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
@@ -8550,7 +7434,7 @@ load_dxvk1103()
{
# https://github.com/doitsujin/dxvk
w_download "https://github.com/doitsujin/dxvk/releases/download/v1.10.3/dxvk-1.10.3.tar.gz" 8d1a3c912761b450c879f98478ae64f6f6639e40ce6848170a0f6b8596fd53c6
- helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+ helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
}
w_metadata dxvk2000 dlls \
@@ -8622,17 +7506,126 @@ load_dxvk2030()
helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d9,d3d10core,d3d11"
}
+w_metadata dxvk2040 dlls \
+ title="Vulkan-based D3D8/D3D9/D3D10/D3D11 implementation for Linux / Wine (2.4)" \
+ publisher="Philip Rebohle" \
+ year="2024" \
+ media="download" \
+ file1="dxvk-2.4.tar.gz" \
+ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d8.dll" \
+ installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+ installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+ installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+ installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+
+load_dxvk2040()
+{
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v2.4/dxvk-2.4.tar.gz" 784eb023fb8da8868aa562c30ef5562989211fc9fda6bc5155d95e28049fccc7
+ helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d8,d3d9,d3d10core,d3d11"
+}
+
+w_metadata dxvk2041 dlls \
+ title="Vulkan-based D3D8/D3D9/D3D10/D3D11 implementation for Linux / Wine (2.4.1)" \
+ publisher="Philip Rebohle" \
+ year="2024" \
+ media="download" \
+ file1="dxvk-2.4.1.tar.gz" \
+ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d8.dll" \
+ installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+ installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+ installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+ installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+
+load_dxvk2041()
+{
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v2.4.1/dxvk-2.4.1.tar.gz" 7b23db4e1386b5d9a3ec0d83daa8b06096b758639185c11a673373a5ae478d54
+ helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d8,d3d9,d3d10core,d3d11"
+}
+
+w_metadata dxvk2050 dlls \
+ title="Vulkan-based D3D8/D3D9/D3D10/D3D11 implementation for Linux / Wine (2.5)" \
+ publisher="Philip Rebohle" \
+ year="2024" \
+ media="download" \
+ file1="dxvk-2.5.tar.gz" \
+ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d8.dll" \
+ installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+ installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+ installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+ installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+
+load_dxvk2050()
+{
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v2.5/dxvk-2.5.tar.gz" 6e6c63eb3164656452c128f9bcc693f83668c22fcbdc7804b2d0dc68f76c6ad6
+ helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d8,d3d9,d3d10core,d3d11"
+}
+
+w_metadata dxvk2051 dlls \
+ title="Vulkan-based D3D8/D3D9/D3D10/D3D11 implementation for Linux / Wine (2.5.1)" \
+ publisher="Philip Rebohle" \
+ year="2024" \
+ media="download" \
+ file1="dxvk-2.5.1.tar.gz" \
+ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d8.dll" \
+ installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+ installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+ installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+ installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+
+load_dxvk2051()
+{
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v2.5.1/dxvk-2.5.1.tar.gz" eb27507e9b1d4aa5439605d241bb97584c13a7589b885a0df5c4da091194d842
+ helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d8,d3d9,d3d10core,d3d11"
+}
+
+w_metadata dxvk2052 dlls \
+ title="Vulkan-based D3D8/D3D9/D3D10/D3D11 implementation for Linux / Wine (2.5.2)" \
+ publisher="Philip Rebohle" \
+ year="2024" \
+ media="download" \
+ file1="dxvk-2.5.2.tar.gz" \
+ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d8.dll" \
+ installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+ installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+ installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+ installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+
+load_dxvk2052()
+{
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v2.5.2/dxvk-2.5.2.tar.gz" 472a667060d6459abe3025090411f6dfdbd7333377160e869ed975b7c2422b05
+ helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d8,d3d9,d3d10core,d3d11"
+}
+
+w_metadata dxvk2053 dlls \
+ title="Vulkan-based D3D8/D3D9/D3D10/D3D11 implementation for Linux / Wine (2.5.3)" \
+ publisher="Philip Rebohle" \
+ year="2025" \
+ media="download" \
+ file1="dxvk-2.5.3.tar.gz" \
+ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d8.dll" \
+ installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+ installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+ installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+ installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+
+load_dxvk2053()
+{
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v2.5.3/dxvk-2.5.3.tar.gz" d8e6ef7d1168095165e1f8a98c7d5a4485b080467bb573d2a9ef3e3d79ea1eb8
+ helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d8,d3d9,d3d10core,d3d11"
+}
+
#----------------------------------------------------------------
w_metadata dxvk dlls \
- title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (latest)" \
+ title="Vulkan-based D3D8/D3D9/D3D10/D3D11 implementation for Linux / Wine (latest)" \
publisher="Philip Rebohle" \
- year="2023" \
+ year="2024" \
media="download" \
- installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
- installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
- installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
- installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d8.dll" \
+ installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+ installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+ installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+ installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
load_dxvk()
{
@@ -8640,7 +7633,7 @@ load_dxvk()
_W_dxvk_version="$(w_get_github_latest_release doitsujin dxvk)"
_W_dxvk_version="${_W_dxvk_version#v}"
w_linkcheck_ignore=1 w_download "https://github.com/doitsujin/dxvk/releases/download/v${_W_dxvk_version}/dxvk-${_W_dxvk_version}.tar.gz"
- helper_dxvk "dxvk-${_W_dxvk_version}.tar.gz" "7.1" "1.3.204" "dxgi,d3d9,d3d10core,d3d11"
+ helper_dxvk "dxvk-${_W_dxvk_version}.tar.gz" "7.1" "1.3.204" "dxgi,d3d8,d3d9,d3d10core,d3d11"
unset _W_dxvk_version
}
@@ -9656,6 +8649,10 @@ load_dotnet40()
# Avoid a popup on WINEPREFIX updates, see https://bugs.winehq.org/show_bug.cgi?id=41727#c5
"${WINE}" reg add "HKLM\\Software\\Microsoft\\.NETFramework" /v OnlyUseLatestCLR /t REG_DWORD /d 0001 /f
+ if [ "${W_ARCH}" = "win64" ]; then
+ "${WINE}" reg add "HKLM\\Software\\Wow6432Node\\.NETFramework" /v OnlyUseLatestCLR /t REG_DWORD /d 0001 /f
+ fi
+
# See https://bugs.winehq.org/show_bug.cgi?id=47277#c9
case "${LANG}" in
C|en_US.UTF-8*) ;;
@@ -9759,6 +8756,10 @@ load_dotnet45()
# Avoid a popup on WINEPREFIX updates, see https://bugs.winehq.org/show_bug.cgi?id=41727#c5
"${WINE}" reg add "HKLM\\Software\\Microsoft\\.NETFramework" /v OnlyUseLatestCLR /t REG_DWORD /d 0001 /f
+ if [ "${W_ARCH}" = "win64" ]; then
+ "${WINE}" reg add "HKLM\\Software\\Wow6432Node\\.NETFramework" /v OnlyUseLatestCLR /t REG_DWORD /d 0001 /f
+ fi
+
w_warn "Setting Windows version to 2003, otherwise applications using .NET 4.5 will subtly fail"
w_set_winver win2k3
@@ -10213,21 +9214,21 @@ w_metadata dotnet6 dlls \
publisher="Microsoft" \
year="2023" \
media="download" \
- file1="dotnet-runtime-6.0.19-win-x86.exe" \
+ file1="dotnet-runtime-6.0.36-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
load_dotnet6()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/6.0
- w_download https://download.visualstudio.microsoft.com/download/pr/6b04af90-1760-4f04-93bc-548cc03f1d4b/1479bfb3a68bd45bdce774e18449fe6c/dotnet-runtime-6.0.19-win-x86.exe cc1e7714b2f988c779de37c831857e5fa9d9f3d3a53d02298679a2c514c55649
+ w_download https://download.visualstudio.microsoft.com/download/pr/727d79cb-6a4c-4a6b-bd9e-af99ad62de0b/5cd3550f1589a2f1b3a240c745dd1023/dotnet-runtime-6.0.36-win-x86.exe 3b3cb4636251a582158f4b6b340f20b3861e6793eb9a3e64bda29cbf32da3604
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
- w_download https://download.visualstudio.microsoft.com/download/pr/7bb7f85b-9bf0-4c6f-b3e4-a3832720f162/73e280cfd7f686c34748e0bf98d879c7/dotnet-runtime-6.0.19-win-x64.exe e9b1a354e9d207465fc635be80984d842f94d75171a141e51f3151bbfcb06945
- w_try "${WINE}" "dotnet-runtime-6.0.19-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+ w_download https://download.visualstudio.microsoft.com/download/pr/1a5fc50a-9222-4f33-8f73-3c78485a55c7/1cb55899b68fcb9d98d206ba56f28b66/dotnet-runtime-6.0.36-win-x64.exe 6bdad7bc4c41fe93d4ae7b0312b1d017cfe369d28e7e2e421f5b675f9feefe84
+ w_try "${WINE}" "dotnet-runtime-6.0.36-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}
@@ -10238,21 +9239,21 @@ w_metadata dotnetdesktop6 dlls \
publisher="Microsoft" \
year="2023" \
media="download" \
- file1="windowsdesktop-runtime-6.0.19-win-x86.exe" \
+ file1="windowsdesktop-runtime-6.0.36-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
load_dotnetdesktop6()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/6.0
- w_download https://download.visualstudio.microsoft.com/download/pr/1a0e6cd8-4c5b-4a25-8da6-6985792c5cad/aea270b977828772087496b7b073f383/windowsdesktop-runtime-6.0.19-win-x86.exe 9e0399dabe100ebe271b76615629891a10dc9b14aaedb3ec14d0e22e99925ddf
+ w_download https://download.visualstudio.microsoft.com/download/pr/cdc314df-4a4c-4709-868d-b974f336f77f/acd5ab7637e456c8a3aa667661324f6d/windowsdesktop-runtime-6.0.36-win-x86.exe 4e77bd970df0a06528ee88d33e4a8c9fb85beedbdd7219b017083acf0c3aa39e
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
- w_download https://download.visualstudio.microsoft.com/download/pr/30841ca9-5538-40c3-9022-d1ba1e69f6e8/aa94715bc3d74ee0b2e27de757ef0cdb/windowsdesktop-runtime-6.0.19-win-x64.exe f95017731cd35fe71b27aa904fb64242b16f390c52ad6f9d464ddfe8c11325c9
- w_try "${WINE}" "windowsdesktop-runtime-6.0.19-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+ w_download https://download.visualstudio.microsoft.com/download/pr/f6b6c5dc-e02d-4738-9559-296e938dabcb/b66d365729359df8e8ea131197715076/windowsdesktop-runtime-6.0.36-win-x64.exe 0d20debb26fc8b2bc84f25fbd9d4596a6364af8517ebf012e8b871127b798941
+ w_try "${WINE}" "windowsdesktop-runtime-6.0.36-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}
@@ -10263,21 +9264,21 @@ w_metadata dotnet7 dlls \
publisher="Microsoft" \
year="2023" \
media="download" \
- file1="dotnet-runtime-7.0.14-win-x86.exe" \
+ file1="dotnet-runtime-7.0.20-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
load_dotnet7()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/7.0
- w_download https://download.visualstudio.microsoft.com/download/pr/de4e320a-79ea-4304-9acf-975d91251aae/bf49bfe95aa6b22b66eb9af462dee480/dotnet-runtime-7.0.14-win-x86.exe aec1444479216f0175472ade3ed4195276a294029c697d41c4a5e92c8760d734
+ w_download https://download.visualstudio.microsoft.com/download/pr/b2e820bd-b591-43df-ab10-1eeb7998cc18/661ca79db4934c6247f5c7a809a62238/dotnet-runtime-7.0.20-win-x86.exe 9bf79c94ab014b555167e61f3ce653fdf54c70bda6d6c74ab9f6f44652947a89
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
- w_download https://download.visualstudio.microsoft.com/download/pr/5e3be9c1-4b4c-4605-b3bc-18ef04b3c8d5/b1f864adc9c81ab6680385a4270b3887/dotnet-runtime-7.0.14-win-x64.exe 0f52b4e0c33713f8ff7681708fce9074bb7177f51c395139ce243319930bc932
- w_try "${WINE}" "dotnet-runtime-7.0.14-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+ w_download https://download.visualstudio.microsoft.com/download/pr/be7eaed0-4e32-472b-b53e-b08ac3433a22/fc99a5977c57cbfb93b4afb401953818/dotnet-runtime-7.0.20-win-x64.exe 10f48feee0f7fb4c2ed61ecef5e58699743afc9531f8a293680a99fc2d0a78a5
+ w_try "${WINE}" "dotnet-runtime-7.0.20-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}
@@ -10288,21 +9289,21 @@ w_metadata dotnetdesktop7 dlls \
publisher="Microsoft" \
year="2023" \
media="download" \
- file1="windowsdesktop-runtime-7.0.14-win-x86.exe" \
+ file1="windowsdesktop-runtime-7.0.20-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
load_dotnetdesktop7()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/7.0
- w_download https://download.visualstudio.microsoft.com/download/pr/3a87d4cf-87c7-4432-89af-37f21dc651a7/7996e26d189d21afa4fe54a02062df5d/windowsdesktop-runtime-7.0.14-win-x86.exe 956da197039167099ccbb30b71efc9cf3ea4bdcb844016ca0de7c1e41c217e61
+ w_download https://download.visualstudio.microsoft.com/download/pr/b840017b-c69f-4724-a152-11020a0039e6/b74aa12e4ee765a3387a7dcd4ba56187/windowsdesktop-runtime-7.0.20-win-x86.exe 58d32d9857bda5da99afc217669aedacdffb20aed61f15315718eeb3a455b273
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
- w_download https://download.visualstudio.microsoft.com/download/pr/8f5b0079-2bb4-49cd-874e-0f58703eff6e/7010b5f213a2c436a307eb385dbb16ff/windowsdesktop-runtime-7.0.14-win-x64.exe 863d7c749f8c3d9d9e444813b3f8b829ce6aed79dd2c70a9c29532a9d3688821
- w_try "${WINE}" "windowsdesktop-runtime-7.0.14-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+ w_download https://download.visualstudio.microsoft.com/download/pr/08bbfe8f-812d-479f-803b-23ea0bffce47/c320e4b037f3e92ab7ea92c3d7ea3ca1/windowsdesktop-runtime-7.0.20-win-x64.exe 57e7c16e7226c9a29dbc3faedd9e5876cec494c7660528052f52160521e7b714
+ w_try "${WINE}" "windowsdesktop-runtime-7.0.20-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}
@@ -10313,21 +9314,21 @@ w_metadata dotnet8 dlls \
publisher="Microsoft" \
year="2024" \
media="download" \
- file1="dotnet-runtime-8.0.2-win-x86.exe" \
+ file1="dotnet-runtime-8.0.12-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
load_dotnet8()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/8.0
- w_download https://download.visualstudio.microsoft.com/download/pr/e4987764-bda2-4a72-8820-52605f30e899/f5b412fec80d7f4b20fc4ac7740f7279/dotnet-runtime-8.0.2-win-x86.exe b765676fc2f85cb393cabf2bef5dd118578a2a8761be97454352c0c2634957a4
+ w_download https://download.visualstudio.microsoft.com/download/pr/3210417e-ab32-4d14-a152-1ad9a2fcfdd2/da097cee5aa85bd79b6d593e3866fb7f/dotnet-runtime-8.0.12-win-x86.exe eb0d8f39fa2dbb4ff3ff72ad325b6030773df875ab509824ea18c87a368985fa
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
- w_download https://download.visualstudio.microsoft.com/download/pr/a4bc7333-6e30-4e2d-b300-0b4f23537e5b/4b81af6d46a02fba5d9ce030af438c67/dotnet-runtime-8.0.2-win-x64.exe ec10da69116d12691abcb374929cf9eec65e4607095ff1ff035989848fd1db00
- w_try "${WINE}" "dotnet-runtime-8.0.2-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+ w_download https://download.visualstudio.microsoft.com/download/pr/136f4593-e3cd-4d52-bc25-579cdf46e80c/8b98c1347293b48c56c3a68d72f586a1/dotnet-runtime-8.0.12-win-x64.exe a7c394e6ee4e8104d7a01f78103700052cc504370941b7f620e3aa5afbbc61df
+ w_try "${WINE}" "dotnet-runtime-8.0.12-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}
@@ -10338,21 +9339,71 @@ w_metadata dotnetdesktop8 dlls \
publisher="Microsoft" \
year="2024" \
media="download" \
- file1="windowsdesktop-runtime-8.0.2-win-x86.exe" \
+ file1="windowsdesktop-runtime-8.0.12-win-x86.exe" \
installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
load_dotnetdesktop8()
{
# Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/8.0
- w_download https://download.visualstudio.microsoft.com/download/pr/9b77b480-7e32-4321-b417-a41e0f8ea952/3922bbf5538277b1d41e9b49ee443673/windowsdesktop-runtime-8.0.2-win-x86.exe 548bcca012cde72bfa68e693ee3dab175c3aa7926d3a3621c8f6f3b12904b909
+ w_download https://download.visualstudio.microsoft.com/download/pr/acf6e5d3-1e2f-4072-833c-fa84a10841c5/acd48342207247f404a5aaa58d1a1ea1/windowsdesktop-runtime-8.0.12-win-x86.exe 340e30c8611af3800b74f0560f0b6f3feab82ee5cfa3fc0d115b84b08bd5456d
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
if [ "${W_ARCH}" = "win64" ]; then
# Also install the 64-bit version
- w_download https://download.visualstudio.microsoft.com/download/pr/84ba33d4-4407-4572-9bfa-414d26e7c67c/bb81f8c9e6c9ee1ca547396f6e71b65f/windowsdesktop-runtime-8.0.2-win-x64.exe 52099c00372c1ef6c78878f98f6994777170c8f8556bc3b42a6c291a268ce750
- w_try "${WINE}" "windowsdesktop-runtime-8.0.2-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+ w_download https://download.visualstudio.microsoft.com/download/pr/f1e7ffc8-c278-4339-b460-517420724524/f36bb75b2e86a52338c4d3a90f8dac9b/windowsdesktop-runtime-8.0.12-win-x64.exe cb51b559f343cb56e23cad2e5af8c4d1701e221a0a2a4116193a2a9375568814
+ w_try "${WINE}" "windowsdesktop-runtime-8.0.12-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+ fi
+}
+
+#----------------------------------------------------------------
+
+w_metadata dotnet9 dlls \
+ title="MS .NET Runtime 9.0 LTS" \
+ publisher="Microsoft" \
+ year="2024" \
+ media="download" \
+ file1="dotnet-runtime-9.0.1-win-x86.exe" \
+ installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
+
+load_dotnet9()
+{
+ # Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/9.0
+ w_download https://download.visualstudio.microsoft.com/download/pr/21eed405-253a-4ac5-8eed-e54d36bffdaa/3692b7badff8c4311474b4511c3ab929/dotnet-runtime-9.0.1-win-x86.exe dfae88d99d529ce3a363e5098f00cde8fc4f0d605adb256a7cb6cbcf50a6322c
+
+ w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
+ w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
+
+ if [ "${W_ARCH}" = "win64" ]; then
+ # Also install the 64-bit version
+ w_download https://download.visualstudio.microsoft.com/download/pr/24046c49-1b56-4c1b-9c15-75c94d7a841a/d089fe00210b8113c33ea96e1e932fb7/dotnet-runtime-9.0.1-win-x64.exe 9c7b9ba935e5271c7709e9a23f4d67c396c5ca113588c3dea2de67a41588759a
+ w_try "${WINE}" "dotnet-runtime-9.0.1-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+ fi
+}
+
+#----------------------------------------------------------------
+
+w_metadata dotnetdesktop9 dlls \
+ title="MS .NET Desktop Runtime 9.0 LTS" \
+ publisher="Microsoft" \
+ year="2024" \
+ media="download" \
+ file1="windowsdesktop-runtime-9.0.1-win-x86.exe" \
+ installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
+
+load_dotnetdesktop9()
+{
+ # Official version, see https://dotnet.microsoft.com/en-us/download/dotnet/9.0
+ w_download https://download.visualstudio.microsoft.com/download/pr/dcd86c7a-9e55-4cc0-8c71-b99ece1350c4/7cc9c0996933075f56ad69c1169e0c1c/windowsdesktop-runtime-9.0.1-win-x86.exe 4da96170ecd146355b7fff658c05fa76d96f870bad2783707bab28513668b55a
+
+ w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
+ w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
+
+ if [ "${W_ARCH}" = "win64" ]; then
+ # Also install the 64-bit version
+ w_download https://download.visualstudio.microsoft.com/download/pr/ae0291d4-bcdc-4e56-a952-4f7d84bf2673/1bc4a93f466aab309776931e5a5c4eb4/windowsdesktop-runtime-9.0.1-win-x64.exe fe0cf37987f11dbb50bb7f58d2fe5fa75777b81f6dedc1481940ea5a566671e8
+ w_try "${WINE}" "windowsdesktop-runtime-9.0.1-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
fi
}
@@ -12376,7 +11427,7 @@ w_metadata physx dlls \
load_physx()
{
- w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=56606" 9.5
+ w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=56606" 9.5 9.10
w_get_sha256sum "${W_PROGRAMS_X86_UNIX}/NVIDIA Corporation/PhysX/Engine/86C5F4F22ECD/APEX_Particles_x64.dll"
if [ "${_W_gotsha256sum}"x = "b3991e0165a9802b60e2f7d14c1be5f879071999ae74a38263cec9bf043a9eaa"x ] ; then
@@ -12413,6 +11464,96 @@ load_pngfilt()
#----------------------------------------------------------------
+w_metadata powershell_core dlls \
+ title="PowerShell Core" \
+ publisher="Microsoft" \
+ year="2024" \
+ media="download" \
+ file1="PowerShell-7.2.21-win-x86.msi" \
+ file2="PowerShell-7.2.21-win-x64.msi"
+
+load_powershell_core()
+{
+ # Uncomment below and remove win32 download elif and file when PowerShell Core v7.2 LTS goes EOL
+ #w_package_unsupported_win32
+
+ # Download PowerShell Core 7.2.x MSI (Latest LTS Version to support win32)
+ # https://github.com/PowerShell/PowerShell/releases/v7.2.21
+ if [ "${W_ARCH}" = "win64" ]; then
+ w_download "https://github.com/PowerShell/PowerShell/releases/download/v7.2.21/PowerShell-7.2.21-win-x64.msi" 407640b11c89d66ec7892229e68b1d74b26f0e820b52da268c67fd166c2b46ad
+ # Disable SC2154 due to shellcheck not knowing metadata is sourced before this function is run
+ # shellcheck disable=SC2154
+ msi="${file2}"
+ elif [ "${W_ARCH}" = "win32" ]; then
+ w_download "https://github.com/PowerShell/PowerShell/releases/download/v7.2.21/PowerShell-7.2.21-win-x86.msi" cdfd69f6997eabe5abdc38869eedfd90761416261bf95531300f652d0932bf0a
+ # shellcheck disable=SC2154
+ msi="${file1}"
+ fi
+
+ # Change directory to the cache directory where the MSI file is downloaded
+ w_try_cd "${W_CACHE}/${W_PACKAGE}"
+
+ # Install PowerShell Core using Wine's msiexec
+ w_try "${WINE}" msiexec ${W_OPT_UNATTENDED:+/quiet} /i "${msi}" ENABLE_PSREMOTING=1 REGISTER_MANIFEST=1
+}
+
+#----------------------------------------------------------------
+
+w_metadata powershell dlls \
+ title="PowerShell Wrapper For Wine" \
+ publisher="ProjectSynchro" \
+ year="2024" \
+ media="download" \
+ file1="powershell32.exe" \
+ file2="powershell64.exe" \
+ file3="profile.ps1"
+
+load_powershell()
+{
+ w_do_call powershell_core
+
+ _W_powershell_version="$(w_get_github_latest_release projectsynchro powershell-wrapper-for-wine)"
+
+ # Download PowerShell Wrapper 32bit exe
+ w_linkcheck_ignore=1 w_download "https://github.com/ProjectSynchro/powershell-wrapper-for-wine/releases/download/${_W_powershell_version}/powershell32.exe"
+
+ if [ "${W_ARCH}" = "win64" ]; then
+ # Download PowerShell Wrapper 64bit exe
+ w_linkcheck_ignore=1 w_download "https://github.com/ProjectSynchro/powershell-wrapper-for-wine/releases/download/${_W_powershell_version}/powershell64.exe"
+ fi
+
+ # Download PowerShell Wrapper profile.ps1
+ w_linkcheck_ignore=1 w_download "https://github.com/ProjectSynchro/powershell-wrapper-for-wine/releases/download/${_W_powershell_version}/profile.ps1"
+
+ # Change directories to cache
+ w_try_cd "${W_CACHE}/${W_PACKAGE}"
+
+ # Install PWSH Wrapper
+
+ # Disable SC2154 due to shellcheck not knowing metadata is sourced before this function is run
+ # shellcheck disable=SC2154
+ w_try_cp_dll "${file1}" "${W_SYSTEM32_DLLS}/WindowsPowerShell/v1.0/powershell.exe"
+ if [ "${W_ARCH}" = "win64" ]; then
+ # shellcheck disable=SC2154
+ w_try_cp_dll "${file2}" "${W_SYSTEM64_DLLS}/WindowsPowerShell/v1.0/powershell.exe"
+ fi
+
+ # Install profile.ps1 for wrapper
+ if [ "${W_ARCH}" = "win64" ]; then
+ # shellcheck disable=SC2154
+ w_try cp "${file3}" "${W_PROGRAMW6432_UNIX}/PowerShell/7/${file3}"
+ else
+ # shellcheck disable=SC2154
+ w_try cp "${file3}" "${W_PROGRAMS_UNIX}/PowerShell/7/${file3}"
+ fi
+
+ w_override_dlls native powershell.exe
+
+ unset _W_powershell_version
+}
+
+#----------------------------------------------------------------
+
w_metadata prntvpt dlls \
title="prntvpt.dll" \
publisher="Microsoft" \
@@ -13147,6 +12288,8 @@ w_metadata vb5run dlls \
load_vb5run()
{
+ w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=56209" 8.10
+
w_download https://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe b5f8ea5b9d8b30822a2be2cdcb89cda99ec0149832659ad81f45360daa6e6965
w_try_cd "${W_CACHE}/${W_PACKAGE}"
w_try "${WINE}" msvbvm50.exe ${W_OPT_UNATTENDED:+/q}
@@ -13687,9 +12830,11 @@ load_vcrun2015()
w_set_winver winxp
fi
- # Setup will refuse to install ucrtbase because builtin's version number is higher, so manually replace it
- # See https://bugs.winehq.org/show_bug.cgi?id=46317
- w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2015/vc_redist.x86.exe -F 'a10'
+ # Setup will refuse to install msvcp140 & ucrtbase because builtin's version number is higher, so manually replace them
+ # See https://bugs.winehq.org/show_bug.cgi?id=46317 and
+ # https://bugs.winehq.org/show_bug.cgi?id=57518
+ w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x86.exe -F 'a10'
+ w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'msvcp140.dll'
w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll'
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
@@ -13700,8 +12845,9 @@ load_vcrun2015()
# Also install the 64-bit version
# 2022/09/16: d7257265dbc0635c96dd67ddf938a09abe0866cb2d4fa05f8b758c8644e724e4
w_download https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x64.exe d7257265dbc0635c96dd67ddf938a09abe0866cb2d4fa05f8b758c8644e724e4
- # Also replace 64-bit ucrtbase.dll
- w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2015/vc_redist.x64.exe -F 'a10'
+ # Also replace 64-bit msvcp140.dll & ucrtbase.dll
+ w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a10'
+ w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'msvcp140.dll'
w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll'
w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
;;
@@ -13760,7 +12906,8 @@ load_vcrun2017()
# 2017/10/02: 2da11e22a276be85970eaed255daf3d92af84e94142ec04252326a882e57303e
# 2019/03/17: 7355962b95d6a5441c304cd2b86baf37bc206f63349f4a02289bcfb69ef142d3
# 2019/08/14: 54ad46ae80984aa48cae6361213692c96b3639e322730d28c7fb93b183c761da
- w_download https://aka.ms/vs/15/release/vc_redist.x86.exe 54ad46ae80984aa48cae6361213692c96b3639e322730d28c7fb93b183c761da
+ # 2024/10/17: 251640e8039d34290133b2c6e3e6fe098e61e2756d5a4c45fdcec9e4dee6c187
+ w_download https://aka.ms/vs/15/release/vc_redist.x86.exe 251640e8039d34290133b2c6e3e6fe098e61e2756d5a4c45fdcec9e4dee6c187
w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait ucrtbase vcamp140 vcomp140 vccorlib140 vcruntime140 vcruntime140_1
@@ -13769,9 +12916,11 @@ load_vcrun2017()
w_set_winver winxp
fi
- # Setup will refuse to install ucrtbase because builtin's version number is higher, so manually replace it
- # See https://bugs.winehq.org/show_bug.cgi?id=46317
- w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2017/vc_redist.x86.exe -F 'a10'
+ # Setup will refuse to install msvcp140 & ucrtbase because builtin's version number is higher, so manually replace them
+ # See https://bugs.winehq.org/show_bug.cgi?id=46317 and
+ # https://bugs.winehq.org/show_bug.cgi?id=57518
+ w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x86.exe -F 'a10'
+ w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'msvcp140.dll'
w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll'
w_try_cd "${W_CACHE}/${W_PACKAGE}"
@@ -13784,9 +12933,11 @@ load_vcrun2017()
# 2017/10/02: 7434bf559290cccc3dd3624f10c9e6422cce9927d2231d294114b2f929f0e465
# 2019/03/17: b192e143d55257a0a2f76be42e44ff8ee14014f3b1b196c6e59829b6b3ec453c
# 2019/08/14: 5b0cbb977f2f5253b1ebe5c9d30edbda35dbd68fb70de7af5faac6423db575b5
- w_download https://aka.ms/vs/15/release/vc_redist.x64.exe 5b0cbb977f2f5253b1ebe5c9d30edbda35dbd68fb70de7af5faac6423db575b5
- # Also replace 64-bit ucrtbase.dll
- w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2017/vc_redist.x64.exe -F 'a10'
+ # 2024/10/17: 7cf24eba2bd67ea6229b7dd131e06f4e92ebefc06e36fe401cdd227d7ed78264
+ w_download https://aka.ms/vs/15/release/vc_redist.x64.exe 7cf24eba2bd67ea6229b7dd131e06f4e92ebefc06e36fe401cdd227d7ed78264
+ # Also replace 64-bit msvcp140.dll & ucrtbase.dll
+ w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a10'
+ w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'msvcp140.dll'
w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll'
w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
;;
@@ -13824,15 +12975,21 @@ load_vcrun2019()
# 2021/10/23: 80c7969f4e05002a0cd820b746e0acb7406d4b85e52ef096707315b390927824
# 2022/01/18: 4c6c420cf4cbf2c9c9ed476e96580ae92a97b2822c21329a2e49e8439ac5ad30
# 2023/12/30: 29f649c08928b31e6bb11d449626da14b5e99b5303fe2b68afa63732ef29c946
+ # 2024/10/17: 49545cb0f6499c4a65e1e8d5033441eeeb4edfae465a68489a70832c6a4f6399
w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140
- w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 29f649c08928b31e6bb11d449626da14b5e99b5303fe2b68afa63732ef29c946
+ w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 49545cb0f6499c4a65e1e8d5033441eeeb4edfae465a68489a70832c6a4f6399
if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then
w_store_winver
w_set_winver winxp
fi
+ # Setup will refuse to install msvcp140 because the builtin's version number is higher, so manually replace it
+ # See https://bugs.winehq.org/show_bug.cgi?id=57518
+ w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x86.exe -F 'a10'
+ w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'msvcp140.dll'
+
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
@@ -13854,11 +13011,17 @@ load_vcrun2019()
# 2021/10/23: 9b9dd72c27ab1db081de56bb7b73bee9a00f60d14ed8e6fde45dab3e619b5f04
# 2022/01/18: 296f96cd102250636bcd23ab6e6cf70935337b1bbb3507fe8521d8d9cfaa932f
# 2023/12/30: cee28f29f904524b7f645bcec3dfdfe38f8269b001144cd909f5d9232890d33b
+ # 2024/10/17: 5d9999036f2b3a930f83b7fe3e2186b12e79ae7c007d538f52e3582e986a37c3
# vcruntime140_1 is only shipped on x64:
w_override_dlls native,builtin vcruntime140_1
- w_download https://aka.ms/vs/16/release/vc_redist.x64.exe cee28f29f904524b7f645bcec3dfdfe38f8269b001144cd909f5d9232890d33b
+ w_download https://aka.ms/vs/16/release/vc_redist.x64.exe 5d9999036f2b3a930f83b7fe3e2186b12e79ae7c007d538f52e3582e986a37c3
+
+ # Also replace 64-bit msvcp140.dll
+ w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a11'
+ w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a11" -F 'msvcp140.dll'
+
w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
;;
esac
@@ -13883,16 +13046,16 @@ load_ucrtbase2019()
{
w_override_dlls native,builtin ucrtbase
- # Microsoft download no longer containts ucrtbase so get the last known version from archive.org
- w_download https://web.archive.org/web/20210415064013/https://download.visualstudio.microsoft.com/download/pr/85d47aa9-69ae-4162-8300-e6b7e4bf3cf3/14563755AC24A874241935EF2C22C5FCE973ACB001F99E524145113B2DC638C1/VC_redist.x86.exe 14563755ac24a874241935ef2c22c5fce973acb001f99e524145113b2dc638c1
+ # 2024/10/11: ucrtbase.dll is available again - reverted from archive.org to microsoft URL
+ w_download https://download.visualstudio.microsoft.com/download/pr/85d47aa9-69ae-4162-8300-e6b7e4bf3cf3/14563755AC24A874241935EF2C22C5FCE973ACB001F99E524145113B2DC638C1/VC_redist.x86.exe 14563755ac24a874241935ef2c22c5fce973acb001f99e524145113b2dc638c1
w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/"${W_PACKAGE}"/VC_redist.x86.exe -F 'a10'
w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll'
case "${W_ARCH}" in
win64)
- # Microsoft download no longer containts ucrtbase so get the last known version from archive.org
- w_download https://web.archive.org/web/20210414165612/https://download.visualstudio.microsoft.com/download/pr/85d47aa9-69ae-4162-8300-e6b7e4bf3cf3/52B196BBE9016488C735E7B41805B651261FFA5D7AA86EB6A1D0095BE83687B2/VC_redist.x64.exe 52b196bbe9016488c735e7b41805b651261ffa5d7aa86eb6a1d0095be83687b2
+ # 2024/10/11: ucrtbase.dll is available again - reverted from archive.org to microsoft URL
+ w_download https://download.visualstudio.microsoft.com/download/pr/85d47aa9-69ae-4162-8300-e6b7e4bf3cf3/52B196BBE9016488C735E7B41805B651261FFA5D7AA86EB6A1D0095BE83687B2/VC_redist.x64.exe 52b196bbe9016488c735e7b41805b651261ffa5d7aa86eb6a1d0095be83687b2
w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/"${W_PACKAGE}"/VC_redist.x64.exe -F 'a10'
w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll'
@@ -13920,9 +13083,16 @@ load_vcrun2022()
# 2023/12/30: c61cef97487536e766130fa8714dd1b4143f6738bfb71806018eee1b5fe6f057
# 2024/02/11: 510fc8c2112e2bc544fb29a72191eabcc68d3a5a7468d35d7694493bc8593a79
# 2024/06/10: a32dd41eaab0c5e1eaa78be3c0bb73b48593de8d97a7510b97de3fd993538600
+ # 2024/10/17: ed1967c2ac27d806806d121601b526f84e497ae1b99ed139c0c4c6b50147df4a
+ # 2024/11/20: dd1a8be03398367745a87a5e35bebdab00fdad080cf42af0c3f20802d08c25d4
w_override_dlls native,builtin concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140
- w_download https://aka.ms/vs/17/release/vc_redist.x86.exe a32dd41eaab0c5e1eaa78be3c0bb73b48593de8d97a7510b97de3fd993538600
+ w_download https://aka.ms/vs/17/release/vc_redist.x86.exe dd1a8be03398367745a87a5e35bebdab00fdad080cf42af0c3f20802d08c25d4
+
+ # Setup will refuse to install msvcp140 because the builtin's version number is higher, so manually replace it
+ # See https://bugs.winehq.org/show_bug.cgi?id=57518
+ w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x86.exe -F 'a10'
+ w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'msvcp140.dll'
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
@@ -13936,10 +13106,17 @@ load_vcrun2022()
# 2023/12/30: 4dfe83c91124cd542f4222fe2c396cabeac617bb6f59bdcbdf89fd6f0df0a32f
# 2024/02/11: 1ad7988c17663cc742b01bef1a6df2ed1741173009579ad50a94434e54f56073
# 2024/06/10: 3642e3f95d50cc193e4b5a0b0ffbf7fe2c08801517758b4c8aeb7105a091208a
+ # 2024/10/17: 814e9da5ec5e5d6a8fa701999d1fc3baddf7f3adc528e202590e9b1cb73e4a11
+ # 2024/11/20: 1821577409c35b2b9505ac833e246376cc68a8262972100444010b57226f0940
# vcruntime140_1 is only shipped on x64:
w_override_dlls native,builtin vcruntime140_1
- w_download https://aka.ms/vs/17/release/vc_redist.x64.exe 3642e3f95d50cc193e4b5a0b0ffbf7fe2c08801517758b4c8aeb7105a091208a
+ w_download https://aka.ms/vs/17/release/vc_redist.x64.exe 1821577409c35b2b9505ac833e246376cc68a8262972100444010b57226f0940
+
+ # Also replace 64-bit msvcp140.dll
+ w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a11'
+ w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a11" -F 'msvcp140.dll'
+
w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
;;
esac
@@ -14320,7 +13497,7 @@ w_metadata xaudio29 dlls \
load_xaudio29()
{
- w_download https://www.nuget.org/api/v2/package/Microsoft.XAudio2.Redist/1.2.11 4552e0b5b59de0cdbc6c217261c45f5968f7bbf1e8ab5f208e4bca6fd8fc5780 microsoft.xaudio2.redist.1.2.11.nupkg
+ w_download https://globalcdn.nuget.org/packages/microsoft.xaudio2.redist.1.2.11.nupkg 4552e0b5b59de0cdbc6c217261c45f5968f7bbf1e8ab5f208e4bca6fd8fc5780
w_try_unzip "${W_TMP}" "${W_CACHE}/${W_PACKAGE}/${file1}"
w_try_cp_dll "${W_TMP}/build/native/release/bin/x86/xaudio2_9redist.dll" "${W_SYSTEM32_DLLS}/xaudio2_9.dll"
@@ -15222,19 +14399,16 @@ w_metadata opensymbol fonts \
publisher="libreoffice.org" \
year="2022" \
media="download" \
- file1="fonts-opensymbol_102.11+LibO7.0.4-4+deb11u4~bpo10+1_all.deb" \
+ file1="opens___.ttf" \
installed_file1="${W_FONTSDIR_WIN}/opens___.ttf"
load_opensymbol()
{
- # The OpenSymbol fonts are a replacement for the Windows Wingdings font from OpenOffice.org.
- # Need to w_download Debian since I can't find a standalone download from OpenOffice
- # Note: The source download package on debian is for _all_ of OpenOffice, which is 266 MB.
- w_download https://archive.debian.org/debian/pool/main/libr/libreoffice/fonts-opensymbol_102.11+LibO7.0.4-4+deb11u4~bpo10+1_all.deb 66ba490cbd482b81a8f2d55850af6a7f2d1cc9dab341881359fcdc77cd1c4283
- w_try_cd "${W_TMP}"
- w_try_ar "${W_CACHE}/${W_PACKAGE}/${file1}" data.tar.xz
- w_try tar -Jxf "${W_TMP}/data.tar.xz" ./usr/share/fonts/truetype/libreoffice/opens___.ttf
- w_try_cp_font_files "usr/share/fonts/truetype/libreoffice" "${W_FONTSDIR_UNIX}"
+ # w_download http://ftp.us.debian.org/debian/pool/main/libr/libreoffice/fonts-opensymbol_102.12+LibO7.6.4~rc1-1~bpo12+1_all.deb e35e57a0a703fe656230a30c7675a5c5c4772a11c6f650634765234d1f0fa35f
+
+ # 30.09.2024 download file directly from git repo instead of downloading entire deb package
+ w_download "https://raw.githubusercontent.com/apache/openoffice/5f13fa00702a0abe48858d443bc306f5c5ba26d8/main/extras/source/truetype/symbol/opens___.ttf" 86f6a40ca61adfc5942fb4d2fc360ffba9abd972a7e21c1ee91e494299ff0cbc
+ w_try_cp_font_files "${W_CACHE}/${W_PACKAGE}/" "${W_FONTSDIR_UNIX}"
w_register_font opens___.ttf "OpenSymbol"
}
@@ -15515,18 +14689,24 @@ load_3m_library()
#----------------------------------------------------------------
w_metadata 7zip apps \
- title="7-Zip 19.00" \
+ title="7-Zip 24.09" \
publisher="Igor Pavlov" \
- year="2019" \
+ year="2024" \
media="download" \
- file1="7z1900.exe" \
- installed_exe1="${W_PROGRAMS_X86_WIN}/7-Zip/7zFM.exe"
+ file1="7z2409.exe" \
+ installed_exe1="${W_PROGRAMS_WIN}/7-Zip/7zFM.exe"
load_7zip()
{
- w_download https://www.7-zip.org/a/7z1900.exe 759aa04d5b03ebeee13ba01df554e8c962ca339c74f56627c8bed6984bb7ef80
+ if [ "${W_ARCH}" = "win32" ]; then
+ w_download https://www.7-zip.org/a/7z2409.exe e35e4374100b52e697e002859aefdd5533bcbf4118e5d2210fae6de318947c41
+ _W_installer_exe=7z2409.exe
+ elif [ "${W_ARCH}" = "win64" ]; then
+ w_download https://www.7-zip.org/a/7z2409-x64.exe bdd1a33de78618d16ee4ce148b849932c05d0015491c34887846d431d29f308e
+ _W_installer_exe=7z2409-x64.exe
+ fi
w_try_cd "${W_CACHE}/${W_PACKAGE}"
- w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S}
+ w_try "${WINE}" "${_W_installer_exe}" ${W_OPT_UNATTENDED:+/S}
}
#----------------------------------------------------------------
@@ -15682,7 +14862,7 @@ load_controlpad()
w_try "${WINE}" setup ${W_OPT_UNATTENDED:+/qt}
if ! test -f "${W_SYSTEM32_DLLS}"/FM20.DLL; then
- w_die "Install failed. Please report, If you just wanted fm20.dll, try installing art2min instead."
+ w_die "Install failed. Please report, If you just wanted fm20.dll, try installing art2kmin instead."
fi
}
@@ -16218,7 +15398,7 @@ load_ie8()
w_call msls31
# Change the override to the native so we are sure we use and register them
- w_override_dlls native,builtin ieframe ieproxy itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite
+ w_override_dlls native,builtin ieframe ieproxy iertutil itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite
# IE8 installer will check the version number of iexplore.exe which causes IE8 installer to fail on wine-1.9.0+
w_override_dlls native iexplore.exe
@@ -16680,182 +15860,6 @@ load_npp()
#----------------------------------------------------------------
-w_metadata office2003pro apps \
- title="Microsoft Office 2003 Professional" \
- publisher="Microsoft" \
- year="2002" \
- media="cd" \
- file1="setup.exe" \
- installed_exe1="${W_PROGRAMS_X86_WIN}/Microsoft Office/Office11/WINWORD.EXE"
-
-load_office2003pro()
-{
- w_mount OFFICE11
- w_read_key
-
- w_ahk_do "
- if ( w_opt_unattended > 0 ) {
- run ${W_ISO_MOUNT_LETTER}:setup.exe /EULA_ACCEPT=YES /PIDKEY=${W_KEY}
- } else {
- run ${W_ISO_MOUNT_LETTER}:setup.exe
- }
- SetTitleMatchMode, 2
- WinWait,Microsoft Office 2003 Setup, Welcome
- if ( w_opt_unattended > 0 ) {
- Sleep 500
- WinWait,Microsoft Office 2003 Setup,Key
- Sleep 500
- ControlClick Button1 ; Next
- WinWait,Microsoft Office 2003 Setup,Initials
- Sleep 500
- ControlClick Button1 ; Next
- WinWait,Microsoft Office 2003 Setup,End-User
- Sleep 500
- ControlClick Button1 ; I accept
- ControlClick Button2 ; Next
- WinWait,Microsoft Office 2003 Setup,Recommended
- Sleep 500
- ControlClick Button7 ; Next
- WinWait,Microsoft Office 2003 Setup,Summary
- Sleep 500
- ControlClick Button1 ; Install
- }
- WinWait,Microsoft Office 2003 Setup,Completed
- if ( w_opt_unattended > 0 ) {
- Sleep 500
- ControlClick Button2 ; Finish
- }
- WinWaitClose
- "
-}
-
-#----------------------------------------------------------------
-
-w_metadata office2007pro apps \
- title="Microsoft Office 2007 Professional" \
- publisher="Microsoft" \
- year="2006" \
- media="cd" \
- file1="setup.exe" \
- installed_file1="${W_PROGRAMS_X86_WIN}/Microsoft Office/Office12/WINWORD.EXE"
-
-load_office2007pro()
-{
- if w_workaround_wine_bug 14980 "Using native riched20"; then
- w_override_app_dlls winword.exe n riched20
- w_override_app_dlls excel.exe n riched20
- w_override_app_dlls powerpnt.exe n riched20
- w_override_app_dlls msaccess.exe n riched20
- w_override_app_dlls outlook.exe n riched20
- w_override_app_dlls mspub.exe n riched20
- w_override_app_dlls infopath.exe n riched20
- fi
-
- w_mount OFFICE12
- w_read_key
-
- if [ -n "${W_OPT_UNATTENDED}" ]; then
- # See
- # https://blogs.technet.microsoft.com/office_resource_kit/2009/01/29/configure-a-silent-install-of-the-2007-office-system-with-config-xml/
- # https://www.symantec.com/connect/articles/office-2007-silent-installation-lessons-learned
- cat > "${W_TMP}"/config.xml <<__EOF__
-<Configuration Product="ProPlus">
-<Display Level="none" CompletionNotice="no" SuppressModal="yes" AcceptEula="yes" />
-<PIDKEY Value="${W_KEY}" />
-</Configuration>
-__EOF__
- "${WINE}" "${W_ISO_MOUNT_LETTER}":setup.exe /config "${W_TMP_WIN}"\\config.xml
-
- status=$?
- case ${status} in
- 0|43) ;;
- 78)
- w_die "Installing ${W_PACKAGE} failed, product key ${W_KEY} \
- might be wrong. Try again without -q, or put correct key in \
- ${W_CACHE}/${W_PACKAGE}/key.txt and rerun."
- ;;
- *)
- w_die "Installing ${W_PACKAGE} failed."
- ;;
- esac
-
- else
- w_try "${WINE}" "${W_ISO_MOUNT_LETTER}":setup.exe
- fi
-}
-
-#----------------------------------------------------------------
-
-w_metadata office2013pro apps \
- title="Microsoft Office 2013 Professional" \
- publisher="Microsoft" \
- year="2013" \
- media="download" \
- file1="setup.exe" \
- installed_file1="${W_PROGRAMS_X86_WIN}/Microsoft Office/Office15/WINWORD.EXE"
-
-load_office2013pro()
-{
- w_package_unsupported_win64
-
- if [ ! -x "$(command -v ntlm_auth 2>/dev/null)" ]; then
- w_die "winbind (part of samba) is required for the installation"
- fi
-
- # link from https://www.askvg.com/direct-download-link-microsoft-office-2013-professional-plus-free-trial/
- w_download https://web.archive.org/web/20130324022555/http://care.dlservice.microsoft.com/dl/download/2/9/C/29CC45EF-4CDA-4710-9FB3-1489786570A1/OfficeProfessionalPlus_x86_en-us.img 236f8faae3f979ec72592a63784bba2f0d614916350c44631221b88ae9dae206 "OFFICE15.iso"
-
- w_set_winver win7
-
- w_call corefonts
- w_call tahoma
-
- w_call riched20
-
-
- if w_workaround_wine_bug 43581 "Wine has problems parsing some regex strings during installation"; then
- w_call msxml6
- fi
-
- case "${WINETRICKS_ISO_MOUNT}" in
- # archivemount > 0.8.8: works
- # archivemount <= 0.8.8: cannot finish installation due to path issue
- archivemount)
- _W_last_bad_ver=0.8.8
- _W_tool_ver="$(archivemount --version 2>&1 | head -n 1 | cut -d ' ' -f3)"
- _W_pos_am_ver="$(printf "%s\\n%s" "${_W_tool_ver}" "${_W_last_bad_ver}" | sort -t. -k 1,1n -k 2,2n -k 3,3n | grep -n "^${_W_tool_ver}\$" | cut -d : -f1 | head -n 1)"
- if test "${_W_pos_am_ver}" = "2"; then
- W_USE_USERMOUNT=1
- else
- w_warn "archivemount <= ${_W_last_bad_ver} has path issue and cannot be used."
- fi
- unset _W_last_bad_ver _W_tool_ver _W_pos_am_ver
- ;;
- # fuseiso: works
- # hdiutil: partially tested (only mounting/unmounting and copying files)
- *) W_USE_USERMOUNT=1 ;;
- esac
- w_mount OFFICE15
-
- if [ -n "${W_OPT_UNATTENDED}" ]; then
- cat > "${W_TMP}"/config.xml <<_EOF_
-<Configuration Product="ProPlus">
-<Display Level="none" CompletionNotice="no" SuppressModal="yes" AcceptEula="yes" />
-</Configuration>
-_EOF_
- w_try "${WINE}" "${W_ISO_MOUNT_LETTER}:${file1}" /config "${W_TMP_WIN}"\\config.xml
- else
- w_try "${WINE}" "${W_ISO_MOUNT_LETTER}:${file1}"
- fi
-
- w_wineserver -w
- w_umount
-
- w_warn "Microsoft Office 2013 is far away from running stable under wine 3.3. It should not be used in a productive environment."
-}
-
-#----------------------------------------------------------------
-
w_metadata ollydbg110 apps \
title="OllyDbg" \
publisher="ollydbg.de" \
@@ -17166,96 +16170,6 @@ _EOF_
#----------------------------------------------------------------
-w_metadata qq apps \
- title="QQ 8.9.6(Chinese chat app)" \
- publisher="Tencent" \
- year="2017" \
- media="download" \
- file1="QQ8.9.6.exe" \
- file2="QQ.tar.gz"\
- installed_exe1="${W_PROGRAMS_X86_WIN}/Tencent/QQ/Bin/QQScLauncher.exe" \
- homepage="https://www.qq.com/" \
- unattended="no"
-
-load_qq()
-{
- w_download https://dldir1.qq.com/qqfile/qq/QQ8.9.6/22404/QQ8.9.6.exe d207f49a642be21c4e1b14fc9f4cf47a6a9a2718afbc8bd0685b607b65424ef6
- w_download https://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
-
- if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username."; then
- w_call riched20
- fi
-
- # Make sure chinese fonts are available
- w_call fakechinese
-
- # uses mfc42u.dll
- w_call mfc42
-
- if w_workaround_wine_bug 38171 "Installing desktop file to work around bug"; then
- w_try_cd "${W_TMP}/"
- tar -zxf "${W_CACHE}/qq/QQ.tar.gz"
- w_try_mkdir "${HOME}/.local/share/applications/wine/Programs/腾讯软件/QQ"
- w_try_mkdir "${HOME}/.local/share/icons/hicolor/48x48/apps"
- w_try_mkdir "${HOME}/.local/share/icons/hicolor/256x256/apps"
- w_try mv QQ/腾讯QQ.desktop ~/.local/share/applications/wine/Programs/腾讯软件/QQ
- w_try mv QQ/48x48/QQ.png ~/.local/share/icons/hicolor/48x48/apps
- w_try mv QQ/256x256/QQ.png ~/.local/share/icons/hicolor/256x256/apps
- # shellcheck disable=SC1001
- echo Exec=env WINEPREFIX="${WINEPREFIX}" "${WINE}" \""${W_PROGRAMS_X86_WIN}"/Tencent/QQ/bin/QQScLauncher.exe\" >> "${HOME}/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop"
- fi
-
- if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly"; then
- w_override_dlls disabled txplatform.exe
- fi
-
- # Disable update, stay on the version.
- w_override_dlls disabled txupd.exe
-
- w_try_cd "${W_CACHE}/${W_PACKAGE}"
- w_try "${WINE}" "${file1}"
-}
-
-#----------------------------------------------------------------
-
-w_metadata qqintl apps \
- title="QQ International Instant Messenger 2.11" \
- publisher="Tencent" \
- year="2014" \
- media="download" \
- file1="QQIntl2.11.exe" \
- installed_exe1="${W_PROGRAMS_X86_WIN}/Tencent/QQIntl/Bin/QQ.exe" \
- homepage="https://www.imqq.com/" \
- unattended="no"
-
-load_qqintl()
-{
- w_download https://dldir1.qq.com/qqfile/QQIntl/QQi_PC/QQIntl2.11.exe a08e5d8432ad41745cfe92479a9a0c3328a546c27f05486392ca7b77b1cb02a8
-
- if w_workaround_wine_bug 33086 "Installing native riched20 to allow typing in username"; then
- w_call riched20
- fi
-
- if w_workaround_wine_bug 37617 "Installing native wininet to work around crash"; then
- w_call wininet
- fi
-
- if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly"; then
- w_override_dlls disabled txplatform.exe
- fi
-
- # Make sure chinese fonts are available
- w_call fakechinese
-
- # wants mfc80u.dll
- w_call vcrun2005
-
- w_try_cd "${W_CACHE}/${W_PACKAGE}"
- w_try "${WINE}" "${file1}"
-}
-
-#----------------------------------------------------------------
-
w_metadata safari apps \
title="Safari" \
publisher="Apple" \
@@ -17595,7 +16509,8 @@ load_vc2010express()
# Originally at: https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso
# Mirror list at: http://www.filewatcher.com/_/?q=VS2010Express1.iso
# Formerly at: ftp://www.daba.lv/pub/Programmeeshana/VisualStudio/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
- w_download https://debian.fmi.uni-sofia.bg/~aangelov/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
+ # Formerly at: https://debian.fmi.uni-sofia.bg/~aangelov/VS2010Express1.iso
+ w_download https://master.dl.sourceforge.net/project/beyond-the-sword-sdk/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
# Uninstall wine-mono, installer doesn't attempt to install native .Net if mono is installed,
# Then the installer throws an exception and fails
@@ -17834,8 +16749,9 @@ load_wm9codecs()
# See https://www.microsoft.com/en-us/download/details.aspx?id=507
# Used by direct calls from load_wmp9, so we have to specify cache directory.
- # http://birds.camden.rutgers.edu/
- w_download_to wm9codecs http://birds.camden.rutgers.edu/WM9Codecs9x.exe f25adf6529745a772c4fdd955505e7fcdc598b8a031bb0ce7e5856da5e5fcc95
+ # Formerly at http://birds.camden.rutgers.edu/, but recently switched to a new SSL cert that isn't in debian's ca-certificates
+ # 2024/09/22: switched to https://am.net/lib/tools/Microsoft/MPlayer/WM9Codecs9x.exe
+ w_download_to wm9codecs https://am.net/lib/tools/Microsoft/MPlayer/WM9Codecs9x.exe f25adf6529745a772c4fdd955505e7fcdc598b8a031bb0ce7e5856da5e5fcc95
w_try_cd "${W_CACHE}/wm9codecs"
w_set_winver win2k
w_try "${WINE}" WM9Codecs9x.exe ${W_OPT_UNATTENDED:+/q}
@@ -20073,25 +18989,6 @@ execute_command()
ddr=opengl) w_warn "Calling ddr=opengl is deprecated, please use renderer=gl instead" ; w_call renderer=gl ;;
dxsdk_nov2006) w_warn "Calling dxsdk_nov2006 is deprecated, please use dxsdk_aug2006 instead"; w_call dxsdk_aug2006 ;;
- dxvk054|dxvk54) w_warn "Calling $1 is deprecated, please use dxvk0054 instead" ; w_call dxvk0054 ;;
- dxvk060|dxvk60) w_warn "Calling $1 is deprecated, please use dxvk0060 instead" ; w_call dxvk0060 ;;
- dxvk061|dxvk61) w_warn "Calling $1 is deprecated, please use dxvk0061 instead" ; w_call dxvk0061 ;;
- dxvk062|dxvk62) w_warn "Calling $1 is deprecated, please use dxvk0062 instead" ; w_call dxvk0062 ;;
- dxvk063|dxvk63) w_warn "Calling $1 is deprecated, please use dxvk0063 instead" ; w_call dxvk0063 ;;
- dxvk064|dxvk64) w_warn "Calling $1 is deprecated, please use dxvk0064 instead" ; w_call dxvk0064 ;;
- dxvk065|dxvk65) w_warn "Calling $1 is deprecated, please use dxvk0065 instead" ; w_call dxvk0065 ;;
- dxvk070|dxvk70) w_warn "Calling $1 is deprecated, please use dxvk0070 instead" ; w_call dxvk0070 ;;
- dxvk071|dxvk71) w_warn "Calling $1 is deprecated, please use dxvk0071 instead" ; w_call dxvk0071 ;;
- dxvk072|dxvk72) w_warn "Calling $1 is deprecated, please use dxvk0072 instead" ; w_call dxvk0072 ;;
- dxvk080|dxvk80) w_warn "Calling $1 is deprecated, please use dxvk0080 instead" ; w_call dxvk0080 ;;
- dxvk081|dxvk81) w_warn "Calling $1 is deprecated, please use dxvk0081 instead" ; w_call dxvk0081 ;;
- dxvk090|dxvk90) w_warn "Calling $1 is deprecated, please use dxvk0090 instead" ; w_call dxvk0090 ;;
- dxvk091|dxvk91) w_warn "Calling $1 is deprecated, please use dxvk0091 instead" ; w_call dxvk0091 ;;
- dxvk092|dxvk92) w_warn "Calling $1 is deprecated, please use dxvk0092 instead" ; w_call dxvk0092 ;;
- dxvk093|dxvk93) w_warn "Calling $1 is deprecated, please use dxvk0093 instead" ; w_call dxvk0093 ;;
- dxvk094|dxvk94) w_warn "Calling $1 is deprecated, please use dxvk0094 instead" ; w_call dxvk0094 ;;
- dxvk095|dxvk95) w_warn "Calling $1 is deprecated, please use dxvk0095 instead" ; w_call dxvk0095 ;;
- dxvk096|dxvk96) w_warn "Calling $1 is deprecated, please use dxvk0096 instead" ; w_call dxvk0096 ;;
dxvk100) w_warn "Calling dxvk100 is deprecated, please use dxvk1000 instead" ; w_call dxvk1000 ;;
dxvk101) w_warn "Calling dxvk101 is deprecated, please use dxvk1001 instead" ; w_call dxvk1001 ;;
dxvk102) w_warn "Calling dxvk102 is deprecated, please use dxvk1002 instead" ; w_call dxvk1002 ;;
@@ -20196,17 +19093,6 @@ if ! test "${WINETRICKS_LIB}"; then
case "$1" in
die) w_die "we who are about to die salute you." ;;
- volnameof=*)
- # Debug code. Remove later?
- # Since Linux's volname command can't handle DVDs, winetricks has its own,
- # implemented using dd, old gum, and some string I had laying around.
- # You can try it like this:
- # winetricks volnameof=/dev/sr0
- # or
- # winetricks volnameof=foo.iso
- # This will read the volname from the given image and put it to stdout.
- winetricks_volname "${1#volnameof=}"
- ;;
"")
if [ -z "${DISPLAY}" ]; then
if [ "$(uname -s)" = "Darwin" ]; then
@@ -20223,8 +19109,6 @@ if ! test "${WINETRICKS_LIB}"; then
if [ "${WINETRICKS_GUI}" = "none" ]; then
winetricks_detect_gui --gui
fi
- winetricks_detect_sudo
- test -z "${WINETRICKS_ISO_MOUNT}" && winetricks_detect_iso_mount
while true; do
case ${WINETRICKS_CURMENU} in
main) verbs=$(winetricks_mainmenu) ;;
@@ -20290,8 +19174,6 @@ if ! test "${WINETRICKS_LIB}"; then
*)
winetricks_stats_init
# Command-line case
- winetricks_detect_sudo
- test -z "${WINETRICKS_ISO_MOUNT}" && winetricks_detect_iso_mount
# User gave command-line arguments, so just run those verbs and exit
for verb; do
case ${verb} in
@@ -20315,4 +19197,4 @@ if ! test "${WINETRICKS_LIB}"; then
winetricks_stats_report
fi
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
\ No newline at end of file