From 6df20e751e9d39d52c9a4d0a50ae3ec2664602a2 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Wed, 12 Apr 2023 15:13:50 +0100 Subject: [PATCH 1/2] Wine: Add Lutris Wine and Wine-GE as available Wine versions --- 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 a7289aa6..7f9e4157 100644 --- a/lang/chinese.txt +++ b/lang/chinese.txt @@ -1148,3 +1148,7 @@ 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" diff --git a/lang/dutch.txt b/lang/dutch.txt index ff4fff78..23d4161f 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1148,3 +1148,7 @@ 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" diff --git a/lang/english.txt b/lang/english.txt index ab2e6a95..21f50b5c 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1149,3 +1149,7 @@ 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" diff --git a/lang/englishUK.txt b/lang/englishUK.txt index 6974c240..f1ab601d 100644 --- a/lang/englishUK.txt +++ b/lang/englishUK.txt @@ -1148,3 +1148,7 @@ 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" diff --git a/lang/french.txt b/lang/french.txt index 0f99a010..b86a2a42 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -1148,3 +1148,7 @@ 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" diff --git a/lang/german.txt b/lang/german.txt index 3b680e06..a141e4af 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -1150,3 +1150,7 @@ 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" diff --git a/lang/italian.txt b/lang/italian.txt index 61655fce..a0a6922d 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1148,3 +1148,7 @@ 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" diff --git a/lang/polish.txt b/lang/polish.txt index 3b3dcf27..bfe7367d 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -1148,3 +1148,7 @@ 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" diff --git a/lang/russian.txt b/lang/russian.txt index 67ba542c..7ecb547d 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -1148,3 +1148,7 @@ 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" diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 42eaab01..116ac722 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230412-1" +PROGVERS="v14.0.20230412-2 (lutris-ge-wine)" 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 @@ -2896,6 +2898,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" @@ -5259,6 +5265,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` \ @@ -18698,7 +18706,7 @@ function dlWineGUI { fi } -# currently unused: +# TODO currently unused: function PickSpecificWine { export CURWIKI="$PPW/Download-Custom-Wine" TITLE="${PROGNAME}-${FUNCNAME[0]}" From bbde352e9c36cb3d6e9891c392f665ab534400f2 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Wed, 12 Apr 2023 15:22:08 +0100 Subject: [PATCH 2/2] version bump --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 116ac722..32bc524a 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230412-2 (lutris-ge-wine)" +PROGVERS="v14.0.20230414-1" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com"