From c15c43eb0a4c4f92d83f131f667a4ac3674b298f Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 14 Apr 2025 10:03:12 +0300 Subject: [PATCH 01/34] hack for genshin --- data_from_portwine/scripts/functions_helper | 5 +---- .../scripts/portwine_db/Genshin Impact.ppdb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 298df8e1..d216ab84 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -4318,9 +4318,6 @@ pw_run () { if file "$portwine_exe" | grep -q "x86-64" ; then print_info "file: $portwine_exe is x86-64, force set WINE_LARGE_ADDRESS_AWARE to 0" export WINE_LARGE_ADDRESS_AWARE="0" - if [[ -f "${WINELOADER}64" ]] - then export WINELOADER="${WINELOADER}64" - fi else print_info "file: $portwine_exe not x86-64, force set WINE_LARGE_ADDRESS_AWARE to 1" export WINE_LARGE_ADDRESS_AWARE="1" @@ -6412,7 +6409,7 @@ pw_auto_create_shortcut () { if [[ "${PW_CHECK_AUTOINSTALL}" == "1" ]] \ || [[ "${PW_NO_AUTO_CREATE_SHORTCUT}" == "1" ]] \ || [[ -z "${portwine_exe}" ]] \ - || echo "${portwine_exe}" | grep -i "gc_api.exe\|vkplay\|pulseonline" &>/dev/null + || echo "${portwine_exe}" | grep -i "gc_api.exe\|vkplay\|pulseonline\|hoyoplay_launcher_pp" &>/dev/null then print_warning "Skipping auto create shortcut" return 0 diff --git a/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb b/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb index f2b53ced..1c12346a 100644 --- a/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb +++ b/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb @@ -7,3 +7,22 @@ export PW_WINDOWS_VER="10" export PW_VULKAN_USE="2" export PW_PREFIX_NAME="HO_YO_PLAY" +export PW_WINE_USE="WINE_LG" +add_in_start_portwine() { + genshin_hack() { + if command -v nmcli &>/dev/null ; then + while true ; do + if pgrep -i genshinimp ; then + nmcli networking off + sleep 10 + nmcli networking on + break + else + sleep 0.5 + fi + done + fi + } + genshin_hack & +} + From 38d9a88bbb931b460f89fd6dc911cb2b9a67e6dd Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 14 Apr 2025 12:06:39 +0300 Subject: [PATCH 02/34] Scripts version 2412 --- data_from_portwine/changelog_en | 3 +++ data_from_portwine/changelog_ru | 3 +++ data_from_portwine/scripts/var | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 4746466f..691f61c0 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2412### / Date: 14.04.2025 / Download update size: 4 megabytes +* temporary fixes of the entrance to the game "Genshin Impact" (auto shutdown and connection to the network before launching the game - does not work in Flatpak) + ###Scripts version 2411### / stable / Date: 11.04.2025 / Download update size: 280 megabytes * cumulative update to the stable version of PortProton scripts diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 5881b78d..6b47100a 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2412### / Дата: 14.04.2025 / Размер скачиваемого обновления: 4 мегабайта +* временный фикс входа в игру "Genshin Impact" (автоотключение и подключение к сети перед запуском игры - не работает во flatpak) + ###Scripts version 2411### / stable / Дата: 11.04.2025 / Размер скачиваемого обновления: 380 мегабайт * кумулятивное обновление стабильной версии скриптов PortProton diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 5c1725cc..96dcff0c 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2411 +#SCRIPTS_NEXT_VERSION=2412 #SCRIPTS_STABLE_VERSION=2411 ######################################################################## 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" From 762041d6149d7900328dc7357da5fc5fa47b751d Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sat, 19 Apr 2025 12:31:27 +0300 Subject: [PATCH 03/34] fixed icu*.dll path --- data_from_portwine/scripts/functions_helper | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d216ab84..c7361554 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3057,6 +3057,7 @@ pw_create_unique_exe () { else print_warning "There are no arguments for creating a symbolic link! Skip it..." fi + try_remove_file "${portwine_exe}.ppdb" popd || fatal fi } @@ -3183,6 +3184,7 @@ start_portwine () { done LIST_ICU_DLL_LINKS="icuin68 icuuc68 icudt68" + [[ -d "${WINEDIR}/lib/icu32" ]] && mv "${WINEDIR}/lib/icu32" "${WINEDIR}/lib/icu" for dll in $LIST_ICU_DLL_LINKS ; do if [[ -f "${WINEDIR}/lib/icu/${dll}.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/icu/${dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${dll}.dll" From 233bfaa076bde40b86b68d97e58a027f5f88ebc4 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sat, 19 Apr 2025 12:35:35 +0300 Subject: [PATCH 04/34] Scripts version 2413 --- data_from_portwine/changelog_en | 4 ++++ data_from_portwine/changelog_ru | 4 ++++ data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb | 1 + data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY | 1 - .../scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE | 1 - data_from_portwine/scripts/var | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 691f61c0..c2337f7e 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2413### / Date: 19.04.2025 / Download update size: 4 megabytes +* fixed the start of the game "World of Sea Battle" +* fixed errors related to libraries "ICU* .DLL" + ###Scripts version 2412### / Date: 14.04.2025 / Download update size: 4 megabytes * temporary fixes of the entrance to the game "Genshin Impact" (auto shutdown and connection to the network before launching the game - does not work in Flatpak) diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 6b47100a..21fba830 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2413### / Дата: 19.04.2025 / Размер скачиваемого обновления: 4 мегабайта +* исправлен запуск игры "World of Sea Battle" +* исправлены ошибки связанные с библиотеками "icu*.dll" + ###Scripts version 2412### / Дата: 14.04.2025 / Размер скачиваемого обновления: 4 мегабайта * временный фикс входа в игру "Genshin Impact" (автоотключение и подключение к сети перед запуском игры - не работает во flatpak) diff --git a/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb b/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb index 1c12346a..212f07c4 100644 --- a/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb +++ b/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb @@ -1,6 +1,7 @@ #!/usr/bin/env bash #Author: fidel #Genshin Impact.exe +#GenshinImpact.exe #hoyoplay_launcher_pp.exe #Rating=5 #####################examples########################### diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY index 1da04d20..96704bf9 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY @@ -23,7 +23,6 @@ then export portwine_exe="$WINEPREFIX/drive_c/Program Files/HoYoPlay/launcher.exe" pw_create_unique_exe "hoyoplay_launcher_pp" try_remove_file "${PW_AUTOINSTALL_EXE}" - try_remove_file "${portwine_exe}.ppdb" kill_portwine pw_stop_progress_bar portwine_create_shortcut diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE b/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE index ea32df5c..297a12ab 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE @@ -21,7 +21,6 @@ then pw_start_progress_bar_install_game "World of Sea Battle." pw_run "${PW_AUTOINSTALL_EXE}" try_remove_file "${PW_AUTOINSTALL_EXE}" - try_remove_file "${portwine_exe}.ppdb" if [[ -f "$WINEPREFIX/drive_c/Games/Wosb Launcher/launcher.exe" ]] then export portwine_exe="$WINEPREFIX/drive_c/Games/Wosb Launcher/launcher.exe" else export portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 96dcff0c..dc6bac6d 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2412 +#SCRIPTS_NEXT_VERSION=2413 #SCRIPTS_STABLE_VERSION=2411 ######################################################################## 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" From 5ce1ef8a04ad1dcf400aa7f4cc04b97a50616a22 Mon Sep 17 00:00:00 2001 From: Boris Yumankulov Date: Sat, 19 Apr 2025 16:32:28 +0500 Subject: [PATCH 05/34] Added Numa node select MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Что такое NUMA и зачем это нужно?** В многоядерных системах процессоры разделены на NUMA-узлы (сокеты), каждый из которых имеет свою локальную память и ядра. Привязка игры к ядрам одного NUMA-узла: - уменьшает задержки доступа к памяти, - снижает переключения между ядрами, - может увеличить производительность (до +50% в некоторых играх). --- data_from_portwine/locales/PortProton.pot | 135 +------- .../locales/es/LC_MESSAGES/PortProton.po | 313 ++++++++--------- .../locales/ru/LC_MESSAGES/PortProton.po | 321 ++++++++++-------- data_from_portwine/scripts/functions_helper | 47 ++- data_from_portwine/scripts/start.sh | 2 +- 5 files changed, 386 insertions(+), 432 deletions(-) diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot index 3fa6347b..bbb2ee51 100644 --- a/data_from_portwine/locales/PortProton.pot +++ b/data_from_portwine/locales/PortProton.pot @@ -7,13 +7,13 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2025-04-07 19:38+0500\n" + "POT-Creation-Date: 2025-04-21 21:55+0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=CHARSET\n" + "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" msgid "A running PortProton session was detected.\\nDo you want to end the " @@ -100,12 +100,6 @@ msgstr "" msgid "Edit database file for" msgstr "" -msgid "Global settings" -msgstr "" - -msgid "Settings for user.conf" -msgstr "" - msgid "Open directory" msgstr "" @@ -638,6 +632,15 @@ msgstr "" msgid "Choosing which implementation of vulkan will be used to run the game" msgstr "" +msgid "NUMA node for CPU affinity" +msgstr "" + +msgid "In multi‑core systems, CPUs are split into NUMA nodes, each with its " + "own local memory and cores.\n" + "Binding a game to a single node reduces memory‑access latency and " + "limits costly core‑to‑core switches.)" +msgstr "" + msgid "EDIT DB" msgstr "" @@ -1401,118 +1404,7 @@ msgstr "" msgid "classic" msgstr "" -msgid "light" -msgstr "" - -msgid "dark" -msgstr "" - -msgid "Show in hours and minutes" -msgstr "" - -msgid "Show in days, hours, minutes" -msgstr "" - -msgid "According to last launch" -msgstr "" - -msgid "By time" -msgstr "" - -msgid "GLOBAL SETTINGS (USER.CONF)" -msgstr "" - -msgid "Change global settings" -msgstr "" - -msgid "Change mirror to" -msgstr "" - -msgid "Depending on which mirror is selected, updates will be downloaded " - "from there." -msgstr "" - -msgid "Change branch to" -msgstr "" - -msgid "Depending on the version of the scripts, PortProton will receive the " - "latest changes first (the DEVEL branch), the STABLE branch is " - "updated later and is stable." -msgstr "" - -msgid "Change start gui to" -msgstr "" - -msgid "When using PANED in the game start menu, additional buttons are " - "located on one large page; if NOTEBOOK, then they are divided into " - "several." -msgstr "" - -msgid "Steam covers download" -msgstr "" - -msgid "If downloading steam covers is enabled, they will be downloaded and " - "created. (Disablement is provided in cases where their downloading " - "is unavailable for some reason)" -msgstr "" - -msgid "Choose a graphics card to run the game" -msgstr "" - -msgid "Select which video card will be used to run the game (used for all " - "running games and programs in PortProton)" -msgstr "" - -msgid "Force dpi" -msgstr "" - -msgid "Here you can set forced dpi for applications wine" -msgstr "" - -msgid "Choice wine audio driver" -msgstr "" - -msgid "Fixes sound popling if choice alsa" -msgstr "" - -msgid "Select PortProton theme" -msgstr "" - -msgid "Allows you to select a theme for PortProton" -msgstr "" - -msgid "Select gtk theme" -msgstr "" - -msgid "Allows you to select a theme for GTK." -msgstr "" - -msgid "Time display" -msgstr "" - -msgid "Displays time spent in an application or game" -msgstr "" - -msgid "Sort shortcuts by" -msgstr "" - -msgid "This setting sorts the shortcuts in the main menu" -msgstr "" - -msgid "Open the user.conf settings file in a system text editor to " - "view and change variables manually" -msgstr "" - -msgid "Do you really want to reset settings for" -msgstr "" - -msgid "Do you actually want to change the scripts version to:" -msgstr "" - -msgid "Branch changed to:" -msgstr "" - -msgid "The shortcut will be created in the PortProton directory." +msgid "The shortcut will be changed in the PortProton directory." msgstr "" msgid "Name" @@ -1527,9 +1419,6 @@ msgstr "" msgid "Add shortcut to STEAM library" msgstr "" -msgid "The shortcut will be changed in the PortProton directory." -msgstr "" - msgid "REMOVE SHORTCUT" msgstr "" diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po index 8641e61d..88435ce9 100644 --- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-07 19:32+0500\n" -"PO-Revision-Date: 2025-04-07 19:35+0500\n" +"POT-Creation-Date: 2025-04-21 21:55+0500\n" +"PO-Revision-Date: 2024-11-13 08:18+0500\n" "Last-Translator: \n" "Language-Team: \n" "Language: es_ES\n" @@ -111,12 +111,6 @@ msgstr "Configuración básica" msgid "Edit database file for" msgstr "Editar archivo de base de datos para" -msgid "Global settings" -msgstr "Configuraciones globales" - -msgid "Settings for user.conf" -msgstr "Configuración user.conf" - msgid "Open directory" msgstr "Abrir directorio" @@ -791,6 +785,16 @@ msgstr "" msgid "Choosing which implementation of vulkan will be used to run the game" msgstr "" +msgid "NUMA node for CPU affinity" +msgstr "" + +msgid "" +"In multi‑core systems, CPUs are split into NUMA nodes, each with its own " +"local memory and cores.\n" +"Binding a game to a single node reduces memory‑access latency and limits " +"costly core‑to‑core switches.)" +msgstr "" + msgid "EDIT DB" msgstr "CONFIGURACIÓN" @@ -1693,11 +1697,9 @@ msgid "" "Gamescope is not detected on the system, to install it, run the command in " "the terminal" msgstr "" -"Gamescope no se detecta en el sistema, para instalarlo, ejecute el comando " -"en el terminal" msgid "Can be selected and copied" -msgstr "Se puede seleccionar y copiar" +msgstr "" msgid "" "Gamescope is not detected on the system, please contact the manufacturer " @@ -1818,144 +1820,8 @@ msgstr "compacto" msgid "classic" msgstr "clásico" -msgid "light" -msgstr "ligero" - -msgid "dark" -msgstr "oscuro" - -msgid "Show in hours and minutes" -msgstr "" - -msgid "Show in days, hours, minutes" -msgstr "" - -msgid "According to last launch" -msgstr "" - -#, fuzzy -msgid "By time" -msgstr "Mostrar tiempo" - -msgid "GLOBAL SETTINGS (USER.CONF)" -msgstr "CONFIGURACIONES GLOBALES (USER.CONF)" - -msgid "Change global settings" -msgstr "Cambiar configuraciones globales" - -msgid "Change mirror to" -msgstr "Cambiar el espejo a" - -msgid "" -"Depending on which mirror is selected, updates will be downloaded from there." -msgstr "" -"Dependiendo del espejo seleccionado, las actualizaciones se descargarán " -"desde allí." - -msgid "Change branch to" -msgstr "Cambiar rama a" - -msgid "" -"Depending on the version of the scripts, PortProton will receive the latest " -"changes first (the DEVEL branch), the STABLE branch is updated later and is " -"stable." -msgstr "" -"Dependiendo de la versión de los scripts, PortProton recibirá primero los " -"últimos cambios (la rama DEVEL), la rama STABLE se actualiza más tarde y es " -"estable." - -msgid "Change start gui to" -msgstr "Cambiar la interfaz gráfica de inicio a" - -msgid "" -"When using PANED in the game start menu, additional buttons are located on " -"one large page; if NOTEBOOK, then they are divided into several." -msgstr "" -"Cuando se usa PANED en el menú de inicio del juego, los botones adicionales " -"se encuentran en una página grande; si CUADERNO, entonces se dividen en " -"varios." - -#, fuzzy -msgid "Steam covers download" -msgstr "descargar portadas de steam" - -msgid "" -"If downloading steam covers is enabled, they will be downloaded and created. " -"(Disablement is provided in cases where their downloading is unavailable for " -"some reason)" -msgstr "" -"Si la descarga de portadas de Steam está habilitada, se descargarán y " -"crearán. (La desactivación se proporciona en los casos en que su descarga no " -"esté disponible por algún motivo)" - -msgid "Choose a graphics card to run the game" -msgstr "Elige una tarjeta gráfica para ejecutar el juego" - -msgid "" -"Select which video card will be used to run the game (used for all running " -"games and programs in PortProton)" -msgstr "" -"Selecciona qué tarjeta de vídeo se utilizará para ejecutar el juego (se " -"utiliza para todos los juegos y programas en ejecución en PortProton)" - -msgid "Force dpi" -msgstr "" - -msgid "Here you can set forced dpi for applications wine" -msgstr "" - -msgid "Choice wine audio driver" -msgstr "Controlador de audio de vino elegido" - -msgid "Fixes sound popling if choice alsa" -msgstr "Corrige el sonido estallido de elección alsa alsa" - -msgid "Select PortProton theme" -msgstr "Seleccione el tema PortProton" - -msgid "Allows you to select a theme for PortProton" -msgstr "Le permite seleccionar un tema para PortProton" - -msgid "Select gtk theme" -msgstr "Seleccione el tema gtk" - -msgid "Allows you to select a theme for GTK." -msgstr "Le permite seleccionar un tema para GTK." - -msgid "Time display" -msgstr "Mostrar tiempo" - -msgid "Displays time spent in an application or game" -msgstr "Muestra el tiempo transcurrido en una aplicación o juego" - -#, fuzzy -msgid "Sort shortcuts by" -msgstr "Ordenar accesos directos por tiempo" - -#, fuzzy -msgid "This setting sorts the shortcuts in the main menu" -msgstr "" -"Esta configuración ordena los accesos directos en el menú principal según el " -"tiempo transcurrido en la aplicación o juego" - -msgid "" -"Open the user.conf settings file in a system text editor to view and " -"change variables manually" -msgstr "" -"Abre el archivo de configuración user.conf en un editor de texto del " -"sistema para ver y cambiar las variables manualmente" - -msgid "Do you really want to reset settings for" -msgstr "¿Realmente deseas restablecer la configuración de" - -msgid "Do you actually want to change the scripts version to:" -msgstr "¿Realmente desea cambiar la versión de los scripts a:" - -msgid "Branch changed to:" -msgstr "Rama cambiada a:" - -msgid "The shortcut will be created in the PortProton directory." -msgstr "El acceso directo se creará en el directorio de PortProton." +msgid "The shortcut will be changed in the PortProton directory." +msgstr "El acceso directo se cambiará en el directorio de PortProton." msgid "Name" msgstr "Nombre" @@ -1969,9 +1835,6 @@ msgstr "Agregar acceso directo al escritorio" msgid "Add shortcut to STEAM library" msgstr "Agregar acceso directo a la biblioteca de STEAM" -msgid "The shortcut will be changed in the PortProton directory." -msgstr "El acceso directo se cambiará en el directorio de PortProton." - msgid "REMOVE SHORTCUT" msgstr "ELIMINAR ACCESO DIRECTO" @@ -2168,6 +2031,137 @@ msgstr "UNIRSE" msgid "THIRD PARTY LIBRARIES" msgstr "BIBLIOTECAS DE TERCEROS" +#~ msgid "Global settings" +#~ msgstr "Configuraciones globales" + +#~ msgid "Settings for user.conf" +#~ msgstr "Configuración user.conf" + +#~ msgid "light" +#~ msgstr "ligero" + +#~ msgid "dark" +#~ msgstr "oscuro" + +#, fuzzy +#~ msgid "By time" +#~ msgstr "Mostrar tiempo" + +#~ msgid "GLOBAL SETTINGS (USER.CONF)" +#~ msgstr "CONFIGURACIONES GLOBALES (USER.CONF)" + +#~ msgid "Change global settings" +#~ msgstr "Cambiar configuraciones globales" + +#~ msgid "Change mirror to" +#~ msgstr "Cambiar el espejo a" + +#~ msgid "" +#~ "Depending on which mirror is selected, updates will be downloaded from " +#~ "there." +#~ msgstr "" +#~ "Dependiendo del espejo seleccionado, las actualizaciones se descargarán " +#~ "desde allí." + +#~ msgid "Change branch to" +#~ msgstr "Cambiar rama a" + +#~ msgid "" +#~ "Depending on the version of the scripts, PortProton will receive the " +#~ "latest changes first (the DEVEL branch), the STABLE branch is updated " +#~ "later and is stable." +#~ msgstr "" +#~ "Dependiendo de la versión de los scripts, PortProton recibirá primero los " +#~ "últimos cambios (la rama DEVEL), la rama STABLE se actualiza más tarde y " +#~ "es estable." + +#~ msgid "Change start gui to" +#~ msgstr "Cambiar la interfaz gráfica de inicio a" + +#~ msgid "" +#~ "When using PANED in the game start menu, additional buttons are located " +#~ "on one large page; if NOTEBOOK, then they are divided into several." +#~ msgstr "" +#~ "Cuando se usa PANED en el menú de inicio del juego, los botones " +#~ "adicionales se encuentran en una página grande; si CUADERNO, entonces se " +#~ "dividen en varios." + +#, fuzzy +#~ msgid "Steam covers download" +#~ msgstr "descargar portadas de steam" + +#~ msgid "" +#~ "If downloading steam covers is enabled, they will be downloaded and " +#~ "created. (Disablement is provided in cases where their downloading is " +#~ "unavailable for some reason)" +#~ msgstr "" +#~ "Si la descarga de portadas de Steam está habilitada, se descargarán y " +#~ "crearán. (La desactivación se proporciona en los casos en que su descarga " +#~ "no esté disponible por algún motivo)" + +#~ msgid "Choose a graphics card to run the game" +#~ msgstr "Elige una tarjeta gráfica para ejecutar el juego" + +#~ msgid "" +#~ "Select which video card will be used to run the game (used for all " +#~ "running games and programs in PortProton)" +#~ msgstr "" +#~ "Selecciona qué tarjeta de vídeo se utilizará para ejecutar el juego (se " +#~ "utiliza para todos los juegos y programas en ejecución en PortProton)" + +#~ msgid "Choice wine audio driver" +#~ msgstr "Controlador de audio de vino elegido" + +#~ msgid "Fixes sound popling if choice alsa" +#~ msgstr "Corrige el sonido estallido de elección alsa alsa" + +#~ msgid "Select PortProton theme" +#~ msgstr "Seleccione el tema PortProton" + +#~ msgid "Allows you to select a theme for PortProton" +#~ msgstr "Le permite seleccionar un tema para PortProton" + +#~ msgid "Select gtk theme" +#~ msgstr "Seleccione el tema gtk" + +#~ msgid "Allows you to select a theme for GTK." +#~ msgstr "Le permite seleccionar un tema para GTK." + +#~ msgid "Time display" +#~ msgstr "Mostrar tiempo" + +#~ msgid "Displays time spent in an application or game" +#~ msgstr "Muestra el tiempo transcurrido en una aplicación o juego" + +#, fuzzy +#~ msgid "Sort shortcuts by" +#~ msgstr "Ordenar accesos directos por tiempo" + +#, fuzzy +#~ msgid "This setting sorts the shortcuts in the main menu" +#~ msgstr "" +#~ "Esta configuración ordena los accesos directos en el menú principal según " +#~ "el tiempo transcurrido en la aplicación o juego" + +#~ msgid "" +#~ "Open the user.conf settings file in a system text editor to view " +#~ "and change variables manually" +#~ msgstr "" +#~ "Abre el archivo de configuración user.conf en un editor de texto " +#~ "del sistema para ver y cambiar las variables manualmente" + +#~ msgid "Do you really want to reset settings for" +#~ msgstr "¿Realmente deseas restablecer la configuración de" + +#~ msgid "Do you actually want to change the scripts version to:" +#~ msgstr "¿Realmente desea cambiar la versión de los scripts a:" + +#~ msgid "Branch changed to:" +#~ msgstr "Rama cambiada a:" + +#~ msgid "The shortcut will be created in the PortProton directory." +#~ msgstr "El acceso directo se creará en el directorio de PortProton." + #~ msgid "" #~ "This program comes with absolutely no warranty.\n" #~ "See the License for details." @@ -2193,8 +2187,8 @@ msgstr "BIBLIOTECAS DE TERCEROS" #~ msgid "" #~ "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" #~ msgstr "" -#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar." -#~ "\\n\\¿Quieres reiniciar STEAM ahora?" +#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar.\\n" +#~ "\\¿Quieres reiniciar STEAM ahora?" #~ msgid "Restarting STEAM... Please wait." #~ msgstr "Restarting STEAM... Please wait." @@ -2202,6 +2196,17 @@ msgstr "BIBLIOTECAS DE TERCEROS" #~ msgid "Please wait. downloading covers for" #~ msgstr "Por favor, espera. Descargando portadas para" +#~ msgid "" +#~ "Gamescope is not detected on the system, to install it, run the " +#~ "command in the terminal:\\nflatpak install -y runtime/org.freedesktop." +#~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be " +#~ "selected and copied)" +#~ msgstr "" +#~ "Gamescope no se detecta en el sistema, para instalarlo, ejecute el " +#~ "comando en el terminal:\\n flatpak install -y runtime/org.freedesktop." +#~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n (Se puede " +#~ "seleccionar y copiar)" + #, sh-format #~ msgid "" #~ "PortProton v. ${install_ver}\n" diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po index 38c42a6c..c92f324e 100644 --- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po @@ -7,17 +7,17 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-07 19:32+0500\n" -"PO-Revision-Date: 2025-04-07 19:33+0500\n" +"POT-Creation-Date: 2025-04-21 21:55+0500\n" +"PO-Revision-Date: 2025-04-21 21:59+0500\n" "Last-Translator: \n" "Language-Team: \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" -"X-Generator: Poedit 3.4.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"X-Generator: Poedit 3.6\n" msgid "" "A running PortProton session was detected.\\nDo you want to end the previous " @@ -119,12 +119,6 @@ msgstr "Основные настройки" msgid "Edit database file for" msgstr "Редактировать файл настроек для" -msgid "Global settings" -msgstr "Глобальные настройки" - -msgid "Settings for user.conf" -msgstr "Настройки для user.conf" - msgid "Open directory" msgstr "Открыть папку" @@ -814,6 +808,18 @@ msgstr "Выбор Vulkan драйвера для AMD" msgid "Choosing which implementation of vulkan will be used to run the game" msgstr "Выбор драйвера Vulkan для запуска игры" +msgid "NUMA node for CPU affinity" +msgstr "Узел NUMA для привязки к процессору" + +msgid "" +"In multi‑core systems, CPUs are split into NUMA nodes, each with its own " +"local memory and cores.\n" +"Binding a game to a single node reduces memory‑access latency and limits " +"costly core‑to‑core switches.)" +msgstr "" +"Каждый NUMA-узел имеет собственную память и ядра. Привязка игры к одному " +"узлу снижает задержку и повышает производительность" + msgid "EDIT DB" msgstr "НАСТРОЙКИ" @@ -1681,11 +1687,10 @@ msgid "" "Gamescope is not detected on the system, to install it, run the command in " "the terminal" msgstr "" -"Gamescope не найден в системе, для его установки выполните команду в " -"терминале" +#, fuzzy msgid "Can be selected and copied" -msgstr "Можно выделить и скопировать" +msgstr "(можно выделить и скопировать)" msgid "" "Gamescope is not detected on the system, please contact the manufacturer " @@ -1806,137 +1811,8 @@ msgstr "компактная" msgid "classic" msgstr "классическая" -msgid "light" -msgstr "светлая" - -msgid "dark" -msgstr "тёмная" - -msgid "Show in hours and minutes" -msgstr "Отображать в часах и минутах" - -msgid "Show in days, hours, minutes" -msgstr "Отображать в днях, часах и минутах" - -msgid "According to last launch" -msgstr "По данным последнего запуска" - -msgid "By time" -msgstr "По проведённому времени" - -msgid "GLOBAL SETTINGS (USER.CONF)" -msgstr "ГЛОБАЛЬНЫЕ НАСТРОЙКИ (USER.CONF)" - -msgid "Change global settings" -msgstr "Изменить глобальные настройки" - -msgid "Change mirror to" -msgstr "Сменить зеркало на" - -msgid "" -"Depending on which mirror is selected, updates will be downloaded from there." -msgstr "" -"В зависимости от того, какое выбрано зеркало, оттуда и будут загружаться " -"обновления." - -msgid "Change branch to" -msgstr "Сменить версию на" - -msgid "" -"Depending on the version of the scripts, PortProton will receive the latest " -"changes first (the DEVEL branch), the STABLE branch is updated later and is " -"stable." -msgstr "" -"В зависимости от версии скриптов, PortProton будет получать самые последнее " -"изменения раньше всех (ветка DEVEL), ветка STABLE обновляется позже и " -"является стабильной." - -msgid "Change start gui to" -msgstr "Изменить интерфейс запуска на" - -msgid "" -"When using PANED in the game start menu, additional buttons are located on " -"one large page; if NOTEBOOK, then they are divided into several." -msgstr "" -"При использовании PANED в меню запуске игры дополнительные кнопки находятся " -"на одной большой странице, если NOTEBOOK, то поделены на несколько." - -msgid "Steam covers download" -msgstr "Скачивание обложек для steam" - -msgid "" -"If downloading steam covers is enabled, they will be downloaded and created. " -"(Disablement is provided in cases where their downloading is unavailable for " -"some reason)" -msgstr "" -"Если скачивания обложек steam включено, то они будут загружаться и " -"создаваться. (Отключение предусмотрено в тех случаях, когда их скачивание по " -"каким-то причинам недоступно)" - -msgid "Choose a graphics card to run the game" -msgstr "Выбрать видеокарту для запуска игры" - -msgid "" -"Select which video card will be used to run the game (used for all running " -"games and programs in PortProton)" -msgstr "" -"Выбор видеокарты для запуска игры (используется для всех запущенных игр и " -"программ в PortProton)" - -msgid "Force dpi" -msgstr "Принудительный масштаб" - -msgid "Here you can set forced dpi for applications wine" -msgstr "Здесь вы можете установить принудительный масштаб для приложений wine" - -msgid "Choice wine audio driver" -msgstr "Выбрать звуковой драйвер" - -msgid "Fixes sound popling if choice alsa" -msgstr "Выбор alsa исправляет заикание звука" - -msgid "Select PortProton theme" -msgstr "Выбрать тему PortProton" - -msgid "Allows you to select a theme for PortProton" -msgstr "Позволяет выбрать тему для PortProton" - -msgid "Select gtk theme" -msgstr "Выбрать тему GTK" - -msgid "Allows you to select a theme for GTK." -msgstr "Позволяет выбрать светлую или тёмную тему" - -msgid "Time display" -msgstr "Отображение времени" - -msgid "Displays time spent in an application or game" -msgstr "Отображает общее время проведённое в приложении или игре" - -msgid "Sort shortcuts by" -msgstr "Сортировка ярлыков по" - -msgid "This setting sorts the shortcuts in the main menu" -msgstr "Эта настройка сортирует ярлыки в главном меню" - -msgid "" -"Open the user.conf settings file in a system text editor to view and " -"change variables manually" -msgstr "" -"Открыть файл настроек user.conf в системном текстовом редакторе, " -"чтобы просмотреть и изменить переменные вручную" - -msgid "Do you really want to reset settings for" -msgstr "Вы действительно хотите сбросить настройки для" - -msgid "Do you actually want to change the scripts version to:" -msgstr "Вы действительно хотите изменить версию скриптов на:" - -msgid "Branch changed to:" -msgstr "Версия изменена на:" - -msgid "The shortcut will be created in the PortProton directory." -msgstr "Ярлык будет создан в каталоге PortProton." +msgid "The shortcut will be changed in the PortProton directory." +msgstr "Ярлык будет изменён в каталоге PortProton." msgid "Name" msgstr "Имя" @@ -1950,9 +1826,6 @@ msgstr "Добавить ярлык на рабочий стол" msgid "Add shortcut to STEAM library" msgstr "Добавить ярлык в библиотеку STEAM" -msgid "The shortcut will be changed in the PortProton directory." -msgstr "Ярлык будет изменён в каталоге PortProton." - msgid "REMOVE SHORTCUT" msgstr "УДАЛИТЬ ЯРЛЫК" @@ -2147,6 +2020,147 @@ msgstr "ПРИСОЕДЕНИТЬСЯ" msgid "THIRD PARTY LIBRARIES" msgstr "БИБЛИОТЕКИ" +#~ msgid "Global settings" +#~ msgstr "Глобальные настройки" + +#~ msgid "Settings for user.conf" +#~ msgstr "Настройки для user.conf" + +#~ msgid "light" +#~ msgstr "светлая" + +#~ msgid "dark" +#~ msgstr "тёмная" + +#~ msgid "Show in hours and minutes" +#~ msgstr "Отображать в часах и минутах" + +#~ msgid "Show in days, hours, minutes" +#~ msgstr "Отображать в днях, часах и минутах" + +#~ msgid "According to last launch" +#~ msgstr "По данным последнего запуска" + +#~ msgid "By time" +#~ msgstr "По проведённому времени" + +#~ msgid "GLOBAL SETTINGS (USER.CONF)" +#~ msgstr "ГЛОБАЛЬНЫЕ НАСТРОЙКИ (USER.CONF)" + +#~ msgid "Change global settings" +#~ msgstr "Изменить глобальные настройки" + +#~ msgid "Change mirror to" +#~ msgstr "Сменить зеркало на" + +#~ msgid "" +#~ "Depending on which mirror is selected, updates will be downloaded from " +#~ "there." +#~ msgstr "" +#~ "В зависимости от того, какое выбрано зеркало, оттуда и будут загружаться " +#~ "обновления." + +#~ msgid "Change branch to" +#~ msgstr "Сменить версию на" + +#~ msgid "" +#~ "Depending on the version of the scripts, PortProton will receive the " +#~ "latest changes first (the DEVEL branch), the STABLE branch is updated " +#~ "later and is stable." +#~ msgstr "" +#~ "В зависимости от версии скриптов, PortProton будет получать самые " +#~ "последнее изменения раньше всех (ветка DEVEL), ветка STABLE обновляется " +#~ "позже и является стабильной." + +#~ msgid "Change start gui to" +#~ msgstr "Изменить интерфейс запуска на" + +#~ msgid "" +#~ "When using PANED in the game start menu, additional buttons are located " +#~ "on one large page; if NOTEBOOK, then they are divided into several." +#~ msgstr "" +#~ "При использовании PANED в меню запуске игры дополнительные кнопки " +#~ "находятся на одной большой странице, если NOTEBOOK, то поделены на " +#~ "несколько." + +#~ msgid "Steam covers download" +#~ msgstr "Скачивание обложек для steam" + +#~ msgid "" +#~ "If downloading steam covers is enabled, they will be downloaded and " +#~ "created. (Disablement is provided in cases where their downloading is " +#~ "unavailable for some reason)" +#~ msgstr "" +#~ "Если скачивания обложек steam включено, то они будут загружаться и " +#~ "создаваться. (Отключение предусмотрено в тех случаях, когда их скачивание " +#~ "по каким-то причинам недоступно)" + +#~ msgid "Choose a graphics card to run the game" +#~ msgstr "Выбрать видеокарту для запуска игры" + +#~ msgid "" +#~ "Select which video card will be used to run the game (used for all " +#~ "running games and programs in PortProton)" +#~ msgstr "" +#~ "Выбор видеокарты для запуска игры (используется для всех запущенных игр и " +#~ "программ в PortProton)" + +#~ msgid "Force dpi" +#~ msgstr "Принудительный масштаб" + +#~ msgid "Here you can set forced dpi for applications wine" +#~ msgstr "" +#~ "Здесь вы можете установить принудительный масштаб для приложений wine" + +#~ msgid "Choice wine audio driver" +#~ msgstr "Выбрать звуковой драйвер" + +#~ msgid "Fixes sound popling if choice alsa" +#~ msgstr "Выбор alsa исправляет заикание звука" + +#~ msgid "Select PortProton theme" +#~ msgstr "Выбрать тему PortProton" + +#~ msgid "Allows you to select a theme for PortProton" +#~ msgstr "Позволяет выбрать тему для PortProton" + +#~ msgid "Select gtk theme" +#~ msgstr "Выбрать тему GTK" + +#~ msgid "Allows you to select a theme for GTK." +#~ msgstr "Позволяет выбрать светлую или тёмную тему" + +#~ msgid "Time display" +#~ msgstr "Отображение времени" + +#~ msgid "Displays time spent in an application or game" +#~ msgstr "Отображает общее время проведённое в приложении или игре" + +#~ msgid "Sort shortcuts by" +#~ msgstr "Сортировка ярлыков по" + +#~ msgid "This setting sorts the shortcuts in the main menu" +#~ msgstr "Эта настройка сортирует ярлыки в главном меню" + +#~ msgid "" +#~ "Open the user.conf settings file in a system text editor to view " +#~ "and change variables manually" +#~ msgstr "" +#~ "Открыть файл настроек user.conf в системном текстовом редакторе, " +#~ "чтобы просмотреть и изменить переменные вручную" + +#~ msgid "Do you really want to reset settings for" +#~ msgstr "Вы действительно хотите сбросить настройки для" + +#~ msgid "Do you actually want to change the scripts version to:" +#~ msgstr "Вы действительно хотите изменить версию скриптов на:" + +#~ msgid "Branch changed to:" +#~ msgstr "Версия изменена на:" + +#~ msgid "The shortcut will be created in the PortProton directory." +#~ msgstr "Ярлык будет создан в каталоге PortProton." + #~ msgid "" #~ "This program comes with absolutely no warranty.\n" #~ "See the License for details." @@ -2181,6 +2195,17 @@ msgstr "БИБЛИОТЕКИ" #~ msgid "Please wait. downloading covers for" #~ msgstr "Пожалуйста, подождите. Загрузка обложек для" +#~ msgid "" +#~ "Gamescope is not detected on the system, to install it, run the " +#~ "command in the terminal:\\nflatpak install -y runtime/org.freedesktop." +#~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be " +#~ "selected and copied)" +#~ msgstr "" +#~ "Gamescope не найден в системе, для его установки выполните команду в " +#~ "терминале:\\nflatpak install -y runtime/org.freedesktop.Platform." +#~ "VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Данный текст можно " +#~ "выделить и скопировать)" + #, sh-format #~ msgid "" #~ "PortProton v. ${install_ver}\n" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d216ab84..f4b7950f 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -4326,11 +4326,12 @@ pw_run () { check_variables SteamAppId "0" check_variables SteamGameId "0" + PW_LOG_TO_FILE="${PORT_WINE_PATH}/PortProton.log" PW_LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}:${WINE_LIBRARY_PATH}" print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME" print_var "WINELOADER" "VKD3D_CONFIG" "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" - print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH" "PW_VK_ICD_FILENAMES" + print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH" "PW_VK_ICD_FILENAMES" "PW_TASKSET_SLR" proxy_launch_parameters=${LAUNCH_PARAMETERS//\\\\/\\} if [[ "$PW_USE_RUNTIME" == 1 ]] \ && [[ "$PW_WINE_USE" != "USE_SYSTEM_WINE" ]] @@ -4345,7 +4346,8 @@ pw_run () { print_info "Log from RUNTIME and WINE:" ${PW_RUN_GAMESCOPE} \ ${PW_POWERPROFILECTL_SLR} \ - ${PW_INHIBIT_SLR}\ + ${PW_INHIBIT_SLR} \ + ${PW_TASKSET_SLR} \ ${pw_runtime} \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ LD_PRELOAD="${PW_LD_PRELOAD}" \ @@ -4364,7 +4366,8 @@ pw_run () { echo "Log WINE:" > "${PW_LOG_TO_FILE}" ${PW_RUN_GAMESCOPE} \ ${PW_POWERPROFILECTL_SLR} \ - ${PW_INHIBIT_SLR}\ + ${PW_INHIBIT_SLR} \ + ${PW_TASKSET_SLR} \ ${pw_runtime} \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ LD_PRELOAD="${PW_LD_PRELOAD}" \ @@ -4400,7 +4403,8 @@ pw_run () { ${PW_POWERPROFILECTL_SLR} \ ${PW_MANGOHUD_SLR} \ ${PW_DISPLAY} \ - ${PW_INHIBIT_SLR}\ + ${PW_INHIBIT_SLR} \ + ${PW_TASKSET_SLR} \ "${WINELOADER}" "$@" ${proxy_launch_parameters} &>>"${PW_LOG_TO_FILE}" wait_wineserver else @@ -4419,7 +4423,8 @@ pw_run () { ${PW_POWERPROFILECTL_SLR} \ ${PW_MANGOHUD_SLR} \ ${PW_DISPLAY} \ - ${PW_INHIBIT_SLR}\ + ${PW_INHIBIT_SLR} \ + ${PW_TASKSET_SLR} \ "${WINELOADER}" "$@" ${proxy_launch_parameters} wait_wineserver fi @@ -5202,6 +5207,23 @@ gui_edit_db () { CPU_LIMIT_VAR="disabled" fi + declare -A NODE_MAP + NUMA_NODE_LIST="" + INDEX=0 + while read -r line; do + NODE_MAP[$INDEX]="$line" + NUMA_NODE_LIST+="$INDEX " + ((INDEX++)) + done < <( lscpu | grep -Po "NUMA node\d+ CPU\(s\):\s+\K.*" ) + # удаляем последний пробел, чтобы в combobox не было «0 » + NUMA_NODE_LIST="${NUMA_NODE_LIST% }" + + if [[ -n "${PW_CPU_NUMA_NODE_INDEX}" ]] && [[ "${PW_CPU_NUMA_NODE_INDEX}" != "disabled" ]]; then + NUMA_NODE_INDEX="${PW_CPU_NUMA_NODE_INDEX}" + else + NUMA_NODE_INDEX="disabled" + fi + if [[ -n "${PW_AMD_VULKAN_USE}" ]] && \ [[ "${PW_AMD_VULKAN_USE}" != "disabled" ]] ; then AMD_VULKAN_VAR="${PW_AMD_VULKAN_USE}" @@ -5233,6 +5255,8 @@ immediate - Unlimited frame rate + tearing. mailbox - Triple buffering. Unlimited frame rate + no tearing. relaxed - Same as fifo but allows tearing when below the monitors refresh rate.]} :CB" "$(combobox_fix --disabled "${PW_MESA_VK_WSI_PRESENT_MODE}" "fifo!immediate!mailbox!relaxed")" \ --field="${translations[Select needed AMD vulkan implementation]}!${translations[Choosing which implementation of vulkan will be used to run the game]} $AMD_VULKAN_CB" "$(combobox_fix --disabled "$AMD_VULKAN_VAR" "$AMD_VULKAN_DRIVER_LIST")" \ + --field="${translations[NUMA node for CPU affinity]}!${translations[In multi‑core systems, CPUs are split into NUMA nodes, each with its own local memory and cores. +Binding a game to a single node reduces memory‑access latency and limits costly core‑to‑core switches.)]} :CB" "$(combobox_fix --disabled "${NUMA_NODE_INDEX}" "${NUMA_NODE_LIST}")" \ 1> "$PW_TMPFS_PATH/tmp_output_yad_fps_limit" 2>/dev/null & "${pw_yad}" --notebook --key="$KEY_EDIT_DB_GUI" --title "${translations[EDIT DB]}" --text-align=center \ @@ -5283,6 +5307,17 @@ relaxed - Same as fifo but allows tearing when below the monitors refresh rate.] PW_LOCALE_SELECT="${PW_ADD_SETTINGS[7]}" PW_MESA_VK_WSI_PRESENT_MODE="${PW_ADD_SETTINGS[8]}" PW_AMD_VULKAN_USE="${PW_ADD_SETTINGS[9]}" + NUMA_NODE_INDEX="${PW_ADD_SETTINGS[10]//[[:space:]]/}" + + if [[ "$NUMA_NODE_INDEX" =~ ^[0-9]+$ ]] && [[ -v NODE_MAP[$NUMA_NODE_INDEX] ]]; then + NUMA_CORES="${NODE_MAP[$NUMA_NODE_INDEX]}" + PW_CPU_NUMA_NODE_INDEX="$NUMA_NODE_INDEX" + PW_TASKSET_SLR="taskset -c $NUMA_CORES" + else + PW_CPU_NUMA_NODE_INDEX="disabled" + PW_TASKSET_SLR="" + fi + export PW_CPU_NUMA_NODE_INDEX PW_TASKSET_SLR if [[ "${CPU_LIMIT}" =~ ^[0-9]+$ ]] ; then PW_WINE_CPU_TOPOLOGY="${CPU_LIMIT}:$(seq -s, 0 $(( CPU_LIMIT - 1 )))" @@ -5292,7 +5327,7 @@ relaxed - Same as fifo but allows tearing when below the monitors refresh rate.] export PW_WINE_CPU_TOPOLOGY edit_db_from_gui "${PW_EDIT_DB_LIST[@]}" LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES PW_WINE_CPU_TOPOLOGY \ - PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PW_LOCALE_SELECT PW_MESA_VK_WSI_PRESENT_MODE PW_AMD_VULKAN_USE + PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PW_LOCALE_SELECT PW_MESA_VK_WSI_PRESENT_MODE PW_AMD_VULKAN_USE PW_CPU_NUMA_NODE_INDEX PW_TASKSET_SLR if [[ -z "$MANGOHUD_CONFIG" ]] ; then MONITOR_HEIGHT="$(echo "$PW_SCREEN_RESOLUTION" | awk -F'x' '{print $2}')" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 7f52de59..5733e8ee 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -103,7 +103,7 @@ unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_T unset PW_PREFIX_NAME VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR PW_WINE_CPU_TOPOLOGY unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT -unset PW_TERM PW_EXEC_FROM_DESKTOP WEBKIT_DISABLE_DMABUF_RENDERER PW_AMD_VULKAN_USE PW_VK_ICD_FILENAMES LAUNCH_URI PW_USE_SETUP_FILE +unset PW_TERM PW_EXEC_FROM_DESKTOP WEBKIT_DISABLE_DMABUF_RENDERER PW_AMD_VULKAN_USE PW_VK_ICD_FILENAMES LAUNCH_URI PW_USE_SETUP_FILE PW_CPU_NUMA_NODE_INDEX PW_TASKSET_SLR export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}* From 2cb6436712bf5d40e01f8fbed20818795c77018d Mon Sep 17 00:00:00 2001 From: Boris Yumankulov Date: Thu, 24 Apr 2025 11:00:49 +0500 Subject: [PATCH 06/34] Added Blackwell (RTX50) pci to check_nvidia_rtx --- data_from_portwine/scripts/functions_helper | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d216ab84..c078d148 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2301,6 +2301,8 @@ check_nvidia_rtx () { [[ "$LSPCI_VGA" == *GA[0-9]* ]] && return 0 # Ada_Lovelace [[ "$LSPCI_VGA" == *AD[0-9]* ]] || [[ "$LSPCI_VGA" == *2[6-8][0-9]* ]] && return 0 + # Blackwell and Blackwell 2.0 + [[ "$LSPCI_VGA" == *GB[0-9]* ]] && return 0 fi return 1 } @@ -2753,6 +2755,7 @@ pw_skip_get_info () { export LSPCI_VGA fi + # TODO: Add NVIDIA Smooth Motion if check_nvidia_rtx ; then check_variables PW_USE_NVAPI_AND_DLSS "1" check_variables PW_USE_FAKE_DLSS "0" From c267c6e7dc0da8a2462d0d8963d72046bc2cdd4d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 1 May 2025 12:41:37 +0300 Subject: [PATCH 07/34] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=8D=D0=BC=D1=83=D0=BB=D1=8F=D1=82=D0=BE=D1=80?= =?UTF-8?q?=20melonDS.=20=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= =?UTF-8?q?=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=B5=D1=84=D0=B8=D0=BA=D1=81=D0=B5?= =?UTF-8?q?=20DEFAULT:=20=D0=B8=D0=B3=D1=80=D1=8B=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D0=BA=D0=B0=D0=B5=D1=82,=20=D0=B3=D0=B5=D0=B9?= =?UTF-8?q?=D0=BC=D0=BF=D0=B0=D0=B4=20=D0=B8=20=D0=BA=D0=BB=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=B0=D1=82=D1=83=D1=80=D1=83=20=D0=B2=D0=B8=D0=B4=D0=B8?= =?UTF-8?q?=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлена мини-опечатка в автоустановке ePSXe в имени директории. --- data_from_portwine/img/gui/melonds.png | Bin 0 -> 3679 bytes .../scripts/pw_autoinstall/PW_EPSXE | 4 +-- .../scripts/pw_autoinstall/PW_MELONDS | 23 ++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 data_from_portwine/img/gui/melonds.png create mode 100644 data_from_portwine/scripts/pw_autoinstall/PW_MELONDS diff --git a/data_from_portwine/img/gui/melonds.png b/data_from_portwine/img/gui/melonds.png new file mode 100644 index 0000000000000000000000000000000000000000..d2850dc9f62879085ac4e6fa7ce9bd28a9c3d2c9 GIT binary patch literal 3679 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 Date: Fri, 2 May 2025 09:46:03 +0300 Subject: [PATCH 08/34] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=8D=D0=BC=D1=83=D0=BB=D1=8F=D1=82=D0=BE=D1=80?= =?UTF-8?q?=20Azahar.=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D0=B0=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=20PPSSPP=20(1.16.5=20->=201.18.1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_from_portwine/img/gui/azahar.png | Bin 0 -> 3564 bytes .../scripts/pw_autoinstall/PW_AZAHAR | 24 ++++++++++++++++++ .../scripts/pw_autoinstall/PW_PPSSPP | 4 +-- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 data_from_portwine/img/gui/azahar.png create mode 100644 data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR diff --git a/data_from_portwine/img/gui/azahar.png b/data_from_portwine/img/gui/azahar.png new file mode 100644 index 0000000000000000000000000000000000000000..94c60c521445a1e51574838f9b9f8cfd492d5131 GIT binary patch literal 3564 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 m>$(vR%)|G?#lQbpC4UD2YBpU;1DPr literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR b/data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR new file mode 100644 index 00000000..e0782d25 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# Author: if984 (Maksim K.) +# type: emulators +# name: Azahar +# image: azahar +# info_en: An open source Nintendo 3DS emulator based on Citra, designed to run games with support for enhanced resolutions and advanced emulation settings. +# info_ru: Эмулятор Nintendo 3DS с открытым исходным кодом на основе Citra, созданный для запуска игр с поддержкой улучшенного разрешения и расширенных настроек эмуляции. +########################################################################## +# export LAUNCH_PARAMETERS="/VERYSILENT" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/azahar-2120.3-windows-msys2-installer.exe" +start_portwine +if try_download "https://github.com/azahar-emu/azahar/releases/download/2120.3/azahar-2120.3-windows-msys2-installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror +then + pw_start_progress_bar_install_game "Azahar." + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files/Azahar/azahar.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + try_remove_file "${portwine_exe}.ppdb" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="Azahar" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP index 99e1e894..e3d82980 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP @@ -9,7 +9,7 @@ export LAUNCH_PARAMETERS="/VERYSILENT" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PPSSPPSetup.exe" start_portwine -if try_download "https://ppsspp.org/files/1_16_5/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror +if try_download "https://ppsspp.org/files/1_18_1/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_install_game "PPSSPP." pw_run "${PW_AUTOINSTALL_EXE}" @@ -18,7 +18,7 @@ then try_remove_file "${portwine_exe}.ppdb" kill_portwine pw_stop_progress_bar - export PORTWINE_CREATE_SHORTCUT_NAME="PPSSPPWindows" + export PORTWINE_CREATE_SHORTCUT_NAME="PPSSPP" portwine_create_shortcut fi stop_portwine From 7bce089c7871386f8f1ea828e5fb991437863954 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 3 May 2025 12:49:36 +0300 Subject: [PATCH 09/34] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=8D=D0=BC=D1=83=D0=BB=D1=8F=D1=82=D0=BE=D1=80?= =?UTF-8?q?=20bsnes.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=B2=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B5=20=D0=B0?= =?UTF-8?q?=D0=B2=D1=82=D0=BE=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20FCEUX.=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D0=B0?= =?UTF-8?q?=D0=B2=D1=82=D0=BE=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20RetroArch=20-=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D1=8C=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D0=B0=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D1=8E=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20=D1=8D=D0=BC=D1=83=D0=BB?= =?UTF-8?q?=D1=8F=D1=82=D0=BE=D1=80=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_from_portwine/img/gui/bsnes.png | Bin 0 -> 1539 bytes .../scripts/pw_autoinstall/PW_BSNES | 23 ++++++++++++++++++ .../scripts/pw_autoinstall/PW_FCEUX | 2 +- .../scripts/pw_autoinstall/PW_RETROARCH | 4 ++- 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 data_from_portwine/img/gui/bsnes.png create mode 100644 data_from_portwine/scripts/pw_autoinstall/PW_BSNES diff --git a/data_from_portwine/img/gui/bsnes.png b/data_from_portwine/img/gui/bsnes.png new file mode 100644 index 0000000000000000000000000000000000000000..c2639b9c42f62acf464accd4864bb11e3ea1f679 GIT binary patch literal 1539 zcmV+e2K@PnP)XI)!^xxe7>&l2jop zLMKAAdNg#^Nn0GbhGI+x(z|trpJBTgR!ah-K41sDU_cU}dGczh&sjE~s*{srQal8a z4NTjqGZXN(xKwEl(BfGn1)8PF)VPxOjr++6$7T z#!v7vFR2?P??{MbAeZ4mlj1tfhKtiI7?+!8B)Ka}-jNWxgr@D(DUMHvB$$IAAz=b+ zj&CQz(qHSOH$1~&g#H4K&$6iE0n`U^n3sWt(HI6Jv;h&8nH1mj0)E>&v@L4vPN7cYd!>#44N?j z(3+a*zzX1MR4+!v0Xk9r5|NLksp-gYniw#>UKbgM=OoE;&6R#%lHli9_xn9k51^Hm zE|Vrb3~a=h*&_y7`voMk5R6z?&Dk5MESo;;KtEH*wXNWitjD%Bla?*IL)g0eTk;0S&pzJ-7 zIL@tDTUa~<&wL+@S&ZsiT3tOORs#UX)=3x2Ce`8f9jFJjSXH)hhxnA2Z@`#a@I&-u z--krv3LNM0KFXM}MH4gT&}I@WQE$L~32NW=@=Vvg@~Ey{IgM=g8$@Om9r?n@;5gO8 zKlULe)5`*2A{WDuH5=8e|Lwpb8>2fq^f%k0ejxG93UPD78v)xDc1sc-&4q zFVMqgYJ(`TbZU+t5DsJc$oJUu$NkbdL_k?zYn+PXI7K^9Ap@$jgs)hOOFe>vS2}JO z3@`yW&9hXp5kc9l&P+%iy+bku^DkdM8P_exn2S)o7FdJG!caz3{}lG~6E1Tji63af zat5FIEa7kz3azZ1NO}1~7_$|aRMLb9SbNX_6$P4Ji0pup!lf)Kg|xSyk>=*@`2KA` zcgg=l1Vr{4pn)V~Yp8+j&v5x^3@m}JmX?o!4NzjiuIgd!8wS`)hF5VRw2=gX_zYj* zu%3C0VkJ}>(%ASW*6zU+m}eaatbLz!x~X5T@HKa0cmzuoDGW+*!l0aMr9x2ehM<*N ze!bX*XW?id{qvOv2=V@9#@Tbrx?aWT9v0&=?W>_s?w&) zO<{A!zoiU}%mP*tobg-^q=88UZCeR;8{NQRU?1=yuup_ACriM;WMClrmJ#OxQwg@F pKJYitEmC;-F^+MJV;uhv`~#9$=H6VmfVcnv002ovPDHLkV1hVI(iQ*! literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BSNES b/data_from_portwine/scripts/pw_autoinstall/PW_BSNES new file mode 100644 index 00000000..3b560312 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BSNES @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# Author: if984 (Maksim K.) +# type: emulators +# name: bsnes +# image: bsnes +# info_en: An open source Super Nintendo Entertainment System (SNES) emulator that focuses on performance, accuracy, user-friendly interface, and special features. +# info_ru: Эмулятор Super Nintendo Entertainment System (SNES) с открытым исходным кодом, который фокусируется на производительности, точности, удобном пользовательском интерфейсе и специальных функциях. +######################################################################## +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/bsnes-windows.zip" +start_portwine +if try_download "https://github.com/bsnes-emu/bsnes/releases/download/nightly/bsnes-windows.zip" "${PW_AUTOINSTALL_EXE}" no_mirror +then + pw_start_progress_bar_install_game "bsnes." + "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files" + portwine_exe="$WINEPREFIX/drive_c/Program Files/bsnes-nightly/bsnes.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + try_remove_file "${portwine_exe}.ppdb" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="bsnes" + portwine_create_shortcut +fi +stop_portwine \ No newline at end of file diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX index 42c678e0..7f1790c2 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX +++ b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX @@ -6,7 +6,7 @@ # info_en: An emulator for the Nintendo Entertainment System (NES) that allows players to enjoy classic NES games on modern devices with high compatibility and various enhancements. The emulator includes tools for game development, testing, and recording. # info_ru: Эмулятор Nintendo Entertainment System (NES), который позволяет игрокам наслаждаться классическими играми для NES на современных устройствах с высокой совместимостью и различными улучшениями. Эмулятор включает инструменты для разработки, тестирования и записи игр. ######################################################################## -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/fceux-2.6.5-win64.zip" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/fceux-2.6.6-win64.zip" start_portwine if try_download "https://github.com/TASEmulators/fceux/releases/download/v2.6.6/fceux-2.6.6-win64.zip" "${PW_AUTOINSTALL_EXE}" no_mirror then diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH index e7b821d8..224c53c2 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH @@ -6,9 +6,11 @@ # info_en: An interface for emulators that supports many game consoles and platforms, allowing users to run old games on modern devices. It offers a user-friendly interface, a rich library of emulation cores, and features for performance and graphics customization. # info_ru: Интерфейс для эмуляторов, который поддерживает множество игровых консолей и платформ, позволяя пользователям запускать старые игры на современных устройствах. Он предлагает удобный интерфейс, богатую библиотеку ядер эмуляции и функции для настройки производительности и графики. ######################################################################## +export PW_RETROARCH_VERSION=$(curl -s "https://buildbot.libretro.com/stable/" | grep -oP 'href="/stable/\K[0-9.]+(?=/")' | sort -V | tail -n1) + export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/RetroArch.7z" start_portwine -if try_download "https://buildbot.libretro.com/stable/1.16.0/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" no_mirror +if try_download "https://buildbot.libretro.com/stable/$PW_RETROARCH_VERSION/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_install_game "RetroArch." "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)" From 0b3f630b6702304076c43bbdade38c9515d12511 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 5 May 2025 16:07:23 +0300 Subject: [PATCH 10/34] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20?= =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B8=20Crossout.=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B0?= =?UTF-8?q?=20LGC=20=D0=B2=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=90=D0=92=D0=A2?= =?UTF-8?q?=D0=9E=D0=A3=D0=A1=D0=A2=D0=90=D0=9D=D0=9E=D0=92=D0=9A=D0=90.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_from_portwine/img/gui/lgc.png | Bin 5314 -> 685 bytes .../scripts/pw_autoinstall/PW_CROSSOUT | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data_from_portwine/img/gui/lgc.png b/data_from_portwine/img/gui/lgc.png index 367e5c698b52d05c0d964b26fb6645b94352469c..81244bdc4a7eb6332555980df1934e50372f8096 100644 GIT binary patch delta 662 zcmV;H0%`riDXj&NBYy&PNklVyWoFfY>eZ zCsIW63RTCd571VQsDv2$1bGG+Nf-)kvnCna<{W+uNf04TlRMkG>sPuZx}W{|D8AF# zcQBg@unT+#t^skRT}_yFCyX~{8#r|Uc3C@}u+HQqaOnWts(F!a(5FSD_}tvrjHa7z%t4q3VQ03W2vyNTd|7 zFOh+OMG2p*k^qn2z-A0V>F>|O;gBebI5;@ax?HVRV}E~tpCGt>#h;zPG`~mlH}UOAO_x!U9 z@CE{flJMlC5R_ejHxRhtg~lShiGWk^=>!~rHy3aO-b}zDczprK;PnK`<+2wmd@++BH%8-^h}J3DM`ZPDxXZtbg-;^N|hR;xuE$8&2iW14@D+gv#SJ8jo2IBxR?>mGm;9S_4or2qf`07*qoM6N<$f@e`Yg#Z8m literal 5314 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 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT index 31d84eb2..121535d8 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT @@ -10,6 +10,7 @@ export LAUNCH_PARAMETERS="/VERYSILENT" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/crossout.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Crossout" export PW_PREFIX_NAME="CROSSOUT" +export PW_WINE_USE="WINE_LG" start_portwine if try_download "https://yupmaster.gaijinent.com/launcher/current.php?id=CrossoutLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror @@ -18,7 +19,7 @@ then get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'Decorated' 'REG_SZ' "N" "user" pw_kill_autostart launcher.exe 3 & pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Crossout/launcher.exe" + portwine_exe="${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Crossout Launcher/launcher.exe" pw_create_unique_exe "crossout_launcher_pp" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" From 003ecde8400467ce53772d5dc1bb1fd4037ca3cc Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 7 May 2025 12:01:24 +0300 Subject: [PATCH 11/34] dropped hack for Genshin --- .../scripts/portwine_db/Genshin Impact.ppdb | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb b/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb index 212f07c4..409bfbd6 100644 --- a/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb +++ b/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb @@ -9,21 +9,4 @@ export PW_WINDOWS_VER="10" export PW_VULKAN_USE="2" export PW_PREFIX_NAME="HO_YO_PLAY" export PW_WINE_USE="WINE_LG" -add_in_start_portwine() { - genshin_hack() { - if command -v nmcli &>/dev/null ; then - while true ; do - if pgrep -i genshinimp ; then - nmcli networking off - sleep 10 - nmcli networking on - break - else - sleep 0.5 - fi - done - fi - } - genshin_hack & -} - +export LAUNCH_PARAMETERS="-platform_type CLOUD_THIRD_PARTY_PC" From abef968fdee97f656313eba80a93bcbc2135ddd9 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 7 May 2025 12:03:58 +0300 Subject: [PATCH 12/34] updated GOG installer --- data_from_portwine/scripts/pw_autoinstall/PW_GOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG index cbf4b29e..6d845eb5 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -19,7 +19,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="GOG GALAXY" start_portwine -if try_download "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" no_mirror +if try_download "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_install_game "GOG Galaxy." pw_run "${PW_AUTOINSTALL_EXE}" From c8e84d9a5413d116947f764eb4907d58d872b10a Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 7 May 2025 12:52:26 +0300 Subject: [PATCH 13/34] updated WINE_LG to 10-7 --- data_from_portwine/scripts/var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index dc6bac6d..c5d77b88 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -49,7 +49,7 @@ export PW_FAKE_DLSS_3_VER="0.9.1-plus" export PW_GALLIUM_NINE_VER="0.10" ###WINE_AND_PROTON_LG### export PW_PROTON_LG_VER="PROTON_LG_9-27" -export PW_WINE_LG_VER="WINE_LG_10-5" +export PW_WINE_LG_VER="WINE_LG_10-7" export PW_WINE_FULLSCREEN_FSR="1" export WINE_FULLSCREEN_FSR_MODE="ultra" ###DXVK_AND_VKD3D### From 6beaa71599d64cf05039b95fc46dae592e828f1f Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 7 May 2025 14:11:48 +0300 Subject: [PATCH 14/34] Scripts version 2414 --- data_from_portwine/changelog_en | 9 +++++++++ data_from_portwine/changelog_ru | 9 +++++++++ data_from_portwine/scripts/var | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index c2337f7e..b6fb2fbc 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,15 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2414### / Date: 07.05.2025 / Download update size: 184 megabytes +* updated WINE_LG to version "10-7" +* removed the fix for entering the game "Genshin Impact" (no longer required) +* updated the installation of GOG Launcher (thanks to Vekt0R) +* added detection of NVIDIA RTX 50XX video cards (thanks to Boria138) +* added a setting for binding the game to the cores of one NUMA node, for example, on Intel Xeon (thanks to Boria138) +* added scripts for installing windows emulators Azahar, bsnes, melonDS (thanks to if984) +* updated scripts for installing Crossout, PPSSPP, RetroArch, ePSXe, FCEUX (thanks to if984) + ###Scripts version 2413### / Date: 19.04.2025 / Download update size: 4 megabytes * fixed the start of the game "World of Sea Battle" * fixed errors related to libraries "ICU* .DLL" diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 21fba830..83ff4019 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,15 @@ ----------------------------------------- История изменений: +###Scripts version 2414### / Дата: 07.05.2025 / Размер скачиваемого обновления: 184 мегабайта +* обновлен WINE_LG до версии "10-7" +* удален фикс входа в игру "Genshin Impact" (более не требуется) +* обновлена установка GOG Launcher (спасибо Vekt0R) +* добавлено определение видеокарт NVIDIA RTX 50XX (спасибо Boria138) +* добавлена настройка привязки игры к ядрам одного NUMA-узла например на Intel Xeon (спасибо Boria138) +* добавлены скрипты для установки windows эмуляторов Azahar, bsnes, melonDS (спасибо if984) +* обновлены скрипты для установки Crossout, PPSSPP, RetroArch, ePSXe, FCEUX (спасибо if984) + ###Scripts version 2413### / Дата: 19.04.2025 / Размер скачиваемого обновления: 4 мегабайта * исправлен запуск игры "World of Sea Battle" * исправлены ошибки связанные с библиотеками "icu*.dll" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index c5d77b88..7bde85b3 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2413 +#SCRIPTS_NEXT_VERSION=2414 #SCRIPTS_STABLE_VERSION=2411 ######################################################################## 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" From 4a0ea39d0a4b31f2ba1e36cfbe09587dd52c31e0 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 7 May 2025 14:23:59 +0300 Subject: [PATCH 15/34] fixed run winetricks from DB settings --- data_from_portwine/scripts/functions_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index e7242984..909efe6f 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -4095,7 +4095,7 @@ start_portwine () { echo "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" >> "${PW_TMPFS_PATH}/update_pfx_log" print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" ${pw_runtime} LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \ - "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} | tee -a "${PW_TMPFS_PATH}/update_pfx_log" + "${PORT_WINE_TMP_PATH}/winetricks" -q -f ${PW_DLL_NEED_INSTALL} | tee -a "${PW_TMPFS_PATH}/update_pfx_log" wait_wineserver kill_portwine fi From a81fdc489518cd922104e072d6fa63ccf2b3dcf1 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 7 May 2025 14:28:04 +0300 Subject: [PATCH 16/34] Scripts version 2415 --- data_from_portwine/changelog_en | 3 +++ data_from_portwine/changelog_ru | 3 +++ data_from_portwine/scripts/var | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index b6fb2fbc..30c78216 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2415### / Date: 07.05.2025 / Download update size: 4 megabytes +* fixed installation of libraries added to the settings when starting the game + ###Scripts version 2414### / Date: 07.05.2025 / Download update size: 184 megabytes * updated WINE_LG to version "10-7" * removed the fix for entering the game "Genshin Impact" (no longer required) diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 83ff4019..12f6f242 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2415### / Дата: 07.05.2025 / Размер скачиваемого обновления: 4 мегабайта +* исправлена установка библиотек добавленных в настройки при запуске игры + ###Scripts version 2414### / Дата: 07.05.2025 / Размер скачиваемого обновления: 184 мегабайта * обновлен WINE_LG до версии "10-7" * удален фикс входа в игру "Genshin Impact" (более не требуется) diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 7bde85b3..663a82e6 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2414 +#SCRIPTS_NEXT_VERSION=2415 #SCRIPTS_STABLE_VERSION=2411 ######################################################################## 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" From f5616598b9910ef0a55cabcd99ca2f572957549d Mon Sep 17 00:00:00 2001 From: Htylol Date: Fri, 9 May 2025 02:08:38 +0500 Subject: [PATCH 17/34] Fixed generate_pot after adding Numa node --- data_from_portwine/locales/PortProton.pot | 124 +++++++- .../locales/es/LC_MESSAGES/PortProton.po | 280 +++++++++-------- .../locales/ru/LC_MESSAGES/PortProton.po | 283 +++++++++--------- data_from_portwine/scripts/functions_helper | 5 +- 4 files changed, 409 insertions(+), 283 deletions(-) diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot index bbb2ee51..dba19d79 100644 --- a/data_from_portwine/locales/PortProton.pot +++ b/data_from_portwine/locales/PortProton.pot @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2025-04-21 21:55+0500\n" + "POT-Creation-Date: 2025-05-09 02:05+0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -316,9 +316,6 @@ msgstr "" msgid "UPDATING NOW" msgstr "" -msgid "EXIT" -msgstr "" - msgid "Searching for .exe files... Please wait." msgstr "" @@ -348,6 +345,9 @@ msgid "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the " "missing package: d3dadapter9" msgstr "" +msgid "EXIT" +msgstr "" + msgid "You will need to check internet connection,and\\npress Repeat for " "repeat download" msgstr "" @@ -1404,7 +1404,118 @@ msgstr "" msgid "classic" msgstr "" -msgid "The shortcut will be changed in the PortProton directory." +msgid "light" +msgstr "" + +msgid "dark" +msgstr "" + +msgid "Show in hours and minutes" +msgstr "" + +msgid "Show in days, hours, minutes" +msgstr "" + +msgid "According to last launch" +msgstr "" + +msgid "By time" +msgstr "" + +msgid "GLOBAL SETTINGS (USER.CONF)" +msgstr "" + +msgid "Change global settings" +msgstr "" + +msgid "Change mirror to" +msgstr "" + +msgid "Depending on which mirror is selected, updates will be downloaded " + "from there." +msgstr "" + +msgid "Change branch to" +msgstr "" + +msgid "Depending on the version of the scripts, PortProton will receive the " + "latest changes first (the DEVEL branch), the STABLE branch is " + "updated later and is stable." +msgstr "" + +msgid "Change start gui to" +msgstr "" + +msgid "When using PANED in the game start menu, additional buttons are " + "located on one large page; if NOTEBOOK, then they are divided into " + "several." +msgstr "" + +msgid "Steam covers download" +msgstr "" + +msgid "If downloading steam covers is enabled, they will be downloaded and " + "created. (Disablement is provided in cases where their downloading " + "is unavailable for some reason)" +msgstr "" + +msgid "Choose a graphics card to run the game" +msgstr "" + +msgid "Select which video card will be used to run the game (used for all " + "running games and programs in PortProton)" +msgstr "" + +msgid "Force dpi" +msgstr "" + +msgid "Here you can set forced dpi for applications wine" +msgstr "" + +msgid "Choice wine audio driver" +msgstr "" + +msgid "Fixes sound popling if choice alsa" +msgstr "" + +msgid "Select PortProton theme" +msgstr "" + +msgid "Allows you to select a theme for PortProton" +msgstr "" + +msgid "Select gtk theme" +msgstr "" + +msgid "Allows you to select a theme for GTK." +msgstr "" + +msgid "Time display" +msgstr "" + +msgid "Displays time spent in an application or game" +msgstr "" + +msgid "Sort shortcuts by" +msgstr "" + +msgid "This setting sorts the shortcuts in the main menu" +msgstr "" + +msgid "Open the user.conf settings file in a system text editor to " + "view and change variables manually" +msgstr "" + +msgid "Do you really want to reset settings for" +msgstr "" + +msgid "Do you actually want to change the scripts version to:" +msgstr "" + +msgid "Branch changed to:" +msgstr "" + +msgid "The shortcut will be created in the PortProton directory." msgstr "" msgid "Name" @@ -1419,6 +1530,9 @@ msgstr "" msgid "Add shortcut to STEAM library" msgstr "" +msgid "The shortcut will be changed in the PortProton directory." +msgstr "" + msgid "REMOVE SHORTCUT" msgstr "" diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po index 88435ce9..001d708f 100644 --- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-21 21:55+0500\n" +"POT-Creation-Date: 2025-05-09 02:05+0500\n" "PO-Revision-Date: 2024-11-13 08:18+0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -348,9 +348,6 @@ msgstr "VUELVA MÁS TARDE" msgid "UPDATING NOW" msgstr "ACTUALIZANDO AHORA" -msgid "EXIT" -msgstr "SALIR" - msgid "Searching for .exe files... Please wait." msgstr "Buscando archivos .exe... Por favor, espera." @@ -385,6 +382,9 @@ msgstr "" "d3dadapter9.so.1.0.0 - No encontrado en el sistema.\n" "Instala el paquete faltante:d3dadapter9" +msgid "EXIT" +msgstr "SALIR" + msgid "" "You will need to check internet connection,and\\npress Repeat for repeat " "download" @@ -1820,8 +1820,144 @@ msgstr "compacto" msgid "classic" msgstr "clásico" -msgid "The shortcut will be changed in the PortProton directory." -msgstr "El acceso directo se cambiará en el directorio de PortProton." +msgid "light" +msgstr "ligero" + +msgid "dark" +msgstr "oscuro" + +msgid "Show in hours and minutes" +msgstr "" + +msgid "Show in days, hours, minutes" +msgstr "" + +msgid "According to last launch" +msgstr "" + +#, fuzzy +msgid "By time" +msgstr "Mostrar tiempo" + +msgid "GLOBAL SETTINGS (USER.CONF)" +msgstr "CONFIGURACIONES GLOBALES (USER.CONF)" + +msgid "Change global settings" +msgstr "Cambiar configuraciones globales" + +msgid "Change mirror to" +msgstr "Cambiar el espejo a" + +msgid "" +"Depending on which mirror is selected, updates will be downloaded from there." +msgstr "" +"Dependiendo del espejo seleccionado, las actualizaciones se descargarán " +"desde allí." + +msgid "Change branch to" +msgstr "Cambiar rama a" + +msgid "" +"Depending on the version of the scripts, PortProton will receive the latest " +"changes first (the DEVEL branch), the STABLE branch is updated later and is " +"stable." +msgstr "" +"Dependiendo de la versión de los scripts, PortProton recibirá primero los " +"últimos cambios (la rama DEVEL), la rama STABLE se actualiza más tarde y es " +"estable." + +msgid "Change start gui to" +msgstr "Cambiar la interfaz gráfica de inicio a" + +msgid "" +"When using PANED in the game start menu, additional buttons are located on " +"one large page; if NOTEBOOK, then they are divided into several." +msgstr "" +"Cuando se usa PANED en el menú de inicio del juego, los botones adicionales " +"se encuentran en una página grande; si CUADERNO, entonces se dividen en " +"varios." + +#, fuzzy +msgid "Steam covers download" +msgstr "descargar portadas de steam" + +msgid "" +"If downloading steam covers is enabled, they will be downloaded and created. " +"(Disablement is provided in cases where their downloading is unavailable for " +"some reason)" +msgstr "" +"Si la descarga de portadas de Steam está habilitada, se descargarán y " +"crearán. (La desactivación se proporciona en los casos en que su descarga no " +"esté disponible por algún motivo)" + +msgid "Choose a graphics card to run the game" +msgstr "Elige una tarjeta gráfica para ejecutar el juego" + +msgid "" +"Select which video card will be used to run the game (used for all running " +"games and programs in PortProton)" +msgstr "" +"Selecciona qué tarjeta de vídeo se utilizará para ejecutar el juego (se " +"utiliza para todos los juegos y programas en ejecución en PortProton)" + +msgid "Force dpi" +msgstr "" + +msgid "Here you can set forced dpi for applications wine" +msgstr "" + +msgid "Choice wine audio driver" +msgstr "Controlador de audio de vino elegido" + +msgid "Fixes sound popling if choice alsa" +msgstr "Corrige el sonido estallido de elección alsa alsa" + +msgid "Select PortProton theme" +msgstr "Seleccione el tema PortProton" + +msgid "Allows you to select a theme for PortProton" +msgstr "Le permite seleccionar un tema para PortProton" + +msgid "Select gtk theme" +msgstr "Seleccione el tema gtk" + +msgid "Allows you to select a theme for GTK." +msgstr "Le permite seleccionar un tema para GTK." + +msgid "Time display" +msgstr "Mostrar tiempo" + +msgid "Displays time spent in an application or game" +msgstr "Muestra el tiempo transcurrido en una aplicación o juego" + +#, fuzzy +msgid "Sort shortcuts by" +msgstr "Ordenar accesos directos por tiempo" + +#, fuzzy +msgid "This setting sorts the shortcuts in the main menu" +msgstr "" +"Esta configuración ordena los accesos directos en el menú principal según el " +"tiempo transcurrido en la aplicación o juego" + +msgid "" +"Open the user.conf settings file in a system text editor to view and " +"change variables manually" +msgstr "" +"Abre el archivo de configuración user.conf en un editor de texto del " +"sistema para ver y cambiar las variables manualmente" + +msgid "Do you really want to reset settings for" +msgstr "¿Realmente deseas restablecer la configuración de" + +msgid "Do you actually want to change the scripts version to:" +msgstr "¿Realmente desea cambiar la versión de los scripts a:" + +msgid "Branch changed to:" +msgstr "Rama cambiada a:" + +msgid "The shortcut will be created in the PortProton directory." +msgstr "El acceso directo se creará en el directorio de PortProton." msgid "Name" msgstr "Nombre" @@ -1835,6 +1971,9 @@ msgstr "Agregar acceso directo al escritorio" msgid "Add shortcut to STEAM library" msgstr "Agregar acceso directo a la biblioteca de STEAM" +msgid "The shortcut will be changed in the PortProton directory." +msgstr "El acceso directo se cambiará en el directorio de PortProton." + msgid "REMOVE SHORTCUT" msgstr "ELIMINAR ACCESO DIRECTO" @@ -2037,131 +2176,6 @@ msgstr "BIBLIOTECAS DE TERCEROS" #~ msgid "Settings for user.conf" #~ msgstr "Configuración user.conf" -#~ msgid "light" -#~ msgstr "ligero" - -#~ msgid "dark" -#~ msgstr "oscuro" - -#, fuzzy -#~ msgid "By time" -#~ msgstr "Mostrar tiempo" - -#~ msgid "GLOBAL SETTINGS (USER.CONF)" -#~ msgstr "CONFIGURACIONES GLOBALES (USER.CONF)" - -#~ msgid "Change global settings" -#~ msgstr "Cambiar configuraciones globales" - -#~ msgid "Change mirror to" -#~ msgstr "Cambiar el espejo a" - -#~ msgid "" -#~ "Depending on which mirror is selected, updates will be downloaded from " -#~ "there." -#~ msgstr "" -#~ "Dependiendo del espejo seleccionado, las actualizaciones se descargarán " -#~ "desde allí." - -#~ msgid "Change branch to" -#~ msgstr "Cambiar rama a" - -#~ msgid "" -#~ "Depending on the version of the scripts, PortProton will receive the " -#~ "latest changes first (the DEVEL branch), the STABLE branch is updated " -#~ "later and is stable." -#~ msgstr "" -#~ "Dependiendo de la versión de los scripts, PortProton recibirá primero los " -#~ "últimos cambios (la rama DEVEL), la rama STABLE se actualiza más tarde y " -#~ "es estable." - -#~ msgid "Change start gui to" -#~ msgstr "Cambiar la interfaz gráfica de inicio a" - -#~ msgid "" -#~ "When using PANED in the game start menu, additional buttons are located " -#~ "on one large page; if NOTEBOOK, then they are divided into several." -#~ msgstr "" -#~ "Cuando se usa PANED en el menú de inicio del juego, los botones " -#~ "adicionales se encuentran en una página grande; si CUADERNO, entonces se " -#~ "dividen en varios." - -#, fuzzy -#~ msgid "Steam covers download" -#~ msgstr "descargar portadas de steam" - -#~ msgid "" -#~ "If downloading steam covers is enabled, they will be downloaded and " -#~ "created. (Disablement is provided in cases where their downloading is " -#~ "unavailable for some reason)" -#~ msgstr "" -#~ "Si la descarga de portadas de Steam está habilitada, se descargarán y " -#~ "crearán. (La desactivación se proporciona en los casos en que su descarga " -#~ "no esté disponible por algún motivo)" - -#~ msgid "Choose a graphics card to run the game" -#~ msgstr "Elige una tarjeta gráfica para ejecutar el juego" - -#~ msgid "" -#~ "Select which video card will be used to run the game (used for all " -#~ "running games and programs in PortProton)" -#~ msgstr "" -#~ "Selecciona qué tarjeta de vídeo se utilizará para ejecutar el juego (se " -#~ "utiliza para todos los juegos y programas en ejecución en PortProton)" - -#~ msgid "Choice wine audio driver" -#~ msgstr "Controlador de audio de vino elegido" - -#~ msgid "Fixes sound popling if choice alsa" -#~ msgstr "Corrige el sonido estallido de elección alsa alsa" - -#~ msgid "Select PortProton theme" -#~ msgstr "Seleccione el tema PortProton" - -#~ msgid "Allows you to select a theme for PortProton" -#~ msgstr "Le permite seleccionar un tema para PortProton" - -#~ msgid "Select gtk theme" -#~ msgstr "Seleccione el tema gtk" - -#~ msgid "Allows you to select a theme for GTK." -#~ msgstr "Le permite seleccionar un tema para GTK." - -#~ msgid "Time display" -#~ msgstr "Mostrar tiempo" - -#~ msgid "Displays time spent in an application or game" -#~ msgstr "Muestra el tiempo transcurrido en una aplicación o juego" - -#, fuzzy -#~ msgid "Sort shortcuts by" -#~ msgstr "Ordenar accesos directos por tiempo" - -#, fuzzy -#~ msgid "This setting sorts the shortcuts in the main menu" -#~ msgstr "" -#~ "Esta configuración ordena los accesos directos en el menú principal según " -#~ "el tiempo transcurrido en la aplicación o juego" - -#~ msgid "" -#~ "Open the user.conf settings file in a system text editor to view " -#~ "and change variables manually" -#~ msgstr "" -#~ "Abre el archivo de configuración user.conf en un editor de texto " -#~ "del sistema para ver y cambiar las variables manualmente" - -#~ msgid "Do you really want to reset settings for" -#~ msgstr "¿Realmente deseas restablecer la configuración de" - -#~ msgid "Do you actually want to change the scripts version to:" -#~ msgstr "¿Realmente desea cambiar la versión de los scripts a:" - -#~ msgid "Branch changed to:" -#~ msgstr "Rama cambiada a:" - -#~ msgid "The shortcut will be created in the PortProton directory." -#~ msgstr "El acceso directo se creará en el directorio de PortProton." - #~ msgid "" #~ "This program comes with absolutely no warranty.\n" #~ "See the License for details." @@ -2187,8 +2201,8 @@ msgstr "BIBLIOTECAS DE TERCEROS" #~ msgid "" #~ "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" #~ msgstr "" -#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar.\\n" -#~ "\\¿Quieres reiniciar STEAM ahora?" +#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar." +#~ "\\n\\¿Quieres reiniciar STEAM ahora?" #~ msgid "Restarting STEAM... Please wait." #~ msgstr "Restarting STEAM... Please wait." diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po index c92f324e..af537ff6 100644 --- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-21 21:55+0500\n" +"POT-Creation-Date: 2025-05-09 02:05+0500\n" "PO-Revision-Date: 2025-04-21 21:59+0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "X-Generator: Poedit 3.6\n" msgid "" @@ -359,9 +359,6 @@ msgstr "НАПОМНИТЬ ПОЗЖЕ" msgid "UPDATING NOW" msgstr "ОБНОВИТЬ СЕЙЧАС" -msgid "EXIT" -msgstr "ВЫХОД" - msgid "Searching for .exe files... Please wait." msgstr "Поиск .exe файлов... Пожалуйста, подождите." @@ -395,6 +392,9 @@ msgstr "" "d3dadapter9.so.1.0.0 - Не найден в системе.\\nУстановите недостающий пакет: " "d3dadapter9" +msgid "EXIT" +msgstr "ВЫХОД" + msgid "" "You will need to check internet connection,and\\npress Repeat for repeat " "download" @@ -1811,8 +1811,137 @@ msgstr "компактная" msgid "classic" msgstr "классическая" -msgid "The shortcut will be changed in the PortProton directory." -msgstr "Ярлык будет изменён в каталоге PortProton." +msgid "light" +msgstr "светлая" + +msgid "dark" +msgstr "тёмная" + +msgid "Show in hours and minutes" +msgstr "Отображать в часах и минутах" + +msgid "Show in days, hours, minutes" +msgstr "Отображать в днях, часах и минутах" + +msgid "According to last launch" +msgstr "По данным последнего запуска" + +msgid "By time" +msgstr "По проведённому времени" + +msgid "GLOBAL SETTINGS (USER.CONF)" +msgstr "ГЛОБАЛЬНЫЕ НАСТРОЙКИ (USER.CONF)" + +msgid "Change global settings" +msgstr "Изменить глобальные настройки" + +msgid "Change mirror to" +msgstr "Сменить зеркало на" + +msgid "" +"Depending on which mirror is selected, updates will be downloaded from there." +msgstr "" +"В зависимости от того, какое выбрано зеркало, оттуда и будут загружаться " +"обновления." + +msgid "Change branch to" +msgstr "Сменить версию на" + +msgid "" +"Depending on the version of the scripts, PortProton will receive the latest " +"changes first (the DEVEL branch), the STABLE branch is updated later and is " +"stable." +msgstr "" +"В зависимости от версии скриптов, PortProton будет получать самые последнее " +"изменения раньше всех (ветка DEVEL), ветка STABLE обновляется позже и " +"является стабильной." + +msgid "Change start gui to" +msgstr "Изменить интерфейс запуска на" + +msgid "" +"When using PANED in the game start menu, additional buttons are located on " +"one large page; if NOTEBOOK, then they are divided into several." +msgstr "" +"При использовании PANED в меню запуске игры дополнительные кнопки находятся " +"на одной большой странице, если NOTEBOOK, то поделены на несколько." + +msgid "Steam covers download" +msgstr "Скачивание обложек для steam" + +msgid "" +"If downloading steam covers is enabled, they will be downloaded and created. " +"(Disablement is provided in cases where their downloading is unavailable for " +"some reason)" +msgstr "" +"Если скачивания обложек steam включено, то они будут загружаться и " +"создаваться. (Отключение предусмотрено в тех случаях, когда их скачивание по " +"каким-то причинам недоступно)" + +msgid "Choose a graphics card to run the game" +msgstr "Выбрать видеокарту для запуска игры" + +msgid "" +"Select which video card will be used to run the game (used for all running " +"games and programs in PortProton)" +msgstr "" +"Выбор видеокарты для запуска игры (используется для всех запущенных игр и " +"программ в PortProton)" + +msgid "Force dpi" +msgstr "Принудительный масштаб" + +msgid "Here you can set forced dpi for applications wine" +msgstr "Здесь вы можете установить принудительный масштаб для приложений wine" + +msgid "Choice wine audio driver" +msgstr "Выбрать звуковой драйвер" + +msgid "Fixes sound popling if choice alsa" +msgstr "Выбор alsa исправляет заикание звука" + +msgid "Select PortProton theme" +msgstr "Выбрать тему PortProton" + +msgid "Allows you to select a theme for PortProton" +msgstr "Позволяет выбрать тему для PortProton" + +msgid "Select gtk theme" +msgstr "Выбрать тему GTK" + +msgid "Allows you to select a theme for GTK." +msgstr "Позволяет выбрать светлую или тёмную тему" + +msgid "Time display" +msgstr "Отображение времени" + +msgid "Displays time spent in an application or game" +msgstr "Отображает общее время проведённое в приложении или игре" + +msgid "Sort shortcuts by" +msgstr "Сортировка ярлыков по" + +msgid "This setting sorts the shortcuts in the main menu" +msgstr "Эта настройка сортирует ярлыки в главном меню" + +msgid "" +"Open the user.conf settings file in a system text editor to view and " +"change variables manually" +msgstr "" +"Открыть файл настроек user.conf в системном текстовом редакторе, " +"чтобы просмотреть и изменить переменные вручную" + +msgid "Do you really want to reset settings for" +msgstr "Вы действительно хотите сбросить настройки для" + +msgid "Do you actually want to change the scripts version to:" +msgstr "Вы действительно хотите изменить версию скриптов на:" + +msgid "Branch changed to:" +msgstr "Версия изменена на:" + +msgid "The shortcut will be created in the PortProton directory." +msgstr "Ярлык будет создан в каталоге PortProton." msgid "Name" msgstr "Имя" @@ -1826,6 +1955,9 @@ msgstr "Добавить ярлык на рабочий стол" msgid "Add shortcut to STEAM library" msgstr "Добавить ярлык в библиотеку STEAM" +msgid "The shortcut will be changed in the PortProton directory." +msgstr "Ярлык будет изменён в каталоге PortProton." + msgid "REMOVE SHORTCUT" msgstr "УДАЛИТЬ ЯРЛЫК" @@ -2026,141 +2158,6 @@ msgstr "БИБЛИОТЕКИ" #~ msgid "Settings for user.conf" #~ msgstr "Настройки для user.conf" -#~ msgid "light" -#~ msgstr "светлая" - -#~ msgid "dark" -#~ msgstr "тёмная" - -#~ msgid "Show in hours and minutes" -#~ msgstr "Отображать в часах и минутах" - -#~ msgid "Show in days, hours, minutes" -#~ msgstr "Отображать в днях, часах и минутах" - -#~ msgid "According to last launch" -#~ msgstr "По данным последнего запуска" - -#~ msgid "By time" -#~ msgstr "По проведённому времени" - -#~ msgid "GLOBAL SETTINGS (USER.CONF)" -#~ msgstr "ГЛОБАЛЬНЫЕ НАСТРОЙКИ (USER.CONF)" - -#~ msgid "Change global settings" -#~ msgstr "Изменить глобальные настройки" - -#~ msgid "Change mirror to" -#~ msgstr "Сменить зеркало на" - -#~ msgid "" -#~ "Depending on which mirror is selected, updates will be downloaded from " -#~ "there." -#~ msgstr "" -#~ "В зависимости от того, какое выбрано зеркало, оттуда и будут загружаться " -#~ "обновления." - -#~ msgid "Change branch to" -#~ msgstr "Сменить версию на" - -#~ msgid "" -#~ "Depending on the version of the scripts, PortProton will receive the " -#~ "latest changes first (the DEVEL branch), the STABLE branch is updated " -#~ "later and is stable." -#~ msgstr "" -#~ "В зависимости от версии скриптов, PortProton будет получать самые " -#~ "последнее изменения раньше всех (ветка DEVEL), ветка STABLE обновляется " -#~ "позже и является стабильной." - -#~ msgid "Change start gui to" -#~ msgstr "Изменить интерфейс запуска на" - -#~ msgid "" -#~ "When using PANED in the game start menu, additional buttons are located " -#~ "on one large page; if NOTEBOOK, then they are divided into several." -#~ msgstr "" -#~ "При использовании PANED в меню запуске игры дополнительные кнопки " -#~ "находятся на одной большой странице, если NOTEBOOK, то поделены на " -#~ "несколько." - -#~ msgid "Steam covers download" -#~ msgstr "Скачивание обложек для steam" - -#~ msgid "" -#~ "If downloading steam covers is enabled, they will be downloaded and " -#~ "created. (Disablement is provided in cases where their downloading is " -#~ "unavailable for some reason)" -#~ msgstr "" -#~ "Если скачивания обложек steam включено, то они будут загружаться и " -#~ "создаваться. (Отключение предусмотрено в тех случаях, когда их скачивание " -#~ "по каким-то причинам недоступно)" - -#~ msgid "Choose a graphics card to run the game" -#~ msgstr "Выбрать видеокарту для запуска игры" - -#~ msgid "" -#~ "Select which video card will be used to run the game (used for all " -#~ "running games and programs in PortProton)" -#~ msgstr "" -#~ "Выбор видеокарты для запуска игры (используется для всех запущенных игр и " -#~ "программ в PortProton)" - -#~ msgid "Force dpi" -#~ msgstr "Принудительный масштаб" - -#~ msgid "Here you can set forced dpi for applications wine" -#~ msgstr "" -#~ "Здесь вы можете установить принудительный масштаб для приложений wine" - -#~ msgid "Choice wine audio driver" -#~ msgstr "Выбрать звуковой драйвер" - -#~ msgid "Fixes sound popling if choice alsa" -#~ msgstr "Выбор alsa исправляет заикание звука" - -#~ msgid "Select PortProton theme" -#~ msgstr "Выбрать тему PortProton" - -#~ msgid "Allows you to select a theme for PortProton" -#~ msgstr "Позволяет выбрать тему для PortProton" - -#~ msgid "Select gtk theme" -#~ msgstr "Выбрать тему GTK" - -#~ msgid "Allows you to select a theme for GTK." -#~ msgstr "Позволяет выбрать светлую или тёмную тему" - -#~ msgid "Time display" -#~ msgstr "Отображение времени" - -#~ msgid "Displays time spent in an application or game" -#~ msgstr "Отображает общее время проведённое в приложении или игре" - -#~ msgid "Sort shortcuts by" -#~ msgstr "Сортировка ярлыков по" - -#~ msgid "This setting sorts the shortcuts in the main menu" -#~ msgstr "Эта настройка сортирует ярлыки в главном меню" - -#~ msgid "" -#~ "Open the user.conf settings file in a system text editor to view " -#~ "and change variables manually" -#~ msgstr "" -#~ "Открыть файл настроек user.conf в системном текстовом редакторе, " -#~ "чтобы просмотреть и изменить переменные вручную" - -#~ msgid "Do you really want to reset settings for" -#~ msgstr "Вы действительно хотите сбросить настройки для" - -#~ msgid "Do you actually want to change the scripts version to:" -#~ msgstr "Вы действительно хотите изменить версию скриптов на:" - -#~ msgid "Branch changed to:" -#~ msgstr "Версия изменена на:" - -#~ msgid "The shortcut will be created in the PortProton directory." -#~ msgstr "Ярлык будет создан в каталоге PortProton." - #~ msgid "" #~ "This program comes with absolutely no warranty.\n" #~ "See the License for details." diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 909efe6f..7e08991e 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -204,6 +204,7 @@ generate_pot () { 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' "${PORT_SCRIPTS_PATH}/$i" > "${PORT_SCRIPTS_PATH}/${i}_tmp" + sed -i '/\[\$/d' "${PORT_SCRIPTS_PATH}/${i}_tmp" done #Когда присходит предупреждение: синтаксис $"..." запрещен по соображениям безопасности; используйте eval_gettext #и ругается на строку в которой нет перевода, можно использовать sed -i '//d' и убрать эту строку @@ -5314,7 +5315,7 @@ Binding a game to a single node reduces memory‑access latency and limits costl PW_AMD_VULKAN_USE="${PW_ADD_SETTINGS[9]}" NUMA_NODE_INDEX="${PW_ADD_SETTINGS[10]//[[:space:]]/}" - if [[ "$NUMA_NODE_INDEX" =~ ^[0-9]+$ ]] && [[ -v NODE_MAP[$NUMA_NODE_INDEX] ]]; then + if [[ $NUMA_NODE_INDEX =~ ^[0-9]+$ ]] && [[ -v NODE_MAP[$NUMA_NODE_INDEX] ]] ; then NUMA_CORES="${NODE_MAP[$NUMA_NODE_INDEX]}" PW_CPU_NUMA_NODE_INDEX="$NUMA_NODE_INDEX" PW_TASKSET_SLR="taskset -c $NUMA_CORES" @@ -5324,7 +5325,7 @@ Binding a game to a single node reduces memory‑access latency and limits costl fi export PW_CPU_NUMA_NODE_INDEX PW_TASKSET_SLR - if [[ "${CPU_LIMIT}" =~ ^[0-9]+$ ]] ; then + if [[ $CPU_LIMIT =~ ^[0-9]+$ ]] ; then PW_WINE_CPU_TOPOLOGY="${CPU_LIMIT}:$(seq -s, 0 $(( CPU_LIMIT - 1 )))" else PW_WINE_CPU_TOPOLOGY="disabled" From f56bbdb2b565b3061f65e081f72692bc3e4a1dcf Mon Sep 17 00:00:00 2001 From: Htylol Date: Fri, 9 May 2025 18:20:56 +0500 Subject: [PATCH 18/34] Added the ability to use dxvk and vkd3d which are shipped with proton versions. --- data_from_portwine/scripts/functions_helper | 52 +++++++++++++++------ data_from_portwine/scripts/var | 1 + 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 909efe6f..8faf3788 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3913,14 +3913,20 @@ start_portwine () { if [[ -n "$CP_DXVK_FILES" ]] ; then print_info "Try create symlink DXVK files..." for wine_dxvk_dll in $CP_DXVK_FILES ; do - if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" ]] ; then - try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" - try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" - if [[ "$PW_USE_FAKE_DLSS_3" == "1" ]] && [[ "$wine_dxvk_dll" == dxgi ]] - then var_winedlloverride_update "dxgi=n,b" - else var_winedlloverride_update "${wine_dxvk_dll}=n" + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ + && [[ -f "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" + try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" + else + if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" ]] ; then + try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" + try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" fi fi + if [[ $PW_USE_FAKE_DLSS_3 == "1" ]] && [[ $wine_dxvk_dll == "dxgi" ]] + then var_winedlloverride_update "dxgi=n,b" + else var_winedlloverride_update "${wine_dxvk_dll}=n" + fi done create_new_dir "${PATH_TO_DXVK_FILES}/dxvk_cache" export DXVK_STATE_CACHE_PATH="${PATH_TO_DXVK_FILES}"/dxvk_cache @@ -3929,9 +3935,16 @@ start_portwine () { if [[ "$DXVK_ENABLE_NVAPI" == "1" ]] ; then print_info "Try create symlink NVAPI files..." - try_force_link_file "${PATH_TO_DXVK_FILES}/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll" - try_force_link_file "${PATH_TO_DXVK_FILES}/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll" - try_force_link_file "${PATH_TO_DXVK_FILES}/x64/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll" + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ + && [[ -f "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll" + try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll" + try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll" + else + try_force_link_file "${PATH_TO_DXVK_FILES}/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll" + try_force_link_file "${PATH_TO_DXVK_FILES}/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll" + try_force_link_file "${PATH_TO_DXVK_FILES}/x64/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll" + fi var_winedlloverride_update "nvapi64,nvofapi64,nvapi=n;nvcuda=b" else try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll" @@ -3942,9 +3955,21 @@ start_portwine () { if [[ -n "$CP_VKD3D_FILES" ]] ; then print_info "Try create symlink VKD3D files..." for wine_vkd3d_dll in $CP_VKD3D_FILES ; do - if [[ -f "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" ]] ; then - try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" - try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ + && [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" || -f "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" ]] ; then + if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + fi + if [[ -f "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" ]] ; then + try_force_link_file "${WINEDIR}/lib/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + fi + else + if [[ -f "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" ]] ; then + try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + fi var_winedlloverride_update "${wine_vkd3d_dll}=n" fi done @@ -5087,7 +5112,7 @@ gui_edit_db () { PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_DISABLE_COMPOSITING PW_USE_RUNTIME PW_DINPUT_PROTOCOL PW_USE_NATIVE_WAYLAND PW_USE_GALLIUM_ZINK PW_USE_GALLIUM_NINE - PW_USE_DAMAVAND + PW_USE_DAMAVAND PW_USE_SUPPLIED_DXVK_VKD3D ) if check_wayland_session ; then @@ -5143,6 +5168,7 @@ gui_edit_db () { PW_USE_GALLIUM_ZINK_INFO=${translations[Use Gallium Zink (OpenGL driver is implemented via Vulkan)]} PW_USE_GALLIUM_NINE_INFO=${translations[Use Gallium Nine (native DirectX 9 for MESA)]} PW_USE_DAMAVAND_INFO=${translations[Instead of DXVK, use WineD3D vulkan (Damavand). Experimental function.]} + PW_USE_SUPPLIED_DXVK_VKD3D_INFO=${translations[Use dxvk and vkd3d which are bundled with wine or proton. (Does not work with PROTON_LG and WINE_LG)]} # PW_VULKAN_NO_ASYNC_INFO=${translations[Disable asynchronous calls for VULKAN and DXVK modes]} # PW_OLD_GL_STRING_INFO=${translations[Forced use of older versions of OpenGL]} diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 663a82e6..b957d208 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -41,6 +41,7 @@ export STAGING_SHARED_MEMORY="1" export PW_USE_GALLIUM_ZINK="0" export PW_USE_GALLIUM_NINE="0" export PW_USE_DAMAVAND="0" +export PW_USE_SUPPLIED_DXVK_VKD3D="1" ###DEFAULT_WINE### export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v20" From e287e42bfcc79d26207313c5db38b1f89b0f9fda Mon Sep 17 00:00:00 2001 From: Htylol Date: Fri, 9 May 2025 18:38:24 +0500 Subject: [PATCH 19/34] Added translations for supplied_dxvk_vkd3d --- data_from_portwine/locales/PortProton.pot | 4 ++++ data_from_portwine/locales/es/LC_MESSAGES/PortProton.po | 7 +++++++ data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot index bbb2ee51..eff7f948 100644 --- a/data_from_portwine/locales/PortProton.pot +++ b/data_from_portwine/locales/PortProton.pot @@ -534,6 +534,10 @@ msgid "Instead of DXVK, use WineD3D vulkan (Damavand). Experimental " "function." msgstr "" +msgid "Use dxvk and vkd3d which are bundled with wine or proton. (Does not " + "work with PROTON_LG and WINE_LG)" +msgstr "" + msgid "Disable asynchronous calls for VULKAN and DXVK modes" msgstr "" diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po index 88435ce9..a88dfbd0 100644 --- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po @@ -642,6 +642,13 @@ msgstr "" msgid "Instead of DXVK, use WineD3D vulkan (Damavand). Experimental function." msgstr "WineD3D Vulkan (Damavand experimental)" +msgid "" +"Use dxvk and vkd3d which are bundled with wine or proton. (Does not work " +"with PROTON_LG and WINE_LG)" +msgstr "" +"Utilice dxvk y vkd3d que vienen incluidos con wine o proton. (No funciona " +"con PROTON_LG y WINE_LG)" + msgid "Disable asynchronous calls for VULKAN and DXVK modes" msgstr "Desactivar llamadas asíncronas para los modos VULKAN y DXVK" diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po index c92f324e..fa68afa0 100644 --- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po @@ -663,6 +663,13 @@ msgstr "" "Вместо DXVK используется WineD3D vulkan (Дамаванд). Экспериментальная " "функция." +msgid "" +"Use dxvk and vkd3d which are bundled with wine or proton. (Does not work " +"with PROTON_LG and WINE_LG)" +msgstr "" +"Использовать dxvk и vkd3d, которые поставляются в комплекте с wine или " +"proton. (Не работает с PROTON_LG и WINE_LG)" + msgid "Disable asynchronous calls for VULKAN and DXVK modes" msgstr "Отключить асинхронные вызовы для режимов VULKAN и DXVK" From 0162b6bdd8edff6c9f6adf6bf17739e1f25385db Mon Sep 17 00:00:00 2001 From: Htylol Date: Fri, 9 May 2025 20:14:36 +0500 Subject: [PATCH 20/34] With WINE_LG and PROTON_LG, the PW_USE_SUPPLIED_DXVK_VKD3D setting is not available --- data_from_portwine/scripts/functions_helper | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 8faf3788..8bd1e871 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -5179,8 +5179,7 @@ gui_edit_db () { 0) # WineD3D OpenGL VKD3D_CB="DCB" - DISABLE_EDIT_DB_LIST="PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_DAMAVAND - " + DISABLE_EDIT_DB_LIST="PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_DAMAVAND" ;; 1|2) # Stable, Newest @@ -5189,11 +5188,12 @@ gui_edit_db () { 5) # Legacy VKD3D_CB="DCB" - DISABLE_EDIT_DB_LIST="PW_USE_RAY_TRACING - " + DISABLE_EDIT_DB_LIST="PW_USE_RAY_TRACING" ;; esac + [[ $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] && DISABLE_EDIT_DB_LIST+=" PW_USE_SUPPLIED_DXVK_VKD3D" + unset ADD_CHK_BOX_EDIT_DB for int_to_boole in "${PW_EDIT_DB_LIST[@]}" ; do if [[ "${!int_to_boole}" == "1" ]] @@ -5203,8 +5203,7 @@ gui_edit_db () { TMP_HELP_FOR_GUI="${int_to_boole}_INFO" int_to_boole_non_pw="${int_to_boole//PW_/}" int_to_boole_non_pw="${int_to_boole_non_pw//"_"/" "}" - if [[ ! "${PW_VULKAN_USE}" =~ ^(1|2)$ ]] \ - && [[ -n $DISABLE_EDIT_DB_LIST ]] ; then + if [[ -n $DISABLE_EDIT_DB_LIST ]] ; then unset CHECK_BOOLE_TRUE for check_boole in $DISABLE_EDIT_DB_LIST ; do if [[ $check_boole == "$int_to_boole" ]] ; then From 3642be99c89812bc54b86345180ceb2d8dbbfb3e Mon Sep 17 00:00:00 2001 From: Htylol Date: Sat, 10 May 2025 01:39:33 +0500 Subject: [PATCH 21/34] Fix for d8vk and when other 3D apis are used --- data_from_portwine/scripts/functions_helper | 23 +++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 8bd1e871..33da17ca 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3690,6 +3690,14 @@ start_portwine () { fi fi + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ + && [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] \ + && [[ $PW_VULKAN_USE != "0" ]] ; then + CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi" + CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" + PW_USE_SUPPLIED_DXVK_VKD3D="2" + fi + # DGVOODOO2 enable: if [[ "${PW_DGVOODOO2}" == "1" ]] ; then print_info "Try create symlink DGVOODOO2 files..." @@ -3913,10 +3921,14 @@ start_portwine () { if [[ -n "$CP_DXVK_FILES" ]] ; then print_info "Try create symlink DXVK files..." for wine_dxvk_dll in $CP_DXVK_FILES ; do - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] \ && [[ -f "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" + elif [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] \ + && [[ -f "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" ]] && [[ $wine_dxvk_dll == "d3d8" ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/d3d8.dll" + try_force_link_file "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/d3d8.dll" else if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" ]] ; then try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" @@ -3935,7 +3947,7 @@ start_portwine () { if [[ "$DXVK_ENABLE_NVAPI" == "1" ]] ; then print_info "Try create symlink NVAPI files..." - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] \ && [[ -f "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll" try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll" @@ -3955,7 +3967,7 @@ start_portwine () { if [[ -n "$CP_VKD3D_FILES" ]] ; then print_info "Try create symlink VKD3D files..." for wine_vkd3d_dll in $CP_VKD3D_FILES ; do - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] \ && [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" || -f "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" ]] ; then if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" @@ -3970,8 +3982,8 @@ start_portwine () { try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" fi - var_winedlloverride_update "${wine_vkd3d_dll}=n" fi + var_winedlloverride_update "${wine_vkd3d_dll}=n" done create_new_dir "${PATH_TO_VKD3D_FILES}/vkd3d_cache" export VKD3D_SHADER_CACHE_PATH="${PATH_TO_VKD3D_FILES}/vkd3d_cache" @@ -5797,8 +5809,7 @@ gui_dgvoodoo2 () { TMP_HELP_FOR_GUI="${int_to_boole}_INFO" int_to_boole_non_pw="${int_to_boole//PW_DGV2/}" int_to_boole_non_pw="${int_to_boole_non_pw//"_"/" "}" - if [[ ! "${PW_VULKAN_USE}" =~ ^(1|2)$ ]] \ - && [[ -n $DISABLE_DGV2_LIST ]] ; then + if [[ -n $DISABLE_DGV2_LIST ]] ; then unset CHECK_BOOLE_TRUE for check_boole in $DISABLE_DGV2_LIST ; do if [[ $check_boole == "$int_to_boole" ]] ; then From ede26c6a4cefd05ee28417e14e344ea0a01b96ff Mon Sep 17 00:00:00 2001 From: Htylol Date: Sat, 10 May 2025 04:15:39 +0500 Subject: [PATCH 22/34] Added compatibility with older versions of Proton --- data_from_portwine/scripts/functions_helper | 29 ++++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 33da17ca..ea905b2b 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3692,9 +3692,28 @@ start_portwine () { if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ && [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] \ - && [[ $PW_VULKAN_USE != "0" ]] ; then - CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi" - CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" + && [[ ! $PW_VULKAN_USE =~ (0|3) ]] ; then + if [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d10.dll" && -f "${WINEDIR}/lib64/wine/dxvk/d3d10_1.dll" ]] ; then + CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi" + CP_WINE_FILES="" + else + CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi" + CP_WINE_FILES="d3d10_1 d3d10" + fi + if [[ -f "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/d3d8.dll" + try_force_link_file "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/d3d8.dll" + var_winedlloverride_update "d3d8=n" + elif [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d8.dll" ]] + then add_to_var CP_DXVK_FILES "d3d8" + else add_to_var CP_WINE_FILES "d3d8" + fi + if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12core.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-1.dll" ]] ; then + CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" + else + CP_VKD3D_FILES="d3d12 libvkd3d-shader-1" + add_to_var CP_WINE_FILES "d3d12core" + fi PW_USE_SUPPLIED_DXVK_VKD3D="2" fi @@ -3925,10 +3944,6 @@ start_portwine () { && [[ -f "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" - elif [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] \ - && [[ -f "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" ]] && [[ $wine_dxvk_dll == "d3d8" ]] ; then - try_force_link_file "${WINEDIR}/lib/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/d3d8.dll" - try_force_link_file "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/d3d8.dll" else if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" ]] ; then try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" From a446285949a6e5a8abc6e2a166a6f3c0df5dd1fb Mon Sep 17 00:00:00 2001 From: Htylol Date: Sat, 10 May 2025 18:56:07 +0500 Subject: [PATCH 23/34] Added a check for d3d9.dll file from dxvk directory, removed unnecessary conditions --- data_from_portwine/scripts/functions_helper | 40 ++++++++++----------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index ea905b2b..c71c4987 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -661,10 +661,11 @@ try_download () { } var_winedlloverride_update () { - export WINEDLLOVERRIDES="${1}${WINEDLLOVERRIDES:+;$WINEDLLOVERRIDES}" + if [[ ! $WINEDLLOVERRIDES =~ $1 ]] ; then + export WINEDLLOVERRIDES="${1}${WINEDLLOVERRIDES:+;$WINEDLLOVERRIDES}" + fi } - var_vkd3d_config_update () { if echo "$VKD3D_CONFIG" | grep "$1" then return 0 @@ -2454,7 +2455,6 @@ pw_init_db () { ;; esac - [[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1 [[ "${START_FROM_PP_GUI}" == 1 ]] && export PW_GUI_DISABLED_CS=0 && unset START_FROM_PP_GUI @@ -3692,7 +3692,8 @@ start_portwine () { if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ && [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] \ - && [[ ! $PW_VULKAN_USE =~ (0|3) ]] ; then + && [[ ! $PW_VULKAN_USE =~ (0|3) ]] \ + && [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d9.dll" ]] ; then if [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d10.dll" && -f "${WINEDIR}/lib64/wine/dxvk/d3d10_1.dll" ]] ; then CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi" CP_WINE_FILES="" @@ -3710,11 +3711,15 @@ start_portwine () { fi if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12core.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-1.dll" ]] ; then CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" - else + elif [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-shader-1.dll" ]] ; then CP_VKD3D_FILES="d3d12 libvkd3d-shader-1" add_to_var CP_WINE_FILES "d3d12core" + else + CP_VKD3D_FILES="" + add_to_var CP_WINE_FILES "d3d12 d3d12core" fi - PW_USE_SUPPLIED_DXVK_VKD3D="2" + else + PW_USE_SUPPLIED_DXVK_VKD3D="0" fi # DGVOODOO2 enable: @@ -3940,15 +3945,12 @@ start_portwine () { if [[ -n "$CP_DXVK_FILES" ]] ; then print_info "Try create symlink DXVK files..." for wine_dxvk_dll in $CP_DXVK_FILES ; do - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] \ - && [[ -f "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" ]] ; then + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] ; then try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" else - if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" ]] ; then - try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" - try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" - fi + try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" + try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" fi if [[ $PW_USE_FAKE_DLSS_3 == "1" ]] && [[ $wine_dxvk_dll == "dxgi" ]] then var_winedlloverride_update "dxgi=n,b" @@ -3962,8 +3964,7 @@ start_portwine () { if [[ "$DXVK_ENABLE_NVAPI" == "1" ]] ; then print_info "Try create symlink NVAPI files..." - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] \ - && [[ -f "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" ]] ; then + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] && [[ -f "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll" try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll" try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll" @@ -3982,8 +3983,7 @@ start_portwine () { if [[ -n "$CP_VKD3D_FILES" ]] ; then print_info "Try create symlink VKD3D files..." for wine_vkd3d_dll in $CP_VKD3D_FILES ; do - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] \ - && [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" || -f "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" ]] ; then + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] ; then if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" @@ -3993,10 +3993,8 @@ start_portwine () { try_force_link_file "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" fi else - if [[ -f "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" ]] ; then - try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" - try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" - fi + try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" fi var_winedlloverride_update "${wine_vkd3d_dll}=n" done @@ -4199,7 +4197,6 @@ start_portwine () { get_and_set_reg_file --delete 'Software\Wine\Drivers' 'Graphics' fi - case "$PW_SOUND_DRIVER_USE" in pulse) get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "pulse" "user" ;; alsa) get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "alsa" "user" ;; @@ -4383,7 +4380,6 @@ pw_run () { check_variables SteamAppId "0" check_variables SteamGameId "0" - PW_LOG_TO_FILE="${PORT_WINE_PATH}/PortProton.log" PW_LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}:${WINE_LIBRARY_PATH}" print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME" From 9d07b9cbc309026d419900a9bd2204f98e560594 Mon Sep 17 00:00:00 2001 From: Htylol Date: Sun, 11 May 2025 01:23:36 +0500 Subject: [PATCH 24/34] Fixed for compatibility with dgvoodoo2 --- data_from_portwine/scripts/functions_helper | 73 +++++++++++---------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index c71c4987..cf1c5179 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -661,9 +661,7 @@ try_download () { } var_winedlloverride_update () { - if [[ ! $WINEDLLOVERRIDES =~ $1 ]] ; then - export WINEDLLOVERRIDES="${1}${WINEDLLOVERRIDES:+;$WINEDLLOVERRIDES}" - fi + export WINEDLLOVERRIDES="${1}${WINEDLLOVERRIDES:+;$WINEDLLOVERRIDES}" } var_vkd3d_config_update () { @@ -3701,21 +3699,23 @@ start_portwine () { CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi" CP_WINE_FILES="d3d10_1 d3d10" fi - if [[ -f "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" ]] ; then - try_force_link_file "${WINEDIR}/lib/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/d3d8.dll" - try_force_link_file "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/d3d8.dll" - var_winedlloverride_update "d3d8=n" - elif [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d8.dll" ]] - then add_to_var CP_DXVK_FILES "d3d8" - else add_to_var CP_WINE_FILES "d3d8" + if [[ $PW_DGVOODOO2 != "1" ]] ; then + if [[ -f "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/d3d8.dll" + try_force_link_file "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/d3d8.dll" + var_winedlloverride_update "d3d8=n" + elif [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d8.dll" ]] + then add_to_var CP_DXVK_FILES "d3d8" + else add_to_var CP_WINE_FILES "d3d8" + fi fi if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12core.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-1.dll" ]] ; then CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" elif [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-shader-1.dll" ]] ; then - CP_VKD3D_FILES="d3d12 libvkd3d-shader-1" + CP_VKD3D_FILES="d3d12 libvkd3d-1 libvkd3d-shader-1" add_to_var CP_WINE_FILES "d3d12core" else - CP_VKD3D_FILES="" + CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1" add_to_var CP_WINE_FILES "d3d12 d3d12core" fi else @@ -3735,26 +3735,31 @@ start_portwine () { try_force_link_file "${PATH_TO_DGV2_FILES}/x64/d3d9.dll" "${WINEPREFIX}/drive_c/windows/system32/d3d9.dll" try_remove_file "${WINEPREFIX}/drive_c/windows/system32/dgVoodoo.conf" try_force_link_file "${DGV2CONF}" "${WINEPREFIX}/drive_c/windows/system32/dgVoodoo.conf" - case "${PW_VULKAN_USE}" in - 0) - rm_from_var CP_WINE_FILES "d3d9 d3d8" - ;; - 1) - rm_from_var CP_DXVK_FILES "d3d9" - rm_from_var CP_WINE_FILES "d3d8" - ;; - 2) - rm_from_var CP_DXVK_FILES "d3d9 d3d8" - ;; - 3) - rm_from_var CP_GALLIUM_NINE_FILES "d3d9" - rm_from_var CP_WINE_FILES "d3d8" - ;; - 5) - rm_from_var CP_DXVK_FILES "d3d9" - rm_from_var CP_WINE_FILES "d3d8" - ;; - esac + + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] ; then + rm_from_var CP_DXVK_FILES "d3d9" + else + case "${PW_VULKAN_USE}" in + 0) + rm_from_var CP_WINE_FILES "d3d9 d3d8" + ;; + 1) + rm_from_var CP_DXVK_FILES "d3d9" + rm_from_var CP_WINE_FILES "d3d8" + ;; + 2) + rm_from_var CP_DXVK_FILES "d3d9 d3d8" + ;; + 3) + rm_from_var CP_GALLIUM_NINE_FILES "d3d9" + rm_from_var CP_WINE_FILES "d3d8" + ;; + 5) + rm_from_var CP_DXVK_FILES "d3d9" + rm_from_var CP_WINE_FILES "d3d8" + ;; + esac + fi fi if [[ "${PW_DGV2_GLIDE_NAPALM}" == "1" ]] ; then @@ -3984,11 +3989,11 @@ start_portwine () { print_info "Try create symlink VKD3D files..." for wine_vkd3d_dll in $CP_VKD3D_FILES ; do if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] ; then - if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" ]] ; then + if [[ $wine_vkd3d_dll =~ d3d12 ]] ; then try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" fi - if [[ -f "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" ]] ; then + if [[ $wine_vkd3d_dll =~ libvkd3d ]] ; then try_force_link_file "${WINEDIR}/lib/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" fi From 9d79a2111eeadc37aec243ce9ade50bdd6d89002 Mon Sep 17 00:00:00 2001 From: Boris Yumankulov Date: Wed, 7 May 2025 23:47:08 +0500 Subject: [PATCH 25/34] added Sarek Proton to download other wine Signed-off-by: Boris Yumankulov --- data_from_portwine/scripts/functions_helper | 25 ++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 909efe6f..87064801 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -4837,6 +4837,7 @@ gui_proton_downloader () { try_remove_file "${PW_TMPFS_PATH}/tmp_proton_pw_git" try_remove_file "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git" try_remove_file "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" + try_remove_file "${PW_TMPFS_PATH}/tmp_proton_sarek_git" try_remove_file "${PW_TMPFS_PATH}/tmp_proton_ge_git" try_remove_file "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" try_remove_file "${PW_TMPFS_PATH}/tmp_installed_wine" @@ -4901,6 +4902,14 @@ gui_proton_downloader () { echo "${PGEGIT}" | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" done fi + + # PROTON_SAREK + read -r -d '' -a PROTON_SAREK_GIT < <(curl -s "https://api.github.com/repos/pythonlover02/Proton-Sarek/releases" | grep "browser_download_url.*\.tar\.gz" | cut -d \" -f 4) + if [[ -n "${PROTON_SAREK_GIT[0]}" ]] ; then + for PGEGIT in "${PROTON_SAREK_GIT[@]}" ; do + echo "${PGEGIT}" | awk -F/ '{print $NF}' | sed 's/.tar.gz//' >> "${PW_TMPFS_PATH}/tmp_proton_sarek_git" + done + fi pw_stop_progress_bar @@ -4913,7 +4922,7 @@ gui_proton_downloader () { for INSTALLING_VERSION_IN_DIST in * ; do sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PW_TMPFS_PATH}/tmp_proton_pw_git" \ "${PW_TMPFS_PATH}/tmp_proton_ge_git" "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git" \ - "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" + "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" "${PW_TMPFS_PATH}/tmp_proton_sarek_git" done popd 1>/dev/null || fatal @@ -4922,6 +4931,7 @@ gui_proton_downloader () { TMP_PROTON_KR_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git" | tr '\n' ' ')" TMP_PROTON_CU_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" | tr '\n' ' ')" TMP_PROTON_CACHYOS_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" | tr '\n' ' ')" + TMP_PROTON_SAREK_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_sarek_git" | tr '\n' ' ')" ls -l ${PORT_WINE_PATH}/data/dist | awk '{print $9}' | sed -e "/$PW_PROTON_LG_VER/d" -e "/$PW_WINE_LG_VER/d" -e '/^$/d' 1>"${PW_TMPFS_PATH}/tmp_installed_wine" TMP_INSTALLED_WINE="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_installed_wine" | tr '\n' ' ')" @@ -4973,6 +4983,14 @@ gui_proton_downloader () { "${pw_yad}" --plug=$KEY_WINE --tabnum=6 --list --checklist --separator="" \ --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \ --column "${translations[Set]}" \ + --column "${translations[Select WINE for download:]}" \ + $TMP_PROTON_SAREK_GIT \ + 1>> "${PW_TMPFS_PATH}/tmp_set_wine" \ + 2>/dev/null & + + "${pw_yad}" --plug=$KEY_WINE --tabnum=7 --list --checklist --separator="" \ + --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \ + --column "${translations[Set]}" \ --column "${translations[Select installed WINE for delete:]}" \ $TMP_INSTALLED_WINE \ 1> "${PW_TMPFS_PATH}/tmp_installed_wine_set" \ @@ -4987,6 +5005,7 @@ gui_proton_downloader () { --tab="PROTON-GE!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --tab="WINE-GE-CUSTOM!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --tab="PROTON-CACHYOS!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ + --tab="PROTON-SAREK!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --tab="${translations[INSTALLED]}!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \ --button="${translations[CANCEL]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!":1 \ --button="${translations[OK]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!":0 2>/dev/null @@ -5057,7 +5076,7 @@ gui_proton_downloader () { if [[ "$1" != "silent" ]] ; then for GIVE_ALL_WINE in ${VERSION_WINE_GIT} ; do - for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" ; do + for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" ; do if [[ ${GIVE_WINE_URL^^} =~ ${GIVE_ALL_WINE^^}.TAR ]] ; then export URL_VERSION_PROTON_GIT=$GIVE_WINE_URL fi @@ -5068,7 +5087,7 @@ gui_proton_downloader () { restart_pp else print_error "$PW_WINE_USE" - for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" ; do + for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" ; do if [[ ${GIVE_WINE_URL^^} =~ ${PW_WINE_USE^^} ]] ; then export URL_VERSION_PROTON_GIT=$GIVE_WINE_URL fi From f3ee917135820aa57ad7f06998d9204f39341b29 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sat, 17 May 2025 10:29:33 +0300 Subject: [PATCH 26/34] Scripts version 2416 --- data_from_portwine/changelog_en | 5 +++++ data_from_portwine/changelog_ru | 5 +++++ data_from_portwine/scripts/var | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 30c78216..31fd5d99 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2416### / Date: 17.05.2025 / Download update size: 4 megabytes +* fixed translation generation (thanks to Htylol) +* added the ability to download Sarek Proton (thanks to Boria138) +* when using third-party versions of PROTON, DXVK and VKD3D are used, which are supplied with them (thanks to Htylol) + ###Scripts version 2415### / Date: 07.05.2025 / Download update size: 4 megabytes * fixed installation of libraries added to the settings when starting the game diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 12f6f242..1c2b588c 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2416### / Дата: 17.05.2025 / Размер скачиваемого обновления: 4 мегабайта +* исправлена генерация переводов (спасибо Htylol) +* добавлена возможность скачивания Sarek Proton (спасибо Boria138) +* при использовании сторонних версий PROTON используется DXVK и VKD3D, которые поставляются вместе с ними (спасибо Htylol) + ###Scripts version 2415### / Дата: 07.05.2025 / Размер скачиваемого обновления: 4 мегабайта * исправлена установка библиотек добавленных в настройки при запуске игры diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index b957d208..edaaadd7 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2415 +#SCRIPTS_NEXT_VERSION=2416 #SCRIPTS_STABLE_VERSION=2411 ######################################################################## 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" From 63c90c468ffbeff5c5c5244086f6419401ca0b69 Mon Sep 17 00:00:00 2001 From: Htylol Date: Sat, 17 May 2025 21:06:34 +0500 Subject: [PATCH 27/34] For supplied_dxvk_vkd3d added support for Proton 10 --- data_from_portwine/scripts/functions_helper | 68 +++++++++++++-------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index bb42ce94..d2cf350c 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3692,7 +3692,7 @@ start_portwine () { if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \ && [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] \ && [[ ! $PW_VULKAN_USE =~ (0|3) ]] \ - && [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d9.dll" ]] ; then + && [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d9.dll" || -f "${WINEDIR}/lib/wine/dxvk/x86_64-windows/d3d9.dll" ]] ; then if [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d10.dll" && -f "${WINEDIR}/lib64/wine/dxvk/d3d10_1.dll" ]] ; then CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi" CP_WINE_FILES="" @@ -3705,12 +3705,13 @@ start_portwine () { try_force_link_file "${WINEDIR}/lib/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/d3d8.dll" try_force_link_file "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/d3d8.dll" var_winedlloverride_update "d3d8=n" - elif [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d8.dll" ]] + elif [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d8.dll" || "${WINEDIR}/lib/wine/dxvk/x86_64-windows/d3d8.dll" ]] then add_to_var CP_DXVK_FILES "d3d8" else add_to_var CP_WINE_FILES "d3d8" fi fi - if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12core.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-1.dll" ]] ; then + if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12core.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-1.dll" ]] \ + || [[ -f "${WINEDIR}/lib/wine/vkd3d-proton/x86_64-windows/d3d12core.dll" && -f "${WINEDIR}/lib/vkd3d/x86_64-windows/libvkd3d-1.dll" ]] ; then CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" elif [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-shader-1.dll" ]] ; then CP_VKD3D_FILES="d3d12 libvkd3d-1 libvkd3d-shader-1" @@ -3719,6 +3720,7 @@ start_portwine () { CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1" add_to_var CP_WINE_FILES "d3d12 d3d12core" fi + [[ -f "${WINEDIR}/lib/wine/dxvk/x86_64-windows/d3d9.dll" ]] && PW_USE_SUPPLIED_DXVK_VKD3D="2" else PW_USE_SUPPLIED_DXVK_VKD3D="0" fi @@ -3951,13 +3953,17 @@ start_portwine () { if [[ -n "$CP_DXVK_FILES" ]] ; then print_info "Try create symlink DXVK files..." for wine_dxvk_dll in $CP_DXVK_FILES ; do - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] ; then - try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" - try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" - else - try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" - try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" - fi + case "$PW_USE_SUPPLIED_DXVK_VKD3D" in + 2) + try_force_link_file "${WINEDIR}/lib/wine/dxvk/i386-windows/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" + try_force_link_file "${WINEDIR}/lib/wine/dxvk/x86_64-windows/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" ;; + 1) + try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" + try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" ;; + 0) + try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" + try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" ;; + esac if [[ $PW_USE_FAKE_DLSS_3 == "1" ]] && [[ $wine_dxvk_dll == "dxgi" ]] then var_winedlloverride_update "dxgi=n,b" else var_winedlloverride_update "${wine_dxvk_dll}=n" @@ -3970,7 +3976,11 @@ start_portwine () { if [[ "$DXVK_ENABLE_NVAPI" == "1" ]] ; then print_info "Try create symlink NVAPI files..." - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] && [[ -f "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" ]] ; then + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "2" ]] && [[ -f "${WINEDIR}/lib/wine/nvapi/x86_64-windows/nvapi64.dll" ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/nvapi/i386-windows/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll" + try_force_link_file "${WINEDIR}/lib/wine/nvapi/x86_64-windows/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll" + try_force_link_file "${WINEDIR}/lib/wine/nvapi/x86_64-windows/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll" + elif [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] && [[ -f "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll" try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll" try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll" @@ -3989,19 +3999,29 @@ start_portwine () { if [[ -n "$CP_VKD3D_FILES" ]] ; then print_info "Try create symlink VKD3D files..." for wine_vkd3d_dll in $CP_VKD3D_FILES ; do - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] ; then - if [[ $wine_vkd3d_dll =~ d3d12 ]] ; then - try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" - try_force_link_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" - fi - if [[ $wine_vkd3d_dll =~ libvkd3d ]] ; then - try_force_link_file "${WINEDIR}/lib/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" - try_force_link_file "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" - fi - else - try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" - try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" - fi + case "$PW_USE_SUPPLIED_DXVK_VKD3D" in + 2) + if [[ $wine_vkd3d_dll =~ d3d12 ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/i386-windows/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/x86_64-windows/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + fi + if [[ $wine_vkd3d_dll =~ libvkd3d ]] ; then + try_force_link_file "${WINEDIR}/lib/vkd3d/i386-windows/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${WINEDIR}/lib/vkd3d/x86_64-windows/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + fi ;; + 1) + if [[ $wine_vkd3d_dll =~ d3d12 ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + fi + if [[ $wine_vkd3d_dll =~ libvkd3d ]] ; then + try_force_link_file "${WINEDIR}/lib/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + fi ;; + 0) + try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" ;; + esac var_winedlloverride_update "${wine_vkd3d_dll}=n" done create_new_dir "${PATH_TO_VKD3D_FILES}/vkd3d_cache" From abcb6496a17fc27afee8fd45f7d6251932f35cec Mon Sep 17 00:00:00 2001 From: Htylol Date: Sat, 17 May 2025 21:09:38 +0500 Subject: [PATCH 28/34] For supplied_dxvk_vkd3d added by default DXVK_ASYNC=1 --- data_from_portwine/scripts/functions_helper | 1 + 1 file changed, 1 insertion(+) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d2cf350c..3e281906 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3693,6 +3693,7 @@ start_portwine () { && [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] \ && [[ ! $PW_VULKAN_USE =~ (0|3) ]] \ && [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d9.dll" || -f "${WINEDIR}/lib/wine/dxvk/x86_64-windows/d3d9.dll" ]] ; then + export DXVK_ASYNC="1" if [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d10.dll" && -f "${WINEDIR}/lib64/wine/dxvk/d3d10_1.dll" ]] ; then CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi" CP_WINE_FILES="" From 8c6140e9645e7ac97478a1125eb4f7c877c63edc Mon Sep 17 00:00:00 2001 From: Htylol Date: Tue, 20 May 2025 07:10:44 +0500 Subject: [PATCH 29/34] Fixed errors for libvkd3d on Proton 10 --- data_from_portwine/scripts/functions_helper | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 3e281906..c6f82653 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3706,7 +3706,7 @@ start_portwine () { try_force_link_file "${WINEDIR}/lib/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/d3d8.dll" try_force_link_file "${WINEDIR}/lib64/wine/d8vk/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/d3d8.dll" var_winedlloverride_update "d3d8=n" - elif [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d8.dll" || "${WINEDIR}/lib/wine/dxvk/x86_64-windows/d3d8.dll" ]] + elif [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d8.dll" || -f "${WINEDIR}/lib/wine/dxvk/x86_64-windows/d3d8.dll" ]] then add_to_var CP_DXVK_FILES "d3d8" else add_to_var CP_WINE_FILES "d3d8" fi @@ -3740,7 +3740,7 @@ start_portwine () { try_remove_file "${WINEPREFIX}/drive_c/windows/system32/dgVoodoo.conf" try_force_link_file "${DGV2CONF}" "${WINEPREFIX}/drive_c/windows/system32/dgVoodoo.conf" - if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] ; then + if [[ $PW_USE_SUPPLIED_DXVK_VKD3D != "0" ]] ; then rm_from_var CP_DXVK_FILES "d3d9" else case "${PW_VULKAN_USE}" in @@ -4023,7 +4023,7 @@ start_portwine () { try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" ;; esac - var_winedlloverride_update "${wine_vkd3d_dll}=n" + [[ ! $wine_vkd3d_dll =~ libvkd3d ]] && var_winedlloverride_update "${wine_vkd3d_dll}=n" done create_new_dir "${PATH_TO_VKD3D_FILES}/vkd3d_cache" export VKD3D_SHADER_CACHE_PATH="${PATH_TO_VKD3D_FILES}/vkd3d_cache" From e09524a3d2ee432659b44499d0c0bb79062ce376 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 20 May 2025 20:28:43 +0300 Subject: [PATCH 30/34] Fixed GSTREAMER path for GE Proton 10+ --- data_from_portwine/scripts/functions_helper | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index c6f82653..428d0651 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1694,7 +1694,11 @@ init_wine_ver () { if ! check_flatpak ; then WINE_LIBRARY_PATH="${WINEDIR}/lib" - [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]] && WINE_LIBRARY_PATH+=":${WINEDIR}/lib64" + if [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]] + then WINE_LIBRARY_PATH+=":${WINEDIR}/lib64" + elif [[ -d "${WINEDIR}/lib/x86_64-linux-gnu/gstreamer-1.0" ]] + then WINE_LIBRARY_PATH+=":${WINEDIR}/lib/x86_64-linux-gnu:${WINEDIR}/lib/i386-linux-gnu" + fi export WINE_LIBRARY_PATH fi @@ -3135,10 +3139,12 @@ start_portwine () { pw_init_runtime if [[ "${PW_USE_GSTREAMER}" == "1" ]] ; then - if [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]] \ - && ! check_flatpak - then - export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" + if ! check_flatpak ; then + if [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]] + then export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" + elif [[ -d "${WINEDIR}/lib/x86_64-linux-gnu/gstreamer-1.0" ]] + then export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib/x86_64-linux-gnu/gstreamer-1.0:${WINEDIR}/lib/i386-linux-gnu/gstreamer-1.0" + fi fi export GST_GL_WINDOW="surfaceless" unset GST_GL_WINDOW From 3cde7716d63f7dda1d700e277312bd79a7c2a9b7 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 20 May 2025 20:39:49 +0300 Subject: [PATCH 31/34] Scripts version 2417 --- data_from_portwine/changelog_en | 4 ++++ data_from_portwine/changelog_ru | 4 ++++ data_from_portwine/scripts/var | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 31fd5d99..18863d00 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2417### / Date: 20.05.2025 / Download update size: 4 megabytes +* fixed of third-party versions of DXVK and VKD3D for GE-Proton10+ (thanks to Htylol) +* fixed of GSTREAMER (playing videos) on GE-Proton10+ + ###Scripts version 2416### / Date: 17.05.2025 / Download update size: 4 megabytes * fixed translation generation (thanks to Htylol) * added the ability to download Sarek Proton (thanks to Boria138) diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 1c2b588c..aa1f46ef 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2417### / Дата: 20.05.2025 / Размер скачиваемого обновления: 4 мегабайта +* исправлена работа сторонних версий DXVK и VKD3D для GE-Proton10+ (спасибо Htylol) +* исправлена работа GSTREAMER (отображение видеороликов) на версиях GE-Proton10+ + ###Scripts version 2416### / Дата: 17.05.2025 / Размер скачиваемого обновления: 4 мегабайта * исправлена генерация переводов (спасибо Htylol) * добавлена возможность скачивания Sarek Proton (спасибо Boria138) diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index edaaadd7..b1e77a02 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2416 +#SCRIPTS_NEXT_VERSION=2417 #SCRIPTS_STABLE_VERSION=2411 ######################################################################## 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" From 135fcbc3067c9d9de400ebb9d045684027e5c244 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sat, 24 May 2025 13:46:57 +0300 Subject: [PATCH 32/34] Fixed icu*.dll path for GE Proton 10+ --- data_from_portwine/scripts/functions_helper | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 428d0651..b046d325 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3197,6 +3197,9 @@ start_portwine () { if [[ -f "${WINEDIR}/lib/icu/${dll}.dll" ]] ; then try_force_link_file "${WINEDIR}/lib/icu/${dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${dll}.dll" try_force_link_file "${WINEDIR}/lib64/icu/${dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${dll}.dll" + elif [[ -f "${WINEDIR}/lib/wine/icu/i386-windows/${dll}.dll" ]] ; then + try_force_link_file "${WINEDIR}/lib/wine/icu/i386-windows/${dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${dll}.dll" + try_force_link_file "${WINEDIR}/lib/wine/icu/x86_64-windows/${dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${dll}.dll" else try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/${dll}.dll" try_remove_file "${WINEPREFIX}/drive_c/windows/system32/${dll}.dll" From 87158d1d79603387fc5426842528f4f2cee10aaf Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sat, 24 May 2025 13:58:47 +0300 Subject: [PATCH 33/34] Scripts version 2418 --- data_from_portwine/changelog_en | 3 +++ data_from_portwine/changelog_ru | 3 +++ data_from_portwine/scripts/var | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 18863d00..dc94d729 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2418### / Date: 24.05.2025 / Download update size: 4 megabytes +* сompleted adding full support for third-party GE-Proton versions 10 and above + ###Scripts version 2417### / Date: 20.05.2025 / Download update size: 4 megabytes * fixed of third-party versions of DXVK and VKD3D for GE-Proton10+ (thanks to Htylol) * fixed of GSTREAMER (playing videos) on GE-Proton10+ diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index aa1f46ef..f02abc0d 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2418### / Дата: 24.05.2025 / Размер скачиваемого обновления: 4 мегабайта +* завершено добавление полной поддержки сторонних GE-Proton версий 10 и выше + ###Scripts version 2417### / Дата: 20.05.2025 / Размер скачиваемого обновления: 4 мегабайта * исправлена работа сторонних версий DXVK и VKD3D для GE-Proton10+ (спасибо Htylol) * исправлена работа GSTREAMER (отображение видеороликов) на версиях GE-Proton10+ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index b1e77a02..a3c09023 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2417 +#SCRIPTS_NEXT_VERSION=2418 #SCRIPTS_STABLE_VERSION=2411 ######################################################################## 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" From 1b0c6c05594738b890fd5658bb8349260c5b9db2 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sat, 24 May 2025 14:04:44 +0300 Subject: [PATCH 34/34] STABLE: Scripts version 2419 --- data_from_portwine/changelog_en | 3 +++ data_from_portwine/changelog_ru | 3 +++ data_from_portwine/scripts/var | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index dc94d729..fc1421c5 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2419### / stable / Дата: 24.05.2025 / Download update size: 185 megabytes +* cumulative update to the stable version of PortProton scripts + ###Scripts version 2418### / Date: 24.05.2025 / Download update size: 4 megabytes * сompleted adding full support for third-party GE-Proton versions 10 and above diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index f02abc0d..d8c845aa 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2419### / stable / Дата: 24.05.2025 / Размер скачиваемого обновления: 185 мегабайт +* кумулятивное обновление стабильной версии скриптов PortProton + ###Scripts version 2418### / Дата: 24.05.2025 / Размер скачиваемого обновления: 4 мегабайта * завершено добавление полной поддержки сторонних GE-Proton версий 10 и выше diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index a3c09023..886b1b04 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,7 +1,7 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2418 -#SCRIPTS_STABLE_VERSION=2411 +#SCRIPTS_NEXT_VERSION=2419 +#SCRIPTS_STABLE_VERSION=2419 ######################################################################## 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="0"