diff options
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | PKGBUILD | 84 | ||||
-rw-r--r-- | setup_dxvk_aur.verb | 19 |
3 files changed, 53 insertions, 65 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.90_4_ge0e945f + pkgver = 0.94.r6.g4e22e4b pkgrel = 1 url = https://github.com/doitsujin/dxvk arch = x86_64 @@ -11,12 +11,12 @@ pkgbase = dxvk-wine-git makedepends = git makedepends = wine depends = vulkan-icd-loader - depends = wine>=3.14 + depends = wine>=4.0rc1 depends = winetricks - source = dxvk-src::git+https://github.com/doitsujin/dxvk.git + source = git+https://github.com/doitsujin/dxvk.git source = setup_dxvk_aur.verb sha256sums = SKIP - sha256sums = b441fc757176718b2601aab73987fb103ddd7cd4a4c3587de1e88d73e762be6b + sha256sums = 5ad17ac7a6e1a66ac0c5e621fe8f9b955817b1aca78bf80c95d3e2714d9e12c8 pkgname = dxvk-wine64-git arch = x86_64 @@ -25,7 +25,6 @@ pkgname = dxvk-wine64-git provides = dxvk64 conflicts = dxvk-win64-bin conflicts = dxvk-win64-git - conflicts = dxvk-git conflicts = dxvk-bin pkgname = dxvk-wine32-git @@ -39,6 +38,10 @@ pkgname = dxvk-wine32-git provides = dxvk32 conflicts = dxvk-win32-bin conflicts = dxvk-win32-git - conflicts = dxvk-git conflicts = dxvk-bin +pkgname = dxvk-git + pkgdesc = Dummy package to smooth the transition to the split packages + depends = dxvk-wine32-git + depends = dxvk-wine64-git + @@ -1,76 +1,59 @@ # Maintainer: AdriĆ Cereto i MassaguĆ© <ssorgatem at gmail.com> pkgbase=dxvk-wine-git -pkgname=('dxvk-wine64-git' 'dxvk-wine32-git') -pkgver=0.90_4_ge0e945f +pkgname=('dxvk-wine64-git' 'dxvk-wine32-git' 'dxvk-git') +pkgver=0.94.r6.g4e22e4b 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') url="https://github.com/doitsujin/dxvk" license=('zlib/libpng') -depends=('vulkan-icd-loader' 'wine>=3.14' 'winetricks') +depends=('vulkan-icd-loader' 'wine>=4.0rc1' 'winetricks') makedepends=('ninja' 'meson>=0.43' 'glslang' 'git' 'wine') -source=(dxvk-src::"git+https://github.com/doitsujin/dxvk.git" +source=("git+https://github.com/doitsujin/dxvk.git" setup_dxvk_aur.verb ) -sha256sums=("SKIP" "b441fc757176718b2601aab73987fb103ddd7cd4a4c3587de1e88d73e762be6b") +sha256sums=("SKIP" "5ad17ac7a6e1a66ac0c5e621fe8f9b955817b1aca78bf80c95d3e2714d9e12c8") pkgver() { - cd dxvk-src - git describe | sed s/"-"/"_"/g | sed 's/^v\(.*\)/\1/' + cd dxvk + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' } - build() { - cd dxvk-src - rm -rf "$pkgbase/build.wine??" - meson --cross-file build-wine64.txt \ - --buildtype "release"\ - --prefix "$PWD/../build64"\ - --strip\ - -Denable_tests=false\ - "$pkgbase/build.wine64" - cd "$pkgbase/build.wine64" - ninja install - cd "../.." - rm -rf "$pkgbase/build.wine64" - meson --cross-file build-wine32.txt \ - --buildtype "release"\ - --prefix "$PWD/../build32"\ - --strip\ - -Denable_tests=false\ - "$pkgbase/build.wine32" - cd "$pkgbase/build.wine32" - ninja install - cd "../.." - rm -rf "$pkgbase/build.wine32" + meson dxvk "build/x64" \ + --cross-file dxvk/build-wine64.txt \ + --prefix "/usr/share/dxvk/x64" \ + --bindir "" --libdir "" \ + --buildtype "release" \ + --strip \ + -D enable_tests=false + ninja -C "build/x64" + + meson dxvk "build/x32" \ + --cross-file dxvk/build-wine32.txt \ + --prefix "/usr/share/dxvk/x32" \ + --bindir "" --libdir "" \ + --buildtype "release" \ + --strip \ + -D enable_tests=false + ninja -C "build/x32" } _package_dxvk() { - if [ "$1" = "32" ]; then - _destdir="/usr/lib32/dxvk" - else - _destdir="/usr/lib/dxvk" - fi - mkdir -p "$pkgdir/$_destdir" - cp -v build$1/*/* "$pkgdir/$_destdir" - extension=".dll.so" - for libname in "d3d11" "dxgi" "d3d10" "d3d10_1" "d3d10core"; do - if [ ! -f "$pkgdir"/$_destdir/$libname$extension ] ; then - echo "Missing file: $libname$extension, build was unsuccessful" - return 1 - fi - done + 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/$_destdir/setup_dxvk_aur.verb" + 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" echo "#!/bin/sh" > "$pkgdir/usr/bin/setup_dxvk$1" - echo "winetricks --force $_destdir/setup_dxvk_aur.verb" >> "$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" } package_dxvk-wine64-git() { arch=('x86_64') - conflicts=("dxvk-win64-bin" "dxvk-win64-git" "dxvk-git" "dxvk-bin") + conflicts=("dxvk-win64-bin" "dxvk-win64-git" "dxvk-bin") provides=("dxvk" "dxvk64") optdepends=('dxvk32: 32-bit support') _package_dxvk 64 @@ -78,9 +61,14 @@ package_dxvk-wine64-git() { package_dxvk-wine32-git() { arch=('i686' 'x86_64') - conflicts=("dxvk-win32-bin" "dxvk-win32-git" "dxvk-git" "dxvk-bin") + conflicts=("dxvk-win32-bin" "dxvk-win32-git" "dxvk-bin") depends=('lib32-vulkan-icd-loader' 'wine>=3.14' 'winetricks') optdepends=('dxvk64: 64-bit support') provides=("dxvk" "dxvk32") _package_dxvk 32 } + +package_dxvk-git() { + pkgdesc="Dummy package to smooth the transition to the split packages" + depends=("dxvk-wine32-git" "dxvk-wine64-git") +} diff --git a/setup_dxvk_aur.verb b/setup_dxvk_aur.verb index f73ce39c24ff..75880d428806 100644 --- a/setup_dxvk_aur.verb +++ b/setup_dxvk_aur.verb @@ -3,16 +3,14 @@ w_metadata setup_dxvk_aur dlls \ publisher="Philip Rebohle" \ year="2018" \ media="manual_download" \ - file1="dxgi.dll" \ - file2="d3d11.dll" \ - file3="d3d10.dll" \ - file4="d3d10_1.dll" \ - file5="d3d10core.dll" \ - installed_file1="C:\\windows\\system32\\dxgi.dll" \ - installed_file2="C:\\windows\\system32\\d3d11.dll" \ - installed_file3="C:\\windows\\system32\\d3d10.dll" \ - installed_file4="C:\\windows\\system32\\d3d10_1.dll" \ - installed_file5="C:\\windows\\system32\\system32/d3d10core.dll" \ + file1="d3d11.dll" \ + file2="d3d10.dll" \ + file3="d3d10_1.dll" \ + file4="d3d10core.dll" \ + installed_file1="C:\\windows\\system32\\d3d11.dll" \ + installed_file2="C:\\windows\\system32\\d3d10.dll" \ + installed_file3="C:\\windows\\system32\\d3d10_1.dll" \ + installed_file4="C:\\windows\\system32\\system32/d3d10core.dll" \ homepage="https://github.com/doitsujin/dxvk" DXVK_ARCH=64 @@ -36,7 +34,6 @@ load_setup_dxvk_aur() done w_override_dlls native \ - dxgi \ d3d11 \ d3d10 \ d3d10_1 \ |