diff options
| author | Adrià Cereto-Massagué | 2018-03-04 19:11:32 +0100 |
|---|---|---|
| committer | Adrià Cereto-Massagué | 2018-03-04 19:29:09 +0100 |
| commit | 2a065377b9cd337f1058995466ec3afcb303bc0f (patch) | |
| tree | 3d57eae91f555edc9ff46ad9d4bc428c3a04d36f | |
| parent | ee1eafa6c1bc5a83da585fd525fa14ec8da43c3c (diff) | |
| download | aur-2a065377b9cd337f1058995466ec3afcb303bc0f.tar.gz | |
fix double compilation issue
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 27 |
2 files changed, 18 insertions, 14 deletions
@@ -1,6 +1,6 @@ pkgbase = dxvk-git pkgdesc = A Vulkan-based compatibility layer for Direct3D 11 which allows running 3D applications on Linux using Wine. Requires Wine with Vulkan support (wine-staging or wine-vulkan) - pkgver = 20180301.3dea58d + pkgver = 20180303.52f6ba1 pkgrel = 1 url = https://github.com/doitsujin/dxvk arch = x86_64 @@ -11,8 +11,7 @@ pkgbase = dxvk-git makedepends = mingw-w64-gcc depends = vulkan-icd-loader depends = wine - optdepends = wine-staging: Wine with Vulkan support - optdepends = wine-vulkan: Wine with Vulkan support + optdepends = wine-vulkan-git: Wine with Vulkan support provides = dxvk conflicts = dxvk-bin options = !strip @@ -2,7 +2,7 @@ pkgname=dxvk-git _srcname=dxvk -pkgver=20180301.3dea58d +pkgver=20180303.52f6ba1 pkgrel=1 epoch= pkgdesc="A Vulkan-based compatibility layer for Direct3D 11 which allows running 3D applications on Linux using Wine. Requires Wine with Vulkan support (wine-staging or wine-vulkan)" @@ -13,7 +13,7 @@ groups=() depends=('vulkan-icd-loader' 'wine') makedepends=('ninja' 'meson' 'glslang' 'mingw-w64-gcc') checkdepends=() -optdepends=('wine-staging: Wine with Vulkan support' 'wine-vulkan: Wine with Vulkan support') +optdepends=('wine-vulkan-git: Wine with Vulkan support') provides=("dxvk") conflicts=("dxvk-bin") replaces=() @@ -35,29 +35,34 @@ pkgver() { build() { cd "$_srcname" - if [ -d "build.w64" ]; then rm -r build.w64; fi + if [ -d "build.w64" ]; then rm -rf build.w64; fi meson --cross-file build-win64.txt build.w64 cd build.w64 - meson configure -Dprefix=/opt/dxvk/w64 -Dbuildtype=release + meson configure -Dbuildtype=release ninja cd .. - if [ -d "build.w32" ]; then rm -r build.w32; fi + if [ -d "build.w32" ]; then rm -rf build.w32; fi meson --cross-file build-win32.txt build.w32 cd build.w32 - meson configure -Dprefix=/opt/dxvk/w32 -Dbuildtype=release + meson configure -Dbuildtype=release ninja } package() { + #Workaround meson bug that ignores prefix... + mkdir -p "$pkgdir/opt/dxvk/x64" + mkdir -p "$pkgdir/opt/dxvk/x32" cd "$_srcname"/build.w64 - meson configure -Dprefix=/opt/dxvk/w64 + #meson configure -Dprefix=/opt/dxvk/w64 DESTDIR="$pkgdir/" ninja install - mkdir -p "$pkgdir/usr/local/bin" - ln -s "/opt/dxvk/w64/bin/setup_dxvk.sh" "$pkgdir/usr/local/bin/setup_dxvk64" + mv "$pkgdir/usr/local/"* "$pkgdir/opt/dxvk/x64" cd ../build.w32 - meson configure -Dprefix=/opt/dxvk/w32 + #meson configure -Dprefix=/opt/dxvk/w32 DESTDIR="$pkgdir/" ninja install - ln -s "/opt/dxvk/w32/bin/setup_dxvk.sh" "$pkgdir/usr/local/bin/setup_dxvk32" + mv "$pkgdir/usr/local/"* "$pkgdir/opt/dxvk/x32" + mkdir -p "$pkgdir/usr/local/bin" + ln -s "/opt/dxvk/x32/bin/setup_dxvk.sh" "$pkgdir/usr/local/bin/setup_dxvk32" + ln -s "/opt/dxvk/x64/bin/setup_dxvk.sh" "$pkgdir/usr/local/bin/setup_dxvk64" } |