From ae59befd55d8a37c8cf0611b81430ffda9566ba1 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Thu, 13 Apr 2023 22:59:55 +0100 Subject: [PATCH] Wine: Add Lutris Wine and Wine-GE as available Wine versions (#783) --- lang/chinese.txt | 4 ++++ lang/dutch.txt | 4 ++++ lang/english.txt | 4 ++++ lang/englishUK.txt | 4 ++++ lang/french.txt | 4 ++++ lang/german.txt | 4 ++++ lang/italian.txt | 4 ++++ lang/polish.txt | 4 ++++ lang/russian.txt | 4 ++++ steamtinkerlaunch | 12 ++++++++++-- 10 files changed, 46 insertions(+), 2 deletions(-) diff --git a/lang/chinese.txt b/lang/chinese.txt index 8cf9ee33..cc4e7887 100644 --- a/lang/chinese.txt +++ b/lang/chinese.txt @@ -1148,5 +1148,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/lang/dutch.txt b/lang/dutch.txt index a8b5371d..14e4dd21 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1148,5 +1148,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/lang/english.txt b/lang/english.txt index d534ce1d..b82bedbf 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1149,5 +1149,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/lang/englishUK.txt b/lang/englishUK.txt index e9acf4da..dd848baf 100644 --- a/lang/englishUK.txt +++ b/lang/englishUK.txt @@ -1148,5 +1148,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/lang/french.txt b/lang/french.txt index 88d8906a..49964b63 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -1148,5 +1148,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/lang/german.txt b/lang/german.txt index aab90531..848744c4 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -1150,5 +1150,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/lang/italian.txt b/lang/italian.txt index e00319b8..cf3db215 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1148,5 +1148,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/lang/polish.txt b/lang/polish.txt index 772ec785..7ef003e4 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -1148,5 +1148,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/lang/russian.txt b/lang/russian.txt index 954a5a61..3e50e817 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -1148,5 +1148,9 @@ GUI_STLRAD_PFTST="RADV Perfest options" DESC_STLRAD_PFTST="A comma-separated list of named flags, which can be used to enable experimental driver features and performance enhancements for RADV Vulkan driver" GUI_MAHUDLSYM="Use MangoHud --dlsym" DESC_MAHUDLSYM="Append '--dlsym' to MangoHud - May fix OpenGL games not displaying MangoHud" +GUI_CW_LUTRIS="Wine Lutris URL" +DESC_CW_LUTRIS="The project page of Lutris Wine" +GUI_CW_WINEGE="Wine-GE URL" +DESC_CW_WINEGE="The project page of Wine-GE" GUI_DLSTEAMDECKCOMPATINFO="Download Steam Deck compatibility information" DESC_DLSTEAMDECKCOMPATINFO="Fetch Steam Deck compatibility information from Steam - Previously fetched compatibility information will be preserved" diff --git a/steamtinkerlaunch b/steamtinkerlaunch index b414c768..b8808417 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230412-3" +PROGVERS="v14.0.20230414-4" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com" @@ -2580,6 +2580,8 @@ function setDefaultCfgValues { if [ -z "$MO2PROJURL" ] ; then MO2PROJURL="$GHURL/ModOrganizer2/modorganizer"; fi if [ -z "$HMMPROJURL" ] ; then HMMPROJURL="$GHURL/thesupersonic16/HedgeModManager"; fi if [ -z "$CW_KRON4EK" ] ; then CW_KRON4EK="$GHURL/Kron4ek/Wine-Builds/releases"; fi + if [ -z "$CW_LUTRIS" ] ; then CW_LUTRIS="$GHURL/lutris/wine/releases"; fi + if [ -z "$CW_WINEGE" ] ; then CW_WINEGE="$GHURL/GloriousEggroll/wine-ge-custom/releases"; fi if [ -z "$IGCSZIP" ] ; then IGCSZIP="$GHURL/FransBouma/InjectableGenericCameraSystem/releases/download/IGCSInjector_102/IGCSInjector_v102.zip"; fi if [ -z "$UUUURL" ] ; then UUUURL="https://framedsc.github.io/GeneralGuides/universal_ue4_consoleunlocker.htm#downloading-the-uuu"; fi if [ -z "$OVRFSRURL" ] ; then OVRFSRURL="$GHURL/fholger/$OVFS/releases"; fi @@ -2897,6 +2899,10 @@ function saveCfg { echo "CP_PROTONSTL=\"$CP_PROTONSTL\"" echo "## Wine Kron4ek URL" echo "CW_KRON4EK=\"$CW_KRON4EK\"" + echo "## Lutris Wine URL" + echo "CW_LUTRIS=\"$CW_LUTRIS\"" + echo "## Wine-GE URL" + echo "CW_WINEGE=\"$CW_WINEGE\"" echo "## d3d47 64bit DL URL " echo "DL_D3D47_64=\"$DL_D3D47_64\"" echo "## d3d47 32bit DL URL" @@ -5263,6 +5269,8 @@ function AllSettingsEntriesDummyFunction { --field=" $GUI_CP_PROTONGE!$DESC_CP_PROTONGE ('CP_PROTONGE')" "${CP_PROTONGE/#-/ -}" `#CAT_Urls` `#MENU_URL` \ --field=" $GUI_CP_PROTONSTL!$DESC_CP_PROTONSTL ('CP_PROTONSTL')" "${CP_PROTONSTL/#-/ -}" `#CAT_Urls` `#MENU_URL` \ --field=" $GUI_CW_KRON4EK!$DESC_CW_KRON4EK ('CW_KRON4EK')" "${CW_KRON4EK/#-/ -}" `#CAT_Urls` `#MENU_URL` \ +--field=" $GUI_CW_LUTRIS!$DESC_CW_LUTRIS ('CW_LUTRIS')" "${CW_LUTRIS/#-/ -}" `#CAT_Urls` `#MENU_URL` \ +--field=" $GUI_CW_WINEGE!$DESC_CW_WINEGE ('CW_WINEGE')" "${CW_WINEGE/#-/ -}" `#CAT_Urls` `#MENU_URL` \ --field=" $GUI_DL_D3D47_64!$DESC_DL_D3D47_64 ('DL_D3D47_64')" "${DL_D3D47_64/#-/ -}" `#CAT_Urls` `#MENU_URL` \ --field=" $GUI_DL_D3D47_32!$DESC_DL_D3D47_32 ('DL_D3D47_32')" "${DL_D3D47_32/#-/ -}" `#CAT_Urls` `#MENU_URL` \ --field=" $GUI_RESHADEDLURL!$DESC_RESHADEDLURL ('RESHADEDLURL')" "${RESHADEDLURL/#-/ -}" `#CAT_Urls` `#MENU_URL` \ @@ -18706,7 +18714,7 @@ function dlWineGUI { fi } -# currently unused: +# TODO currently unused: function PickSpecificWine { export CURWIKI="$PPW/Download-Custom-Wine" TITLE="${PROGNAME}-${FUNCNAME[0]}"