Commit 343dda7f authored by Mikhail Tergoev's avatar Mikhail Tergoev

Scripts version 2191

parent b0f10aea
...@@ -2,6 +2,15 @@ You can help us in the development of the project on the website: boosty.to/linu ...@@ -2,6 +2,15 @@ You can help us in the development of the project on the website: boosty.to/linu
----------------------------------------- -----------------------------------------
Changelog: 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### ###Scripts version 2190###
* added auto-detection of the path to the file to be launched after selecting automatic installation ITCH.IO * 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 * 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) ...@@ -819,7 +828,7 @@ export WINE_FULLSCREEN_FSR="1" (by default)
* updated db files * updated db files
###Scripts version 2065### ###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### ###Scripts version 2064###
* added notification to the user about possible problems when starting in a Wayland session (once and only under Wayland) * added notification to the user about possible problems when starting in a Wayland session (once and only under Wayland)
......
...@@ -2,6 +2,15 @@ ...@@ -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### ###Scripts version 2190###
* добавлено автоопределение пути до запускаемого файла после выбора автоматической установки ITCH.IO (ALT bug 46278) * добавлено автоопределение пути до запускаемого файла после выбора автоматической установки ITCH.IO (ALT bug 46278)
* полностью удален лончер FULQRUM GAMES из PortProton в связи с переходом всех их ПК игр в лончер STEAM (ALT bug 46279) * полностью удален лончер FULQRUM GAMES из PortProton в связи с переходом всех их ПК игр в лончер STEAM (ALT bug 46279)
...@@ -16,7 +25,7 @@ ...@@ -16,7 +25,7 @@
* установка Indiegala Client устанавливается в отдельный префикс IGCLIENT и добавлена информация при запуске лончера: После первого подтверждения логина в вашем браузере необходимо перезапустить игру * установка Indiegala Client устанавливается в отдельный префикс IGCLIENT и добавлена информация при запуске лончера: После первого подтверждения логина в вашем браузере необходимо перезапустить игру
* временно убраны установщики которые треуют доработки: * временно убраны установщики которые треуют доработки:
Genshin Impact (разработчики со своей стороны снова запретили запуск под wine) Genshin Impact (разработчики со своей стороны снова запретили запуск под wine)
Plarium Play (требуется dotnet 6 который не работает адекватно на данный момент) Plarium Play
Electronic Arts App (после перехода с Origin на EA App лончер работает, но игры не запускаются) Electronic Arts App (после перехода с Origin на EA App лончер работает, но игры не запускаются)
* добавлена возможность скачивания новой версии wine: PROTON_STEAM_8.0-2D (с помощью DOWNLOAD OTHER WINE) * добавлена возможность скачивания новой версии wine: PROTON_STEAM_8.0-2D (с помощью DOWNLOAD OTHER WINE)
* исправлено неправильное отображение иконки игры при запуске схожих по названию exe файлов: Setup, setup, Launcher, launcher (ALT bug 46269) * исправлено неправильное отображение иконки игры при запуске схожих по названию exe файлов: Setup, setup, Launcher, launcher (ALT bug 46269)
...@@ -611,7 +620,7 @@ export WINE_FULLSCREEN_FSR="1" (используется по умолчанию ...@@ -611,7 +620,7 @@ export WINE_FULLSCREEN_FSR="1" (используется по умолчанию
* обновлены db файлы * обновлены db файлы
###Scripts version 2065### ###Scripts version 2065###
* HOTFIX - корректировка завершения процессов yad и yad_new * HOTFIX - корректировка завершения процессов yad и yad_v12_3
###Scripts version 2064### ###Scripts version 2064###
* добавлено уведомление пользователю о возможных проблемах при запуске в Wayland сессии (один раз и только под Wayland) * добавлено уведомление пользователю о возможных проблемах при запуске в Wayland сессии (один раз и только под Wayland)
...@@ -1018,7 +1027,7 @@ PS: не забывает для активации добавить перем ...@@ -1018,7 +1027,7 @@ PS: не забывает для активации добавить перем
###Scripts version 1104### ###Scripts version 1104###
* крупное обновлеение контейнера (libs_v16): * крупное обновлеение контейнера (libs_v16):
- добавлен /bin/yad_new версии 10.1 скомпилированный специально для будущего меню в трее) - добавлен /bin/yad_v12_3 версии 10.1 скомпилированный специально для будущего меню в трее)
- обновлен MANGOHUD (требуется проверка под OpenGL) - обновлен MANGOHUD (требуется проверка под OpenGL)
- обновлен 7z необходимый для будущей автоматической установки Rockstar Game Launcher - обновлен 7z необходимый для будущей автоматической установки Rockstar Game Launcher
* для тестовой поддержки wayland добавлена переменная в скрипт var: GDK_BACKEND="x11" * для тестовой поддержки wayland добавлена переменная в скрипт var: GDK_BACKEND="x11"
......
data_from_portwine/img/gui/poe.png

2.87 KB | W: | H:

data_from_portwine/img/gui/poe.png

5.33 KB | W: | H:

data_from_portwine/img/gui/poe.png
data_from_portwine/img/gui/poe.png
data_from_portwine/img/gui/poe.png
data_from_portwine/img/gui/poe.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -5,7 +5,7 @@ if [ "${update_loc}" = "RUS" ] ...@@ -5,7 +5,7 @@ if [ "${update_loc}" = "RUS" ]
then then
KEY_CREDITS=$RANDOM 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" \ --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \
--text-align=center --scroll --text="PortProton v. ${install_ver} --text-align=center --scroll --text="PortProton v. ${install_ver}
scripts v. ${scripts_install_ver} scripts v. ${scripts_install_ver}
...@@ -18,7 +18,7 @@ https://linux-gaming.ru ...@@ -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 (Михаил Тергоев) --text-align=center --scroll --text="Автор: Casro-Fidel (Михаил Тергоев)
Помощники разработчика и тестировщики: Помощники разработчика и тестировщики:
...@@ -42,7 +42,7 @@ WelchDragon ...@@ -42,7 +42,7 @@ WelchDragon
Vuursteen 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) Авторские права (©) 2022 Castro-Fidel (linux-gaming.ru)
...@@ -65,7 +65,7 @@ Vuursteen ...@@ -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 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \
<<< ' Проект поддержали: <<< ' Проект поддержали:
https://boosty.to/portwine-linux.ru https://boosty.to/portwine-linux.ru
...@@ -308,7 +308,7 @@ Vuursteen ...@@ -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 \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \
--text-info --scroll <<< \ --text-info --scroll <<< \
"Website: https://linux-gaming.ru/ "Website: https://linux-gaming.ru/
...@@ -324,7 +324,7 @@ Yandex кошелек: 410012267513818 ...@@ -324,7 +324,7 @@ Yandex кошелек: 410012267513818
Задонатить на стрим: Задонатить на стрим:
https://www.donationalerts.com/r/portwine_linux" & 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 --fontname="Serif bold italic 10" --text-info <<< " Сторонние библиотеки, которые используются в PortProton
PortProton собран на основе бесплатных библиотек программного обеспечения: PortProton собран на основе бесплатных библиотек программного обеспечения:
...@@ -335,7 +335,7 @@ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds ...@@ -335,7 +335,7 @@ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds
YAD: https://github.com/v1cont/yad YAD: https://github.com/v1cont/yad
ZENITY: https://github.com/GNOME/zenity" & 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 \ --center --notebook --no-buttons --tab-pos=bottom \
--tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \ --tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \
--tab="БИБЛИОТЕКИ" --tab="БИБЛИОТЕКИ"
...@@ -347,7 +347,7 @@ else ...@@ -347,7 +347,7 @@ else
KEY_CREDITS=$RANDOM 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" \ --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \
--text-align=center --scroll --text="PortProton v. ${install_ver} --text-align=center --scroll --text="PortProton v. ${install_ver}
scripts v. ${scripts_install_ver} scripts v. ${scripts_install_ver}
...@@ -361,7 +361,7 @@ This program comes with absolutely no warranty. ...@@ -361,7 +361,7 @@ This program comes with absolutely no warranty.
See the License for details." & 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) --text-align=center --scroll --text="Author: Casro-Fidel (Mikhail Tergoev)
Developer assistants and testers: Developer assistants and testers:
...@@ -381,7 +381,7 @@ andrey4korop ...@@ -381,7 +381,7 @@ andrey4korop
zorn 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) Copyright (©) 2022 Castro-Fidel (linux-gaming.ru)
...@@ -403,7 +403,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ...@@ -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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE." & 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 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \
<<< ' The project was supported: <<< ' The project was supported:
https://boosty.to/portwine-linux.ru: https://boosty.to/portwine-linux.ru:
...@@ -646,7 +646,7 @@ SOFTWARE." & ...@@ -646,7 +646,7 @@ SOFTWARE." &
The list will be updated...' & 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 \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \
--text-info --scroll <<< \ --text-info --scroll <<< \
"Website: http://linux-gaming.ru "Website: http://linux-gaming.ru
...@@ -662,7 +662,7 @@ Yandex wallet: 410012267513818 ...@@ -662,7 +662,7 @@ Yandex wallet: 410012267513818
Donat on stream: Donat on stream:
https://www.donationalerts.com/r/portwine_linux" & 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 --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: PortProton is built on the basis of the following free software libraries:
...@@ -674,7 +674,7 @@ YAD: https://github.com/v1cont/yad ...@@ -674,7 +674,7 @@ YAD: https://github.com/v1cont/yad
ZENITY: https://github.com/GNOME/zenity" & 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 \ --center --notebook --no-buttons --tab-pos=bottom \
--tab="ABOUT PORTPROTON" --tab="AUTORS" --tab="LICENSE" --tab="SPONSORS" --tab="JOIN" \ --tab="ABOUT PORTPROTON" --tab="AUTORS" --tab="LICENSE" --tab="SPONSORS" --tab="JOIN" \
--tab="THIRD PARTY LIBRARIES" --tab="THIRD PARTY LIBRARIES"
......
...@@ -384,8 +384,8 @@ init_wine_ver () { ...@@ -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" 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 '/Steam.exe/d' "${WINEDIR}/share/wine/wine.inf"
sed -i '/\\Valve\\Steam/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 fi
sed -i '/winemenubuilder/d' "${WINEDIR}/share/wine/wine.inf"
fi fi
return 0 return 0
} }
...@@ -606,12 +606,12 @@ stop_portwine () { ...@@ -606,12 +606,12 @@ stop_portwine () {
kill_portwine && kill_portwine &&
try_remove_dir "${PW_WINELIB}/var" try_remove_dir "${PW_WINELIB}/var"
find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete 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 if [ ! -z "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" ] ; then
kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" 2>/dev/null kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" 2>/dev/null
fi fi
add_in_stop_portwine #&>/dev/null add_in_stop_portwine #&>/dev/null
kill -n 9 `pgrep -a start.sh | grep -i '/PortProton/' | awk '{print $1}'` > /dev/null 2>&1 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 exit 0
} }
export -f stop_portwine export -f stop_portwine
...@@ -640,7 +640,7 @@ pw_download_libs () { ...@@ -640,7 +640,7 @@ pw_download_libs () {
fi fi
fi fi
export pw_yad="${PW_WINELIB}/portable/bin/yad" 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_zstd="${PW_WINELIB}/portable/bin/zstd"
export pw_7z="${PW_WINELIB}/portable/lib/p7zip/7z" export pw_7z="${PW_WINELIB}/portable/lib/p7zip/7z"
if [ -x "`which xterm 2>/dev/null`" ]; then if [ -x "`which xterm 2>/dev/null`" ]; then
...@@ -792,7 +792,7 @@ pw_init_db () { ...@@ -792,7 +792,7 @@ pw_init_db () {
export ADD_CB_DBFILE="${PW_CHECK_DB_FILE}!${ADD_CB_DBFILE}" export ADD_CB_DBFILE="${PW_CHECK_DB_FILE}!${ADD_CB_DBFILE}"
fi fi
done 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="" \ --title "Database file selection..." --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --form --separator="" \
--field="DB FILE: :CB" "${ADD_CB_DBFILE}"` --field="DB FILE: :CB" "${ADD_CB_DBFILE}"`
if [[ "$?" == "1" || "$?" == "252" ]] ; then exit 0 ; fi if [[ "$?" == "1" || "$?" == "252" ]] ; then exit 0 ; fi
...@@ -819,7 +819,7 @@ pw_init_db () { ...@@ -819,7 +819,7 @@ pw_init_db () {
print_info "Use ${PORTWINE_DB_FILE} db file." print_info "Use ${PORTWINE_DB_FILE} db file."
fi fi
if [ -z "$PATH_TO_GAME" ] ; then 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
fi fi
return 0 return 0
...@@ -841,11 +841,11 @@ pw_port_update () { ...@@ -841,11 +841,11 @@ pw_port_update () {
print_info "Scripts version in github = ${scripts_current_ver}" print_info "Scripts version in github = ${scripts_current_ver}"
print_info "Scripts version local = ${scripts_install_ver}" print_info "Scripts version local = ${scripts_install_ver}"
if [[ ! -z "${scripts_current_ver}" ]] && [[ "${scripts_current_ver}" -gt "${scripts_install_ver}" ]] ; then if [[ ! -z "${scripts_current_ver}" ]] && [[ "${scripts_current_ver}" -gt "${scripts_install_ver}" ]] ; then
if [[ -f "${PW_WINELIB}/portable/bin/yad_new" ]] ; then if [[ -f "${PW_WINELIB}/portable/bin/yad_v12_3" ]] ; then
export pw_yad_new="${PW_WINELIB}/portable/bin/yad_new" 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 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' ` 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 \ --borders=5 --form --separator='%%%' --width=1200 --height=600 --center \
--field=":TXT" "${CHANGLOG_NEWS}" \ --field=":TXT" "${CHANGLOG_NEWS}" \
--field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" ` --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" `
...@@ -874,7 +874,7 @@ pw_port_update () { ...@@ -874,7 +874,7 @@ pw_port_update () {
try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
try_remove_dir "${PORT_WINE_TMP_PATH}/PortWINE-master/" try_remove_dir "${PORT_WINE_TMP_PATH}/PortWINE-master/"
echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver" 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 \ zenity --title="Changelog" --text-info --width=1200 --height=550 \
--filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" --filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}"
fi fi
...@@ -992,7 +992,7 @@ pw_find_exe () { ...@@ -992,7 +992,7 @@ pw_find_exe () {
done < "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe" done < "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe"
OrigIFS="$IFS" && IFS=% 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-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})" --text="\n${loc_gui_create_shortcut_for_exe}" --column="path to .exe file:" ${FIND_TO_GUI})"
YAD_STATUS="$?" YAD_STATUS="$?"
......
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
#####################examples########################### #####################examples###########################
# export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (used winetricks) # 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_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL
# export PW_USE_TERMINAL="1" 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_PREFIX_NAME="EA_APP" export PW_PREFIX_NAME="EA_APP"
export WINEDLLOVERRIDES="winemenubuilder=d" # export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64"
# export PW_WINE_USE="WINE-8.8-STAGING-AMD64" # gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64"
# gui_proton_downloader silent "WINE-8.8-STAGING-AMD64"
...@@ -4,35 +4,33 @@ ...@@ -4,35 +4,33 @@
#Rating=1-5 #Rating=1-5
#####################examples########################### #####################examples###########################
##export PW_COMMENT_DB="blablabla" ##export PW_COMMENT_DB="blablabla"
export PW_WINE_USE="WINE-PROTON-8.0-2-AMD64" export PW_WINDOWS_VER="7"
export PW_PREFIX_NAME="DOTNET"
export PW_WINDOWS_VER="10"
export PW_DLL_INSTALL="" export PW_DLL_INSTALL=""
export WINEDLLOVERRIDES="libglesv2="
export LAUNCH_PARAMETERS="" export LAUNCH_PARAMETERS=""
export PW_VULKAN_USE="1" export PW_VULKAN_USE="1"
export PW_USE_DXR10="0" export PW_PREFIX_NAME="PLARIUM_PLAY"
##export PW_DLSS_ON=1 export PW_MANGOHUD="0"
##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN 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_NVAPI_AND_DLSS="0"
export PW_USE_FAKE_DLSS="0"
export PW_WINE_FULLSCREEN_FSR="0"
export PW_HIDE_NVIDIA_GPU="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 PW_VIRTUAL_DESKTOP="0"
##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue
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_USE_TERMINAL="0" export PW_USE_TERMINAL="0"
export PW_GUI_DISABLED_CS="0" export PW_GUI_DISABLED_CS="0"
##export PATH_TO_GAME= export PW_USE_GAMEMODE="0"
##add_in_start_portwine () { commands ; } 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=""
...@@ -9,10 +9,11 @@ else ...@@ -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" 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 fi
export PW_WINDOWS_VER="10" export PW_WINDOWS_VER="10"
export WINEDLLOVERRIDES="" export WINEDLLOVERRIDES="mscoree,mshtml="
export PW_MUST_HAVE_DLL="" export PW_MUST_HAVE_DLL=""
export PW_PREFIX_NAME="VK_PLAY" export PW_PREFIX_NAME="VK_PLAY"
export PW_USE_GSTREAMER="1" export PW_USE_GSTREAMER="1"
export PW_VULKAN_USE="2"
export PW_WINE_USE="WINE_8.5_LG" export PW_WINE_USE="WINE_8.5_LG"
gui_proton_downloader silent "WINE_8.5_LG" gui_proton_downloader silent "WINE_8.5_LG"
......
...@@ -24,7 +24,7 @@ try_download_caliber () { ...@@ -24,7 +24,7 @@ try_download_caliber () {
set -o pipefail set -o pipefail
wget -t 5 -T 3 "$1" --no-check-certificate --output-document="$2" 2>&1 | \ 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./' | \ 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 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
} }
......
...@@ -5,13 +5,10 @@ export LAUNCH_PARAMETERS=("/silent" "/repair" ) ...@@ -5,13 +5,10 @@ export LAUNCH_PARAMETERS=("/silent" "/repair" )
export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe"
export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetricks) export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetricks)
export PW_VULKAN_USE=1 export PW_VULKAN_USE=1
export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 d3dcompiler_47"
export PW_PREFIX_NAME="EA_APP" export PW_PREFIX_NAME="EA_APP"
export DISABLE_CP_DEFPFX=1 # export DISABLE_CP_DEFPFX=1
export PW_USE_D3D_EXTRAS=0 # export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64"
export WINEDLLOVERRIDES="winemenubuilder=d" # gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64"
# export PW_WINE_USE="WINE-8.8-STAGING-AMD64"
# gui_proton_downloader silent "WINE-8.8-STAGING-AMD64"
start_portwine start_portwine
if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}"
......
...@@ -8,7 +8,7 @@ try_download_lgc () { ...@@ -8,7 +8,7 @@ try_download_lgc () {
set -o pipefail set -o pipefail
wget -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ 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./' | \ 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 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
} }
......
#!/usr/bin/env bash #!/usr/bin/env bash
# Author: chal55rus (Sergey P.) # Author: chal55rus (Sergey P.)
######################################################################## ########################################################################
export PW_PREFIX_NAME=DOTNET
export LAUNCH_PARAMETERS=("/s" ) export LAUNCH_PARAMETERS=("/s" )
export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/plarium_play_setup.exe" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/plarium_play_setup.exe"
export PW_WINE_USE="WINE-PROTON-8.0-2-AMD64" export PW_WINDOWS_VER="7"
gui_proton_downloader silent "WINE-PROTON-8.0-2-AMD64" 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 start_portwine
if try_download "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" if try_download "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}"
......
#!/usr/bin/env bash #!/usr/bin/env bash
# Author: chal55rus (Sergey P.) # Author: chal55rus (Sergey P.)
######################################################################## ########################################################################
export PW_VULKAN_USE="1"
export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe"
start_portwine start_portwine
if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}"
......
...@@ -7,6 +7,7 @@ export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dri ...@@ -7,6 +7,7 @@ export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dri
export WINEDLLOVERRIDES="mscoree,mshtml=" export WINEDLLOVERRIDES="mscoree,mshtml="
export PW_MUST_HAVE_DLL="" export PW_MUST_HAVE_DLL=""
export PW_WINE_USE="WINE_8.5_LG" export PW_WINE_USE="WINE_8.5_LG"
pw_clear_pfx
gui_proton_downloader silent "WINE_8.5_LG" gui_proton_downloader silent "WINE_8.5_LG"
start_portwine start_portwine
......
...@@ -9,7 +9,7 @@ try_download_wgc () { ...@@ -9,7 +9,7 @@ try_download_wgc () {
set -o pipefail set -o pipefail
wget -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ 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./' | \ 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 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
} }
......
...@@ -301,29 +301,31 @@ start_portwine () { ...@@ -301,29 +301,31 @@ start_portwine () {
else else
unset PROTON_BATTLEYE_RUNTIME PROTON_EAC_RUNTIME unset PROTON_BATTLEYE_RUNTIME PROTON_EAC_RUNTIME
fi fi
#try link d3d extras libs
if [[ -d "${PW_PLUGINS_PATH}/d3d_extras" ]]
then PATH_TO_D3DEXTRAS="${PW_PLUGINS_PATH}/d3d_extras" if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then
else PATH_TO_D3DEXTRAS="${PW_WINELIB}/d3d_extras" if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then
fi echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"
if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then fi
echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" if [[ -d "${PW_PLUGINS_PATH}/d3d_extras" ]]
fi then PATH_TO_D3DEXTRAS="${PW_PLUGINS_PATH}/d3d_extras"
for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \ else PATH_TO_D3DEXTRAS="${PW_WINELIB}/d3d_extras"
d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \ fi
d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \ #try link d3d extras libs
d3dx10_42 d3dx10_43 d3dx10 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \ for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \
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 d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \
do d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \
if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then 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}/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/" 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" 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
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"
echo "${d3d_extras_from_plugins}" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" fi
fi done
done fi
echo "Try link wine DXGI by default..." 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" 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" 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 () { ...@@ -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" 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
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 if [[ "${PW_USE_SHADER_CACHE}" == 1 ]] ; then
create_new_dir "${PATH_TO_DXVK_FILES}/gl_shader_cache" create_new_dir "${PATH_TO_DXVK_FILES}/gl_shader_cache"
...@@ -465,11 +462,11 @@ start_portwine () { ...@@ -465,11 +462,11 @@ start_portwine () {
fi fi
for try_cp_dll_from_wine in "ntdll.dll" "vulkan-1.dll" "winevulkan.dll" ; do 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}" 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/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 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}" 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/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 fi
done done
...@@ -512,7 +509,7 @@ start_portwine () { ...@@ -512,7 +509,7 @@ start_portwine () {
kill_portwine kill_portwine
fi fi
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 if [[ ! -z "${PW_WINDOWS_VER}" && `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ]] ; then
export PW_WINDOWS_VER="xp64" export PW_WINDOWS_VER="xp64"
fi fi
......
#!/usr/bin/env bash #!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru) #Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2190 #SCRIPTS_NEXT_VERSION=2191
######################################################################## ########################################################################
export PW_MANGOHUD=0 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 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" ...@@ -20,7 +20,7 @@ export PW_USE_TERMINAL="0"
export PW_WINEDBG_DISABLE="1" export PW_WINEDBG_DISABLE="1"
export PW_WINDOWS_VER="10" export PW_WINDOWS_VER="10"
export WINEARCH="win64" export WINEARCH="win64"
export PW_LIBS_VER="_v42" export PW_LIBS_VER="_v43"
export GDK_BACKEND="x11" export GDK_BACKEND="x11"
export PW_USE_GSTREAMER="1" export PW_USE_GSTREAMER="1"
export PW_USE_D3D_EXTRAS="1" export PW_USE_D3D_EXTRAS="1"
...@@ -60,7 +60,7 @@ export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" ...@@ -60,7 +60,7 @@ export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf"
pw_install_dll_in_prefix () pw_install_dll_in_prefix ()
{ {
case $PW_PREFIX_NAME in 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" ;; DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;;
*) export PW_MUST_HAVE_DLL="" ;; *) export PW_MUST_HAVE_DLL="" ;;
esac esac
......
...@@ -50,7 +50,7 @@ pw_update_pfx_cover_gui () { ...@@ -50,7 +50,7 @@ pw_update_pfx_cover_gui () {
PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 80}'` PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 80}'`
echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log" echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log"
unset PW_TIMER 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 sleep 0.005
if [[ ! -z "${line}" ]] && [[ -z "`echo "${line}" | grep -i "gstreamer"`" ]] \ if [[ ! -z "${line}" ]] && [[ -z "`echo "${line}" | grep -i "gstreamer"`" ]] \
&& [[ -z "`echo "${line}" | grep -i "kerberos"`" ]] \ && [[ -z "`echo "${line}" | grep -i "kerberos"`" ]] \
...@@ -62,10 +62,10 @@ pw_update_pfx_cover_gui () { ...@@ -62,10 +62,10 @@ pw_update_pfx_cover_gui () {
sleep 3 sleep 3
PW_TIMER=1 PW_TIMER=1
fi fi
done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_new}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="2" --text-info --tail & done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v12_3}" --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 & "${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 & --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="$!" export PW_YAD_PID_PFX_COVER_UI="$!"
return 0 return 0
...@@ -109,8 +109,8 @@ open_changelog () { ...@@ -109,8 +109,8 @@ open_changelog () {
export -f open_changelog export -f open_changelog
pw_tray_icon () { pw_tray_icon () {
if [ ! -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ] ; then if [ ! -z "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" ] ; then
kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`"
fi fi
tray_icon_click () { tray_icon_click () {
...@@ -134,7 +134,7 @@ pw_tray_icon () { ...@@ -134,7 +134,7 @@ pw_tray_icon () {
} }
export -f tray_icon_click_exit 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" \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
--image="$PW_GUI_ICON_PATH/port_proton.png" \ --image="$PW_GUI_ICON_PATH/port_proton.png" \
--command="bash -c tray_icon_click" \ --command="bash -c tray_icon_click" \
...@@ -171,7 +171,7 @@ pw_gui_for_edit_db () { ...@@ -171,7 +171,7 @@ pw_gui_for_edit_db () {
edit_db_field_add $@ edit_db_field_add $@
old_IFS=$IFS old_IFS=$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" & 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_edit_db" &
IFS=$old_IFS IFS=$old_IFS
...@@ -180,7 +180,7 @@ pw_gui_for_edit_db () { ...@@ -180,7 +180,7 @@ pw_gui_for_edit_db () {
"XP") ADD_WINVER_EDIT_DB="XP!7!10" ;; "XP") ADD_WINVER_EDIT_DB="XP!7!10" ;;
*) ADD_WINVER_EDIT_DB="10!7!XP" ;; *) ADD_WINVER_EDIT_DB="10!7!XP" ;;
esac 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_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_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" \ --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 () { ...@@ -189,7 +189,7 @@ pw_gui_for_edit_db () {
--field=":LBL" "" \ --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" & --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} <b>${PORTWINE_DB}</b>\n ${loc_gui_edit_db_help}" --separator=" " --borders=10 --center \ --text "${loc_gui_edit_db} <b>${PORTWINE_DB}</b>\n ${loc_gui_edit_db_help}" --separator=" " --borders=10 --center \
--window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
--button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \ --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \
...@@ -405,16 +405,16 @@ gui_vkBasalt () { ...@@ -405,16 +405,16 @@ gui_vkBasalt () {
fi fi
export old_IFS=$IFS export old_IFS=$IFS
export 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" \ --text-align=center --text="$loc_gui_vkbasalt_top" \
${ADD_GUI_FX} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" & ${ADD_GUI_FX} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" &
export IFS="${old_IFS}" 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}" \ --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \
1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" & 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" \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
--button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \
--button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \ --button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment