STABLE: Scripts version 2385

data_from_portwine/changelog_en

@@ -2,11 +2,20 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2385### / stable / Date: 29.12.2024 / Download update size: 195 megabytes
+* cumulative update to the stable version of PortProton scripts
+
+###Scripts version 2384### / Date: 29.12.2024 / Download update size: 12 megabytes
+* improved launch of shortcuts for games from Epic Games Launcher (thanks for the help Htylol)
+* updated versions:
+    * DXVK_GIT "2.5.2-1" (shared with dxvk-nvapi)
+    * VKD3D_GIT "1.1-4326" (shared with vkd3d-shader)
+* ATTENTION! Due to problems with access to the steamgriddb website, downloading of covers is temporarily disabled when creating shortcuts for the Steam library
+
 ###Scripts version 2383### / Date: 22.12.2024 / Download update size: 4 megabytes
 * added automatic creation of shortcuts for games from Epic Games Launcher (thanks alex2844)
 
 ###Scripts version 2382### / Date: 22.12.2024 / Download update size: 270 megabytes
-* updated PROTON_LG to version "9-21"
 * updated versions:
     * DXVK_GIT "2.5.1-35" (shared with dxvk-nvapi)
     * VKD3D_GIT "1.1-4325" (shared with vkd3d-shader)

data_from_portwine/changelog_ru

@@ -2,11 +2,20 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2385### / stable / Дата: 29.12.2024 / Размер скачиваемого обновления: 195 мегабайт
+* кумулятивное обновление стабильной версии скриптов PortProton
+
+###Scripts version 2384### / Дата: 29.12.2024 / Размер скачиваемого обновления: 12 мегабайт
+* доработан запуск ярлыков для игр из Epic Games Launcher (спасибо за помощь Htylol)
+* обновлены версии:
+    * DXVK_GIT "2.5.2-1" (совместно с dxvk-nvapi)
+    * VKD3D_GIT "1.1-4326" (совместно vkd3d-shader)
+* ВНИМАНИЕ! Из за проблем с доступом к сайту steamgriddb, временно отключено скачивание обложек при создании ярлыков для библиотеки Steam
+
 ###Scripts version 2383### / Дата: 22.12.2024 / Размер скачиваемого обновления: 4 мегабайта
 * добавлено автоматическое создание ярлыков для игр из Epic Games Launcher (спасибо alex2844)
 
 ###Scripts version 2382### / Дата: 22.12.2024 / Размер скачиваемого обновления: 270 мегабайт
-* обновлен PROTON_LG до версии "9-21"
 * обновлены версии:
     * DXVK_GIT "2.5.1-35" (совместно с dxvk-nvapi)
     * VKD3D_GIT "1.1-4325" (совместно vkd3d-shader)

data_from_portwine/scripts/add_in_steam.sh

@@ -372,6 +372,10 @@ addNonSteamGame() {
 				printf '\x08\x08\x08\x08'
 			} >> "${SCPATH}"
 
+			# TODO: замень использование steamgriddb на steam так как сайт steamgriddb у многих без VPN не работает
+			# а пока просто блочим использование
+			export DOWNLOAD_STEAM_GRID="0"
+
 			if [[ "${DOWNLOAD_STEAM_GRID}" == "1" ]] ; then
 				pw_start_progress_bar_block "${translations[Please wait. downloading covers for]} ${NOSTAPPNAME}"
 				addGrids

data_from_portwine/scripts/functions_helper

@@ -200,7 +200,7 @@ export -f change_locale
 
 generate_pot () {
     local FILES_FOR_GETTEXT i
-    FILES_FOR_GETTEXT=(functions_helper start.sh setup.sh add_in_steam.sh help_info)
+    FILES_FOR_GETTEXT=(functions_helper start.sh setup.sh add_in_steam.sh)
     for i in "${FILES_FOR_GETTEXT[@]}" ; do
         sed -e 's/{translations\[/(gettext \"/g' -e 's/]}/")/g' -e 's/eval_translations/gettext/g' \
         "${PORT_SCRIPTS_PATH}/$i" > "${PORT_SCRIPTS_PATH}/${i}_tmp"
@@ -220,7 +220,6 @@ generate_pot () {
         "data/scripts/setup.sh_tmp" \
         "data/scripts/functions_helper_tmp" \
         "data/scripts/add_in_steam.sh_tmp" \
-        "data/scripts/help_info_tmp" \
         -o "$TEMPLATE_POT"
         popd 1>/dev/null || fatal
         if [[ -f "$LANG_PO" ]] ; then
@@ -236,7 +235,6 @@ generate_pot () {
     try_remove_file "${PORT_SCRIPTS_PATH}/setup.sh_tmp"
     try_remove_file "${PORT_SCRIPTS_PATH}/functions_helper_tmp"
     try_remove_file "${PORT_SCRIPTS_PATH}/add_in_steam.sh_tmp"
-    try_remove_file "${PORT_SCRIPTS_PATH}/help_info_tmp"
     try_remove_dir "${PW_CACHE_LANG_PATH}"
 }
 export -f generate_pot
@@ -1701,6 +1699,9 @@ init_wine_ver () {
 
     export MEDIACONV_BLANK_VIDEO_FILE="${WINEDIR}"/share/media/blank.mkv
     export MEDIACONV_BLANK_AUDIO_FILE="${WINEDIR}"/share/media/blank.ptna
+    if  [[ -d "${WINEDIR}"/share/espeak-ng-data ]] ; then
+        export ESPEAK_DATA_PATH="${WINEDIR}"/share/
+    fi
     return 0
 }
 
@@ -3148,7 +3149,7 @@ start_portwine () {
     if [[ "${PW_LOG}" == 1 ]] \
     || [[ -n "$PW_DEBUG" ]]
     then
-        export WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg"
+        export WINEDEBUG="+loaddll,+gstreamer"
         export WINE_MONO_TRACE="E:System.NotImplementedException"
         export VKBASALT_LOG_LEVEL="error"
     else
@@ -3946,7 +3947,7 @@ start_portwine () {
         export WINE_CPU_TOPOLOGY="${PW_WINE_CPU_TOPOLOGY}"
     fi
 
-    if [[ ! -z "${PW_VK_ICD_FILENAMES}" ]] ; then
+    if [[ -n "${PW_VK_ICD_FILENAMES}" ]] ; then
         export VK_ICD_FILENAMES="${PW_VK_ICD_FILENAMES}"
         export VK_DRIVER_FILES="${PW_VK_ICD_FILENAMES}"
     fi
@@ -4375,14 +4376,21 @@ portwine_launch () {
     fi
 
     [[ $PW_LOG != 1 ]] && debug_timer --start -s "PW_TIME_IN_GAME"
-    if [[ -n "${LAUNCH_URI}" ]]; then
+    if [[ -n "${LAUNCH_URI}" ]] ; then
         pw_run start /high /b "${LAUNCH_URI}" &
+        unset GAMEPID
         while true ; do
             sleep 5
-            GAMEPID="$(pgrep -fa "$(basename "$portwine_exe")" | grep -v "start.sh" | grep -i "epic" | awk '{print $1}')"
-            [[ -n $GAMEPID ]] && break
+            if [[ -z "$GAMEPID" ]] ; then
+                GAMEPID="$(pgrep -fa 'EpicPortal|epicusername|epiclocale|AUTH_LOGIN' | awk '{print $1}')"
+            else
+                if waitpid "$GAMEPID" ; then
+                    sleep 1
+                    GAMEPID="$(pgrep -fa 'EpicPortal|epicusername|epiclocale|AUTH_LOGIN' | awk '{print $1}')"
+                    [[ -z "$GAMEPID" ]] && break || continue
+                fi
+            fi
         done
-        while [[ -f "/proc/$GAMEPID/exe" ]] ; do sleep 5 ; done
     else
         case "${portwine_exe,,}" in
             *.exe)
@@ -5063,7 +5071,7 @@ gui_edit_db () {
         CPU_LIMIT_VAR="disabled"
     fi
 
-    if [[ ! -z "${PW_AMD_VULKAN_USE}" ]] && \
+    if [[ -n "${PW_AMD_VULKAN_USE}" ]] && \
     [[ "${PW_AMD_VULKAN_USE}" != "disabled" ]] ; then
         AMD_VULKAN_VAR="${PW_AMD_VULKAN_USE}"
         export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1

data_from_portwine/scripts/portwine_db/EpicGamesLauncher.ppdb

@@ -4,10 +4,8 @@
 #Rating=5
 ##############################################
 #export PW_COMMENT_DB="PortWINE database file for Epic Games Launcher"
-export PW_VULKAN_USE=1
 export LAUNCH_PARAMETERS="-SkipBuildPatchPrereq"
 export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2019"
-export PW_USE_D3D_EXTRAS=1
 export PW_WINE_USE="PROTON_LG"
 export WINEDLLOVERRIDES="vulkan-1=n,b"
 # add_in_start_portwine () {

data_from_portwine/scripts/var

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2383
-#SCRIPTS_STABLE_VERSION=2380
+#SCRIPTS_NEXT_VERSION=2385
+#SCRIPTS_STABLE_VERSION=2385
 ########################################################################
 export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT"
 # export PROTON_USE_XALIA="1"
@@ -45,7 +45,7 @@ export PW_FAKE_DLSS_VER="230506"
 export PW_FAKE_DLSS_3_VER="090"
 export PW_GALLIUM_NINE_VER="0.10"
 ###WINE_AND_PROTON_LG###
-export PW_PROTON_LG_VER="PROTON_LG_9-21"
+export PW_PROTON_LG_VER="PROTON_LG_9-19"
 export PW_WINE_LG_VER="WINE_LG_9-12-2"
 export PW_WINE_FULLSCREEN_FSR="1"
 export WINE_FULLSCREEN_FSR_MODE="ultra"
@@ -54,9 +54,9 @@ export PW_VULKAN_USE="2"
 export VKD3D_LIMIT_TESS_FACTORS="64"
 export DXVK_LEGACY_VER="1.6.1"
 export DXVK_STABLE_VER="1.10.3-28"
-export DXVK_GIT_VER="2.5.1-35"
+export DXVK_GIT_VER="2.5.2-1"
 export VKD3D_STABLE_VER="1.1-2602"
-export VKD3D_GIT_VER="1.1-4325"
+export VKD3D_GIT_VER="1.1-4326"
 ###VKBASALT###
 export PW_VKBASALT_EFFECTS="Curves:cas"
 export PW_VKBASALT_FFX_CAS="0.50"