summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Grande2020-10-04 16:10:32 -0400
committerVincent Grande2020-10-04 16:10:32 -0400
commit673f842f5bacc418399bb9b1b2f5dcdfb751c51d (patch)
treec576c56543674f3ab77a2d488bb8b7b9e7395a21
parent438cc3e1f08fba1378372092a00aada5dd964cc8 (diff)
downloadaur-673f842f5bacc418399bb9b1b2f5dcdfb751c51d.tar.gz
mega fix
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD14
-rw-r--r--dxvk-mingw-proton-ge-async-git.install20
3 files changed, 11 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 68cbc2b50778..27eb49ef4d96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,6 @@ pkgbase = dxvk-mingw-proton-ge-async-git
pkgver = 1.5.r3.ga265af74
pkgrel = 1
url = https://github.com/doitsujin/dxvk
- install = dxvk-mingw-proton-ge-async-git.install
arch = x86_64
license = zlib/libpng
makedepends = ninja
@@ -32,7 +31,6 @@ pkgbase = dxvk-mingw-proton-ge-async-git
conflicts = dxvk-win64-git
conflicts = dxvk-winelib-git
options = !strip
- options = !buildflags
options = staticlibs
source = git+https://github.com/doitsujin/dxvk.git
source = dxvk-async.patch
diff --git a/PKGBUILD b/PKGBUILD
index a4dff221395c..70995774b920 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,6 +4,16 @@
# This package needs reinstalled after every Proton update.
+# You need to remove certain old 64bit and 32bit dxvk .dll files from your proton-ge directory before installing this package, or you will receive errors when trying to install.
+
+# Examples:
+
+# sudo rm -rf /usr/share/steam/compatibilitytools.d/proton-ge-custom*/dist/lib/wine/dxvk/d3d*
+# sudo rm -rf /usr/share/steam/compatibilitytools.d/proton-ge-custom*/dist/lib/wine/dxvk/dxg*
+
+# sudo rm -rf /usr/share/steam/compatibilitytools.d/proton-ge-custom*/dist/lib64/wine/dxvk/d3d*
+# sudo rm -rf /usr/share/steam/compatibilitytools.d/proton-ge-custom*/dist/lib64/wine/dxvk/dxg*"
+
pkgname=('dxvk-mingw-proton-ge-async-git')
pkgver=1.5.r3.ga265af74
pkgrel=1
@@ -15,15 +25,13 @@ depends=('vulkan-icd-loader' 'wine>=4.0rc1' 'lib32-vulkan-icd-loader')
provides=("dxvk" "d9vk" "dxvk=$pkgver")
makedepends=('ninja' 'meson>=0.43' 'glslang' 'mingw-w64-gcc' 'git' 'wine')
conflicts=('d9vk-mingw-git' 'dxvk-mingw-git' 'dxvk-mingw' 'dxvk-winelib' 'd9vk-bin' 'd9vk-winelib-git' "dxvk-bin" "dxvk-git" "dxvk-wine32-git" "dxvk-wine64-git" "dxvk-win32-git" "dxvk-win64-git" "dxvk-winelib-git")
-options=(!strip !buildflags staticlibs)
+options=(!strip staticlibs)
source=("git+https://github.com/doitsujin/dxvk.git"
"dxvk-async.patch"
"extraopts.patch")
sha256sums=("SKIP"
"SKIP"
"SKIP")
-install=$pkgname.install
-
pkgver() {
cd dxvk
diff --git a/dxvk-mingw-proton-ge-async-git.install b/dxvk-mingw-proton-ge-async-git.install
deleted file mode 100644
index a30dc9b13c33..000000000000
--- a/dxvk-mingw-proton-ge-async-git.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pre_install() {
-
-echo "You need to remove certain old 64bit and 32bit dxvk .dll files from your proton-ge directory before installing this package, or you will receive errors when trying to install.
-
-This package also needs reinstalled after every Proton update.
-
-Examples:
-
-sudo rm -rf /usr/share/steam/compatibilitytools.d/proton-ge-custom*/dist/lib/wine/dxvk/d3d*
-sudo rm -rf /usr/share/steam/compatibilitytools.d/proton-ge-custom*/dist/lib/wine/dxvk/dxg*
-
-sudo rm -rf /usr/share/steam/compatibilitytools.d/proton-ge-custom*/dist/lib64/wine/dxvk/d3d*
-sudo rm -rf /usr/share/steam/compatibilitytools.d/proton-ge-custom*/dist/lib64/wine/dxvk/dxg*"
-
-read -p "Are you sure? " -n 1 -r
-echo # (optional) move to a new line
-if [[ $REPLY =~ ^[Yy]$ ]]
-then
- # do dangerous stuff
-fi