slay dummies

2 files changed, 12 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d60b9a5b0905..45dfc41ae624 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dxvk-wine-git
 	pkgdesc = A Vulkan-based compatibility layer for Direct3D 10/11 which allows running 3D applications on Linux using Wine. Winelib version
-	pkgver = 1.0.r1.g71186859
+	pkgver = 1.1.1.r0.g37f9a7ff
 	pkgrel = 1
 	url = https://github.com/doitsujin/dxvk
 	arch = x86_64
@@ -13,22 +13,15 @@ pkgbase = dxvk-wine-git
 	depends = vulkan-icd-loader
 	depends = wine>=4.0rc1
 	depends = lib32-vulkan-icd-loader
+	conflicts = dxvk-bin
+	conflicts = dxvk-git
+	conflicts = dxvk-wine32-git
+	conflicts = dxvk-wine64-git
+	conflicts = dxvk-win32-git
+	conflicts = dxvk-win64-git
+	conflicts = dxvk-mingw-git
 	source = git+https://github.com/doitsujin/dxvk.git
 	sha256sums = SKIP
 
-pkgname = dxvk-wine64-git
-	pkgdesc = Dummy package
-	depends = dxvk-winelib-git
-
-pkgname = dxvk-wine32-git
-	pkgdesc = Dummy package
-	depends = dxvk-winelib-git
-
-pkgname = dxvk-git
-	pkgdesc = Dummy package
-	depends = dxvk-winelib-git
-
 pkgname = dxvk-winelib-git
-	arch = x86_64
-	conflicts = dxvk-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index b76ea3f2f3c0..671185605e3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Adrià Cereto i Massagué <ssorgatem at gmail.com>
 
 pkgbase=dxvk-wine-git
-pkgname=('dxvk-wine64-git' 'dxvk-wine32-git' 'dxvk-git' 'dxvk-winelib-git')
-pkgver=1.0.r1.g71186859
+pkgname=('dxvk-winelib-git')
+pkgver=1.1.1.r0.g37f9a7ff
 pkgrel=1
 pkgdesc="A Vulkan-based compatibility layer for Direct3D 10/11 which allows running 3D applications on Linux using Wine. Winelib version"
 arch=('x86_64')
@@ -10,6 +10,7 @@ url="https://github.com/doitsujin/dxvk"
 license=('zlib/libpng')
 depends=('vulkan-icd-loader' 'wine>=4.0rc1' 'lib32-vulkan-icd-loader')
 makedepends=('ninja' 'meson>=0.43' 'glslang' 'git' 'wine')
+conflicts=("dxvk-bin" "dxvk-git" "dxvk-wine32-git" "dxvk-wine64-git" "dxvk-win32-git" "dxvk-win64-git" "dxvk-mingw-git")
 source=("git+https://github.com/doitsujin/dxvk.git"  )
 sha256sums=("SKIP")
 
@@ -38,31 +39,10 @@ build() {
     ninja -C "build/x32"
 }
 
-package_dxvk-wine64-git() {
-        pkgdesc="Dummy package"
-        depends=("dxvk-winelib-git")
-}
-
-package_dxvk-wine32-git() {
-        pkgdesc="Dummy package"
-        depends=("dxvk-winelib-git")
-}
-
-package_dxvk-git() {
-        pkgdesc="Dummy package"
-        depends=("dxvk-winelib-git")
-    }
-
 package_dxvk-winelib-git() {
-        arch=('x86_64')
-        conflicts=("dxvk-bin")
         DESTDIR="$pkgdir" ninja -C "build/x32" install
         DESTDIR="$pkgdir" ninja -C "build/x64" install
         install -Dm 644 dxvk/setup_dxvk.sh "$pkgdir/usr/share/dxvk/setup_dxvk.sh"
         mkdir -p "$pkgdir/usr/bin"
-	echo "#!/bin/sh" > "$pkgdir/usr/bin/setup_dxvk"
-	echo '/usr/share/dxvk/setup_dxvk.sh $1 --symlink --without-dxgi' >> "$pkgdir/usr/bin/setup_dxvk"
-        chmod +x "$pkgdir/usr/share/dxvk/setup_dxvk.sh"
-	chmod +x "$pkgdir/usr/bin/setup_dxvk"
-        chown -R root:root "$pkgdir/usr/"
+        ln -s /usr/share/dxvk/setup_dxvk.sh "$pkgdir/usr/bin/setup_dxvk"
 }