diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 674b84c5..e577dec1 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,18 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2406### / stable / Date: 22.03.2025 / Download update size: 4 megabytes +* cumulative update to the stable version of PortProton scripts + +###Scripts version 2405### / Date: 20.03.2025 / Download update size: 4 megabytes +* USE_GALLIUM_ZINK is disabled by default (breaks some launchers, with the example of "Black Desert Online") +* USE_GALLIUM_NINE returned and added to additional settings + +###Scripts version 2404### / Date: 20.03.2025 / Download update size: 4 megabytes +* fixed license display +* fixed the work of the game "Eve Online" (to use correction, use the autoinstalling Eve Online from Portproton) +* updated installer for "World of Sea Battle" + ###Scripts version 2403### / stable / Date: 18.03.2025 / Download update size: 200 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 3502ddad..6ab4c42d 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,18 @@ ----------------------------------------- История изменений: +###Scripts version 2406### / stable / Дата: 22.03.2025 / Размер скачиваемого обновления: 4 мегабайта +* кумулятивное обновление стабильной версии скриптов PortProton + +###Scripts version 2405### / Дата: 20.03.2025 / Размер скачиваемого обновления: 4 мегабайта +* USE_GALLIUM_ZINK отключен по умолчанию (ломает некоторые лончеры, на примере "Black Desert Online") +* USE_GALLIUM_NINE возвращен и добавлен в дополнительные настройки + +###Scripts version 2404### / Дата: 20.03.2025 / Размер скачиваемого обновления: 4 мегабайта +* исправлено отображение лицензии +* исправлена работа игры "EVE Online" (для применения исправления воспользуйтесь автоустановкой лончера EVE Online из PortProton) +* обновлен установщик для "World of Sea Battle" + ###Scripts version 2403### / stable / Дата: 18.03.2025 / Размер скачиваемого обновления: 200 мегабайт * кумулятивное обновление стабильной версии скриптов PortProton diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot index ba388726..dfacf9f3 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-03-07 17:18+0500\n" + "POT-Creation-Date: 2025-03-20 21:49+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -350,6 +350,10 @@ msgstr "" msgid "Launched" msgstr "" +msgid "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the " + "missing package: d3dadapter9" +msgstr "" + msgid "You will need to check internet connection,and\\npress Repeat for " "repeat download" msgstr "" @@ -529,6 +533,9 @@ msgstr "" msgid "Use Gallium Zink (OpenGL driver is implemented via Vulkan)" msgstr "" +msgid "Use Gallium Nine (native DirectX 9 for MESA)" +msgstr "" + msgid "Instead of DXVK, use WineD3D vulkan (Damavand). Experimental " "function." msgstr "" @@ -1615,10 +1622,6 @@ msgstr "" msgid "SAVE" msgstr "" -msgid "This program comes with absolutely no warranty.\n" - "See the License for details." -msgstr "" - msgid "Author: Casro-Fidel (Mikhail Tergoev)\n" "\n" "Developer assistants and testers:" @@ -1635,7 +1638,7 @@ msgid "Do you want to join and help in the development of the project:" msgstr "" msgid "Website: http://linux-gaming.ru\n" - "Discord: http://discord.gg/yJSEFjF\n" + "TG: https://t.me/linux_gaming_ru\n" "VK: https://vk.com/linuxgamingru\n" "-------------------------------------------\n" "Become a paid subscriber:\n" @@ -1661,9 +1664,6 @@ msgstr "" msgid "ABOUT US" msgstr "" -msgid "ABOUT PORTPROTON" -msgstr "" - msgid "AUTORS" msgstr "" diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po index 518ad5a8..b15b0ea3 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-03-07 17:14+0500\n" +"POT-Creation-Date: 2025-03-20 21:49+0300\n" "PO-Revision-Date: 2024-11-13 08:18+0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -384,6 +384,13 @@ msgstr "¿Quieres instalar las bibliotecas recomendadas en el nuevo prefijo:" msgid "Launched" msgstr "Lanzado" +msgid "" +"d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing " +"package: d3dadapter9" +msgstr "" +"d3dadapter9.so.1.0.0 - No encontrado en el sistema.\n" +"Instala el paquete faltante:d3dadapter9" + msgid "" "You will need to check internet connection,and\\npress Repeat for repeat " "download" @@ -634,6 +641,9 @@ msgstr "" msgid "Use Gallium Zink (OpenGL driver is implemented via Vulkan)" msgstr "Gallium Zink (OpenGL a Vulkan)" +msgid "Use Gallium Nine (native DirectX 9 for MESA)" +msgstr "" + #, fuzzy msgid "Instead of DXVK, use WineD3D vulkan (Damavand). Experimental function." msgstr "WineD3D Vulkan (Damavand experimental)" @@ -2064,13 +2074,6 @@ msgstr "ATRÁS" msgid "SAVE" msgstr "AHORRAR" -msgid "" -"This program comes with absolutely no warranty.\n" -"See the License for details." -msgstr "" -"Este programa se proporciona sin ninguna garantía.\n" -"Consulta la licencia para más detalles." - msgid "" "Author: Casro-Fidel (Mikhail Tergoev)\n" "\n" @@ -2093,9 +2096,10 @@ msgstr "La lista se actualizará..." msgid "Do you want to join and help in the development of the project:" msgstr "Quieres unirte y ayudar en el desarrollo del proyecto:" +#, fuzzy msgid "" "Website: http://linux-gaming.ru\n" -"Discord: http://discord.gg/yJSEFjF\n" +"TG: https://t.me/linux_gaming_ru\n" "VK: https://vk.com/linuxgamingru\n" "-------------------------------------------\n" "Become a paid subscriber:\n" @@ -2139,9 +2143,6 @@ msgstr "" msgid "ABOUT US" msgstr "SOBRE NOSOTROS" -msgid "ABOUT PORTPROTON" -msgstr "SOBRE PORTPROTON" - msgid "AUTORS" msgstr "AUTORES" @@ -2157,6 +2158,16 @@ msgstr "UNIRSE" msgid "THIRD PARTY LIBRARIES" msgstr "BIBLIOTECAS DE TERCEROS" +#~ msgid "" +#~ "This program comes with absolutely no warranty.\n" +#~ "See the License for details." +#~ msgstr "" +#~ "Este programa se proporciona sin ninguna garantía.\n" +#~ "Consulta la licencia para más detalles." + +#~ msgid "ABOUT PORTPROTON" +#~ msgstr "SOBRE PORTPROTON" + #~ msgid "Mirror changed to:" #~ msgstr "Espejo cambiado a:" @@ -2172,8 +2183,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." @@ -2213,13 +2224,6 @@ msgstr "BIBLIOTECAS DE TERCEROS" #~ "Recordar la resolución de pantalla al iniciar el juego y devolverla al " #~ "cerrar (útil para juegos que cambian la resolución de pantalla al cerrar)" -#~ msgid "" -#~ "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing " -#~ "package: d3dadapter9" -#~ msgstr "" -#~ "d3dadapter9.so.1.0.0 - No encontrado en el sistema.\n" -#~ "Instala el paquete faltante:d3dadapter9" - #~ msgid "" #~ "MIT License\n" #~ "\n" diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po index 23f20a7c..fd9c5273 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-03-07 17:14+0500\n" -"PO-Revision-Date: 2025-03-07 17:18+0500\n" +"POT-Creation-Date: 2025-03-20 21:49+0300\n" +"PO-Revision-Date: 2025-03-20 21:50+0300\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.5\n" msgid "" "A running PortProton session was detected.\\nDo you want to end the previous " @@ -394,6 +394,13 @@ msgstr "Хотите добавить рекомендуемые библиот msgid "Launched" msgstr "Запущено" +msgid "" +"d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing " +"package: d3dadapter9" +msgstr "" +"d3dadapter9.so.1.0.0 - Не найден в системе.\\nУстановите недостающий пакет: " +"d3dadapter9" + msgid "" "You will need to check internet connection,and\\npress Repeat for repeat " "download" @@ -654,6 +661,9 @@ msgstr "" msgid "Use Gallium Zink (OpenGL driver is implemented via Vulkan)" msgstr "Использовать Gallium Zink (трансляция OpenGL в Vulkan)" +msgid "Use Gallium Nine (native DirectX 9 for MESA)" +msgstr "Принудительно использовать Gallium Nine (нативный DirectX9 для Mesa)" + msgid "Instead of DXVK, use WineD3D vulkan (Damavand). Experimental function." msgstr "" "Вместо DXVK используется WineD3D vulkan (Дамаванд). Экспериментальная " @@ -1658,7 +1668,6 @@ msgstr "" "запуском), работает вместе с SDL BACKEND (используется по умолчанию в " "Wayland сессии)" -#, fuzzy msgid "" "if specified, sets a base output height to linearly scale the cursor against." msgstr "" @@ -2045,13 +2054,6 @@ msgstr "НАЗАД" msgid "SAVE" msgstr "СОХРАНИТЬ" -msgid "" -"This program comes with absolutely no warranty.\n" -"See the License for details." -msgstr "" -"Эта программа поставляется без каких-либо гарантий.\n" -"Подробнее см. в Лицензия." - msgid "" "Author: Casro-Fidel (Mikhail Tergoev)\n" "\n" @@ -2076,7 +2078,7 @@ msgstr "Хотите присоединится и помочь в развит msgid "" "Website: http://linux-gaming.ru\n" -"Discord: http://discord.gg/yJSEFjF\n" +"TG: https://t.me/linux_gaming_ru\n" "VK: https://vk.com/linuxgamingru\n" "-------------------------------------------\n" "Become a paid subscriber:\n" @@ -2085,7 +2087,7 @@ msgid "" "-------------------------------------------" msgstr "" "Website: https://linux-gaming.ru/\n" -"Discord: http://discord.gg/yJSEFjF\n" +"TG: https://t.me/linux_gaming_ru\n" "VK: https://vk.com/linuxgamingru\n" "-------------------------------------------\n" "Стать платным подписчиком:\n" @@ -2120,9 +2122,6 @@ msgstr "" msgid "ABOUT US" msgstr "О НАС" -msgid "ABOUT PORTPROTON" -msgstr "О PORTPROTON" - msgid "AUTORS" msgstr "АВТОРЫ" @@ -2138,6 +2137,16 @@ msgstr "ПРИСОЕДЕНИТЬСЯ" msgid "THIRD PARTY LIBRARIES" msgstr "БИБЛИОТЕКИ" +#~ msgid "" +#~ "This program comes with absolutely no warranty.\n" +#~ "See the License for details." +#~ msgstr "" +#~ "Эта программа поставляется без каких-либо гарантий.\n" +#~ "Подробнее см. в Лицензия." + +#~ msgid "ABOUT PORTPROTON" +#~ msgstr "О PORTPROTON" + #~ msgid "Mirror changed to:" #~ msgstr "Зеркало для скачивания изменено на:" @@ -2198,13 +2207,6 @@ msgstr "БИБЛИОТЕКИ" #~ "возвращать его при закрытии (полезно для игр, меняющих разрешение экрана " #~ "рабочего стола)" -#~ msgid "" -#~ "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing " -#~ "package: d3dadapter9" -#~ msgstr "" -#~ "d3dadapter9.so.1.0.0 - Не найден в системе.\\nУстановите недостающий " -#~ "пакет: d3dadapter9" - #~ msgid "" #~ "MIT License\n" #~ "\n" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index f4ee78c9..2839f590 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2950,13 +2950,6 @@ pw_create_gui_png () { export name_desktop_png="bat" return 0 fi - name_desktop_png="${PORTPROTON_NAME// /_}" - if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then - local ICON_NAME_REGEX=(\! % \$ \& \<) - for i in "${ICON_NAME_REGEX[@]}" ; do - name_desktop_png="${name_desktop_png//$i/}" - done - fi fi if [[ -z "$PORTPROTON_NAME" ]] \ @@ -2998,6 +2991,16 @@ pw_create_gui_png () { edit_db_from_gui PORTPROTON_NAME FILE_DESCRIPTION fi + if [[ -z $name_desktop_png ]] ; then + name_desktop_png="${PORTPROTON_NAME// /_}" + if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then + local ICON_NAME_REGEX=(\! % \$ \& \<) + for i in "${ICON_NAME_REGEX[@]}" ; do + name_desktop_png="${name_desktop_png//$i/}" + done + fi + fi + resize_png "$portwine_exe" "${PORTPROTON_NAME}" "48" "128" PORTPROTON_NAME_PNG="${PORTPROTON_NAME// /_}" @@ -3605,7 +3608,9 @@ start_portwine () { try_force_link_file "${PHYSX_PATH}/cudart64_65.dll" "${WINEPREFIX}/drive_c/windows/system32/cudart64_65.dll" # 3D API - unset CP_VKD3D_FILES CP_DXVK_FILES CP_DGV2_FILES CP_WINE_FILES PATH_TO_DXVK_FILES PATH_TO_VKD3D_FILES + unset CP_VKD3D_FILES CP_DXVK_FILES CP_DGV2_FILES CP_WINE_FILES PATH_TO_DXVK_FILES PATH_TO_VKD3D_FILES CP_GALLIUM_NINE_FILES + [[ "$PW_USE_GALLIUM_NINE" == "1" ]] && PW_VULKAN_USE="3" + if [[ $PW_USE_DAMAVAND == "1" ]] && [[ $PW_VULKAN_USE != "0" ]] ; then # WINED3D VULKAN (DAMAVAND) print_info "Use DAMAVAND (DirectX to wined3d vulkan)" @@ -3649,6 +3654,23 @@ start_portwine () { CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" CP_WINE_FILES="d3d10_1 d3d10" ;; + 3) + # GALLIUM NINE + print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)" + PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" + CP_GALLIUM_NINE_FILES="d3d9" + CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1" + CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d8 dxgi" + export __GL_YIELD="NOTHING" + export mesa_glthread="true" + export WINE_D3D_CONFIG="renderer=gl" + export PW_VKBASALT="0" + export PW_MANGOHUD="0" + export PW_WINE_FULLSCREEN_FSR="0" + export PW_USE_GALLIUM_ZINK="0" + export DXVK_ENABLE_NVAPI="0" + export PW_USE_VRCLIENT="0" + ;; 5) # LEGACY DXVK print_info "DXVK v.${DXVK_LEGACY_VER} in use" @@ -3704,6 +3726,10 @@ start_portwine () { 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" @@ -3938,6 +3964,45 @@ start_portwine () { export VKD3D_SHADER_CACHE_PATH="${PATH_TO_VKD3D_FILES}/vkd3d_cache" fi + if [[ "$CP_GALLIUM_NINE_FILES" == "d3d9" ]] ; then + PATH_TO_GALLIUM_NINE_FILES="${PW_PLUGINS_PATH}/gallium_nine_v.${PW_GALLIUM_NINE_VER}" + if [[ ! -d "$PATH_TO_GALLIUM_NINE_FILES" ]] ; then + if try_download "github.com/Castro-Fidel/vulkan/releases/download/gallium_nine_v.${PW_GALLIUM_NINE_VER}/gallium_nine_v.${PW_GALLIUM_NINE_VER}.tar.xz" \ + "${PORT_WINE_PATH}/data/tmp/gallium_nine_v.${PW_GALLIUM_NINE_VER}.tar.xz" ; then + if ! unpack "${PORT_WINE_PATH}/data/tmp/gallium_nine_v.${PW_GALLIUM_NINE_VER}.tar.xz" "$PW_PLUGINS_PATH/" + then try_remove_dir "$PATH_TO_GALLIUM_NINE_FILES" + fi + try_remove_file "${PORT_WINE_PATH}/data/tmp/gallium_nine_v.${PW_GALLIUM_NINE_VER}.tar.xz" + fi + fi + print_info "Try create symlink GALLIUM_NINE files..." + try_force_link_file "${PATH_TO_GALLIUM_NINE_FILES}/lib32/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/syswow64/d3d9.dll" + try_force_link_file "${PATH_TO_GALLIUM_NINE_FILES}/lib64/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/system32/d3d9.dll" + unset FIND_D3D_MODULE D3D_MODULE_PATH + if ! check_flatpak ; then + FIND_D3D_MODULE=$(dirname "$(find /usr/ -maxdepth 4 -type f -name "d3dadapter9.so.*" 2>/dev/null)") + if [[ -n "$FIND_D3D_MODULE" ]] ; then + IFS=$'\n' + for D3D_MP in $FIND_D3D_MODULE ; do + if [[ -n "$D3D_MODULE_PATH" ]] + then export D3D_MODULE_PATH="$D3D_MODULE_PATH:/run/host${D3D_MP}" + else export D3D_MODULE_PATH="/run/host${D3D_MP}" + fi + done + IFS="$orig_IFS" + print_info "D3D_MODULE_PATH=${D3D_MODULE_PATH}" + else + pw_stop_progress_bar + yad_error "${translations[d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing package: d3dadapter9]}" + stop_portwine + fi + else + export D3D_MODULE_PATH="/app/lib/i386-linux-gnu/GL/default/lib/d3d:/usr/lib/x86_64-linux-gnu/GL/default/lib/d3d" + print_info "D3D_MODULE_PATH=${D3D_MODULE_PATH}" + fi + var_winedlloverride_update "d3d9=n" + fi + if [[ "$PW_USE_VRCLIENT" = "1" ]] ; then if [[ ! -d "${WINEPREFIX}/drive_c/vrclient/bin" ]] ; then create_new_dir "${WINEPREFIX}/drive_c/vrclient/bin" @@ -5029,7 +5094,8 @@ gui_edit_db () { PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL PW_GUI_DISABLED_CS PW_USE_GAMEMODE 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_DAMAVAND + PW_DISABLE_COMPOSITING PW_USE_RUNTIME PW_DINPUT_PROTOCOL PW_USE_NATIVE_WAYLAND PW_USE_GALLIUM_ZINK PW_USE_GALLIUM_NINE + PW_USE_DAMAVAND ) if check_wayland_session ; then @@ -5083,6 +5149,7 @@ gui_edit_db () { PW_DINPUT_PROTOCOL_INFO=${translations[Force use DirectInput protocol instead of XInput]} PW_USE_NATIVE_WAYLAND_INFO=${translations[Enable experemental native Wayland support (need special wine build to work)]} 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_VULKAN_NO_ASYNC_INFO=${translations[Disable asynchronous calls for VULKAN and DXVK modes]} @@ -6550,7 +6617,7 @@ pw_prefix_manager () { IFS=$'\n' try_remove_file "${PW_TMPFS_PATH}/dll_list_tmp" while read -r PW_BOOL_IN_DLL_LIST ; do - if [[ ! ${PW_BOOL_IN_DLL_LIST} =~ (d3d|directx9|dont_use|dxvk|vkd3d|faudio1|Foundation) ]] ; then + if [[ ! ${PW_BOOL_IN_DLL_LIST} =~ (d3d|directx9|dont_use|dxvk|vkd3d|galliumnine|faudio1|Foundation) ]] ; then if grep ^"$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{print $1}')"$ "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ; then echo -e "true\n$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{print $1}')\n$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{ $1 = ""; print substr($0, 2) }')" >> "${PW_TMPFS_PATH}/dll_list_tmp" else @@ -6692,6 +6759,7 @@ portwine_start_debug () { 0) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DirectX to wined3d opengl" >> "${PORT_WINE_PATH}/PortProton.log" ;; 1) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_STABLE_VER}, VKD3D-PROTON v.${VKD3D_STABLE_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;; 2) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_GIT_VER}, VKD3D-PROTON v.${VKD3D_GIT_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;; + 3) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - Native DX9 on MESA drivers" >> "${PORT_WINE_PATH}/PortProton.log" ;; 5) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_LEGACY_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;; *) echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/PortProton.log" ;; esac @@ -7056,24 +7124,15 @@ gui_credits () { # shellcheck source=/dev/null source "${PORT_WINE_PATH}/data/scripts/thanks" - "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri --scroll \ - --text-align=center --text="${translations[PortProton v. \${install_ver} -scripts v. \${scripts_install_ver}]}" --text-info <<< "https://linux-gaming.ru - -$(eval_translations "Copyright © \$%DATE% Castro-Fidel (linux-gaming.ru)" "DATE=$(date +%Y)") - -${translations[This program comes with absolutely no warranty. -See the License for details.]}" 2>/dev/null & - - "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=2 --scroll \ + "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --scroll \ --text-info <<< "${translations[Author: Casro-Fidel (Mikhail Tergoev) Developer assistants and testers:]} $(credits_devel)" 2>/dev/null & - "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll < <(eval_translations "MIT License + "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=2 --text-info --scroll <<< "MIT License -Copyright © \$%DATE% Castro-Fidel (linux-gaming.ru) +Copyright © $(date +%Y) Castro-Fidel (linux-gaming.ru) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal @@ -7091,9 +7150,9 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE." "DATE=$(date +%Y)") 2>/dev/null & +SOFTWARE." "DATE=$(date +%Y)" 2>/dev/null & - "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=4 \ + "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=3 \ --text-info --show-uri --scroll \ <<< "${translations[The project was supported: https://boosty.to/portwine-linux.ru]} @@ -7101,11 +7160,11 @@ $(credits_boosty) ${translations[The list will be updated...]}" 2>/dev/null & - "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=5 \ + "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text="${translations[Do you want to join and help in the development of the project:]}" \ --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \ --uri-color=red --show-uri --text-info --scroll <<< "${translations[Website: http://linux-gaming.ru -Discord: http://discord.gg/yJSEFjF +TG: https://t.me/linux_gaming_ru VK: https://vk.com/linuxgamingru ------------------------------------------- Become a paid subscriber: @@ -7113,7 +7172,7 @@ boosty: https://boosty.to/portwine-linux.ru Yandex wallet: 410012267513818 -------------------------------------------]}" 2>/dev/null & - "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ + "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=5 --show-uri --title="THIRD PARTY LIBRARIES" \ --text-info <<< "${translations[ Third-party libraries that are used in PortProton PortProton is built on the basis of the following free software libraries: @@ -7125,9 +7184,10 @@ YAD: https://github.com/v1cont/yad DGVOODOO2: https://dege.fw.hu/]}" 2>/dev/null & "${pw_yad}" --title "${translations[ABOUT US]}" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --notebook --no-buttons --tab-pos=bottom --expand --width=750 --height=400 \ - --tab="${translations[ABOUT PORTPROTON]}" --tab="${translations[AUTORS]}" --tab="${translations[LICENSE]}" \ - --tab="${translations[SPONSORS]}" --tab="${translations[JOIN]}" --tab="${translations[THIRD PARTY LIBRARIES]}" + --notebook --no-buttons --tab-pos=bottom --expand --width=950 --height=500 \ + --tab="${translations[AUTORS]}" --tab="${translations[LICENSE]}" \ + --tab="${translations[SPONSORS]}" --tab="${translations[JOIN]}" \ + --tab="${translations[THIRD PARTY LIBRARIES]}" restart_pp } diff --git a/data_from_portwine/scripts/portwine_db/eve.ppdb b/data_from_portwine/scripts/portwine_db/eve.ppdb index ba4eb50e..ee308ef5 100644 --- a/data_from_portwine/scripts/portwine_db/eve.ppdb +++ b/data_from_portwine/scripts/portwine_db/eve.ppdb @@ -15,8 +15,8 @@ if [[ "${DESKTOP_SESSION}" =~ "gnome" ]] \ fi export PW_WINDOWS_VER="10" export PW_WINE_USE="WINE_LG" -export PW_USE_WINE_DXGI="1" -export PW_VULKAN_USE="1" +export PW_USE_WINE_DXGI="0" +export PW_VULKAN_USE="2" export PW_USE_GSTREAMER="0" export PW_PREFIX_NAME="EVE_ONLINE" export PW_WINE_FULLSCREEN_FSR="0" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE index d44aa19c..b5f63e33 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -8,8 +8,8 @@ ######################################################################## export PW_WINDOWS_VER="10" export PW_WINE_USE="WINE_LG" -export PW_USE_WINE_DXGI="1" -export PW_VULKAN_USE="1" +export PW_USE_WINE_DXGI="0" +export PW_VULKAN_USE="2" export PW_USE_GSTREAMER="0" export PW_PREFIX_NAME="EVE_ONLINE" export PW_WINE_FULLSCREEN_FSR="0" @@ -20,7 +20,6 @@ export PW_USE_EAC_AND_BE="1" export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 arial tahoma" # msdelta export WINEDLLOVERRIDES="msvcp140,msvcp140_1=n" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/eve-online-latest+Setup.exe" -export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher" start_portwine if try_download "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror @@ -29,24 +28,29 @@ then EVE_LAUNCHER_DIR="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/eve-online" $pw_7z x "${PW_USER_TEMP}/eve-online-latest+Setup.exe" -o"${EVE_LAUNCHER_DIR}" -y - $pw_7z x "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" -o"${EVE_LAUNCHER_DIR}/tmp" -y + EVE_VERSION="$(cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}')" - APP_DIR="app-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`" + $pw_7z x "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" -o"${EVE_LAUNCHER_DIR}/tmp" -y - create_new_dir "${EVE_LAUNCHER_DIR}/$APP_DIR" + + create_new_dir "${EVE_LAUNCHER_DIR}/app-$EVE_VERSION" create_new_dir "${EVE_LAUNCHER_DIR}/packages/SquirrelTemp" - cp -r "${EVE_LAUNCHER_DIR}/tmp/lib/net45/." "${EVE_LAUNCHER_DIR}/$APP_DIR" - cp "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" "${EVE_LAUNCHER_DIR}/packages" - mv "${EVE_LAUNCHER_DIR}/${APP_DIR}/eve-online_ExecutionStub.exe" "${EVE_LAUNCHER_DIR}/eve-online.exe" + cp -r "${EVE_LAUNCHER_DIR}/tmp/lib/net45/." "${EVE_LAUNCHER_DIR}/app-$EVE_VERSION" + cp "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" "${EVE_LAUNCHER_DIR}/packages" + mv "${EVE_LAUNCHER_DIR}/app-${EVE_VERSION}/eve-online_ExecutionStub.exe" "${EVE_LAUNCHER_DIR}/eve-online.exe" cp "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/packages" mv "${EVE_LAUNCHER_DIR}/setupIcon.ico" "${EVE_LAUNCHER_DIR}/app.ico" - rm -rf "${EVE_LAUNCHER_DIR}/background.gif" "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/tmp" + rm -rf "${EVE_LAUNCHER_DIR}/background.gif" "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/tmp" + + pw_stop_progress_bar portwine_exe="${EVE_LAUNCHER_DIR}/eve-online.exe" - pw_stop_progress_bar - portwine_create_shortcut try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" + + export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher" + portwine_create_shortcut + fi stop_portwine 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 7e243965..ea32df5c 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 @@ -22,7 +22,10 @@ then pw_run "${PW_AUTOINSTALL_EXE}" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" - export portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe" + 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" + fi pw_create_unique_exe "wosb_launcher_pp" kill_portwine pw_stop_progress_bar diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ebd9979b..0eef8f5b 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=2403 -#SCRIPTS_STABLE_VERSION=2403 +#SCRIPTS_NEXT_VERSION=2406 +#SCRIPTS_STABLE_VERSION=2406 ######################################################################## 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" @@ -38,13 +38,15 @@ export PW_LOCALE_SELECT="disabled" export PW_DINPUT_PROTOCOL="0" export PW_USE_VRCLIENT="0" export STAGING_SHARED_MEMORY="1" -export PW_USE_GALLIUM_ZINK="1" +export PW_USE_GALLIUM_ZINK="0" +export PW_USE_GALLIUM_NINE="0" export PW_USE_DAMAVAND="0" ###DEFAULT_WINE### export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v20" export PW_FAKE_DLSS_VER="230506" 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-19" export PW_WINE_LG_VER="WINE_LG_10-1"