diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rwxr-xr-x | build_installer.sh | 10 | ||||
| -rw-r--r-- | evelauncher.sh | 2 | ||||
| -rw-r--r-- | evesetup.shlib | 48 | ||||
| -rw-r--r-- | setup.sh.in | 21 |
6 files changed, 53 insertions, 49 deletions
@@ -1,7 +1,7 @@ pkgbase = evesetup pkgdesc = An inofficial EVE Online Launcher Setup Tool. pkgver = 1548102 - pkgrel = 13 + pkgrel = 14 url = https://forums.eveonline.com/t/eve-installing/71494 arch = x86_64 license = custom @@ -48,9 +48,9 @@ pkgbase = evesetup source = https://github.com/doitsujin/dxvk/releases/download/v1.7/dxvk-1.7.tar.gz source = https://binaries.eveonline.com/evelauncher-1548102.tar.gz sha256sums = ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4 - sha256sums = b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8 + sha256sums = 9758ff906a3e849e94f6edeb0e0fdf59627f713bc1a9b6e06f171a3285d0a007 sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 - sha256sums = 721bd6e9d5232253241e8a9ba5692ad4400edfbd9f6ff21d0717eac9baaab8ad + sha256sums = dc3b9db6821e6889e4afeecb57758c73b5e1802437e9d99db98ac43ff77171e6 sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b sha256sums = 9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653 sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd @@ -61,8 +61,8 @@ pkgbase = evesetup sha256sums = 261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8 sha256sums = 528fc6627e8893db5d7092194e9f3320067f2f1f4593a206aee8a5207956e563 sha256sums = d4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2 - sha256sums = 0a39c2fce60e2464440cdcaf8288d98d6c79eb6f489da6598a1f709837f98cd1 - sha256sums = f4a9e044d349e0363d5eeb1d308736c287bb1a0335476fab6f46d50a0a688429 + sha256sums = e6a00ad0a14f66533dbbc2485388433440dd656e54a15ceeffe5a75d8d736158 + sha256sums = c7108348a1d19e146bb19bf47da342d04ab4dcaf730ce59b2082535764eeb4f2 sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3 sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422 sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a @@ -1,7 +1,7 @@ #Maintainer: Gharim Turen <gharim@turen.de> pkgname=evesetup pkgver=1548102 -pkgrel=13 +pkgrel=14 pkgdesc="An inofficial EVE Online Launcher Setup Tool." arch=(x86_64) url="https://forums.eveonline.com/t/eve-installing/71494" @@ -85,6 +85,7 @@ package() { cp ${srcdir}/evelauncher.kwinrule ${pkgdir}/opt/${pkgname}/doc cp -r ${srcdir}/dxvk-1.7/x32 ${pkgdir}/opt/${pkgname}/lib/dxvk/ cp -r ${srcdir}/dxvk-1.7/x64 ${pkgdir}/opt/${pkgname}/lib/dxvk/ + echo "dxvk-1.7" >${pkgdir}/opt/${pkgname}/lib/dxvk/version cp -r ${srcdir}/icons ${pkgdir}/usr/share/ cp -f ${srcdir}/evelauncher.sh.real ${srcdir}/evelauncher/evelauncher.sh rm -f ${srcdir}/evelauncher/*.a ${srcdir}/evelauncher/*.la @@ -115,9 +116,9 @@ package() { } sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4' - 'b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8' + '9758ff906a3e849e94f6edeb0e0fdf59627f713bc1a9b6e06f171a3285d0a007' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' - '721bd6e9d5232253241e8a9ba5692ad4400edfbd9f6ff21d0717eac9baaab8ad' + 'dc3b9db6821e6889e4afeecb57758c73b5e1802437e9d99db98ac43ff77171e6' 'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b' '9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653' '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd' @@ -128,8 +129,8 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4' '261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8' '528fc6627e8893db5d7092194e9f3320067f2f1f4593a206aee8a5207956e563' 'd4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2' - '0a39c2fce60e2464440cdcaf8288d98d6c79eb6f489da6598a1f709837f98cd1' - 'f4a9e044d349e0363d5eeb1d308736c287bb1a0335476fab6f46d50a0a688429' + 'e6a00ad0a14f66533dbbc2485388433440dd656e54a15ceeffe5a75d8d736158' + 'c7108348a1d19e146bb19bf47da342d04ab4dcaf730ce59b2082535764eeb4f2' '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3' '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422' '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a' diff --git a/build_installer.sh b/build_installer.sh index cdcf37f48776..b3429c38040d 100755 --- a/build_installer.sh +++ b/build_installer.sh @@ -9,6 +9,7 @@ version=$(grep ^pkgver PKGBUILD | cut -d= -f2) || exit 1 release=$(grep ^pkgrel PKGBUILD | cut -d= -f2) || exit 1 arch=$(uname -m) +dvver=$(grep doitsujin PKGBUILD | cut -d\" -f2 | sed 's,.*-,,;s,.tar.*,,' ) dvcsum="" elcsum="" mscsum="ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2" @@ -16,7 +17,7 @@ rcsum="" pshal=$(grep -n ^sha256sum PKGBUILD | cut -d: -f1) psrcl=$(grep -n ^source PKGBUILD | cut -d: -f1) -pdvsl=$(grep -n dxvk-1.7.tar.gz\" PKGBUILD | cut -d: -f1) +pdvsl=$(grep -n dxvk-$dvver.tar.gz\" PKGBUILD | cut -d: -f1) pelsl=$(grep -n evelauncher-\${pkgver}.tar.gz\" PKGBUILD | cut -d: -f1) pdfsl=$(expr $pdvsl - $psrcl) pofsl=$(expr $pelsl - $psrcl) @@ -81,6 +82,7 @@ sed -i s,ELVER=\"\",ELVER=\"$version\", evesetup/evelauncher.sh cp ../setup.sh.in evesetup/setup.sh sed -i s,elver=\"\",elver=\"$version\", evesetup/setup.sh sed -i s,elcsum=\"\",elcsum=\"$elcsum\", evesetup/setup.sh +sed -i s,dvver=\"\",dvver=\"$dvver\", evesetup/setup.sh sed -i s,dvcsum=\"\",dvcsum=\"$dvcsum\", evesetup/setup.sh chmod a+x evesetup/setup.sh echo "done." @@ -97,11 +99,11 @@ if [ -f "../evelauncher-$version.tar.gz" ] ;then else printf "\nEVE Launcher archive not found, will be downloaded during the setup process.\n" fi -if [ -f "../dxvk-1.7.tar.gz" ] ;then +if [ -f "../dxvk-$dvver.tar.gz" ] ;then printf "\nFound DXVK archive..." - rcsum="$(sha256sum ../dxvk-1.7.tar.gz | cut -d' ' -f1)" + rcsum="$(sha256sum ../dxvk-$dvver.tar.gz | cut -d' ' -f1)" if [ "$rcsum" = "$dvcsum" ] ;then - cp ../dxvk-1.7.tar.gz evesetup/ && \ + cp ../dxvk-$dvver.tar.gz evesetup/ && \ echo "added." else echo "skipped, checksum mismatch." diff --git a/evelauncher.sh b/evelauncher.sh index b7a4bee2d156..bac55f47f0aa 100644 --- a/evelauncher.sh +++ b/evelauncher.sh @@ -24,5 +24,7 @@ if [ ! -r "$LAUNCHER/translations/qt_en.qm" ] ;then fi fi +export DXVK_LOG_LEVEL=${DXVK_LOG_LEVEL:-error} + cd $EVEDIR exec $LAUNCHER/evelauncher.sh diff --git a/evesetup.shlib b/evesetup.shlib index 1a8ba6d08b52..821bb95868a9 100644 --- a/evesetup.shlib +++ b/evesetup.shlib @@ -1,16 +1,9 @@ #!/bin/sh -# evelauncher fixed values - CONFDIR="$HOME/.config/CCP" EVECONF="$CONFDIR/EVE.conf" - -# default value if not set - SHAREDIR="$HOME/.eve" -# evesetup shared functions - check_elv() { ELBIN=$(getdate $LAUNCHER/evelauncher) ELBIN=$(expr $ELBIN / 180 \* 180) @@ -80,12 +73,21 @@ check_wine() { desktop_msg "ERROR: \"$CUSTOMWP\" not found!" exit 1 fi + DXVKLIBDIR=$SETUPDIR/lib/dxvk + DXVKFILELIST="d3d10core d3d11 dxgi" + WINSYSDIR=$WINEPREFIX/drive_c/windows/system32 + W32SYSDIR=${WINSYSDIR%/*}/syswow64 INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null | tr -dc [:digit:]) || true WINEINFP=$(readlink -f $CUSTOMWP) WINECONF=$(find ${WINEINFP%bin*}share/wine* -name 'wine.inf') WINEDATE=$(getdate $WINECONF) if [ "x$WINEDATE" != "x$INSTWINE" ] ;then - desktop_msg "Preparing wine environment for EVE" + desktop_msg "Prepare wine environment for EVE" + for DXVKFILE in $DXVKFILELIST ;do + rm $WINSYSDIR/$DXVKFILE.dll* 2>/dev/null || true + rm $W32SYSDIR/$DXVKFILE.dll* 2>/dev/null || true + sed -i /\"$DXVKFILE\"=\"native\"/d $WINEPREFIX/user.reg 2>/dev/null || true + done env WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml=d" \ @@ -94,6 +96,18 @@ check_wine() { $WINE reg add \ 'HKCU\Software\Wine\FileOpenAssociations' \ /v Enable /d N /f >/dev/null + if [ -d "$DXVKLIBDIR" ] ;then + for DXVKFILE in $DXVKFILELIST ;do + cp $DXVKLIBDIR/x64/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll + if [ -d "$W32SYSDIR" ] ;then + cp $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll + fi + env WINEPREFIX=$WINEPREFIX \ + $WINE reg add \ + 'HKCU\Software\Wine\DllOverrides' \ + /v $DXVKFILE /d native >/dev/null + done + fi fi if [ "x$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "x0" ] ;then env WINEPREFIX=$WINEPREFIX \ @@ -101,24 +115,6 @@ check_wine() { 'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \ /v winemenubuilder /f >/dev/null fi - DXVKLIBDIR=$SETUPDIR/lib/dxvk - WINSYSDIR=$WINEPREFIX/drive_c/windows/system32 - W32SYSDIR=${WINSYSDIR%/*}/syswow64 - if [ -r "$DXVKLIBDIR" -a ! -r "$WINSYSDIR/d3d11.dll.old" ] ;then - desktop_msg "Setup DXVK in EVE's wine environment" - for DXVKFILE in d3d10core d3d11 dxgi ;do - mv $WINSYSDIR/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll.old - cp $DXVKLIBDIR/x64/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll - if [ -d "$W32SYSDIR" ] ;then - mv $W32SYSDIR/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll.old - cp $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll - fi - env WINEPREFIX=$WINEPREFIX \ - $WINE reg add \ - 'HKCU\Software\Wine\DllOverrides' \ - /v $DXVKFILE /d native >/dev/null - done - fi } desktop_msg() { diff --git a/setup.sh.in b/setup.sh.in index b6983ec49abe..f7b66895f2f8 100644 --- a/setup.sh.in +++ b/setup.sh.in @@ -12,10 +12,12 @@ bootstrap_install() { for eta in ./eve-transl${qtver}-??.tar.gz ;do install -m 0644 "$eta" "$libdir" done - if [ -f "./dxvk-1.7.tar.gz" ] ;then + if [ -f "./dxvk-$dvver.tar.gz" ] ;then install -d "$libdir/dxvk/" - tar xf ./dxvk-1.7.tar.gz -C $libdir/dxvk/ --strip-components=1 \ - dxvk-1.7/x32 dxvk-1.7/x64 + echo "dxvk-$dvver" >"$libdir/dxvk/version" + chmod 0644 "$libdir/dxvk/version" + tar xf ./dxvk-$dvver.tar.gz -C $libdir/dxvk/ --no-same-owner \ + --strip-components=1 dxvk-$dvver/x32 dxvk-$dvver/x64 fi install -m 0644 "./evesetup.shlib" "$libdir" install -m 0644 "./evelauncher-${elver}.tar.gz" "$libdir" @@ -120,14 +122,14 @@ build_lib() { } get_dxvk() { - if [ ! -r "./dxvk-1.7.tar.gz" ] ;then - printf "\nDownload dxvk-1.7.tar.gz...\n\n" - curl -L -O https://github.com/doitsujin/dxvk/releases/download/v1.7/dxvk-1.7.tar.gz + if [ ! -r "./dxvk-$dvver.tar.gz" ] ;then + printf "\nDownload dxvk-$dvver.tar.gz...\n\n" + curl -L -O https://github.com/doitsujin/dxvk/releases/download/v$dvver/dxvk-$dvver.tar.gz fi - rcsum="$(sha256sum ./dxvk-1.7.tar.gz| cut -d' ' -f1)" + rcsum="$(sha256sum ./dxvk-$dvver.tar.gz| cut -d' ' -f1)" if [ "$rcsum" != "$dvcsum" ] ;then - printf "\n\nWarning: Checksum dxvk-1.7.tar.gz mismatch, ignored.\n" - rm ./dxvk-1.7.tar.gz 2>/dev/null || true + printf "\n\nWarning: Checksum dxvk-$dvver.tar.gz mismatch, ignored.\n" + rm ./dxvk-$dvver.tar.gz 2>/dev/null || true fi } @@ -165,6 +167,7 @@ docdir="$destdir/doc" qtver="5.11" elver="" elcsum="" +dvver="" dvcsum="" rcsum="" key="" |