From 343dda7fe8255425411c76df553ea53bb70a80bc Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 30 May 2023 02:25:25 +0300 Subject: [PATCH] Scripts version 2191 --- data_from_portwine/changelog_eng | 11 +++- data_from_portwine/changelog_rus | 15 ++++- data_from_portwine/img/gui/poe.png | Bin 2936 -> 5463 bytes data_from_portwine/scripts/credits | 28 ++++----- data_from_portwine/scripts/functions_helper | 24 ++++---- .../scripts/portwine_db/EALauncher | 10 +-- .../scripts/portwine_db/PlariumPlay | 48 +++++++-------- .../scripts/portwine_db/VKPlayLoader | 3 +- .../scripts/pw_autoinstall/PW_CALIBER | 2 +- .../scripts/pw_autoinstall/PW_EAAPP | 9 +-- .../scripts/pw_autoinstall/PW_LGC | 2 +- .../scripts/pw_autoinstall/PW_PLARIUM_PLAY | 32 +++++++++- .../scripts/pw_autoinstall/PW_ROCKSTAR | 1 + .../scripts/pw_autoinstall/PW_VKPLAY | 1 + .../scripts/pw_autoinstall/PW_WGC | 2 +- data_from_portwine/scripts/runlib | 57 +++++++++--------- data_from_portwine/scripts/start.sh | 57 ++++++++++-------- data_from_portwine/scripts/var | 6 +- data_from_portwine/scripts/zen_yad_gui | 26 ++++---- 19 files changed, 188 insertions(+), 146 deletions(-) mode change 100755 => 100644 data_from_portwine/img/gui/poe.png diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 5b54c7f..6e5cc69 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,15 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2191### +* the libs_v43 library package has been updated + pressure-vessel 0.20230418.0 + sniper 0.20230424.48416 + YAD 12.3 +* fixed vkPlay Cloud Cloud gaming (it is necessary to reinstall vkPlay from the AUTOINSTALL tab after updating the scripts) +* the installation and launch of Plarium Play has been restored +* PortProton has been transferred to a new version of the pseudographic interface: YAD 12.3 + ###Scripts version 2190### * added auto-detection of the path to the file to be launched after selecting automatic installation ITCH.IO * the FULCRUM GAMES launcher has been completely removed from PortProton due to the transition of all their PC games to the STEAM launcher @@ -819,7 +828,7 @@ export WINE_FULLSCREEN_FSR="1" (by default) * updated db files ###Scripts version 2065### -* HOTFIX - correcting the termination of the yad and yad_new processes +* HOTFIX - correcting the termination of the yad and yad_v12_3 processes ###Scripts version 2064### * added notification to the user about possible problems when starting in a Wayland session (once and only under Wayland) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 589cf61..e317af0 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,15 @@ ----------------------------------------- История изменений: +###Scripts version 2191### +* обновлен пакет библиотек libs_v43 + pressure-vessel 0.20230418.0 + sniper 0.20230424.48416 + YAD 12.3 +* исправлен облачный гейминг vkPlay Cloud (необходимо после обновления скриптов повторно переустановить vkPlay из вкладки АВТОУСТАНОВКА) +* восстановлена установка и запуск Plarium Play +* PortProton переведен на новую версию псевдографического интерфейса: YAD 12.3 + ###Scripts version 2190### * добавлено автоопределение пути до запускаемого файла после выбора автоматической установки ITCH.IO (ALT bug 46278) * полностью удален лончер FULQRUM GAMES из PortProton в связи с переходом всех их ПК игр в лончер STEAM (ALT bug 46279) @@ -16,7 +25,7 @@ * установка Indiegala Client устанавливается в отдельный префикс IGCLIENT и добавлена информация при запуске лончера: После первого подтверждения логина в вашем браузере необходимо перезапустить игру * временно убраны установщики которые треуют доработки: Genshin Impact (разработчики со своей стороны снова запретили запуск под wine) - Plarium Play (требуется dotnet 6 который не работает адекватно на данный момент) + Plarium Play Electronic Arts App (после перехода с Origin на EA App лончер работает, но игры не запускаются) * добавлена возможность скачивания новой версии wine: PROTON_STEAM_8.0-2D (с помощью DOWNLOAD OTHER WINE) * исправлено неправильное отображение иконки игры при запуске схожих по названию exe файлов: Setup, setup, Launcher, launcher (ALT bug 46269) @@ -611,7 +620,7 @@ export WINE_FULLSCREEN_FSR="1" (используется по умолчанию * обновлены db файлы ###Scripts version 2065### -* HOTFIX - корректировка завершения процессов yad и yad_new +* HOTFIX - корректировка завершения процессов yad и yad_v12_3 ###Scripts version 2064### * добавлено уведомление пользователю о возможных проблемах при запуске в Wayland сессии (один раз и только под Wayland) @@ -1018,7 +1027,7 @@ PS: не забывает для активации добавить перем ###Scripts version 1104### * крупное обновлеение контейнера (libs_v16): - - добавлен /bin/yad_new версии 10.1 скомпилированный специально для будущего меню в трее) + - добавлен /bin/yad_v12_3 версии 10.1 скомпилированный специально для будущего меню в трее) - обновлен MANGOHUD (требуется проверка под OpenGL) - обновлен 7z необходимый для будущей автоматической установки Rockstar Game Launcher * для тестовой поддержки wayland добавлена переменная в скрипт var: GDK_BACKEND="x11" diff --git a/data_from_portwine/img/gui/poe.png b/data_from_portwine/img/gui/poe.png old mode 100755 new mode 100644 index b270e271e0ff1210dbccbfa36b3feaacf72e9dfd..8584248d63de527c07bee79312fdb8ecedffe24d GIT binary patch literal 5463 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 N002ovPDHLkV1hwgfiwUB delta 2929 zcmV-%3y$>HD)<(VB!6#dLqkw$V`BgSD3NuMJ4*vW6otP;MbU%^T8LO|5k(;ZQ4mXw zg-sBN3Px=IfUiY(#IT)$@R)FXtzawO67Do|`m*qWaKw=V3STNcRplqe*($#&c4iY3;8#7h z><>=;U?b;P!u`Tw%PbnT^QfBy()qa=sogSra7i#p42={;Rxl|Lm715#{`L)4d{eB7 z$B@5G2}c}Ra)08Dh+34cX{i~})AE^=RPMj?bTh+4)$V~9G(CFWYcDi!!&lk!J`X+b z>j)Yi;5=XVuS!m%@1mFMT6iBq8*qA2*HSxhwh3MLw(jT^sX?YclYy5L2qvN98d?{t zS=H7#zJu9yd7>-W-Ge^aA6ohb4FqTqP4*l<00009aDPZya{vGf5&!@T5&_cPe*6Fc z39m^+K~!i3?N@7zRMj2-opbNZ+<8BDW_O3#g?%WZJVaiCwUh*`??(byG@@v#wuzst zreAE**w>dfX-%3Kp^Z&bQ5%a@P@8HgP#d+PZUq+DWr11P+1;6)$9>FwozpY4yFrq5 z(5Cf+bAOVVd+wQY&j0uS{htH0MvH+K11$zx473<%G0Ag9_spDgE-hQRCb!}%>woX>yL8D&M@JX$6rVX=eINB*w&>nv z*IYYS>><-<*R^BjY~S3znf2-4FXs8V4mB?R$uD0Hy!FN|&ucGjuPnWK{Ys}c^~0jc zG9Jgsg$N?HfL1geZrU6X%83F7$D^n4@~4KLt(GTb#pm5;o7P5;p?R-~J4gj2tZ8%HXWzA{ z?e~$nF@mc?b#5`RIZ0XCcZT9mwIC)Loyv4(_f1R|SE`yZN#Wjobokf@{XLh^W5Y+; zg+OO}|4a(3UHuhFwK%+P_0@S{>$+=lfPdF3BPCl{k~Q6~IWmEl2>t_P=sg{slQsC4 zCxEI6R0P2}g@aOFC@}us2`-gvFDkl&-A5e^7Wp&&WcPzq8xM zotw5v&pp4xZT$ZAE4$sxQVKgT)$W>(MP*{r7b|U2XVHrdS6EoLNI`Fx53p?5u73?l zt>JAoiy!~CND>hrIel^*TCvQ7kpPo4gKwBeso}u$m-qKJm}j>MS%3JCtl98PuQ$y? z^ZVwL$@l(H<$pt1KHtHzI41$!rXQAlSkd9qDTDi@+^T{0WKiAv z=4+Y&cv0TbRDlNg#<=6QE!%X{eX%fp_S+uEPF$Cp`4$is?XjcGI*as$gzymR8)fyxsvXMo=T_3D?2NtCnuBhgbfWjq5 z=akTPynk8T{aT{is(bP%b%Gu<;b+fP%-?=-A2) zBojH9=|1qmWAI556@l+cKE;hw@db;E4n8|zIKFzWSo-Oy!^B*7FpC?#AV;0Kbi zFtpJc%z9lI--Y5F$A1I2gmBjly?AmbLt$hXNB*`N@9rPR%?}^NvV}ni_kh>O@X)OR z$VD4p?E+r-dmK|NjFY7a;ff;TatgazmK;}D)#K^@H1HRtfMwN3Y|DHx6b!94^xD!f z(_kbPqOKwUQHHvxP)jom&wo>-&5jWA6^31Vj$!xDJ8P^j>)d42 zVAp^TT%1ex3V&;u3gQJ76%pIS=Z9(4Kc-arDZu-hDbO^CE0yBQnpPbZ3drJONFsOx zdP!7c6;*?QJ1%UCVrb08hwqn=Iy#CCy&ASX#c*vFkm4D<@UD)V+A6SA2WLtQ2PS~X z0v~jdrJf#U$apKr2?IJd6W2LlocUC>GE}XWUvH*B(|;I9CNiF4sbIT|S1e2T3wL-| zM+Os0A3hj)PxL-@6zd+mSxi9dU5iLDk0-uX!}p~+ZvUezV#L6st9)49*Nw;Dtib2> zmc!iU%yk$_(MX(dLgi{j1k0z4rqwPINziJw#QcHC z8$o|yeSbU_XSrMl?UT=9X{Us2B7(`OGS2$?aEkX}ba)W`T^TG1<>87}Lh?nR2zCoP zMY4T9yp;j4$_N-$M4^*Vn5tm^DPfhoXp=+$m#YCn^y zmh*1{L?8bfy>4Xng3+((8a<=PI9?7RmWrWP)PFHn8i3{=g2x-gVE!y#7tWbz^lp*{ zQ;tGvq|2}dwRl?80~0Z!IH5v;f{l{n=c-yJ!flR$kO4yY3k|@GF+Lmc>Gh@-nBLfU zdIBM@Yni>tRL2hH@|9djNVj!Js;Y{VC(^6{=JN;Pn4-W5*O}YD5SFQ-IF<*My$}v4 z+l032-iY2&R*Quz;+^S7- zB05zi6eor{MHsX92&H#Mq6v>Mn>Z@^_J4~Q7p;I}o4i~r%S0d-?zBqemld{E*DTHy zCQ6jh0?A|wqUcetH$a)FL}O#8Ny8G6cpA1yRYqN-YDE+*T_wEHgu9NojMZG1(YmGY z5{Tb!G@+)UHrnco8lTC9&bv_w1f%o9p^%|z`mKJS{{bS=1(Gb2sq)mX6eSo;B!4rT zb*;)I;U=BAe(|S&=;^W1VP7B^-YQFyB@^k8W@t}EBGErr)vBVawIPV;I8Vm^bxK0v z_#-}lhzq|?HY5i^iJfhkZr*drQXWsV|Dv%Lj3oOTdji48md5)RHYATi!jU9xOJ`{$ znw)V%e=u@)AQW4^c=6gsflMb-S!y-Y*)uBUp(V@LOTuc`21Bup4d4%MyrXf4)ZX4r zLt)Xbe$gYH&d#`FFcd!rNC`w95`q4W2DadNAcc}Md%tMhE%_}5S`4%pXfe=YpvAzK bnt^`-fh=PW`Ji{u00000NkvXXu0mjfnzWBz diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index bfa63ea..9436f3e 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -5,7 +5,7 @@ if [ "${update_loc}" = "RUS" ] then KEY_CREDITS=$RANDOM -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \ --text-align=center --scroll --text="PortProton v. ${install_ver} scripts v. ${scripts_install_ver} @@ -18,7 +18,7 @@ https://linux-gaming.ru Подробнее см. в Лицензия." & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=2 \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=2 \ --text-align=center --scroll --text="Автор: Casro-Fidel (Михаил Тергоев) Помощники разработчика и тестировщики: @@ -42,7 +42,7 @@ WelchDragon Vuursteen " & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) Авторские права (©) 2022 Castro-Fidel (linux-gaming.ru) @@ -65,7 +65,7 @@ Vuursteen ВНЕ ИЛИ В СВЯЗИ С ПРОГРАММНЫМ ОБЕСПЕЧЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ ИЛИ ДРУГИМИ СДЕЛКАМИ В ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ." & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=4 \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \ <<< ' Проект поддержали: https://boosty.to/portwine-linux.ru @@ -308,7 +308,7 @@ Vuursteen Список будет дополняться...' & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ --text-info --scroll <<< \ "Website: https://linux-gaming.ru/ @@ -324,7 +324,7 @@ Yandex кошелек: 410012267513818 Задонатить на стрим: https://www.donationalerts.com/r/portwine_linux" & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ --fontname="Serif bold italic 10" --text-info <<< " Сторонние библиотеки, которые используются в PortProton PortProton собран на основе бесплатных библиотек программного обеспечения: @@ -335,7 +335,7 @@ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds YAD: https://github.com/v1cont/yad ZENITY: https://github.com/GNOME/zenity" & -"${pw_yad_new}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ +"${pw_yad_v12_3}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --center --notebook --no-buttons --tab-pos=bottom \ --tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \ --tab="БИБЛИОТЕКИ" @@ -347,7 +347,7 @@ else KEY_CREDITS=$RANDOM -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \ --text-align=center --scroll --text="PortProton v. ${install_ver} scripts v. ${scripts_install_ver} @@ -361,7 +361,7 @@ This program comes with absolutely no warranty. See the License for details." & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=2 \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=2 \ --text-align=center --scroll --text="Author: Casro-Fidel (Mikhail Tergoev) Developer assistants and testers: @@ -381,7 +381,7 @@ andrey4korop zorn " & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License Copyright (©) 2022 Castro-Fidel (linux-gaming.ru) @@ -403,7 +403,7 @@ 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="${KEY_CREDITS}" --tabnum=4 \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \ <<< ' The project was supported: https://boosty.to/portwine-linux.ru: @@ -646,7 +646,7 @@ SOFTWARE." & The list will be updated...' & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Do you want to join and help in the development of the project:" \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Do you want to join and help in the development of the project:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ --text-info --scroll <<< \ "Website: http://linux-gaming.ru @@ -662,7 +662,7 @@ Yandex wallet: 410012267513818 Donat on stream: https://www.donationalerts.com/r/portwine_linux" & -"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ +"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ --fontname="Serif bold italic 10" --text-info <<< " Third-party libraries that are used in PortProton PortProton is built on the basis of the following free software libraries: @@ -674,7 +674,7 @@ YAD: https://github.com/v1cont/yad ZENITY: https://github.com/GNOME/zenity" & -"${pw_yad_new}" --title "ABOUT US" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ +"${pw_yad_v12_3}" --title "ABOUT US" --key="${KEY_CREDITS}" --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" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 935c354..ffa7e70 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -384,8 +384,8 @@ init_wine_ver () { echo 'HKLM,System\ControlSet001\Services\nvlddmkm,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' >> "${WINEDIR}/share/wine/wine.inf" sed -i '/Steam.exe/d' "${WINEDIR}/share/wine/wine.inf" sed -i '/\\Valve\\Steam/d' "${WINEDIR}/share/wine/wine.inf" + sed -i '/winemenubuilder/d' "${WINEDIR}/share/wine/wine.inf" fi - sed -i '/winemenubuilder/d' "${WINEDIR}/share/wine/wine.inf" fi return 0 } @@ -606,12 +606,12 @@ stop_portwine () { kill_portwine && try_remove_dir "${PW_WINELIB}/var" find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete - if [ ! -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ] ; then - kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" 2>/dev/null + if [ ! -z "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" ] ; then + kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" 2>/dev/null fi add_in_stop_portwine #&>/dev/null kill -n 9 `pgrep -a start.sh | grep -i '/PortProton/' | awk '{print $1}'` > /dev/null 2>&1 - killall yad_new &>/dev/null + killall yad_v12_3 &>/dev/null exit 0 } export -f stop_portwine @@ -640,7 +640,7 @@ pw_download_libs () { fi fi export pw_yad="${PW_WINELIB}/portable/bin/yad" - export pw_yad_new="${PW_WINELIB}/portable/bin/yad_new" + export pw_yad_v12_3="${PW_WINELIB}/portable/bin/yad_v12_3" export pw_zstd="${PW_WINELIB}/portable/bin/zstd" export pw_7z="${PW_WINELIB}/portable/lib/p7zip/7z" if [ -x "`which xterm 2>/dev/null`" ]; then @@ -792,7 +792,7 @@ pw_init_db () { export ADD_CB_DBFILE="${PW_CHECK_DB_FILE}!${ADD_CB_DBFILE}" fi done - PORTWINE_DB_FILE=`"${pw_yad_new}" --text-align=center --text "${PW_SELECTION_DB_LOC}" --borders=15 --form --center \ + PORTWINE_DB_FILE=`"${pw_yad_v12_3}" --text-align=center --text "${PW_SELECTION_DB_LOC}" --borders=15 --form --center \ --title "Database file selection..." --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --form --separator="" \ --field="DB FILE: :CB" "${ADD_CB_DBFILE}"` if [[ "$?" == "1" || "$?" == "252" ]] ; then exit 0 ; fi @@ -819,7 +819,7 @@ pw_init_db () { print_info "Use ${PORTWINE_DB_FILE} db file." fi if [ -z "$PATH_TO_GAME" ] ; then - export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" + export PATH_TO_GAME="$(dirname $(readlink -f "${portwine_exe}"))" fi fi return 0 @@ -841,11 +841,11 @@ pw_port_update () { print_info "Scripts version in github = ${scripts_current_ver}" print_info "Scripts version local = ${scripts_install_ver}" if [[ ! -z "${scripts_current_ver}" ]] && [[ "${scripts_current_ver}" -gt "${scripts_install_ver}" ]] ; then - if [[ -f "${PW_WINELIB}/portable/bin/yad_new" ]] ; then - export pw_yad_new="${PW_WINELIB}/portable/bin/yad_new" + if [[ -f "${PW_WINELIB}/portable/bin/yad_v12_3" ]] ; then + export pw_yad_v12_3="${PW_WINELIB}/portable/bin/yad_v12_3" curl -s --list-only "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" | sszen CHANGLOG_NEWS=`cat "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed "/Scripts version ${scripts_install_ver}/,$ d" | sed '1,/---/ d' ` - xcsd=`"${pw_yad_new}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ + xcsd=`"${pw_yad_v12_3}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --borders=5 --form --separator='%%%' --width=1200 --height=600 --center \ --field=":TXT" "${CHANGLOG_NEWS}" \ --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" ` @@ -874,7 +874,7 @@ pw_port_update () { try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" try_remove_dir "${PORT_WINE_TMP_PATH}/PortWINE-master/" echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver" - if [[ -z "${pw_yad_new}" ]] ; then + if [[ -z "${pw_yad_v12_3}" ]] ; then zenity --title="Changelog" --text-info --width=1200 --height=550 \ --filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" fi @@ -992,7 +992,7 @@ pw_find_exe () { done < "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe" OrigIFS="$IFS" && IFS=% - PW_SET_FIND_EXE="$("${pw_yad_new}" --height="300" --width="1000" --center --list \ + PW_SET_FIND_EXE="$("${pw_yad_v12_3}" --height="300" --width="1000" --center --list \ --text-align=center --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "Create shortcut for..." \ --text="\n${loc_gui_create_shortcut_for_exe}" --column="path to .exe file:" ${FIND_TO_GUI})" YAD_STATUS="$?" diff --git a/data_from_portwine/scripts/portwine_db/EALauncher b/data_from_portwine/scripts/portwine_db/EALauncher index a9a5935..b48a54a 100755 --- a/data_from_portwine/scripts/portwine_db/EALauncher +++ b/data_from_portwine/scripts/portwine_db/EALauncher @@ -6,11 +6,7 @@ #####################examples########################### # export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (used winetricks) export PW_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL -# export PW_USE_TERMINAL="1" -export DISABLE_CP_DEFPFX=1 -export PW_USE_D3D_EXTRAS=0 -export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 d3dcompiler_47" +export PW_USE_TERMINAL="1" export PW_PREFIX_NAME="EA_APP" -export WINEDLLOVERRIDES="winemenubuilder=d" -# export PW_WINE_USE="WINE-8.8-STAGING-AMD64" -# gui_proton_downloader silent "WINE-8.8-STAGING-AMD64" +# export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64" +# gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64" diff --git a/data_from_portwine/scripts/portwine_db/PlariumPlay b/data_from_portwine/scripts/portwine_db/PlariumPlay index fb92cc8..dbbdaee 100644 --- a/data_from_portwine/scripts/portwine_db/PlariumPlay +++ b/data_from_portwine/scripts/portwine_db/PlariumPlay @@ -4,35 +4,33 @@ #Rating=1-5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" -export PW_WINE_USE="WINE-PROTON-8.0-2-AMD64" -export PW_PREFIX_NAME="DOTNET" -export PW_WINDOWS_VER="10" +export PW_WINDOWS_VER="7" export PW_DLL_INSTALL="" -export WINEDLLOVERRIDES="libglesv2=" export LAUNCH_PARAMETERS="" export PW_VULKAN_USE="1" -export PW_USE_DXR10="0" -##export PW_DLSS_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -export PW_USE_NVAPI_AND_DLSS="0" -export PW_HIDE_NVIDIA_GPU="0" -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -export PW_VIRTUAL_DESKTOP="0" -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +export PW_PREFIX_NAME="PLARIUM_PLAY" +export PW_MANGOHUD="0" +export PW_MANGOHUD_x32="0" +export PW_MANGOHUD_USER_CONF="0" export ENABLE_VKBASALT="0" -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) -export PW_NO_FSYNC="0" export PW_NO_ESYNC="1" -##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -export PW_HEAP_DELAY_FREE="0" -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +export PW_NO_FSYNC="1" +export PW_USE_RAY_TRACING="0" +export PW_USE_NVAPI_AND_DLSS="0" +export PW_USE_FAKE_DLSS="0" +export PW_WINE_FULLSCREEN_FSR="0" +export PW_HIDE_NVIDIA_GPU="0" +export PW_VIRTUAL_DESKTOP="0" export PW_USE_TERMINAL="0" export PW_GUI_DISABLED_CS="0" -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } +export PW_USE_GAMEMODE="0" +export PW_DX12_DISABLE="1" +export PW_PRIME_RENDER_OFFLOAD="0" +export PW_USE_D3D_EXTRAS="0" +export PW_FIX_VIDEO_IN_GAME="0" +export PW_USE_GSTREAMER="0" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="0" +export PW_USE_WINE_DXGI="0" +export PW_USE_EAC_AND_BE="0" +export WINEDLLOVERRIDES="" diff --git a/data_from_portwine/scripts/portwine_db/VKPlayLoader b/data_from_portwine/scripts/portwine_db/VKPlayLoader index a4910b1..8527102 100755 --- a/data_from_portwine/scripts/portwine_db/VKPlayLoader +++ b/data_from_portwine/scripts/portwine_db/VKPlayLoader @@ -9,10 +9,11 @@ else export PW_COMMENT_DB="If you use Wayland, to intercept control in Atomic Heart\n,you need to collapse the VK Play Game Center itself into the tray" fi export PW_WINDOWS_VER="10" -export WINEDLLOVERRIDES="" +export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_MUST_HAVE_DLL="" export PW_PREFIX_NAME="VK_PLAY" export PW_USE_GSTREAMER="1" +export PW_VULKAN_USE="2" export PW_WINE_USE="WINE_8.5_LG" gui_proton_downloader silent "WINE_8.5_LG" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER index 427134b..d3c160f 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER @@ -24,7 +24,7 @@ try_download_caliber () { set -o pipefail wget -t 5 -T 3 "$1" --no-check-certificate --output-document="$2" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - "${pw_yad_new}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 + "${pw_yad_v12_3}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 } diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index 4db6f24..3ab9273 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -5,13 +5,10 @@ export LAUNCH_PARAMETERS=("/silent" "/repair" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe" export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetricks) export PW_VULKAN_USE=1 -export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 d3dcompiler_47" export PW_PREFIX_NAME="EA_APP" -export DISABLE_CP_DEFPFX=1 -export PW_USE_D3D_EXTRAS=0 -export WINEDLLOVERRIDES="winemenubuilder=d" -# export PW_WINE_USE="WINE-8.8-STAGING-AMD64" -# gui_proton_downloader silent "WINE-8.8-STAGING-AMD64" +# export DISABLE_CP_DEFPFX=1 +# export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64" +# gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64" start_portwine if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LGC b/data_from_portwine/scripts/pw_autoinstall/PW_LGC index e693f22..ea8ee62 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LGC @@ -8,7 +8,7 @@ try_download_lgc () { set -o pipefail wget -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - "${pw_yad_new}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 + "${pw_yad_v12_3}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 } diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY index ddc4ebd..65361ed 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY @@ -1,11 +1,37 @@ #!/usr/bin/env bash # Author: chal55rus (Sergey P.) ######################################################################## -export PW_PREFIX_NAME=DOTNET export LAUNCH_PARAMETERS=("/s" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/plarium_play_setup.exe" -export PW_WINE_USE="WINE-PROTON-8.0-2-AMD64" -gui_proton_downloader silent "WINE-PROTON-8.0-2-AMD64" +export PW_WINDOWS_VER="7" +export PW_DLL_INSTALL="" +export LAUNCH_PARAMETERS="" +export PW_PREFIX_NAME="PLARIUM_PLAY" +export PW_MANGOHUD="0" +export PW_MANGOHUD_x32="0" +export PW_MANGOHUD_USER_CONF="0" +export ENABLE_VKBASALT="0" +export PW_NO_ESYNC="1" +export PW_NO_FSYNC="1" +export PW_USE_RAY_TRACING="0" +export PW_USE_NVAPI_AND_DLSS="0" +export PW_USE_FAKE_DLSS="0" +export PW_WINE_FULLSCREEN_FSR="0" +export PW_HIDE_NVIDIA_GPU="0" +export PW_VIRTUAL_DESKTOP="0" +export PW_USE_TERMINAL="0" +export PW_GUI_DISABLED_CS="0" +export PW_USE_GAMEMODE="0" +export PW_DX12_DISABLE="1" +export PW_PRIME_RENDER_OFFLOAD="0" +export PW_USE_D3D_EXTRAS="0" +export PW_FIX_VIDEO_IN_GAME="0" +export PW_USE_GSTREAMER="0" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="0" +export PW_USE_WINE_DXGI="0" +export PW_USE_EAC_AND_BE="0" +export WINEDLLOVERRIDES="" start_portwine if try_download "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR index a2b8c4e..51d4052 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Author: chal55rus (Sergey P.) ######################################################################## +export PW_VULKAN_USE="1" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe" start_portwine if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY index 2a110d3..6bcf92f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY @@ -7,6 +7,7 @@ export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dri export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_MUST_HAVE_DLL="" export PW_WINE_USE="WINE_8.5_LG" +pw_clear_pfx gui_proton_downloader silent "WINE_8.5_LG" start_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index cfe44b2..ee70561 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC @@ -9,7 +9,7 @@ try_download_wgc () { set -o pipefail wget -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - "${pw_yad_new}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 + "${pw_yad_v12_3}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 } diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 8374d6e..dfba8bb 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -301,29 +301,31 @@ start_portwine () { else unset PROTON_BATTLEYE_RUNTIME PROTON_EAC_RUNTIME fi - #try link d3d extras libs - if [[ -d "${PW_PLUGINS_PATH}/d3d_extras" ]] - then PATH_TO_D3DEXTRAS="${PW_PLUGINS_PATH}/d3d_extras" - else PATH_TO_D3DEXTRAS="${PW_WINELIB}/d3d_extras" - fi - if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then - echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" - fi - for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \ - d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \ - d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \ - d3dx10_42 d3dx10_43 d3dx10 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \ - d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 d3dx9_43 - do - if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then + + + if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then + if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then + echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" + fi + if [[ -d "${PW_PLUGINS_PATH}/d3d_extras" ]] + then PATH_TO_D3DEXTRAS="${PW_PLUGINS_PATH}/d3d_extras" + else PATH_TO_D3DEXTRAS="${PW_WINELIB}/d3d_extras" + fi + #try link d3d extras libs + for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \ + d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \ + d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \ + d3dx10_42 d3dx10_43 d3dx10 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \ + d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 d3dx9_43 + do try_force_link_file "${PATH_TO_D3DEXTRAS}/x64/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" try_force_link_file "${PATH_TO_D3DEXTRAS}/x32/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" var_winedlloverride_update "${d3d_extras_from_plugins}=n" - fi - if [[ -z "`grep "${d3d_extras_from_plugins}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then - echo "${d3d_extras_from_plugins}" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" - fi - done + if [[ -z "`grep "${d3d_extras_from_plugins}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then + echo "${d3d_extras_from_plugins}" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" + fi + done + fi echo "Try link wine DXGI by default..." if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" @@ -431,11 +433,6 @@ start_portwine () { then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/vrclient_x64.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin/vrclient_x64.dll" fi fi - - try_remove_dir "${PORT_WINE_TMP_PATH}/mesa_shader_cache" - try_remove_dir "${PORT_WINE_TMP_PATH}/vkd3d_cache" - try_remove_dir "${PORT_WINE_TMP_PATH}/dxvk_cache" - try_remove_dir "${PORT_WINE_TMP_PATH}/gl_shader_cache" if [[ "${PW_USE_SHADER_CACHE}" == 1 ]] ; then create_new_dir "${PATH_TO_DXVK_FILES}/gl_shader_cache" @@ -465,11 +462,11 @@ start_portwine () { fi for try_cp_dll_from_wine in "ntdll.dll" "vulkan-1.dll" "winevulkan.dll" ; do - if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" - then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" + if ! try_copy_file "${WINEDIR}"/lib/wine/i386-windows/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" + then try_copy_file "${WINEDIR}"/lib/wine/fakedlls/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" fi - if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${try_cp_dll_from_wine}" - then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${try_cp_dll_from_wine}" + if ! try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${try_cp_dll_from_wine}" + then try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${try_cp_dll_from_wine}" fi done @@ -512,7 +509,7 @@ start_portwine () { kill_portwine fi fi - if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" ]] && [[ -z `cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" | grep "Windows $PW_WINDOWS_VER"` ]] ; then + if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" ]] && [[ -z `grep "Windows $PW_WINDOWS_VER" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"` ]] ; then if [[ ! -z "${PW_WINDOWS_VER}" && `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ]] ; then export PW_WINDOWS_VER="xp64" fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 2b3eb58..05a46a8 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -8,7 +8,7 @@ if [ -f "$1" ]; then fi . "$(dirname $(readlink -f "$0"))/runlib" kill_portwine -killall -15 yad_new 2>/dev/null +killall -15 yad_v12_3 2>/dev/null kill -TERM `pgrep -a yad | grep ${portname} | head -n 1 | awk '{print $1}'` 2>/dev/null if [[ -f "/usr/bin/portproton" ]] && [[ -f "${HOME}/.local/share/applications/PortProton.desktop" ]] ; then @@ -188,7 +188,7 @@ portwine_start_debug () { sleep 3 pw_stop_progress_bar_cover unset PW_TIMER - while read -r line || [[ -n $(pgrep -a yad | grep "yad_new --text-info --tail --button="STOP":0 --title="DEBUG"" | awk '{print $1}') ]] ; do + while read -r line || [[ -n $(pgrep -a yad | grep "yad_v12_3 --text-info --tail --button="STOP":0 --title="DEBUG"" | awk '{print $1}') ]] ; do sleep 0.005 if [[ -n "${line}" ]] && [[ -z "$(echo "${line}" | grep -i "kerberos")" ]] \ && [[ -z "$(echo "${line}" | grep -i "ntlm")" ]] @@ -199,7 +199,7 @@ portwine_start_debug () { sleep 3 PW_TIMER=1 fi - done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_new}" --text-info --tail --button="STOP":0 --title="DEBUG" \ + done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v12_3}" --text-info --tail --button="STOP":0 --title="DEBUG" \ --skip-taskbar --center --width=800 --height=400 --text "${port_debug}" && kill_portwine # sleep 1 && zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap &> /dev/null && kill_portwine @@ -290,19 +290,19 @@ pw_prefix_manager () { pw_stop_progress_bar KEY_EDIT_MANAGER_GUI=$RANDOM - "${pw_yad_new}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=1 --list --checklist \ + "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=1 --list --checklist \ --text="Select components to install in prefix: \"${PW_PREFIX_NAME}\", using wine: \"${PW_WINE_USE}\"" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/dll_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" & - "${pw_yad_new}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=2 --list --checklist \ + "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=2 --list --checklist \ --text="Select fonts to install in prefix: \"${PW_PREFIX_NAME}\", using wine: \"${PW_WINE_USE}\"" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/fonts_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" & - "${pw_yad_new}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=3 --list --checklist \ + "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=3 --list --checklist \ --text="Change config for prefix: \"${PW_PREFIX_NAME}\"" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" & - "${pw_yad_new}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=5 --width=900 --height=800 --center \ + "${pw_yad_v12_3}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=5 --width=900 --height=800 --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "PREFIX MANAGER..." --tab-pos=bottom --tab="DLL" --tab="FONTS" --tab="SETTINGS" YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then @@ -343,7 +343,7 @@ pw_winetricks () { pw_stop_progress_bar echo "WINETRICKS..." > "${PORT_WINE_TMP_PATH}/update_pfx_log" unset PW_TIMER - while read -r line || [[ -n $(pgrep -a yad | grep "yad_new --text-info --tail --no-buttons --title="WINETRICKS"" | awk '{print $1}') ]] ; do + while read -r line || [[ -n $(pgrep -a yad | grep "yad_v12_3 --text-info --tail --no-buttons --title="WINETRICKS"" | awk '{print $1}') ]] ; do sleep 0.005 if [[ -n "${line}" ]] && [[ -z "$(echo "${line}" | grep -i "gstreamer")" ]] \ && [[ -z "$(echo "${line}" | grep -i "kerberos")" ]] \ @@ -355,11 +355,11 @@ pw_winetricks () { sleep 3 PW_TIMER=1 fi - done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_new}" --text-info --tail --no-buttons --title="WINETRICKS" \ + done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v12_3}" --text-info --tail --no-buttons --title="WINETRICKS" \ --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y & "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log" - kill -s SIGTERM "$(pgrep -a yad_new | grep "title=WINETRICKS" | awk '{print $1}')" > /dev/null 2>&1 + kill -s SIGTERM "$(pgrep -a yad_v12_3 | grep "title=WINETRICKS" | awk '{print $1}')" > /dev/null 2>&1 stop_portwine } @@ -368,12 +368,19 @@ pw_start_cont_xterm () { unset PW_SANDBOX_HOME_PATH # export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" pw_init_runtime - ${pw_runtime} xterm + ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ + env ${PW_MANGOHUD_SLR} \ + PATH="${PATH}" \ + LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ + LD_PRELOAD="${PW_LD_PRELOAD}" \ + VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \ + VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \ + xterm } pw_create_prefix_backup () { cd "$HOME" - PW_PREFIX_TO_BACKUP=$("${pw_yad_new}" --file --directory --borders=5 --width=650 --height=500 --auto-close --center \ + PW_PREFIX_TO_BACKUP=$("${pw_yad_v12_3}" --file --directory --borders=5 --width=650 --height=500 --auto-close --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "BACKUP PREFIX TO...") YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi @@ -562,7 +569,7 @@ if [ -n "${portwine_exe}" ]; then else PW_SHORTCUT="${loc_gui_delete_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_delete_shortcut}:98" fi - OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=7 --form --center \ + OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=10 --form --center \ --title "${portname}-${install_ver} (${scripts_install_ver})" --image "${PW_ICON_FOR_YAD}" --separator=";" --keep-icon-size \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --field="3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \ @@ -590,7 +597,7 @@ if [ -n "${portwine_exe}" ]; then else button_click () { [[ -n "$1" ]] && echo "$1" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" - if [[ -n $(pidof -s yad) ]] || [[ -n $(pidof -s yad_new) ]] ; then + if [[ -n $(pidof -s yad) ]] || [[ -n $(pidof -s yad_v12_3) ]] ; then kill -s SIGUSR1 $(pgrep -a yad | grep "\-\-key=${KEY} \-\-notebook" | awk '{print $1}') > /dev/null 2>&1 fi } @@ -598,7 +605,7 @@ else run_desktop_b_click () { [[ -n "$1" ]] && echo "$1" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" - if [[ -n $(pidof -s yad) ]] || [[ -n $(pidof -s yad_new) ]] ; then + if [[ -n $(pidof -s yad) ]] || [[ -n $(pidof -s yad_v12_3) ]] ; then kill -s SIGUSR1 $(pgrep -a yad | grep "\-\-key=${KEY} \-\-notebook" | awk '{print $1}') > /dev/null 2>&1 fi PW_EXEC_FROM_DESKTOP="$(cat "${PORT_WINE_PATH}/${PW_YAD_SET//¬/" "}" | grep Exec | head -n 1 | awk -F"=env " '{print $2}')" @@ -659,7 +666,7 @@ else gui_open_scripts_from_backup () { cd "${PORT_WINE_TMP_PATH}/scripts_backup/" - PW_SCRIPT_FROM_BACKUP=$("${pw_yad_new}" --file --borders=5 --width=650 --height=500 --auto-close --center \ + PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v12_3}" --file --borders=5 --width=650 --height=500 --auto-close --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz") YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi @@ -691,10 +698,10 @@ else done IFS="$orig_IFS" old_IFS=$IFS && IFS="%" - "${pw_yad_new}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --align-buttons --keep-icon-size --scroll --separator=" " ${PW_GENERATE_BUTTONS} & + "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --align-buttons --keep-icon-size --scroll --separator=" " ${PW_GENERATE_BUTTONS} & IFS="$orig_IFS" - "${pw_yad_new}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ + "${pw_yad_v12_3}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ --field=" $loc_gui_pw_reinstall_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \ --field=" $loc_gui_rm_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \ --field=" $loc_gui_upd_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \ @@ -705,7 +712,7 @@ else --field=" Xterm"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \ --field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_credits"' & - "${pw_yad_new}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ + "${pw_yad_v12_3}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ --field=" 3D API : :CB" "${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" \ --field=" PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ @@ -719,7 +726,7 @@ else --field=" CLEAR PREFIX"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ --field=" CREATE PFX BACKUP"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & - "${pw_yad_new}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --keep-icon-size --scroll \ + "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --keep-icon-size --scroll \ --field=" Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \ --field=" MAME"!"$PW_GUI_ICON_PATH/mame.png"!"":"FBTN" '@bash -c "button_click PW_MAME"' \ --field=" ScummVM"!"$PW_GUI_ICON_PATH/scummvm.png"!"":"FBTN" '@bash -c "button_click PW_SCUMMVM"' \ @@ -738,7 +745,7 @@ else --field=" Demul"!"$PW_GUI_ICON_PATH/demul.png"!"":"FBTN" '@bash -c "button_click PW_DEMUL"' \ --field=" Rpcs3"!"$PW_GUI_ICON_PATH/rpcs3.png"!"":"FBTN" '@bash -c "button_click PW_RPCS3"' & - "${pw_yad_new}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --keep-icon-size --scroll \ + "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --keep-icon-size --scroll \ --field=" Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \ --field=" Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png"!"":"FBTN" '@bash -c "button_click PW_WGC"' \ --field=" vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \ @@ -765,18 +772,18 @@ else --field=" Metal War Online"!"$PW_GUI_ICON_PATH/mwo.png"!"":"FBTN" '@bash -c "button_click PW_MWO"' \ --field=" Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \ --field=" Indiegala Client"!"$PW_GUI_ICON_PATH/igclient.png"!"":"FBTN" '@bash -c "button_click PW_IGCLIENT"' \ + --field=" Plarium Play"!"$PW_GUI_ICON_PATH/plariumplay.png"!"":"FBTN" '@bash -c "button_click PW_PLARIUM_PLAY"' \ --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' & # --field=" Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' # --field=" Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' - # --field=" Plarium Play"!"$PW_GUI_ICON_PATH/plariumplay.png"!"":"FBTN" '@bash -c "button_click PW_PLARIUM_PLAY"' # --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"' # --field=" Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' if [[ `which wmctrl` ]] &>/dev/null ; then sleep 2 - while [[ $(pgrep -a yad_new | head -n 1 | awk '{print $1}' 2>/dev/null) ]] ; do + while [[ $(pgrep -a yad_v12_3 | head -n 1 | awk '{print $1}' 2>/dev/null) ]] ; do sleep 2 PW_MAIN_GUI_SIZE_TMP="$(wmctrl -lG | grep PortProton-1.0 | awk '{print $5" "$6}' 2>/dev/null)" if [[ -n "${PW_MAIN_GUI_SIZE_TMP}" ]] ; then @@ -786,7 +793,7 @@ else fi & if [[ -z "${PW_ALL_DF}" ]] ; then - "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close --center \ + "${pw_yad_v12_3}" --key=$KEY --notebook --borders=5 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom --keep-icon-size \ --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ @@ -796,7 +803,7 @@ else --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" YAD_STATUS="$?" else - "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close --center \ + "${pw_yad_v12_3}" --key=$KEY --notebook --borders=5 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom --keep-icon-size \ --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 1905e1a..fba7296 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=2190 +#SCRIPTS_NEXT_VERSION=2191 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -20,7 +20,7 @@ export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v42" +export PW_LIBS_VER="_v43" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" @@ -60,7 +60,7 @@ export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" pw_install_dll_in_prefix () { case $PW_PREFIX_NAME in - DEFAULT) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019" ;; + DEFAULT) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2022" ;; DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;; *) export PW_MUST_HAVE_DLL="" ;; esac diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 7adeccc..764add4 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -50,7 +50,7 @@ pw_update_pfx_cover_gui () { PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 80}'` echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log" unset PW_TIMER - while read -r line || [[ ! -z `pgrep -a yad | grep "yad_new --notebook --key="$PW_KEY_PROGRESS_BAR"" | awk '{print $1}'` ]] ; do + while read -r line || [[ ! -z `pgrep -a yad | grep "yad_v12_3 --notebook --key="$PW_KEY_PROGRESS_BAR"" | awk '{print $1}'` ]] ; do sleep 0.005 if [[ ! -z "${line}" ]] && [[ -z "`echo "${line}" | grep -i "gstreamer"`" ]] \ && [[ -z "`echo "${line}" | grep -i "kerberos"`" ]] \ @@ -62,10 +62,10 @@ pw_update_pfx_cover_gui () { sleep 3 PW_TIMER=1 fi - done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_new}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="2" --text-info --tail & - "${pw_yad_new}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="1" --picture --filename="${PW_GIF_FILE}" --image-on-top & + done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v12_3}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="2" --text-info --tail & + "${pw_yad_v12_3}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="1" --picture --filename="${PW_GIF_FILE}" --image-on-top & - "${pw_yad_new}" --notebook --key="$PW_KEY_PROGRESS_BAR" --tab=LOGO --tab=TERMINAL --no-buttons --undecorated \ + "${pw_yad_v12_3}" --notebook --key="$PW_KEY_PROGRESS_BAR" --tab=LOGO --tab=TERMINAL --no-buttons --undecorated \ --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --tab-pos=bottom & export PW_YAD_PID_PFX_COVER_UI="$!" return 0 @@ -109,8 +109,8 @@ open_changelog () { export -f open_changelog pw_tray_icon () { - if [ ! -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ] ; then - kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" + if [ ! -z "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" ] ; then + kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" fi tray_icon_click () { @@ -134,7 +134,7 @@ pw_tray_icon () { } export -f tray_icon_click_exit - "${pw_yad_new}" --notification --no-middle \ + "${pw_yad_v12_3}" --notification --no-middle \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --image="$PW_GUI_ICON_PATH/port_proton.png" \ --command="bash -c tray_icon_click" \ @@ -171,7 +171,7 @@ pw_gui_for_edit_db () { edit_db_field_add $@ old_IFS=$IFS IFS="%" - "${pw_yad_new}" --plug=$KEY_EDIT_DB_GUI --tabnum="1" --form --separator=" " --columns=4 ${ADD_CHK_BOX_EDIT_DB} \ + "${pw_yad_v12_3}" --plug=$KEY_EDIT_DB_GUI --tabnum="1" --form --separator=" " --columns=4 ${ADD_CHK_BOX_EDIT_DB} \ 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_edit_db" & IFS=$old_IFS @@ -180,7 +180,7 @@ pw_gui_for_edit_db () { "XP") ADD_WINVER_EDIT_DB="XP!7!10" ;; *) ADD_WINVER_EDIT_DB="10!7!XP" ;; esac - "${pw_yad_new}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator="%" --columns=1 \ + "${pw_yad_v12_3}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator="%" --columns=1 \ --field="${loc_gui_ver_windows}!${loc_gui_ver_windows_help} :CB" "${ADD_WINVER_EDIT_DB}" \ --field="${loc_gui_aut_winetricks}!${loc_gui_aut_winetricks_help} :CBE" "${PW_DLL_INSTALL}!vcrun2019 corefonts lucida" \ --field="${loc_gui_winedllover}!${loc_gui_winedllover_help} :CBE" "${WINEDLLOVERRIDES}!libglesv2=!d3dx9_36,d3dx9_42=n,b;mfc120=b,n" \ @@ -189,7 +189,7 @@ pw_gui_for_edit_db () { --field=":LBL" "" \ --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :SCL" ${FPS_LIMIT_VAR} 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" & - "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="550" \ + "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="650" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=10 --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \ @@ -405,16 +405,16 @@ gui_vkBasalt () { fi export old_IFS=$IFS export IFS="%" - "${pw_yad_new}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=5 --separator=" " \ + "${pw_yad_v12_3}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=5 --separator=" " \ --text-align=center --text="$loc_gui_vkbasalt_top" \ ${ADD_GUI_FX} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" & export IFS="${old_IFS}" - "${pw_yad_new}" --plug=$KEY_FX_GUI --tabnum="2" --separator=" " --form \ + "${pw_yad_v12_3}" --plug=$KEY_FX_GUI --tabnum="2" --separator=" " --form \ --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" & - "${pw_yad_new}" --paned --key="$KEY_FX_GUI" --height="500" --title="vkBasalt" --center --borders=10 \ + "${pw_yad_v12_3}" --paned --key="$KEY_FX_GUI" --height="700" --title="vkBasalt" --center --borders=10 \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ --button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \