Scripts version 2118

2022-06-15 23:02:23 +03:00
parent 366cd15995
commit d2410479d8
12 changed files with 141 additions and 24 deletions
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,8 +2,13 @@ You can help us in the development of the project on the website: boosty.to/port
 -----------------------------------------
 Changelog:

+###Scripts version 2118###
+* PW_USE_D3D_EXTRAS is back on by default (except WGC)
+* updated "PROTON_STEAM" to version 7.0-3
+* added information about the project and developers (test mode)
+
 ###Scripts version 2117###
-* HOTFIX - World of Sea Battle
+* HOTFIX - World of Sea Battles
 * HOTFIX - AUTOINSTALL

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

+###Scripts version 2118###
+* переменная PW_USE_D3D_EXTRAS снова включена по умолчанию (кроме WGC)
+* обновлен "PROTON_STEAM" до версии 7.0-3
+* добавлена информация о проекте, разработчиках и донатеров (тестовый режим) 
+
 ###Scripts version 2117###
 * исправлена установка и запуск World of Sea Battle
 * для AUTOINSTALL по умолчанию включена переменная PW_USE_D3D_EXTRAS (необходима для стабильной установки лончеров в тихом режиме)
--- a/data_from_portwine/scripts/credits
+++ b/data_from_portwine/scripts/credits
@@ -0,0 +1,112 @@
+#! /bin/sh
+"${pw_yad_new}" --plug=10 --tabnum=1 --show-uri \
+--text-align=center --text="PortProton v.${install_ver}
+scripts v. ${scripts_install_ver}
+
+Программа для запуска Windows игр и приложений в GNU/Linux
+
+https://portwine-linux.ru
+
+Copyright © 2022 Castro-Fidel (PortWINE-Linux.ru)
+
+This program comes with absolutely no warranty.
+See the License for details." &
+
+
+"${pw_yad_new}" --plug=10 --tabnum=2 \
+--text-align=center --text="Author:   Casro-Fidel
+
+Development assistants:
+Cefeiko
+Dezert1r
+Taz_mania
+Anton_Famillianov
+gavr
+RidBowt
+chal55rus
+UserDiscord
+
+Список будет дополнятся..." &
+
+"${pw_yad_new}" --plug=10 --tabnum=3 --text-info <<< "MIT License
+
+Copyright (©) 2022 Castro-Fidel (PortWINE-Linux.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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED (AS IS), WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+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." &
+
+"${pw_yad_new}" --plug=10 --tabnum=4 \
+--text-align=center \
+--text="Sponsors:
+Cefeiko
+Dezert1r
+Taz_mania
+Anton_Famillianov
+gavr
+RidBowt
+chal55rus
+UserDiscord
+Александр
+Сергей 33(46)RUS
+Aule Mahal
+CyberBoar
+Evgen
+johny
+Maksami
+MRModer
+Pependos
+Phoenix55rus
+Xpamych
+Виндета(рот)
+Ка6адОнНа
+ХОЛО МУДРАЯ
+
+Список будет дополнятся..." &
+
+"${pw_yad_new}" --plug=10 --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \
+--title=JOIN --window-icon=group  --image=system-config-users --uri-color=red --show-uri \
+--text-info <<< \
+"Website:  http://portwine-linux.ru
+Discord:  http://discord.gg/yJSEFjF
+VK:       https://vk.com/portwinelinux
+-------------------------------------------
+Стать платным подписчиком:
+boosty: https://boosty.to/portwine-linux.ru
+patreon: https://www.patreon.com/portproton
+Кошельки WebMoney:   WMZ-Z135951244401   WME-E325631629973
+Yandex кошельк:   410012267513818
+-------------------------------------------
+Задонатить на стрим:
+https://www.donationalerts.com/r/portwine_linux" &
+
+"${pw_yad_new}" --plug=10 --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
+--text-info <<< "Сторонние библиотеки, которые используются в PortProton
+
+PortProton собран на основе следующих бесплатных библиотек программного обеспечения:
+
+WINE-PROTON: https://github.com/ValveSoftware/Proton
+WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/
+YAD: https://github.com/v1cont/"${pw_yad_new}"
+ZENITY: https://github.com/GNOME/zenity" &
+    
+"${pw_yad_new}" --title "ABOUT US" --key=10 --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
+--center --notebook --no-buttons  --tab-pos=bottom \
+--tab="ABOUT PORTPROTON" --tab="AUTORS" --tab="LICENSE" --tab="SPONSORS" --tab="JOIN" \
+--tab="THIRD PARTY LIBRARIES"
+
+/usr/bin/env bash -c ${pw_full_command_line[*]} 
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -12,7 +12,7 @@ then
    export loc_gui_changelog="История изменений"
    export loc_gui_edit_usc="Редактировать USER.CONF"
    export loc_gui_scripts_fb="Откатить версию скриптов"
-    export loc_gui_about_us="О нас"
+    export loc_gui_credits="Авторы и спасибы =)"

 	export loc_tray_winefile="Файловый менеджер WINE"
 	export loc_tray_tascmng="Диспетчер задач WINE"
@@ -142,7 +142,7 @@ then
    export loc_gui_changelog="CHANGELOG"
    export loc_gui_edit_usc="EDIT USER.CONF"
    export loc_gui_scripts_fb="SCRIPTS FROM BACKUP"
-    export loc_gui_about_us="ABOUT PORTPROTON"
+    export loc_gui_credits="CREDITS"

 	export loc_tray_winefile="WINEFILE"
 	export loc_tray_tascmng="TASKMNR"
--- a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient
+++ b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient
@@ -7,7 +7,7 @@
 export PW_COMMENT_DB="World of Sea Battle"
 export PW_PREFIX_NAME="DOTNET"
 export PW_WINDOWS_VER="10"
-export PW_DLL_INSTALL="dotnet48 dotnet20sp2 faudio"
+export PW_DLL_INSTALL="faudio dotnet48 dotnet20sp2"
 export WINEDLLOVERRIDES="quartz=b"
 export LAUNCH_PARAMETERS=""
 export PW_WINE_USE="PROTON_GE"
--- a/data_from_portwine/scripts/portwine_db/WorldOfTanks
+++ b/data_from_portwine/scripts/portwine_db/WorldOfTanks
@@ -7,3 +7,4 @@ export PW_VULKAN_USE=1                       #dxvk, vkd3d or 0 for OpenGL
 export PW_DLL_INSTALL="lucida vcrun2019"     # Install DDL in port prefix (used winetricks) 
 export WINEDLLOVERRIDES="xaudio2_7="
 export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
+export PW_USE_D3D_EXTRAS=0
--- a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
+++ b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
@@ -8,6 +8,7 @@
    export PW_PREFIX_NAME="DOTNET"
    export PW_DLL_INSTALL="mfc42 vb6run physx dotnet40"        # Install DDL in port prefix (used winetricks) 
    export PW_COMMENT_DB="World Of Tanks EnCore"
+    export PW_USE_D3D_EXTRAS=0
    ## export DXVK_HUD=fps,devinfo
    ## export PW_MANGOHUD=1
 #####################examples###########################
--- a/data_from_portwine/scripts/portwine_db/wgc
+++ b/data_from_portwine/scripts/portwine_db/wgc
@@ -15,6 +15,7 @@ export WINEDLLOVERRIDES="ucrtbase,xaudio2_7,xaudio2_8=n,b"
 export PW_DLL_INSTALL="lucida vcrun2019"     # Install DDL in port prefix (used winetricks)
 ##export PW_GUI_DISABLED_CS=1
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
+export PW_USE_D3D_EXTRAS=0

 add_in_start_portwine () {
    if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" ]] ; then
--- a/data_from_portwine/scripts/portwine_db/wot_encore_install_ru
+++ b/data_from_portwine/scripts/portwine_db/wot_encore_install_ru
@@ -8,6 +8,7 @@
    export PW_PREFIX_NAME="DOTNET"
    export PW_DLL_INSTALL="dotnet40 vcrun2017  mfc42 vb6run physx"
    export PW_COMMENT_DB="World Of Tanks EnCore Installer"
+    export PW_USE_D3D_EXTRAS=0
    ## export DXVK_HUD=fps,devinfo
    ## export PW_MANGOHUD=1
 #####################examples###########################
--- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB
@@ -4,7 +4,7 @@
 export PW_PREFIX_NAME="DOTNET"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/wos_client.exe"
 export LAUNCH_PARAMETERS=("/VERYSILENT")
-export PW_DLL_INSTALL="dotnet48 dotnet20sp2 faudio"
+export PW_DLL_INSTALL="faudio dotnet48 dotnet20sp2"
 export PW_VULKAN_USE=1

 if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -425,19 +425,10 @@ pw_autoinstall_from_db () {
    . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}"
 }

-gui_about_portproton () {
-    "${pw_yad_new}" --about --pname=PortProton  \
-    --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
-    --pversion="${install_ver}\n(scripts v. ${scripts_install_ver})" \
-    --image=help-about \
-    --copyright="Copyright © 2022 Castro-Fidel (PortWINE-Linux.ru)" \
-    --comments="Порт для запуска Windows игр и приложений в GNU/Linux" \
-    --license=MIT \
-    --authors="Castro-Fidel",,"Выражаем особую благодарность в помоще проекту:",Cefeiko,Dezert1r,Taz_mania,Anton_Famillianov,gavr,RidBowt,chal55rus,UserDiscord \
-    --website=portwine-linux.ru/ \
-    --website-label=portwine-linux.ru
+gui_credits () {
+    . "${PORT_SCRIPTS_PATH}/credits"
 }
-export -f gui_about_portproton
+export -f gui_credits

 ###MAIN###
 PW_PREFIX_NAME="$(echo "${PW_PREFIX_NAME}" | sed -e s/[[:blank:]]/_/g)"
@@ -608,8 +599,8 @@ else
    --field="   $loc_gui_upd_pp"!""!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
    --field="   $loc_gui_changelog"!""!"":"FBTN" '@bash -c "button_click open_changelog"' \
    --field="   $loc_gui_edit_usc"!""!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \
-    --field="   $loc_gui_scripts_fb"!""!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' &
-    # --field="   $loc_gui_about_us"!""!"":"FBTN" '@bash -c "button_click gui_about_portproton"' &
+    --field="   $loc_gui_scripts_fb"!""!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \
+    --field="   $loc_gui_credits"!""!"":"FBTN" '@bash -c "button_click gui_credits"' &

    "${pw_yad_new}" --plug=${KEY} --tabnum=3 --columns=3 --align-buttons --form --separator=";" \
    --field="  3D API  : :CB" "VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL!GALLIUM_NINE (native DX9 on MESA)" \
@@ -732,7 +723,7 @@ case "$PW_YAD_SET" in
    open_changelog) open_changelog ;;
    120) gui_vkBasalt ;;
    pw_create_prefix_backup) pw_create_prefix_backup ;;
-    gui_about_portproton) gui_about_portproton ;;
+    gui_credits) gui_credits ;;
    PW_*) pw_autoinstall_from_db ;;
 esac

--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2117
+#SCRIPTS_NEXT_VERSION=2118
 ########################################################################
 export PW_MANGOHUD=0
 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt
@@ -25,7 +25,7 @@ export PW_LIBS_VER="_v31"
 export PORTWINE_URL="https://portwine-linux.ru/"
 export GDK_BACKEND="x11"
 export PW_USE_GSTREAMER=1
-export PW_USE_D3D_EXTRAS=0
+export PW_USE_D3D_EXTRAS=1
 export PW_PREFIX_NAME="DEFAULT"
 export WINE_WIN_START="start.exe /i /unix"
 export PW_USE_SHADER_CACHE=1
@@ -35,7 +35,7 @@ export PW_FORCE_LARGE_ADDRESS_AWARE=1
 export PW_WINE_USE=PROTON_GE
 export PW_PLUGINS_VER="_v5"
 ###WINE_PROTON_STEAM###
-export PW_STEAM_VER="7.0-2"
+export PW_STEAM_VER="7.0-3"
 export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}"
 ###WINE_PROTON_GE###
 export PW_GE_VER="7-20"
@@ -49,7 +49,7 @@ pw_install_dll_in_prefix ()
 {
    case $PW_PREFIX_NAME in
        DEFAULT) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019" ;;
-         DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 dotnet48 dotnet20sp2 faudio" ;;
+         DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48 dotnet20sp2" ;;
              *) export PW_MUST_HAVE_DLL="" ;;
    esac
 }