From d7add4c896f0d2278d0ed16d97efef697f315bc7 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Wed, 6 Sep 2023 23:49:34 +0100 Subject: [PATCH] Special K: Remove dxsetup and vc2022 installation (#898) --- lang/chinese.txt | 1 + lang/dutch.txt | 1 + lang/english.txt | 1 + lang/englishUK.txt | 1 + lang/french.txt | 1 + lang/german.txt | 1 + lang/italian.txt | 1 + lang/polish.txt | 1 + lang/russian.txt | 1 + steamtinkerlaunch | 27 ++++++--------------------- 10 files changed, 15 insertions(+), 21 deletions(-) diff --git a/lang/chinese.txt b/lang/chinese.txt index 6fad5ea2..f19c260a 100644 --- a/lang/chinese.txt +++ b/lang/chinese.txt @@ -1207,3 +1207,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/lang/dutch.txt b/lang/dutch.txt index 6668ae37..ca98b92a 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/lang/english.txt b/lang/english.txt index 473014fe..3a86a112 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1207,3 +1207,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/lang/englishUK.txt b/lang/englishUK.txt index f49f3a24..227318d9 100644 --- a/lang/englishUK.txt +++ b/lang/englishUK.txt @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/lang/french.txt b/lang/french.txt index 13e4ed24..ff4e4fac 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/lang/german.txt b/lang/german.txt index 6869ebe4..935c18b3 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -1208,3 +1208,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/lang/italian.txt b/lang/italian.txt index bd43a961..306d0e86 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/lang/polish.txt b/lang/polish.txt index 6eb34f7f..9cf8f33a 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/lang/russian.txt b/lang/russian.txt index bdba73ae..3a994e8e 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -1206,3 +1206,4 @@ NOTY_INSTALLSLR_NOTOOLMANIFEST="No tool_manifest.vdf found for given Proton vers NOTY_INSTALLSLR_INVALIDGAME="Could not find Proton version for selected game, unable to install Steam Linux Runtime" GUI_USEGAMESCOPEWSI="Enable USE_GAMESCOPE_WSI" DESC_USEGAMESCOPEWSI="This can be useful for some HDR options and for some DXVK v2.3 vsync optimisations" +NOTY_SPECIALKINSTALLING="Installing SpecialK..." diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 5f8c1d18..a23a3b2d 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230907-1" +PROGVERS="v14.0.20230907-2" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com" @@ -237,7 +237,7 @@ TIGEMETA="$METADIR/title/general" TICUMETA="$METADIR/title/custom" DRC="drive_c" DRCU="$DRC/users" -DRCW="$DRC/windows" +# DRCW="$DRC/windows" STUS="steamuser" PUBUS="Public" SUBADIR="$STLBACKDIR/$STUS" @@ -8966,6 +8966,7 @@ function dlSpecialK { fi } +# TODO does this need updated for when a game has multiple APIs? See #580 function getSpecialKGameRenderApi { SPEKCOMP="$SPEKDLDIR/${SPEK}_compat.html" MAXAGE=1440 @@ -9083,6 +9084,7 @@ function useSpecialK { writelog "SKIP" "${FUNCNAME[0]} - Nothing to update - '$SPEKDST' corresponds to '$SPEKSRC'" "E" else writelog "INFO" "${FUNCNAME[0]} - Installing '${SPEKSRC##*/}' as '$GP' is $2-bit" "E" + notiShow "$NOTY_SPECIALKINSTALLING" cp "$SPEKSRC" "$SPEKDST" if [ -f "${SPEKSRC//dll/pdb}" ]; then SPEKPDB="${SPEKSRC##*/}" @@ -9092,16 +9094,6 @@ function useSpecialK { echo "$SPEKDDIR/$SPEKPDB" >> "$SPEKENA" fi fi - - # TODO this does not appear to be working! - IPAK="vcrun2022-$3" - if [ -f "$GPFX/${IPAK}_installed.txt" ]; then - writelog "SKIP" "${FUNCNAME[0]} - Skipping '$IPAK' - already installed" "E" - else - installSteWoShPak "$IPAK" "$GPFX" "$RUNWINE" - echo "$IPAK" > "$GPFX/${IPAK}_installed.txt" - fi - installd3d47dll "$4" "$SPEKDDIR" } function installSpekArchDll { @@ -9142,16 +9134,8 @@ function useSpecialK { dlSpecialK getSpecialKGameRenderApi - - writelog "INFO" "${FUNCNAME[0]} - Using '$SPEKDST' as $SPEK destination dll" - if [ -f "$GPFX/$DRCW/DirectX.log" ]; then - writelog "SKIP" "${FUNCNAME[0]} - Skipping 'dxsetup' - already installed" "E" - else - notiShow "$(strFix "$NOTY_INSTSTART" "dxsetup")" - installSteWoShPak "dxsetup" "$GPFX" "$RUNWINE" - notiShow "$(strFix "$NOTY_INSTSTOP" "dxsetup")" - fi + writelog "INFO" "${FUNCNAME[0]} - Using '$SPEKDST' as $SPEK destination dll" echo "$SPEKDST" > "$SPEKENA" @@ -13383,6 +13367,7 @@ function runExe { fi } +# Install Steamworks Shared Package (package name mapping can be found at eval/packages/) function installSteWoShPak { AIDORPFX="$2" if [ -n "$3" ]; then