diff --git a/README.md b/README.md index bdf7f3d..17e3c62 100755 --- a/README.md +++ b/README.md @@ -104,8 +104,6 @@ All supported arguments are: - `--no-pol` = Do not update current user's PlayOnLinux Wine prefixes -- `--no-winetricks` = [Debian only] Do not compile or install Winetricks. No DXVK installation unless Winetricks already installed. - ### Force/Lock package versions You can force/lock specific Wine, Wine Staging, DXVK, meson & glslang versions. @@ -170,7 +168,7 @@ Any other vanilla Wine git branch setting than _master_ will be ignored if Wine **NOTE:** This section doesn't concern Ubuntu or Mint users. -Since Debian doesn't provide winetricks package on official repositories, it is strongly recommended that you use provided `debian_install_winetricks.sh` to install Winetricks. Winetricks is required for successful DXVK installation. You can run `debian_install_winetricks.sh` either independently or as a part of `updatewine.sh` main script. +Since Debian doesn't provide winetricks package on official repositories, it is strongly recommended that you use provided `debian_install_winetricks.sh` to install Winetricks. ---------------- @@ -212,8 +210,6 @@ To enable DXVK on existing wineprefixes, just run WINEPREFIX=/path/to/my/wineprefix setup_dxvk ``` -`winetricks` is required for this command. - ## Add DXVK to PlayOnLinux Wine prefixes To install DXVK on specific PlayOnLinux wineprefix which uses a different than `system` version of Wine, apply the following command syntax: @@ -224,8 +220,6 @@ WINEPREFIX="$HOME/.PlayOnLinux/wineprefix/myprefix" WINEPATH=$HOME/.PlayOnLinux/ where you need to set either `linux-amd64` or `linux-x86`, and `wineversion` + `myprefix` to match real ones, obviously. -system-wide `winetricks` executable (`/usr/bin/winetricks`) is required for this command. - ### Manually uninstall temporary development packages (Debian/Ubuntu/Mint): Development packages can take extra space on your system so you may find useful to uninstall them. The script provides an automatic method for that but you can still use additional `debian_cleanup_devpkgs.sh` script which is targeted for uninstalling build time dependencies manually. The script uninstalls majority of Wine-Staging (Git), meson & glslang buildtime dependencies which may not be longer required. Be aware that while running the script, it doesn't consider if you need a development package for any other package compilation process (out of scope of Wine/DXVK)! diff --git a/debian/dxvkroot/dxvk.debdata b/debian/dxvkroot/dxvk.debdata index d38c167..a6584c7 100755 --- a/debian/dxvkroot/dxvk.debdata +++ b/debian/dxvkroot/dxvk.debdata @@ -51,7 +51,7 @@ override_dh_install: # Make a proper executable script folder for setup_dxvk.verb file mkdir -p ${dxvk_relative_builddir}/bin - echo -e \"#!/bin/sh\nwinetricks --force /usr/share/dxvk/setup_dxvk.verb\" > \"${dxvk_relative_builddir}/bin/setup_dxvk\" + echo -e \"#!/bin/sh\n/usr/share/dxvk/setup_dxvk.sh\" > \"${dxvk_relative_builddir}/bin/setup_dxvk\" chmod +x "${dxvk_relative_builddir}/bin/setup_dxvk" dh_install " @@ -116,7 +116,6 @@ pkg_deps_build=( # Runtime dependencies pkg_deps_runtime=( 'wine' -'winetricks' ) # Extra fields for Debian control file Source section diff --git a/debian/dxvkroot/dxvkbuild.sh b/debian/dxvkroot/dxvkbuild.sh index d2418aa..e8d3afa 100755 --- a/debian/dxvkroot/dxvkbuild.sh +++ b/debian/dxvkroot/dxvkbuild.sh @@ -74,9 +74,6 @@ for check in ${args[@]}; do --no-install) NO_INSTALL= ;; -# --no-winetricks) -# NO_WINETRICKS= -# ;; --updateoverride) UPDATE_OVERRIDE= ;; @@ -105,10 +102,6 @@ known_wines=( 'wine-staging-git' ) -known_winetricks=( -'winetricks' -) - function runtimeCheck() { # Friendly name for this package @@ -610,9 +603,6 @@ function pkg_install_main() { # Check existence of known Wine packages runtimeCheck Wine "${known_wines[*]}" -# Check existence of known Winetricks packages -runtimeCheck Winetricks "${known_winetricks[*]}" - # Meson - compile (& install) pkgcompilecheck pkg_install_main meson "${DXVKROOT}/meson.debdata"