From e9c3d0fdd32ea616af84a6e6a36cd1f4d380c1be Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Wed, 26 Jan 2022 02:20:41 +0300 Subject: [PATCH] ###Scripts version 2071### --- data_from_portwine/changelog_eng | 7 ++ data_from_portwine/changelog_rus | 7 ++ data_from_portwine/scripts/functions_helper | 113 ++++++++++-------- data_from_portwine/scripts/lang | 4 +- data_from_portwine/scripts/portwine_db/DXHRDC | 2 +- .../scripts/portwine_db/League of Legends | 4 +- .../scripts/portwine_db/MikuMikuDance | 2 +- data_from_portwine/scripts/runlib | 32 +++-- data_from_portwine/scripts/start.sh | 51 ++++---- data_from_portwine/scripts/var | 2 +- 10 files changed, 136 insertions(+), 88 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 1c47882..65f5926 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,10 +2,17 @@ You can help us in the development of the project on the website: https://boosty ----------------------------------------- Changelog: +###Scripts version 2071### +* added the ability to download other versions of WINE when opening an exe file (in the WINE selection drop-down list) +* updated launch mode gamemode (bug fixed libgamemode.so) +* added FSYNC optimization when getting kernel 5.16+ (increases FPS) +* added new launch mode: "VULKAN (WINE DXGI)" required for some new games using DX12 + ###Scripts version 2070### * added PW_D3D_EXTRAS_DISABLE variable to EDIT_DB for DirectX external library * rollback MANGOHUD to stable version from libs_v19.2 * fixed internet download interruption +* updated WINE_LOL_GE 7.0 ###Scripts version 2069### * added support for OpenSUSE (vkBasalt and MANGOHUD) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 01b3439..52ebaa2 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,10 +2,17 @@ ----------------------------------------- История изменений: +###Scripts version 2071### +* добавлена возможность скачивать другие версии WINE при запуске exe файла (в выпадающем списке выбора WINE) +* обновлен режим запуска gamemode (исправлена ошибка libgamemode.so) +* добавлена оптимизация FSYNC при условии использования ядра 5.16+ (повышает FPS) +* добавлен новый режим запуска: "VULKAN (WINE DXGI)" необходимый для некоторых новых игр использующих DX12 + ###Scripts version 2070### * добавлена переменная PW_D3D_EXTRAS_DISABLE в EDIT_DB для возможности отключения сторонних библиотек DirectX * откат MANGOHUD до стабильной версии из libs_v19.2 * исправлено прерывание загрузки из интернета +* обновлен WINE_LOL_GE до версии 7.0 ###Scripts version 2069### * добавлена поддержка OpenSUSE (vkBasalt и MANGOHUD) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index c00fc55..3eb87ca 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -76,8 +76,8 @@ try_remove_dir () { export -f try_remove_dir try_force_link_file () { - if [ ! -f "$1" ] ; then print_info "file $1 not found for link" - elif [ -z "$2" ] ; then print_error "no way to link file $1" + if [ -z "$2" ] ; then + print_error "no way to link file $1" else ln -sf "$1" "$2" [ "$?" != 0 ] && print_error "failed to link file $1 to $2" || return 0 @@ -335,32 +335,33 @@ init_wine_ver () { rm -fr "${WINEDIR}/$clear_dist_files" done fi + if [[ -d "${WINEDIR}" ]] ; then + [[ ! -f "${WINEDIR}/version" ]] && echo "${PW_WINE_USE}" > "${WINEDIR}/version" - [[ ! -f "${WINEDIR}/version" ]] && echo "${PW_WINE_USE}" > "${WINEDIR}/version" + if [[ ! -d "${WINEDIR}/lib64/" && -d "${WINEDIR}/lib/wine/x86_64-unix" ]] ; then + create_new_dir "${WINEDIR}/lib64/wine" + mv -f "${WINEDIR}/lib/wine/x86_64-unix" "${WINEDIR}/lib64/wine/" + mv -f "${WINEDIR}/lib/wine/x86_64-windows" "${WINEDIR}/lib64/wine/" + fi - if [[ ! -d "${WINEDIR}/lib64/" && -d "${WINEDIR}/lib/wine/x86_64-unix" ]] ; then - create_new_dir "${WINEDIR}/lib64/wine" - mv -f "${WINEDIR}/lib/wine/x86_64-unix" "${WINEDIR}/lib64/wine/" - mv -f "${WINEDIR}/lib/wine/x86_64-windows" "${WINEDIR}/lib64/wine/" + for copy_proton_dll in "dxvk" "vkd3d-proton" ; do + if [[ ! -d "${WINEDIR}/lib/wine/${copy_proton_dll}/" || ! -d "${WINEDIR}/lib64/wine/${copy_proton_dll}/" ]] ; then + try_copy_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}/lib/wine/${copy_proton_dll}" "${WINEDIR}/lib/wine/" + try_copy_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}/lib64/wine/${copy_proton_dll}" "${WINEDIR}/lib64/wine/" + fi + done + + for mono_gecko_chk in "mono" "gecko" ; do + if [ ! -d "${WINEDIR}/share/wine/${mono_gecko_chk}" ] ; then + try_remove_dir "${WINEDIR}/share/wine/${mono_gecko_chk}" + try_force_link_dir "${PORT_WINE_TMP_PATH}/${mono_gecko_chk}" "${WINEDIR}"/share/wine/ + elif ! check_symlink "${WINEDIR}/share/wine/${mono_gecko_chk}" && [[ -d "${WINEDIR}/share/wine/${mono_gecko_chk}" ]] ; then + cp -fr "${WINEDIR}/share/wine/${mono_gecko_chk}" "${PORT_WINE_TMP_PATH}" + rm -fr "${WINEDIR}/share/wine/${mono_gecko_chk}" + try_force_link_dir "${PORT_WINE_TMP_PATH}/${mono_gecko_chk}" "${WINEDIR}"/share/wine/ + fi + done fi - - for copy_proton_dll in "dxvk" "vkd3d-proton" ; do - if [[ ! -d "${WINEDIR}/lib/wine/${copy_proton_dll}/" || ! -d "${WINEDIR}/lib64/wine/${copy_proton_dll}/" ]] ; then - try_copy_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_STEAM_VER}/lib/wine/${copy_proton_dll}" "${WINEDIR}/lib/wine/" - try_copy_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_STEAM_VER}/lib64/wine/${copy_proton_dll}" "${WINEDIR}/lib64/wine/" - fi - done - - for mono_gecko_chk in "mono" "gecko" ; do - if [ ! -d "${WINEDIR}/share/wine/${mono_gecko_chk}" ] ; then - try_remove_dir "${WINEDIR}/share/wine/${mono_gecko_chk}" - try_force_link_dir "${PORT_WINE_TMP_PATH}/${mono_gecko_chk}" "${WINEDIR}"/share/wine/ - elif ! check_symlink "${WINEDIR}/share/wine/${mono_gecko_chk}" && [[ -d "${WINEDIR}/share/wine/${mono_gecko_chk}" ]] ; then - cp -fr "${WINEDIR}/share/wine/${mono_gecko_chk}" "${PORT_WINE_TMP_PATH}" - rm -fr "${WINEDIR}/share/wine/${mono_gecko_chk}" - try_force_link_dir "${PORT_WINE_TMP_PATH}/${mono_gecko_chk}" "${WINEDIR}"/share/wine/ - fi - done } sszen() { @@ -525,6 +526,9 @@ pw_download_libs () { pw_check_and_download_wine () { [ ! -d "${PORT_WINE_PATH}/data/dist/" ] && create_new_dir "${PORT_WINE_PATH}/data/dist" + if [[ "${PW_WINE_USE}" == "GET-OVER-WINE" ]] ; then + gui_proton_downloader + fi if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] then export PW_WINE_USE="${PW_PROTON_STEAM_VER}" elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] @@ -551,6 +555,11 @@ pw_check_and_download_wine () { } pw_check_and_download_plugins () { + if [ ! -z "`ls ${PORT_WINE_TMP_PATH} | grep plugins_v | grep -v plugins${PW_PLUGINS_VER}`" ] ; then + for RM_PLUGINS in `ls ${PORT_WINE_TMP_PATH} | grep plugins_v | grep -v plugins${PW_PLUGINS_VER}` + do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_PLUGINS}" + done + fi if [[ ! -d "${PW_PLUGINS_PATH}/BattlEye_Runtime" || ! -d "${PW_PLUGINS_PATH}/d3d_extras" \ || ! -d "${PW_PLUGINS_PATH}/nvapi" || ! -d "${PW_PLUGINS_PATH}/nvml" ]] then @@ -705,7 +714,7 @@ pw_port_update () { echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver" zenity --title="Changelog" --text-info --width=1200 --height=550 \ --filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" - [ "$?" == 0 ] && /bin/bash -c ${pw_full_command_line[*]} & + [ "$?" == 0 ] && /bin/bash ${pw_full_command_line[*]} & exit 0 fi else @@ -796,7 +805,7 @@ pw_gui_for_edit_db () { --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --button="CANCEL":1 --button="OPEN DB FILE":150 --button="SAVE CHANGES":0 YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" ]] ; then - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 elif [[ "$YAD_STATUS" == "252" ]] ; then exit 0 @@ -835,30 +844,36 @@ gui_proton_downloader () { #PROTON_GE export PROTON_GE_GIT=($(curl -s "https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases" | grep "browser_download_url.*\.tar\.gz" | cut -d \" -f 4)) try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" - for PGEGIT in ${PROTON_GE_GIT[@]} ; do - echo ${PGEGIT} | awk -F/ '{print $NF}' | sed 's/.tar.gz//' >> "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" - done - sed -i '/Proton-6.5-GE-2/,$d' "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" - sed -i '/github-action/d' "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" + if [[ ! -z "${PROTON_GE_GIT}" ]] ; then + for PGEGIT in ${PROTON_GE_GIT[@]} ; do + echo ${PGEGIT} | awk -F/ '{print $NF}' | sed 's/.tar.gz//' >> "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" + done + sed -i '/Proton-6.5-GE-2/,$d' "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" + sed -i '/github-action/d' "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" + fi #PROTON_PW export PROTON_PW_GIT=($(curl -s "https://api.github.com/repos/Castro-Fidel/wine_builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)) try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" - for PPWGIT in ${PROTON_PW_GIT[@]} ; do - echo ${PPWGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" - done - sed -i /${PW_PROTON_GE_VER}/d "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" - sed -i '/plugins/d' "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" - + if [[ ! -z "${PROTON_PW_GIT}" ]] ; then + for PPWGIT in ${PROTON_PW_GIT[@]} ; do + echo ${PPWGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" + done + sed -i /${PW_PROTON_GE_VER}/d "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" + sed -i '/plugins/d' "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" + fi + pw_stop_progress_bar + if [[ -z "${PROTON_GE_GIT}" ]] || [[ -z "${PROTON_PW_GIT}" ]] ; then + zenity_error "Error: check wine from github." + /bin/bash ${pw_full_command_line[*]} & + exit 0 + fi for INSTALLING_VERSION_IN_DIST in `ls "${PORT_WINE_PATH}/data/dist/"` ; do sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" done - pw_stop_progress_bar - #Installed wine - ls -l ${PORT_WINE_PATH}/data/dist | awk '{print $9}' | sed '/^$/d' > ${PORT_WINE_TMP_PATH}/tmp_installed_wine - + ls -l ${PORT_WINE_PATH}/data/dist | awk '{print $9}' | sed '/^$/d' > ${PORT_WINE_TMP_PATH}/tmp_installed_wine #GUI export KEY_WINE=$RANDOM try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" @@ -875,7 +890,7 @@ gui_proton_downloader () { --tab-pos=top --tab="PROTON-GE" --tab="PROTON-PW" --tab="INSTALLED"` YAD_WINE_STATUS="$?" if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 fi @@ -901,7 +916,7 @@ gui_proton_downloader () { if [[ ! -z "${VERSION_INSTALLED_WINE}" ]]; then try_remove_dir "${PORT_WINE_PATH}/data/dist/${VERSION_INSTALLED_WINE}" unset VERSION_INSTALLED_WINE - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 fi @@ -911,6 +926,10 @@ gui_proton_downloader () { if [ -f "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_GIT}.tar.${archive_type}" ] ; then if unpack_tar_${archive_type} "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_GIT}.tar.${archive_type}" "${PORT_WINE_PATH}/data/dist/" ; then try_remove_file "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_GIT}.tar.${archive_type}" + if [ ! -z "${portwine_exe}" ]; then + PW_WINE_USE=${VERSION_WINE_GIT} + edit_db_from_gui PW_WINE_USE + fi else try_remove_file "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_GIT}.tar.${archive_type}" try_remove_dir "${PORT_WINE_PATH}/data/dist/${VERSION_WINE_GIT}" @@ -921,7 +940,7 @@ gui_proton_downloader () { else zenity_error_download && gui_proton_downloader fi - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 } export -f gui_proton_downloader @@ -961,7 +980,7 @@ gui_vkBasalt () { YAD_VKBASALT_STATUS="$?" case "${YAD_VKBASALT_STATUS}" in 1|252) - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 ;; 180) export ENABLE_VKBASALT=0 ;; @@ -989,6 +1008,6 @@ gui_vkBasalt () { export PW_VKBASALT_FFX_CAS="0`bc -s <<< "scale=2; $YAD_CAS_SET/100"`" fi edit_db_from_gui PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS ENABLE_VKBASALT - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 } diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 08d486b..48d58b8 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -7,7 +7,7 @@ export update_loc=${update_loc} if [ "${update_loc}" = "RUS" ] then export PW_CHANGELOG_FILE="changelog_rus" - export PW_SELECTION_DB_LOC="Найдено более одного DB файла для запускаемого приложения.\nВыберите необходимый, или перед следующим слезапуском удалите лишний DB файл.\n" + export PW_SELECTION_DB_LOC="Найдено более одного DB файла для запускаемого приложения.\nВыберите необходимый, или перед следующим запуском удалите лишний DB файл.\n" export inst_set="Выбор" export inst_set_top="Установка PortWINE" @@ -82,6 +82,8 @@ then export PW_DX12_DISABLE_INFO='Принудительное отключение DirectX 12' export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)' export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)' + export PW_D3D_EXTRAS_DISABLE_INFO='Отключить принудительное использование сторонних библиотек DirectX' + export PW_PRIME_RENDER_OFFLOAD_INFO='Включить дискретную видеокарту NVIDIA для ноутбуков с гибридной графикой (при поддержке установленого драйвера в ОС)' export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)' export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместо с CAS' diff --git a/data_from_portwine/scripts/portwine_db/DXHRDC b/data_from_portwine/scripts/portwine_db/DXHRDC index 60a5409..fd7bd34 100644 --- a/data_from_portwine/scripts/portwine_db/DXHRDC +++ b/data_from_portwine/scripts/portwine_db/DXHRDC @@ -10,7 +10,7 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="WINMM=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE_6.19-5 +export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 ##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index 36e6854..c6107d5 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -76,7 +76,7 @@ check_port_for_lol () { fi echo "Waiting for port ${port}" kill -STOP ${uxpid} - timeout 200m /bin/bash -c " + timeout 200m /bin/bash " until openssl s_client -connect :${port} <<< Q > /dev/null 2>&1 ; do sleep 1 done" @@ -89,7 +89,7 @@ add_in_start_portwine () { zenity --question --title="Fix for LoL anti-cheat" \ --text='Root rights are required to execute the command: \n"sysctl -w abi.vsyscall32=0" and "sysctl -p"' --no-wrap [ "$?" = 1 ] && exit 0 - pkexec /bin/bash -c 'sysctl -w abi.vsyscall32=0 && sysctl -p' + pkexec /bin/bash 'sysctl -w abi.vsyscall32=0 && sysctl -p' fi check_port_for_lol & } diff --git a/data_from_portwine/scripts/portwine_db/MikuMikuDance b/data_from_portwine/scripts/portwine_db/MikuMikuDance index 85e4b9a..948d05b 100644 --- a/data_from_portwine/scripts/portwine_db/MikuMikuDance +++ b/data_from_portwine/scripts/portwine_db/MikuMikuDance @@ -5,7 +5,7 @@ #####################examples########################### export PW_COMMENT_DB="MikuMikuDance" ##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="MMEffect,MMHack,d3d9,dsound=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export PW_VULKAN_USE=0 diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 139c90d..b763980 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -137,9 +137,10 @@ start_portwine () { #default wine-mono override for FNA games export WINE_MONO_OVERRIDES="Microsoft.Xna.Framework.*,Gac=n" - if [[ ! -z "${PW_NO_ESYNC}" && "${PW_NO_ESYNC}" != 0 ]] - then export WINEESYNC="0" - else export WINEESYNC="1" + if [[ ! -z "${PW_NO_ESYNC}" && "${PW_NO_ESYNC}" != 0 ]] ; then + export WINEESYNC="0" + else + export WINEESYNC="1" fi if [[ ! -z "${PW_NO_FSYNC}" && "${PW_NO_FSYNC}" != 0 ]] ; then export WINEFSYNC="0" @@ -147,6 +148,7 @@ start_portwine () { else export WINEFSYNC="1" export WINEFSYNC_FUTEX2="1" + export WINEFSYNC_SPINCOUNT=100 fi if [[ ! -z "${PW_FORCE_LARGE_ADDRESS_AWARE}" && "${PW_FORCE_LARGE_ADDRESS_AWARE}" != 0 ]] then export WINE_LARGE_ADDRESS_AWARE="1" @@ -256,8 +258,15 @@ start_portwine () { setxkbmap us,ru fi fi - if [[ -x "`which "gamemoderun" 2>/dev/null`" && "$PW_USE_GAMEMODE" = "1" && -z "`cat /etc/os-release | grep -i "red hat"`" ]] ; then + if [[ -x "`which "gamemoderun" 2>/dev/null`" && "$PW_USE_GAMEMODE" = "1" ]] && \ + [[ -z "`cat /etc/os-release | grep -i "red hat"`" ]] && \ + [[ -z "`cat /etc/os-release | grep -i "centos"`" ]] ; then export PW_GAMEMODERUN=1 + if [[ ! -z "${LD_PRELOAD}" ]] ; then + export PW_LD_PRELOAD="$LD_PRELOAD:libgamemodeauto.so.0" + else + export PW_LD_PRELOAD="libgamemodeauto.so.0" + fi echo "Gamemod will be launched." else export PW_GAMEMODERUN=0 @@ -388,7 +397,7 @@ start_portwine () { try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" done - if [[ ! -z "${PW_USE_WINE_DXGI}" && "${PW_USE_WINE_DXGI}" != 0 ]] ; then + if [[ "${PW_USE_WINE_DXGI}" = 1 ]] || [[ "${PW_VULKAN_USE}" = "2" ]]; then echo "Try link wine DXGI..." if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/dxgi.dll" then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/dxgi.dll" @@ -463,7 +472,7 @@ start_portwine () { "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} 2>&1 | tr /n /r | grep -i "" &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" # if [ "${PW_WINE_VER_FROM_DB}" != "${PW_PROTON_STEAM_VER}" ] ; then # export PW_SILENT_RESTART=1 - # /bin/bash -c ${pw_full_command_line[*]} & + # /bin/bash ${pw_full_command_line[*]} & # exit 0 # fi fi @@ -490,12 +499,13 @@ pw_run () { cd "${WINEPREFIX}/drive_c" fi pw_mangohud_check - print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VKD3D_CONFIG" "LD_LIBRARY_PATH" "PATH" + print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VKD3D_CONFIG" \ + "LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" if [ "${PW_LOG}" == 1 ] ; then export PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" if [[ ! -z "${PW_GAMEMODERUN}" && "${PW_GAMEMODERUN}" != 0 ]] ; then - ${optirun_on} gamemoderun ${pw_runtime} env VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \ - ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" + ${optirun_on} ${pw_runtime} env LD_PRELOAD="${PW_LD_PRELOAD}" VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" \ + LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" else ${optirun_on} ${pw_runtime} env VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \ ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" @@ -503,8 +513,8 @@ pw_run () { else [ "${PW_USE_TERMINAL}" != "1" ] && export PW_TERM="" if [[ ! -z "${PW_GAMEMODERUN}" && "${PW_GAMEMODERUN}" != 0 ]] ; then - $PW_TERM ${optirun_on} gamemoderun ${pw_runtime} env VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \ - ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} + $PW_TERM ${optirun_on} ${pw_runtime} env LD_PRELOAD="${PW_LD_PRELOAD}" VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" \ + LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} else $PW_TERM ${optirun_on} ${pw_runtime} env VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \ ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 0d25dac..609288e 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -142,7 +142,7 @@ portwine_start_debug () { env LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_WINELIB}/portable/lib/\$LIB" "${PW_WINELIB}/portable/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log" echo " " >> "${PORT_WINE_PATH}/${portname}.log" echo "inxi -G:" >> "${PORT_WINE_PATH}/${portname}.log" - "${PW_WINELIB}/portable/bin/inxi" -G >> "${PORT_WINE_PATH}/${portname}.log" + "${PW_WINELIB}/portable/bin/inxi" -G | sed 's/[*]12/""/' >> "${PORT_WINE_PATH}/${portname}.log" echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log" "${PW_WINELIB}/portable/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" @@ -239,10 +239,9 @@ pw_edit_db () { pw_gui_for_edit_db PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \ PW_VULKAN_NO_ASYNC PW_USE_NVAPI_AND_DLSS PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP \ PW_WINEDBG_DISABLE PW_USE_TERMINAL PW_WINE_ALLOW_XIM PW_HEAP_DELAY_FREE PW_NO_WRITE_WATCH PW_GUI_DISABLED_CS \ - PW_USE_GSTREAMER PW_USE_RUNTIME PW_USE_GAMEMODE PW_DX12_DISABLE PW_USE_WINE_DXGI PW_PRIME_RENDER_OFFLOAD \ - PW_D3D_EXTRAS_DISABLE + PW_USE_GSTREAMER PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_D3D_EXTRAS_DISABLE if [ "$?" == 0 ] ; then - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 fi } @@ -279,37 +278,38 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=1 fi case "${PW_VULKAN_USE}" in - "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)' ;; - *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL ' ;; + "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)' ;; + "1") export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL ' ;; + "2") export PW_DEFAULT_VULKAN_USE='VULKAN (WINE DXGI)!VULKAN (DXVK and VKD3D)!OPENGL ' ;; esac if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] ; then - export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] ; then - export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" else if [[ "${PW_WINE_USE}" == "${PW_PROTON_STEAM_VER}" ]] ; then - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" elif [[ "${PW_WINE_USE}" == "${PW_PROTON_GE_VER}" ]] ; then - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" else export DIST_ADD_TO_GUI=`echo ${DIST_ADD_TO_GUI} | sed -e s/"\!${PW_WINE_USE}$//g"` - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" fi fi else - export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL ' + export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL ' if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] ; then - export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] ; then - export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" else if [[ "${PW_WINE_USE}" == "${PW_PROTON_STEAM_VER}" ]] ; then - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" elif [[ "${PW_WINE_USE}" == "${PW_PROTON_GE_VER}" ]] ; then - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" else export DIST_ADD_TO_GUI=`echo ${DIST_ADD_TO_GUI} | sed -e s/"\!${PW_WINE_USE}$//g"` - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" fi fi unset PW_GUI_DISABLED_CS @@ -329,7 +329,7 @@ if [ ! -z "${portwine_exe}" ]; then --button='LAUNCH'!!"${loc_launch}":106 ) export PW_YAD_SET="$?" if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi - export VULKAN_MOD=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}' | awk '{print $1}'` + export VULKAN_MOD=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}'` export PW_WINE_VER=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $2}' | awk '{print $1}'` elif [ ! -z "${PORTWINE_DB_FILE}" ]; then portwine_launch @@ -346,7 +346,7 @@ else gui_clear_pfx () { if gui_question "${port_clear_pfx}" ; then pw_clear_pfx - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 fi } @@ -366,7 +366,7 @@ else gui_pw_update () { try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier" - /bin/bash -c ${pw_full_command_line[*]} & + /bin/bash ${pw_full_command_line[*]} & exit 0 } @@ -426,7 +426,7 @@ else "${pw_yad}" --plug=${KEY} --tabnum=1 --columns=3 --form --separator=";" \ --image "$PW_GUI_ICON_PATH/port_proton.png" \ - --field=":CB" "VULKAN (DXVK and VKD3D)!OPENGL" \ + --field=":CB" "VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL" \ --field=":LBL" "" \ --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \ --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \ @@ -452,14 +452,17 @@ else if [ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" ] ; then cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" export VULKAN_MOD=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk '{print $1}' | awk -F";" '{print $1}'` - export PW_WINE_VER=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk -F";" '{print $5}' | awk '{print $1}'` - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" + export PW_WINE_VER=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk -F";" '{print $5}'` + #try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" fi fi if [[ ! -z "${VULKAN_MOD}" && "${VULKAN_MOD}" = "OPENGL" ]] then export PW_VULKAN_USE="0" -else export PW_VULKAN_USE="1" +elif [[ ! -z "${VULKAN_MOD}" && "${VULKAN_MOD}" = "VULKAN (DXVK and VKD3D)" ]] +then export PW_VULKAN_USE="1" +elif [[ ! -z "${VULKAN_MOD}" && "${VULKAN_MOD}" = "VULKAN (WINE DXGI)" ]] +then export PW_VULKAN_USE="2" fi init_wine_ver diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 0b43d00..b693d8c 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2070 +#SCRIPTS_NEXT_VERSION=2071 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1