Scripts version 2177

906a66ee · Mikhail Tergoev · c17af616 · 906a66ee · 906a66ee · 906a66ee
Commit 906a66ee authored Apr 02, 2023 by Mikhail Tergoev
7 changed files
--- a/README.md
+++ b/README.md
@@ -18,9 +18,22 @@ WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/

 ## Installation using packages

-* **Ubuntu 20.04** (Kubuntu, Xubuntu, Lubuntu, etc.), **Linux Mint 20.x** : [portproton_1.0-2_amd64.deb](https://github.com/Castro-Fidel/PortProton_dpkg/releases/download/portproton_1.0-2_amd64/portproton_1.0-2_amd64.deb)
-* **Arch Linux** and derivatives (Manjaro, Garuda, etc.) : [portproton-1.0-8-x86_64.pkg.tar.zst](https://github.com/Castro-Fidel/PortProton_PKGBUILD/releases/download/portproton-1.0-8-x86_64/portproton-1.0-8-x86_64.pkg.tar.zst)
-* **ROSA Linux** (package in the official repository) is installed with the command:  `sudo urpmi portproton`
+* **Ubuntu 20.04** (Kubuntu, Xubuntu, Lubuntu, etc.), **Linux Mint 20.x** :
+[portproton_1.0-2_amd64.deb](https://github.com/Castro-Fidel/PortProton_dpkg/releases/download/portproton_1.0-2_amd64/portproton_1.0-2_amd64.deb)
+* **Arch Linux** and derivatives (Manjaro, Garuda, etc.) :
+[portproton-1.0-8-x86_64.pkg.tar.zst](https://github.com/Castro-Fidel/PortProton_PKGBUILD/releases/download/portproton-1.0-8-x86_64/portproton-1.0-8-x86_64.pkg.tar.zst)
+* **ROSA Linux** (package in the official repository) is installed with the command:  
+`sudo urpmi portproton`
+* **Alt Linux (Sisyphus)** (package in the official repository) is installed with the command:  
+
+```
+su -
+epm full-upgrade
+epm ei
+epm play portproton
+```
+
+

 ## Universal (manual) installation

@@ -36,6 +49,7 @@ Silent installation (ENG):

 Silent installation (RUS):

+`wget -c 
 `wget -c "https://github.com/Castro-Fidel/PortWINE/raw/master/portwine_install_script/PortProton_1.0" && sh PortProton_1.0 -rus`

 ## Dependencies

--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,17 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:

+###Scripts version 2177###
+* Updated libs_v42 library package:
+     fixed installation of League of Legends
+     fixed problems with primary authorization in different launchers when using PROTON_LG
+     finally fixed the problem of launching RDR2 purchased from the Epic Games Launcher
+* Added instructions for installing PortProton for OS "Alt Linux (Sisyphus)" in README.md and on the site linux-gaming.ru:
+    su -
+    epm full-upgrade
+    epm ei
+    epm play portproton
+
 ###Scripts version 2176###
 * The libc_v41 library package has been updated
    PROTON_LG="7-53" 

--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,17 @@
 -----------------------------------------
 История изменений:

+###Scripts version 2177###
+* Обновлен пакет библиотек libs_v42:
+    исправлена установка League of Legends
+    исправлены проблемы с первичной авторизацией в разных лончерах при использовании PROTON_LG
+    окончательно исправлена проблема запуска RDR2 купленной в Epic Games Launcher
+* добавлена инструкция установки PortProton для ОС "Alt Linux (Sisyphus)" в README.md и на сайте linux-gaming.ru:
+    su -
+    epm full-upgrade
+    epm ei
+    epm play portproton
+
 ###Scripts version 2176###
 * Обновлен пакет библиотек libs_v41
    pressure-vessel	0.20230314.0	

--- a/data_from_portwine/scripts/portwine_db/EALauncher
+++ b/data_from_portwine/scripts/portwine_db/EALauncher
@@ -4,10 +4,10 @@
 #EADesktop.exe
 #Rating=5
 #####################examples###########################
-export PW_DLL_INSTALL="vcrun2022"               # Install DDL in port prefix (used winetricks) 
+# export PW_DLL_INSTALL="vcrun2022"               # Install DDL in port prefix (used winetricks) 
 export PW_VULKAN_USE=1                       # dxvk, vkd3d or 0 for OpenGL
 # export PW_USE_TERMINAL="1"
 export PW_MUST_HAVE_DLL=""
 export PW_PREFIX_NAME="EA_APP"
-export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64"
-gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64"
+# export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64"
+# gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64"
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP
@@ -4,13 +4,12 @@
 export LAUNCH_PARAMETERS=("/silent" "/repair" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe"
 export PW_DLL_INSTALL=""               # Install DDL in port prefix (used winetricks) 
-export PW_VULKAN_USE=1                       # dxvk, vkd3d or 0 for OpenGL
+export PW_VULKAN_USE=1
 export PW_MUST_HAVE_DLL=""
 export PW_PREFIX_NAME="EA_APP"
 # export WINEDLLOVERRIDES="mscoree,mshtml=b"
-export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64"
-gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64"
-
+# export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64"
+# gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64"

 start_portwine
 if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}"

--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -176,9 +176,11 @@ start_portwine () {
    if [[ ! -z "${PW_USE_DXR11}" && "${PW_USE_DXR11}" != 0 ]] ; then 
        var_vkd3d_config_update dxr11
        var_radv_perftest_config_update rt,gpl
+        export VKD3D_FEATURE_LEVEL=12_1
    elif [[ ! -z "${PW_USE_DXR10}" && "${PW_USE_DXR10}" != 0 ]] ; then 
        var_vkd3d_config_update dxr
        var_radv_perftest_config_update rt,gpl
+        export VKD3D_FEATURE_LEVEL=12_1
    fi
    export optirun_on=""
    export check_optimus_manager=

--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2176
+#SCRIPTS_NEXT_VERSION=2177
 ########################################################################
 export PW_MANGOHUD=0
 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt
@@ -20,7 +20,7 @@ export PW_USE_TERMINAL="0"
 export PW_WINEDBG_DISABLE="1"
 export PW_WINDOWS_VER="10"
 export WINEARCH="win64"
-export PW_LIBS_VER="_v41"
+export PW_LIBS_VER="_v42"
 export GDK_BACKEND="x11"
 export PW_USE_GSTREAMER="1"
 export PW_USE_D3D_EXTRAS="1"
@@ -73,22 +73,23 @@ add_in_stop_portwine ()
 ########################################################################
 pw_other_fixes () 
 {
-    if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" ]] ; then
-    #fix after installation Origin, for disabled OriginWebHelperService by default
-        if [[ ! -z `cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep -wm 1 "Origin.exe" | awk '{print $1}'` ]] ; then
-            sysreg_norig=$(((`cat -n "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep OriginWebHelperService | awk '{print $1}'` + 3)))
-            sed -i "${sysreg_norig}s/dword:0000000[1-2]/dword:00000003/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"
-        fi
-        #fix after installation PnkBstr*, for disabled PnkBstr* by default
-        if [[ ! -z `cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep -wm 1 "PnkBstrA.exe" | awk '{print $1}'` ]] ; then
-            sysreg_norig=$(((`cat -n "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep "PnkBstrA.exe" | awk '{print $1}'` + 3)))
-            sed -i "${sysreg_norig}s/dword:0000000[1-2]/dword:00000003/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"
-            if [[ ! -z `cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep -wm 1 "PnkBstrB.exe" | awk '{print $1}'` ]] ; then
-                sysreg_norig=$(((`cat -n "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep "PnkBstrB.exe" | awk '{print $1}'` + 3)))
-                sed -i "${sysreg_norig}s/dword:0000000[1-2]/dword:00000003/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"
-            fi
-        fi
-    fi
+    # if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" ]] ; then
+    # #fix after installation Origin, for disabled OriginWebHelperService by default
+    #     if [[ ! -z `cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep -wm 1 "Origin.exe" | awk '{print $1}'` ]] ; then
+    #         sysreg_norig=$(((`cat -n "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep OriginWebHelperService | awk '{print $1}'` + 3)))
+    #         sed -i "${sysreg_norig}s/dword:0000000[1-2]/dword:00000003/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"
+    #     fi
+    #     #fix after installation PnkBstr*, for disabled PnkBstr* by default
+    #     if [[ ! -z `cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep -wm 1 "PnkBstrA.exe" | awk '{print $1}'` ]] ; then
+    #         sysreg_norig=$(((`cat -n "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep "PnkBstrA.exe" | awk '{print $1}'` + 3)))
+    #         sed -i "${sysreg_norig}s/dword:0000000[1-2]/dword:00000003/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"
+    #         if [[ ! -z `cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep -wm 1 "PnkBstrB.exe" | awk '{print $1}'` ]] ; then
+    #             sysreg_norig=$(((`cat -n "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep "PnkBstrB.exe" | awk '{print $1}'` + 3)))
+    #             sed -i "${sysreg_norig}s/dword:0000000[1-2]/dword:00000003/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"
+    #         fi
+    #     fi
+    # fi
+    echo ""
 }

 # export VKD3D_FEATURE_LEVEL=12_0