diff options
author | Adrià Cereto-Massagué | 2019-01-02 10:51:51 +0100 |
---|---|---|
committer | Adrià Cereto-Massagué | 2019-01-02 10:51:51 +0100 |
commit | 71c066f2ef826153cd9e6d8f6b9ba94440b1bfbe (patch) | |
tree | 58af429f2634c9323bc90ccb533e6087ec25d475 | |
parent | 1a1a3dc40e94745f1bd4c11d5614ff3df7792453 (diff) | |
download | aur-71c066f2ef826153cd9e6d8f6b9ba94440b1bfbe.tar.gz |
fix 32-bit setup verb
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | setup_dxvk_aur.verb | 8 |
3 files changed, 6 insertions, 13 deletions
@@ -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 = 0.94.r6.g4e22e4b + pkgver = 0.94.r8.g1750b14 pkgrel = 1 url = https://github.com/doitsujin/dxvk arch = x86_64 @@ -16,7 +16,7 @@ pkgbase = dxvk-wine-git source = git+https://github.com/doitsujin/dxvk.git source = setup_dxvk_aur.verb sha256sums = SKIP - sha256sums = 3ab24ace22cba8e07997a7e30df85c104a86417704417d8a24ac0af3fb196bc6 + sha256sums = 3be34f7dcfbfd47148b6becafb9fc530606b49c83ddb9ffaf3c71e4f27e56178 pkgname = dxvk-wine64-git arch = x86_64 @@ -2,7 +2,7 @@ pkgbase=dxvk-wine-git pkgname=('dxvk-wine64-git' 'dxvk-wine32-git' 'dxvk-git') -pkgver=0.94.r6.g4e22e4b +pkgver=0.94.r8.g1750b14 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') @@ -13,7 +13,7 @@ makedepends=('ninja' 'meson>=0.43' 'glslang' 'git' 'wine') source=("git+https://github.com/doitsujin/dxvk.git" setup_dxvk_aur.verb ) -sha256sums=("SKIP" "3ab24ace22cba8e07997a7e30df85c104a86417704417d8a24ac0af3fb196bc6") +sha256sums=("SKIP" "3be34f7dcfbfd47148b6becafb9fc530606b49c83ddb9ffaf3c71e4f27e56178") pkgver() { cd dxvk @@ -43,9 +43,8 @@ build() { _package_dxvk() { DESTDIR="$pkgdir" ninja -C "build/x$1" install mkdir -p "$pkgdir/usr/bin" - cat setup_dxvk_aur.verb | sed s/"DXVK_ARCH=64"/"DXVK_ARCH=$1"/g > "$pkgdir/usr/share/dxvk/x$1/setup_dxvk_aur.verb" install -Dm 644 setup_dxvk_aur.verb "$pkgdir/usr/share/dxvk/x$1/setup_dxvk_aur.verb" - sed "s/_ARCH/$1/g" -i "$pkgdir/usr/share/dxvk/x$1/setup_dxvk_aur.verb" + sed "s/SYSTEM64/SYSTEM$1/g" -i "$pkgdir/usr/share/dxvk/x$1/setup_dxvk_aur.verb" echo "#!/bin/sh" > "$pkgdir/usr/bin/setup_dxvk$1" echo "winetricks --force /usr/share/dxvk/x$1/setup_dxvk_aur.verb" >> "$pkgdir/usr/bin/setup_dxvk$1" chmod +x "$pkgdir/usr/bin/setup_dxvk$1" diff --git a/setup_dxvk_aur.verb b/setup_dxvk_aur.verb index 36ea495eacc1..000bff4d5694 100644 --- a/setup_dxvk_aur.verb +++ b/setup_dxvk_aur.verb @@ -13,7 +13,6 @@ w_metadata setup_dxvk_aur dlls \ installed_file4="C:\\windows\\system32\\system32/d3d10core.dll" \ homepage="https://github.com/doitsujin/dxvk" -DXVK_ARCH=64 DXVK_ROOT_DIR=`dirname "$(readlink -f $1)"` load_setup_dxvk_aur() @@ -25,12 +24,7 @@ load_setup_dxvk_aur() echo "Setting up DXVK from $DXVK_ROOT_DIR" for f in "$file1" "$file2" "$file3" "$file4"; do - if [ "$DXVK_ARCH" = "32" ]; then - w_try ln -fs "$DXVK_ROOT_DIR/$f.so" "$W_SYSTEM32_DLLS/$f" - fi - if [ "$DXVK_ARCH" = "64" ]; then - w_try ln -fs "$DXVK_ROOT_DIR/$f.so" "$W_SYSTEM64_DLLS/$f" - fi + w_try ln -fs "$DXVK_ROOT_DIR/$f.so" "$W_SYSTEM64_DLLS/$f" done w_override_dlls native \ |