diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 4011c99..c929386 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -2,11 +2,24 @@ ----------------------------------------- В планах: * добавить inxi в runtime и его вывод с аргументом -G в log -* обновить контейнер до актуального состояния -* обновить поддержку DLSS * добавить проверку количества db файлов на один exe * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2049### +* добавлено скачивание из github нового архива plugins_v1 в котором содержится d3d_extras, beclient, nvml и nvapi (ускоряет первичный запуск PortProton) +* каталоги с новыми версиями PROTON STEAM и GE не удаляют старые версии +* обновлён wine для League of Legends до версии WINE_LOL_GE_6.16-3 (исправляет ошибки с обновлением клиента) +* произведен откат PROTON_STEAM к версии 6.3-7 (более стабильная версия) +* обновлен PROTON_GE до версии 6.19-5 (6.21-2 всё еще не стабилна) +* добавлен автоматический перезапуск игры/программы после наполнения префикса с помощью winetricks +* реализована полная поддержка DLSS (Спасибо VHSgunzo!) +* отдельного режима DXVK более не существует (режим VULKAN заменяет оба режима: DXVK и VKD3D) +* добавлена переменная "DX12_DISABLE" в EDIT_DB для принудительного отключения DirectX12 +* добавлена переменная "USE_WINE_DXGI" в EDIT_DB для принудительного использования встроенной библиотеки DXGI +* добавлена переменная "MANGOHUD_USER_CONF" для использования системных настроек MANGOHUD (GOverlay и т.п.) +* для удобства в интерфейсе EDIT_DB удалены приставки "PW_" (название переменных в db файлах остались без изменений) +* копирование библиотек DXVK и VKD3D заменено созданием символьных ссылок, что немного уменьшает время загрузки порта и увеличивает срок жизни для SSD =) + ###Scripts version 2048### * HOTFIX - востановлена работа контейнера, vkBasalt и mangohud на системах основанных на Debian * DLSS работает в играх под DX11+DXVK (скоро будет работать и под DX12) @@ -583,8 +596,8 @@ PS: не забывает для активации добавить перем * добавлена функция pw_clear_pfx для отчистки префикса порта во время обновления без затрагивания игр и программ * проверка и настройка переменных для MANGOHUD добавлены функцию pw_mangohud_check * версия VKD3D по умолчанию = 2.3 -* добавлена поддержка DXR (RTX) в режиме VKD3D, при условии использования переменной PW_DXR_ON=1 -* переменная PW_DXR_ON добавлена в default db +* добавлена поддержка DXR (RTX) в режиме VKD3D, при условии использования переменной PW_USE_DXR10=1 +* переменная PW_USE_DXR10 добавлена в default db * переменная PW_DXVK_NO_ASYNC переименованна в PW_VULKAN_NO_ASYNC и теперь отключает асинхронные вызовы как в DXVK, так и в VKD3D ###Scripts version 1039### diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index edfe088..adf782f 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -302,8 +302,8 @@ init_wine_ver () { 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/PROTON_STEAM/lib/wine/${copy_proton_dll}" "${WINEDIR}/lib/wine/" - try_copy_dir "${PORT_WINE_PATH}/data/dist/PROTON_STEAM/lib64/wine/${copy_proton_dll}" "${WINEDIR}/lib64/wine/" + 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 @@ -375,62 +375,6 @@ pw_download_libs () { fi } -pw_download_mono () { - [ ${PW_WINE_USE} = "PROTON_GE" ] && export PW_MONO_VER="${PW_MONO_GE_VER}" - if [ ! -d "${PORT_WINE_TMP_PATH}/mono/wine-mono-${PW_MONO_VER}" ] ; then - export url_mono="https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${PW_MONO_VER}/wine-mono-${PW_MONO_VER}-x86.tar.xz" - echo "######################################################" - print_info "Download and install wine mono..." - if try_download "${url_mono}" "${PORT_WINE_TMP_PATH}/wine-mono-${PW_MONO_VER}-x86.tar.xz" ; then - create_new_dir "${PORT_WINE_TMP_PATH}/mono" - if ! unpack_tar_xz "${PORT_WINE_TMP_PATH}/wine-mono-${PW_MONO_VER}-x86.tar.xz" "${PORT_WINE_TMP_PATH}/mono/" - then - try_remove_dir "${PORT_WINE_TMP_PATH}/mono/wine-mono-${PW_MONO_VER}-x86" - zenity_error_download && pw_download_mono - fi - try_remove_file "${PORT_WINE_TMP_PATH}/wine-mono-${PW_MONO_VER}-x86.tar.xz" - else - zenity_error_download && pw_download_mono - fi - fi -} - -pw_download_gecko () { - [ ${PW_WINE_USE} = "PROTON_GE" ] && export PW_GECKO_VER="${PW_GECKO_GE_VER}" - if [ ! -d "${PORT_WINE_TMP_PATH}/gecko/wine-gecko-${PW_GECKO_VER}-x86" ] ; then - export url_gecko_x86="https://dl.winehq.org/wine/wine-gecko/${PW_GECKO_VER}/wine-gecko-${PW_GECKO_VER}-x86.tar.xz" - echo "######################################################" - print_info "Download and install wine gecko x86..." - if try_download "${url_gecko_x86}" "${PORT_WINE_TMP_PATH}/wine-gecko-${PW_GECKO_VER}-x86.tar.xz" ; then - create_new_dir "${PORT_WINE_TMP_PATH}/gecko" - if ! unpack_tar_xz "${PORT_WINE_TMP_PATH}/wine-gecko-${PW_GECKO_VER}-x86.tar.xz" "${PORT_WINE_TMP_PATH}/gecko/" - then - try_remove_dir "${PORT_WINE_TMP_PATH}/gecko/wine-gecko-${PW_GECKO_VER}-x86" - zenity_error_download && pw_download_gecko - fi - try_remove_file "${PORT_WINE_TMP_PATH}/wine-gecko-${PW_GECKO_VER}-x86.tar.xz" - else - zenity_error_download && pw_download_gecko - fi - fi - if [ ! -d "${PORT_WINE_TMP_PATH}/gecko/wine-gecko-${PW_GECKO_VER}-x86_64" ] ; then - export url_gecko_x86_64="https://dl.winehq.org/wine/wine-gecko/${PW_GECKO_VER}/wine-gecko-${PW_GECKO_VER}-x86_64.tar.xz" - echo "######################################################" - print_info "Download and install wine gecko x86_64..." - if try_download "${url_gecko_x86_64}" "${PORT_WINE_TMP_PATH}/wine-gecko-${PW_GECKO_VER}-x86_64.tar.xz" ; then - create_new_dir "${PORT_WINE_TMP_PATH}/gecko" - if ! unpack_tar_xz "${PORT_WINE_TMP_PATH}/wine-gecko-${PW_GECKO_VER}-x86_64.tar.xz" "${PORT_WINE_TMP_PATH}/gecko/" - then - try_remove_dir "${PORT_WINE_TMP_PATH}/gecko/wine-gecko-${PW_GECKO_VER}-x86_64" - zenity_error_download && pw_download_gecko - fi - try_remove_file "${PORT_WINE_TMP_PATH}/wine-gecko-${PW_GECKO_VER}-x86_64.tar.xz" - else - zenity_error_download && pw_download_gecko - fi - fi -} - update_winetricks () { W_TRX_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" W_TRX_EXT_VER="$(curl -s --list-only ${W_TRX_URL} | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" @@ -502,7 +446,7 @@ stop_portwine () { rm -fr "${WINEPREFIX}"/drive_c/users/steamuser/Temp/* fi try_remove_dir "${PW_WINELIB}/var" - find "${WINEPREFIX}/drive_c/" -type f -name "*.tmp" -delete + find "${WINEPREFIX}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete exit 0 } open_changelog () { @@ -551,6 +495,11 @@ pw_init_db () { PORTWINE_DB_FILE=`grep -ilw "#${PORTWINE_DB}" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi` if [ ! -z "${PORTWINE_DB_FILE}" ]; then . "${PORTWINE_DB_FILE}" + if [[ `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] + then export PW_WINE_USE="${PW_PROTON_STEAM_VER}" + elif [[ `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] + then export PW_WINE_USE="${PW_PROTON_GE_VER}" + fi init_wine_ver && print_info "Use ${PORTWINE_DB_FILE} db file." fi @@ -690,7 +639,8 @@ pw_gui_for_edit_db () { else export ${int_to_boole}="FALSE" fi TMP_HELP_FOR_GUI="${int_to_boole}_INFO" - ADD_CHK_BOX_EDIT_DB+="--field=${int_to_boole}!${!TMP_HELP_FOR_GUI}:CHK%${!int_to_boole}%" + int_to_boole_non_pw="`echo ${int_to_boole} | sed 's/^PW_//'`" + ADD_CHK_BOX_EDIT_DB+="--field= ${int_to_boole_non_pw} !${!TMP_HELP_FOR_GUI}:CHK%${!int_to_boole}%" done } edit_db_field_add $@ @@ -703,7 +653,7 @@ pw_gui_for_edit_db () { "${pw_yad_new}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator=" " --columns=1 \ --field="MANGOHUD FPS LIMIT (0-disabled):SCL" ${FPS_LIMIT_VAR} 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="330" \ + "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="370" \ --text "Change settings in database file for ${PORTWINE_DB}\n" --separator=" " --borders=10 --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --button="CANCEL":1 --button="OPEN DB FILE":150 --button="SAVE CHANGES":0 YAD_STATUS="$?" @@ -744,21 +694,18 @@ pw_gui_for_edit_db () { pw_check_and_download_wine () { [ ! -d "${PORT_WINE_PATH}/data/dist/" ] && create_new_dir "${PORT_WINE_PATH}/data/dist" - if [ "${1}" == "PROTON_GE" ] ; then - if [ "`cat "${PORT_WINE_PATH}"/data/dist/PROTON_GE/version | head -n 1`" != "${PW_PROTON_GE_VER}" ] - then try_remove_dir "${PORT_WINE_PATH}/data/dist/PROTON_GE/" - fi - if [ ! -d "${PORT_WINE_PATH}/data/dist/PROTON_GE" ] ; then - print_info "Download and install PROTON_GE..." + if [ "${1}" == "${PW_PROTON_GE_VER}" ] ; then + if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}" ] ; then + print_info "Download and install ${PW_PROTON_GE_VER}..." if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_PROTON_GE_VER}/${PW_PROTON_GE_VER}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - echo "${PW_PROTON_GE_VER}" > "${PORT_WINE_PATH}/data/dist/PROTON_GE/version" + echo "${PW_PROTON_GE_VER}" > "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}/version" try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}.tar.xz" try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}" else try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}.tar.xz" try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}" - try_remove_dir "${PORT_WINE_PATH}/data/dist/PROTON_GE" + try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}" zenity_error_download && pw_check_and_download_wine fi @@ -767,20 +714,37 @@ pw_check_and_download_wine () { fi fi fi - if [ "`cat "${PORT_WINE_PATH}"/data/dist/PROTON_STEAM/version | head -n 1`" != "${PW_PROTON_STEAM_VER}" ] - then try_remove_dir "${PORT_WINE_PATH}/data/dist/PROTON_STEAM/" - fi - if [ ! -d "${PORT_WINE_PATH}/data/dist/PROTON_STEAM" ] ; then - print_info "Download and install PROTON_STEAM..." + if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_PROTON_STEAM_VER}" ] ; then + print_info "Download and install ${PW_PROTON_STEAM_VER}..." if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_PROTON_STEAM_VER}/${PW_PROTON_STEAM_VER}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - echo "${PW_PROTON_STEAM_VER}" > "${PORT_WINE_PATH}/data/dist/PROTON_STEAM/version" + echo "${PW_PROTON_STEAM_VER}" > "${PORT_WINE_PATH}/data/dist/${PW_PROTON_STEAM_VER}/version" try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}" else try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}" - try_remove_dir "${PORT_WINE_PATH}/data/dist/PROTON_STEAM" + try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_STEAM_VER}" + + zenity_error_download && pw_check_and_download_wine + fi + else + zenity_error_download && pw_check_and_download_wine + fi + fi +} + +pw_check_and_download_plugins () { + if [[ ! -d "${PW_PLUGINS_PATH}/BattlEye_Runtime" || ! -d "${PW_PLUGINS_PATH}/d3d_extras" \ + || ! -d "${PW_PLUGINS_PATH}/nvapi" || ! -d "${PW_PLUGINS_PATH}/nvml" ]] + then + print_info "Download and install plugins${PW_PLUGINS_VER}..." + if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then + if unpack_tar_xz "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}" ; then + try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" + else + try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" + try_remove_dir "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" zenity_error_download && pw_check_and_download_wine fi @@ -807,7 +771,7 @@ gui_proton_downloader () { 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 '/PROTON_GE/d' "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" + sed -i /${PW_PROTON_GE_VER}/d "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" 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" @@ -914,7 +878,7 @@ gui_vkBasalt () { --field="AMD FidelityFX - Contrast Adaptive Sharpening":SCL "${VKBASALT_FFX_CAS_GUI}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" & - "${pw_yad_new}" --paned --key="$KEY_FX_GUI" --height="450" --title="vkBasalt" --center --borders=10 \ + "${pw_yad_new}" --paned --key="$KEY_FX_GUI" --height="500" --title="vkBasalt" --center --borders=10 \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="CANCEL":1 --button="DISABLE VKBASALT":180 --button="ENABLE VKBASALT":182 YAD_VKBASALT_STATUS="$?" diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index a1f2238..7d2189a 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -58,8 +58,9 @@ then export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)' export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)' - export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки.) (Рекомендуется не изменять значение)' - export PW_DXR_ON_INFO='Включить поддержку Ray Tracing' + export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки) (Рекомендуется не изменять значение)' + export PW_USE_DXR10_INFO='Включить поддержку Ray Tracing v.1.0' + export PW_USE_DXR11_INFO='Включить поддержку Ray Tracing v.1.1 (бета)' export PW_VULKAN_NO_ASYNC_INFO='Выключить асинхронные вызовы для режимов VULKAN и DXVK' export PW_USE_NVAPI_AND_DLSS_INFO='Включить DLSS на поддерживаемых видеокартах NVIDIA' export PW_OLD_GL_STRING_INFO='Принудительное использование старых версий OpenGL' @@ -76,6 +77,9 @@ then export PW_USE_RUNTIME_INFO='Использовать контейнерный режим запуска (Рекомендуется не изменять значение)' export PW_MANGOHUD_INFO='Использование мониторинга FPS и нагрузки системы (Включается и выключается сочитанием клавиш - правый Shift + F12)' export PW_USE_GAMEMODE_INFO='Использование автоматической оптимизации системы для увеличения производительности в играх (при условии установленного пакета gamemode в системе)' + 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_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)' export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместо с CAS' diff --git a/data_from_portwine/scripts/portwine_db/Anno4 b/data_from_portwine/scripts/portwine_db/Anno4 index a11ef62..a48ced5 100644 --- a/data_from_portwine/scripts/portwine_db/Anno4 +++ b/data_from_portwine/scripts/portwine_db/Anno4 @@ -10,7 +10,7 @@ export PW_COMMENT_DB="If after the first launch you see a black screen,\njust re ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=dxvk -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/AnomalyLauncher b/data_from_portwine/scripts/portwine_db/AnomalyLauncher index 23336d0..d3a0ad3 100644 --- a/data_from_portwine/scripts/portwine_db/AnomalyLauncher +++ b/data_from_portwine/scripts/portwine_db/AnomalyLauncher @@ -10,7 +10,7 @@ export PW_DLL_INSTALL="d3dx10 d3dx11_42 d3dx11_43" # Install DDL i ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export PW_WINE_USE=proton_ge export PW_VULKAN_USE=dxvk -export PW_DXR_ON=0 +export PW_USE_DXR10=0 export PW_VULKAN_NO_ASYNC=0 export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 diff --git a/data_from_portwine/scripts/portwine_db/Arthur b/data_from_portwine/scripts/portwine_db/Arthur index a12dea7..12e3744 100755 --- a/data_from_portwine/scripts/portwine_db/Arthur +++ b/data_from_portwine/scripts/portwine_db/Arthur @@ -13,7 +13,7 @@ export PW_VULKAN_USE=dxvk ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_DXVK_VER=1.8.1 ##export PW_VKD3D_VER=2.2 -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher index 417fdd3..fdcecfb 100755 --- a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher +++ b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher @@ -5,14 +5,13 @@ #Battle.net.exe #Rating=5 ################################################ -export PW_COMMENT_DB="We recommend using PROTON_GE + VULKAN!" +#export PW_COMMENT_DB="We recommend using PROTON_GE + VULKAN!" export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="" export WINEDLLOVERRIDES="locationapi=" export PW_DLL_INSTALL="vcrun2019 d3dx11_42 d3dx11_43" export PW_WINDOWS_VER=10 -export PW_USE_NVAPI_AND_DLSS=0 add_in_start_portwine () { rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/ProgramData/Agent/data" diff --git a/data_from_portwine/scripts/portwine_db/Biomutant b/data_from_portwine/scripts/portwine_db/Biomutant index 933dbf4..e222f06 100755 --- a/data_from_portwine/scripts/portwine_db/Biomutant +++ b/data_from_portwine/scripts/portwine_db/Biomutant @@ -10,7 +10,7 @@ export PW_VULKAN_USE=1 export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/Control_DX11 b/data_from_portwine/scripts/portwine_db/Control_DX11 index 135e849..3999a22 100755 --- a/data_from_portwine/scripts/portwine_db/Control_DX11 +++ b/data_from_portwine/scripts/portwine_db/Control_DX11 @@ -15,7 +15,7 @@ export PW_DLL_INSTALL="physx" ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/Control_DX12 b/data_from_portwine/scripts/portwine_db/Control_DX12 index 44fe36e..c9ce94c 100755 --- a/data_from_portwine/scripts/portwine_db/Control_DX12 +++ b/data_from_portwine/scripts/portwine_db/Control_DX12 @@ -5,7 +5,7 @@ ######################################################## export PW_VULKAN_USE=vkd3d export PW_COMMENT_DB="Control (DX12)" -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_MANGOHUD=1 export PW_DLL_INSTALL="physx" export WINEDLLOVERRIDES="d3d12,d3d_rmdwin10_f,renderer_rmdwin10_f,app_rmdwin10_f,input_rmdwin10_f,renderer_rmdwin10_f,physics_rmdwin10_f,snd_rmdwin10_f,ui_rmdwin10_f=n" @@ -15,7 +15,7 @@ export WINEDLLOVERRIDES="d3d12,d3d_rmdwin10_f,renderer_rmdwin10_f,app_rmdwin10_f ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/DaysGone b/data_from_portwine/scripts/portwine_db/DaysGone index 9984fad..4c82ec8 100755 --- a/data_from_portwine/scripts/portwine_db/DaysGone +++ b/data_from_portwine/scripts/portwine_db/DaysGone @@ -10,7 +10,7 @@ export PW_VULKAN_USE=dxvk export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher index a993e64..f1cc349 100755 --- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher +++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher @@ -3,7 +3,7 @@ #EpicGamesLauncher.exe #Rating=5 ############################################## -export PW_COMMENT_DB="PortWINE database file for Epic Games Launcher was found.\nFor GTA5 it is recommended to use DXVK." +#export PW_COMMENT_DB="PortWINE database file for Epic Games Launcher" export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="-opengl -SkipBuildPatchPrereq" diff --git a/data_from_portwine/scripts/portwine_db/Esprit_Games b/data_from_portwine/scripts/portwine_db/Esprit_Games index 3cff296..fe678c5 100755 --- a/data_from_portwine/scripts/portwine_db/Esprit_Games +++ b/data_from_portwine/scripts/portwine_db/Esprit_Games @@ -9,7 +9,7 @@ export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_NVAPI_DISABLE=1 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/FL64 b/data_from_portwine/scripts/portwine_db/FL64 index 36f8609..ffe5f89 100755 --- a/data_from_portwine/scripts/portwine_db/FL64 +++ b/data_from_portwine/scripts/portwine_db/FL64 @@ -13,7 +13,7 @@ export WINEDLLOVERRIDES="FLEngine,FLEngine_x64=n" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_DXVK_VER=1.8.1 ##export PW_VKD3D_VER=2.2 -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=0 diff --git a/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11 b/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11 index 880c430..acf2569 100755 --- a/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11 +++ b/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11 @@ -13,7 +13,7 @@ export PW_DLL_INSTALL="d3dx11_42 d3dx11_43" ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9 b/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9 index 0693086..fd48705 100755 --- a/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9 +++ b/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9 @@ -13,7 +13,7 @@ export PW_VULKAN_USE=0 ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/Far_Cry_4 b/data_from_portwine/scripts/portwine_db/Far_Cry_4 index b222749..0befd56 100755 --- a/data_from_portwine/scripts/portwine_db/Far_Cry_4 +++ b/data_from_portwine/scripts/portwine_db/Far_Cry_4 @@ -11,7 +11,7 @@ export PW_DLL_INSTALL="d3dcompiler_43 d3dcompiler_47" # Install DD ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index 7bc3065..316bf21 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -15,10 +15,10 @@ export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legends can take ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" export LAUNCH_PARAMETERS=("--launch-product=league_of_legends" "--launch-patchline=live") # Additional launch options -export PW_WINE_USE=WINE_LOL_GE_6.16-2 +export PW_WINE_USE=WINE_LOL_GE_6.16-3 export PW_VULKAN_USE=1 export PW_MUST_HAVE_DLL="" -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 @@ -37,8 +37,6 @@ export PW_NO_ESYNC=1 # Do not use eventfd-based in-pr ##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread ##export WINEARCH=win32 # defaut = win64 ##export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_lol" -export PW_MONO_VER="6.3.0" -export PW_GECKO_VER="2.47.2" ##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG ##export PW_USE_TERMINAL=1 # Force run in terminal ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI diff --git a/data_from_portwine/scripts/portwine_db/MikuMikuDance b/data_from_portwine/scripts/portwine_db/MikuMikuDance index 26ad6c9..6cef38b 100755 --- a/data_from_portwine/scripts/portwine_db/MikuMikuDance +++ b/data_from_portwine/scripts/portwine_db/MikuMikuDance @@ -9,7 +9,7 @@ ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/NovaRO b/data_from_portwine/scripts/portwine_db/NovaRO index 65c7f0c..a416ccc 100755 --- a/data_from_portwine/scripts/portwine_db/NovaRO +++ b/data_from_portwine/scripts/portwine_db/NovaRO @@ -15,7 +15,7 @@ export PW_DLL_INSTALL="d3dcompiler_42 d3dcompiler_43 d3dx9" ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_DXVK_VER=1.8.1 ##export PW_VKD3D_VER=2.2 -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/Origin b/data_from_portwine/scripts/portwine_db/Origin index fe9be99..55fc508 100755 --- a/data_from_portwine/scripts/portwine_db/Origin +++ b/data_from_portwine/scripts/portwine_db/Origin @@ -13,7 +13,7 @@ export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2019 d3dcompiler_43 d3dcompiler_ export PW_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL ##export PW_DXVK_VER=1.8.1 ##export PW_VKD3D_VER=2.2 -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=0 diff --git a/data_from_portwine/scripts/portwine_db/SR2_pc b/data_from_portwine/scripts/portwine_db/SR2_pc index 066ce54..63e7f7f 100755 --- a/data_from_portwine/scripts/portwine_db/SR2_pc +++ b/data_from_portwine/scripts/portwine_db/SR2_pc @@ -8,7 +8,7 @@ export PW_DLL_INSTALL="faudio" # Install DDL in port prefix (used ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/Sam3 b/data_from_portwine/scripts/portwine_db/Sam3 index a72716d..fbfcfdc 100755 --- a/data_from_portwine/scripts/portwine_db/Sam3 +++ b/data_from_portwine/scripts/portwine_db/Sam3 @@ -14,7 +14,7 @@ export PULSE_LATENCY_MSEC=150 ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_DXVK_VER=1.8.1 ##export PW_VKD3D_VER=2.2 -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/Torchlight b/data_from_portwine/scripts/portwine_db/Torchlight index c90f916..c4045e9 100755 --- a/data_from_portwine/scripts/portwine_db/Torchlight +++ b/data_from_portwine/scripts/portwine_db/Torchlight @@ -16,7 +16,7 @@ export PW_VKBASALT_FFX_CAS="1" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_WINE_USE=PROTON_GE # PROTON_STEAM or PROTON_GE ##export PW_VULKAN_USE=vkd3d # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/UNDERTALE b/data_from_portwine/scripts/portwine_db/UNDERTALE index d9c6f16..633c639 100644 --- a/data_from_portwine/scripts/portwine_db/UNDERTALE +++ b/data_from_portwine/scripts/portwine_db/UNDERTALE @@ -13,7 +13,7 @@ export PW_VULKAN_USE=dxvk ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_WINE_USE=proton_ge # proton_steam or proton_ge ##export PW_VULKAN_USE=vkd3d # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default index 386e465..1e48b5c 100755 --- a/data_from_portwine/scripts/portwine_db/default +++ b/data_from_portwine/scripts/portwine_db/default @@ -12,7 +12,7 @@ ##export PW_WINE_USE=PROTON_GE # PROTON_STEAM or PROTON_GE ##export PW_VULKAN_USE=1 # 1 ,dxvk or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 diff --git a/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 b/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 index d21e849..9836604 100644 --- a/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 +++ b/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 @@ -10,7 +10,7 @@ export WINEDLLOVERRIDES=xaudio2_7=n,b ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=dxvk -export PW_DXR_ON=0 +export PW_USE_DXR10=0 export PW_VULKAN_NO_ASYNC=0 export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 diff --git a/data_from_portwine/scripts/portwine_db/ghost b/data_from_portwine/scripts/portwine_db/ghost index 2e33b9c..5ca4404 100644 --- a/data_from_portwine/scripts/portwine_db/ghost +++ b/data_from_portwine/scripts/portwine_db/ghost @@ -12,7 +12,7 @@ export PW_WINE_USE=proton_ge ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/iw4sp b/data_from_portwine/scripts/portwine_db/iw4sp index 125c307..a5d2e0b 100755 --- a/data_from_portwine/scripts/portwine_db/iw4sp +++ b/data_from_portwine/scripts/portwine_db/iw4sp @@ -18,7 +18,7 @@ ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_DXVK_VER=1.8.1 ##export PW_VKD3D_VER=2.2 -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=0 diff --git a/data_from_portwine/scripts/portwine_db/osu b/data_from_portwine/scripts/portwine_db/osu index 159bfdc..624190e 100755 --- a/data_from_portwine/scripts/portwine_db/osu +++ b/data_from_portwine/scripts/portwine_db/osu @@ -13,7 +13,7 @@ export PW_COMMENT_DB="OSU!" ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_NVAPI_DISABLE=1 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/setup b/data_from_portwine/scripts/portwine_db/setup index 1e2a7d8..955f1a8 100755 --- a/data_from_portwine/scripts/portwine_db/setup +++ b/data_from_portwine/scripts/portwine_db/setup @@ -8,7 +8,8 @@ #export PW_COMMENT_DB="blablabla" ################################################ export PW_VULKAN_USE=0 #dxvk or vkd3d -export PW_WINE_USE=PROTON_STEAM +export PW_MANGOHUD=0 +#export PW_WINE_USE=PROTON_STEAM #export WINEDLLOVERRIDES="blabla=n,b" #export PW_LOG=0 # Enable debug mode fo terminal export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. @@ -27,5 +28,4 @@ export PW_USE_GAMEMODE=0 # Force disabele gamemod #export PULSE_LATENCY_MSEC=60 export PW_DLL_INSTALL="mfc42 vcrun2012 mfc120 vcrun2013" #export LAUNCH_PARAMETERS="-d3d9" -export PW_GUI_DISABLED_CS=1 #export PW_WINDOWS_VER=XP # Set windows version 10, 7 or XP diff --git a/data_from_portwine/scripts/portwine_db/sprally2 b/data_from_portwine/scripts/portwine_db/sprally2 index 0ebbb18..52ed196 100644 --- a/data_from_portwine/scripts/portwine_db/sprally2 +++ b/data_from_portwine/scripts/portwine_db/sprally2 @@ -14,7 +14,7 @@ export PW_OLD_GL_STRING=1 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_WINE_USE=proton_ge # proton_steam or proton_ge ##export PW_VULKAN_USE=vkd3d # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/trine b/data_from_portwine/scripts/portwine_db/trine index 3d2c7b4..609bffa 100755 --- a/data_from_portwine/scripts/portwine_db/trine +++ b/data_from_portwine/scripts/portwine_db/trine @@ -9,7 +9,7 @@ export PW_DLL_INSTALL="physx" # Install DDL in port prefix (used w ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXR_ON=1 +##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 diff --git a/data_from_portwine/scripts/portwine_db/witcher3 b/data_from_portwine/scripts/portwine_db/witcher3 index 407a46a..1d8c8e6 100755 --- a/data_from_portwine/scripts/portwine_db/witcher3 +++ b/data_from_portwine/scripts/portwine_db/witcher3 @@ -2,8 +2,6 @@ #Author: xuser #witcher3.exe #Rating=1-5 -######################################################## -export PW_VULKAN_USE=dxvk #####################examples########################### ##export PW_COMMENT_DB="blablabla" ##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP @@ -11,7 +9,6 @@ export PW_VULKAN_USE=dxvk ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -export PW_DXR_ON=0 export PW_VULKAN_NO_ASYNC=0 ##export PW_NVAPI_DISABLE=1 export PW_OLD_GL_STRING=0 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index f4c7e56..13ba9a6 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -4,10 +4,10 @@ export LAUNCH_PARAMETERS=("/q" ) export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/live.na.exe" export LAUNCH_PARAMETERS=("--launch-product=league_of_legends" "--launch-patchline=live") -export VERSION_WINE_FOR_LOL="WINE_LOL_GE_6.16-2" +export VERSION_WINE_FOR_LOL="WINE_LOL_GE_6.16-3" export PW_MUST_HAVE_DLL="" if [ ! -d "${PORT_WINE_PATH}/data/dist/${VERSION_WINE_FOR_LOL}" ] ; then - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/WINE_LOL_GE_6.16-2/${VERSION_WINE_FOR_LOL}.tar.xz" \ + if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${VERSION_WINE_FOR_LOL}/${VERSION_WINE_FOR_LOL}.tar.xz" \ "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_FOR_LOL}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_FOR_LOL}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then try_remove_file "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_FOR_LOL}.tar.xz" @@ -19,8 +19,8 @@ if [ ! -d "${PORT_WINE_PATH}/data/dist/${VERSION_WINE_FOR_LOL}" ] ; then fi [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 fi -export PW_WINE_USE=WINE_LOL_GE_6.16-2 -export PW_VULKAN_USE=dxvk +export PW_WINE_USE=WINE_LOL_GE_6.16-3 +export PW_VULKAN_USE=1 start_portwine if try_download "https://lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" then diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a0e20ee..d4c926b 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -1,6 +1,6 @@ #!/bin/bash # Author: Castro-Fidel (PortWINE-Linux.ru) -# Development assistants: Cefeiko; Rus_Nor; gavr; RidBowt; Dezert1r; Taz_mania; Anton_Famillianov +# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; Rus_Nor; gavr; RidBowt; VHSgunzo ######################################################################## echo ' ████─████─████─███─█───█─███─█──█─███ @@ -24,8 +24,6 @@ fi start_portwine () { pw_check_and_download_wine "${PW_WINE_USE}" init_wine_ver - pw_download_mono - pw_download_gecko if [ -x "`which konsole 2>/dev/null`" ]; then export PW_TERM="konsole --nofork -e" # elif [ -x "`which gnome-terminal 2>/dev/null`" ]; then export PW_TERM="gnome-terminal -- /bin/bash" ??? elif [ -x "`which lxterminal 2>/dev/null`" ]; then export PW_TERM="lxterminal -e" @@ -112,6 +110,10 @@ start_portwine () { [[ ! -d "${PW_WINELIB}/portable/lib/lib/i386-linux-gnu" ]] && ln -s "${PW_WINELIB}/portable/lib/lib32" "${PW_WINELIB}/portable/lib/lib/i386-linux-gnu" [[ ! -d "${PW_WINELIB}/portable/lib/lib/x86_64-linux-gnu" ]] && ln -s "${PW_WINELIB}/portable/lib/lib" "${PW_WINELIB}/portable/lib/lib/x86_64-linux-gnu" echo "RUNTIME is enabled" + #HOTFIX portable libs for Red Hat + [[ ! -d "${PW_WINELIB}/portable/lib/lib/lib" ]] && ln -s "${PW_WINELIB}/portable/lib/lib32" "${PW_WINELIB}/portable/lib/lib/lib" + [[ ! -d "${PW_WINELIB}/portable/lib/lib/lib64" ]] && ln -s "${PW_WINELIB}/portable/lib/lib" "${PW_WINELIB}/portable/lib/lib/lib64" + echo "RUNTIME is enabled" fi if [[ ! -z "${PW_LOG}" && "${PW_LOG}" != 0 ]] ; then @@ -157,8 +159,8 @@ start_portwine () { fi if [[ ! -z "${PW_USE_NVAPI_AND_DLSS}" && "${PW_USE_NVAPI_AND_DLSS}" == 1 && -d "${WINEDIR}/lib/wine/nvapi/" ]] then - try_copy_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" + try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" var_winedlloverride_update "nvapi,nvapi64,nvml=n;nvcuda=b" if [[ ! -f "${WINEPREFIX}/drive_c/windows/system32/nvngx.dll" || ! -f "${WINEPREFIX}/drive_c/windows/system32/_nvngx.dll" ]] ; then try_copy_file `find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}'` "${WINEPREFIX}/drive_c/windows/system32/" @@ -182,9 +184,13 @@ start_portwine () { then export WINE_ALLOW_XIM="1" else export WINE_ALLOW_XIM="0" fi - if [[ ! -z "${PW_DXR_ON}" && "${PW_DXR_ON}" != 0 ]] ; then - var_vkd3d_config_update dxr11 + [[ ! -z "${PW_MANGOHUD_USER_CONF}" && "${PW_MANGOHUD_USER_CONF}" != 0 ]] && unset MANGOHUD_CONFIG + if [[ ! -z "${PW_USE_DXR11}" && "${PW_USE_DXR11}" != 0 ]] + then var_vkd3d_config_update dxr11 + elif [[ ! -z "${PW_USE_DXR10}" && "${PW_USE_DXR10}" != 0 ]] + then var_vkd3d_config_update dxr fi + export optirun_on="" export check_optimus_manager= export PW_NVIDIA="$(lspci | grep NVIDIA)" @@ -215,13 +221,9 @@ start_portwine () { export __GLX_VENDOR_LIBRARY_NAME=nvidia check_vk_icd_file fi - #try link nvml.dll to prefix - if ! try_force_link_file "${WINEDIR}"/lib/wine/nvml.dll.so "${WINEPREFIX}/drive_c/windows/syswow64/nvml.dll" - then try_force_link_file "${WINEDIR}"/lib/wine/i386-unix/nvml.dll.so "${WINEPREFIX}/drive_c/windows/syswow64/nvml.dll" - fi - if ! try_force_link_file "${WINEDIR}"/lib64/wine/nvml.dll.so "${WINEPREFIX}/drive_c/windows/system32/nvml.dll" - then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-unix/nvml.dll.so "${WINEPREFIX}/drive_c/windows/system32/nvml.dll" - fi + #try link nvml.dll.so to prefix + try_force_link_file "${PW_PLUGINS_PATH}"nvml/lib/wine/nvml.dll.so "${WINEPREFIX}/drive_c/windows/syswow64/nvml.dll" + try_force_link_file "${PW_PLUGINS_PATH}"nvml/lib64/wine/nvml.dll.so "${WINEPREFIX}/drive_c/windows/syswow64/nvml.dll" else export DRI_PRIME=1 fi @@ -246,7 +248,7 @@ 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" ]] ; then export PW_GAMEMODERUN=1 echo "Gamemod will be launched." else @@ -276,7 +278,7 @@ start_portwine () { then pw_clear_pfx OLD_PW_WINE_USE="${PW_WINE_USE}" - export PW_WINE_USE=PROTON_STEAM + export PW_WINE_USE=${PW_PROTON_STEAM_VER} init_wine_ver check_dirs_and_files_in_pfx ${pw_runtime} env LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i @@ -302,72 +304,87 @@ start_portwine () { if [ ! -d "${WINEPREFIX}/drive_c/users/steamuser/My Documents" ] then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/Documents" "${WINEPREFIX}/drive_c/users/steamuser/My Documents" fi - #try copy beclient.dll to prefix - if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/beclient.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/beclient.dll "${WINEPREFIX}/drive_c/windows/syswow64/" + #try copy and link Battle Eye libs + try_copy_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/v1/lib/wine/fakedlls/beclient.dll "${WINEPREFIX}/drive_c/windows/syswow64/" + try_copy_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/v1/lib64/wine/fakedlls/beclient.dll "${WINEPREFIX}/drive_c/windows/system32/" + + if [[ ! -d "${WINEDIR}"/lib/wine/i386-unix ]] + then try_force_link_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/v1/lib/wine/beclient.dll.so "${WINEDIR}"/lib/wine/ + else try_force_link_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/v1/lib/wine/beclient.dll.so "${WINEDIR}"/lib/wine/i386-unix/ fi - if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/beclient_x64.dll "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/beclient_x64.dll "${WINEPREFIX}/drive_c/windows/system32/" - fi - var_winedlloverride_update "beclient,beclient_x64=b,n;steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,GameOverlayRenderer,GameOverlayRenderer64,winemenubuilder.exe=" + if [[ ! -d "${WINEDIR}"/lib64/wine/x86_64-unix ]] + then try_force_link_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/v1/lib64/wine/beclient_x64.dll.so "${WINEDIR}"/lib64/wine/ + else try_force_link_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/v1/lib64/wine/beclient_x64.dll.so "${WINEDIR}"/lib64/wine/x86_64-unix/ + fi + try_force_link_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/BEClient.so "${WINEDIR}"/lib + try_force_link_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/BEClient_x64.so "${WINEDIR}"/lib64 + var_winedlloverride_update "beclient,beclient_x64=b,n" + #try copy d3d extras libs + for d3d_extras_from_plugins in d3dcompiler_43 d3dx9_27 d3dx9_32 d3dx9_37.dll d3dx9_42 d3dcompiler_47 d3dx9_28.dll \ + d3dx9_33 d3dx9_38 d3dx9_43 d3dx9_24 d3dx9_29 d3dx9_34 d3dx9_39 d3dx9_25 d3dx9_30 d3dx9_35 d3dx9_40 d3dx9_26 \ + d3dx9_31 d3dx9_36 d3dx9_41 + do + try_copy_file "${PW_PLUGINS_PATH}/d3d_extras/x64/${d3d_extras_from_plugins}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + try_copy_file "${PW_PLUGINS_PATH}/d3d_extras/x32/${d3d_extras_from_plugins}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + var_winedlloverride_update "${d3d_extras_from_plugins}=n" + done + var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,winemenubuilder.exe=" # export TOTAL_VRAM=`"${PW_WINELIB}/runtime/files/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'` # echo "TOTAL_VRAM=${TOTAL_VRAM}" - - [[ "${PW_VULKAN_USE}" = "vkd3d" ]] && export PW_VULKAN_USE=1 - echo "Try copy dxvk_config file" - try_copy_file "${WINEDIR}/lib/wine/dxvk/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/wine/dxvk/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/system32/" - echo "Try copy native VKD3D files" - try_copy_file "${WINEDIR}/lib/vkd3d/libvkd3d-shader-1.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/vkd3d/libvkd3d-shader-1.dll" "${WINEPREFIX}/drive_c/windows/system32/" - for wine_vkd3d_dll in d3d12 libvkd3d-proton-utils-3 ; do - try_copy_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - done - if [[ "${PW_VULKAN_USE}" = "0" || "${PW_VULKAN_USE}" = "1" ]] ; then - echo "Try copy native DXGI" - if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - fi - if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" - fi - fi - if [ "${PW_VULKAN_USE}" = "0" ] ; then + if [[ "${PW_VULKAN_USE}" = "0" ]] ; then echo "Use OpenGL" export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}" export GL_YIELD="NOTHING" + 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" + fi + if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" + then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" + fi + echo "Try link wine d3d filese..." for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do - if ! try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - then try_copy_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + if ! try_force_link_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" + then try_force_link_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" fi - if ! try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + if ! try_force_link_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_build_dll}.dll" + then try_force_link_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_build_dll}.dll" fi done var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b;d3d12=" - elif [ "${PW_VULKAN_USE}" = "1" ] ; then - echo "Use VKD3D-PROTON and DXVK (DX 9-12 to vulkan)" - export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9" - echo "Try copy native DXVK files" - for wine_dxvk_dll in ${CP_DXVK_FILES} ; do - try_copy_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - var_winedlloverride_update "${wine_dxvk_dll}=n" - done - var_winedlloverride_update "d3d12=n;dxgi=b" else - echo "Use DXVK only." - export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi" - echo "Try copy native DXVK files" + echo "Use VKD3D-PROTON and DXVK (DX 9-12 to vulkan)" + export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi dxvk_config" + echo "Try link native DXVK files..." for wine_dxvk_dll in ${CP_DXVK_FILES} ; do - try_copy_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - var_winedlloverride_update "${wine_dxvk_dll}=n" + 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 - var_winedlloverride_update "d3d12=" + if [[ ! -z "${PW_USE_WINE_DXGI}" && "${PW_USE_WINE_DXGI}" != 0 ]] ; 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" + fi + if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" + then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" + fi + var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxvk_config=n;dxgi=b" + else + var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi,dxvk_config=n" + fi + echo "Try link native VKD3D files..." + try_force_link_file "${WINEDIR}/lib/vkd3d/libvkd3d-shader-1.dll" "${WINEPREFIX}/drive_c/windows/syswow64/libvkd3d-shader-1.dll" + try_force_link_file "${WINEDIR}/lib64/vkd3d/libvkd3d-shader-1.dll" "${WINEPREFIX}/drive_c/windows/system32/libvkd3d-shader-1.dll" + for wine_vkd3d_dll in d3d12 libvkd3d-proton-utils-3 ; do + try_force_link_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + done + if [[ ! -z "${PW_DX12_DISABLE}" && "${PW_DX12_DISABLE}" != 0 ]] + then var_winedlloverride_update "libvkd3d-proton-utils-3,libvkd3d-shader-1=n;d3d12=" + else var_winedlloverride_update "d3d12,libvkd3d-proton-utils-3,libvkd3d-shader-1=n" + fi fi create_new_dir "${PORT_WINE_TMP_PATH}/dxvk_cache" export DXVK_STATE_CACHE_PATH="${PORT_WINE_TMP_PATH}"/dxvk_cache @@ -409,14 +426,15 @@ start_portwine () { update_winetricks print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" chmod -R 775 "${HOME}/.cache/winetricks" - if [ "${PW_WINE_VER}" != "PROTON_STEAM" ] ; then + if [ "${PW_WINE_VER}" != "${PW_PROTON_STEAM_VER}" ] ; then export PW_WINE_VER_FROM_DB="${PW_WINE_USE}" - export PW_WINE_VER="PROTON_STEAM" + export PW_WINE_VER="${PW_PROTON_STEAM_VER}" init_wine_ver fi ${pw_runtime} xterm -e env PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \ "${PORT_WINE_TMP_PATH}/winetricks" -q -r ${PW_DLL_NEED_INSTALL} - if [ "${PW_WINE_VER_FROM_DB}" != "PROTON_STEAM" ] ; then + if [ "${PW_WINE_VER_FROM_DB}" != "${PW_PROTON_STEAM_VER}" ] ; then + export PW_SILENT_RESTART=1 /bin/bash -c ${pw_full_command_line[*]} & exit 0 fi @@ -476,8 +494,14 @@ if [ $(id -u) -eq 0 ] ; then zenity --error --text "Do not run the script from the superuser!" 2> /dev/null exit 1 fi -unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_GUI_DISABLED_CS -unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB PW_YAD_SET +if [[ ! -z "${PW_SILENT_RESTART}" && "${PW_SILENT_RESTART}" = 1 ]] ; then + export PW_GUI_DISABLED_CS=1 + unset PW_SILENT_RESTART +else + unset PW_GUI_DISABLED_CS +fi +unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET +unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB unset CHK_SYMLINK_FILE export portname=PortProton @@ -495,6 +519,8 @@ if [ -d "${PORT_WINE_PATH}/data/dist" ] ; then fi done IFS="$orig_IFS" + try_remove_dir "${PORT_WINE_PATH}/data/dist/PROTON_STEAM" + try_remove_dir "${PORT_WINE_PATH}/data/dist/PROTON_GE" fi create_new_dir "${PORT_WINE_TMP_PATH}"/gecko @@ -503,6 +529,8 @@ create_new_dir "${PORT_WINE_TMP_PATH}"/mono cd "${PORT_SCRIPTS_PATH}" . "${PORT_SCRIPTS_PATH}/var" +export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}/" + if [ ! -f "${PORT_WINE_TMP_PATH}/${portname}_loc" ] ; then SET_LANG=`zenity --title "Install $portname" --text "Select the language" --list --radiolist \ --column="Set:" --column "Language:" TRUE "RUS" FALSE "ENG" ` @@ -523,7 +551,8 @@ if [ -z "${INSTALLING_PORT}" ] ; then . "${USER_CONF}" pw_port_update pw_download_libs - pw_check_and_download_wine PROTON_STEAM + pw_check_and_download_wine ${PW_PROTON_STEAM_VER} + pw_check_and_download_plugins pw_init_db . "${USER_CONF}" fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 32f87dd..3383c48 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -94,8 +94,8 @@ portwine_start_debug () { echo "GLIBC version:" >> "${PORT_WINE_PATH}/${portname}.log" echo `ldd --version | grep -m1 ldd | awk '{print $NF}'` >> "${PORT_WINE_PATH}/${portname}.log" echo "--------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - if [ "${PW_VULKAN_USE}" = "0" ]; then echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DX9-11 to OpenGL" >> "${PORT_WINE_PATH}/${portname}.log" - elif [ "${PW_VULKAN_USE}" = "dxvk" ]; then echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/${portname}.log" + if [ "${PW_VULKAN_USE}" = "0" ] + then echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DX9-11 to OpenGL" >> "${PORT_WINE_PATH}/${portname}.log" else echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/${portname}.log" fi echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" @@ -203,7 +203,7 @@ pw_winereg () { pw_winetricks () { update_winetricks export PW_USE_TERMINAL=1 - export PW_WINE_VER="PROTON_STEAM" + export PW_WINE_VER="${PW_PROTON_STEAM_VER}" init_wine_ver cabextract_fix start_portwine @@ -212,9 +212,10 @@ pw_winetricks () { } pw_edit_db () { - pw_gui_for_edit_db PW_MANGOHUD ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_DXR_ON 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_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 if [ "$?" == 0 ] ; then /bin/bash -c ${pw_full_command_line[*]} & exit 0 @@ -231,16 +232,18 @@ pw_autoinstall_from_db () { export PW_NO_WRITE_WATCH=0 export PW_VULKAN_USE=0 unset PW_WINE_VER - export PW_WINE_USE=PROTON_STEAM + export PW_WINE_USE=${PW_PROTON_STEAM_VER} export PW_NO_FSYNC=1 export PW_NO_ESYNC=1 unset PORTWINE_CREATE_SHORTCUT_NAME export PW_DISABLED_CREATE_DB=1 + export PW_MANGOHUD=0 + export ENABLE_VKBASALT=0 . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}" } ###MAIN### -PW_ALL_DIST=`ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"PROTON_GE$//g" | sed -e s/"PROTON_STEAM$//g"` +PW_ALL_DIST=`ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"${PW_PROTON_GE_VER}$//g" | sed -e s/"${PW_PROTON_STEAM_VER}$//g"` unset DIST_ADD_TO_GUI for DAIG in ${PW_ALL_DIST} do @@ -250,24 +253,23 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then [ -z "${PW_COMMENT_DB}" ] && PW_COMMENT_DB="PortWINE database file for "\"${PORTWINE_DB}"\" was found." if [[ -z "${PW_VULKAN_USE}" || -z "${PW_WINE_USE}" ]] ; then unset PW_GUI_DISABLED_CS - [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=dxvk - [ -z "${PW_WINE_USE}" ] && export PW_WINE_USE=PROTON_STEAM + [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=1 + [ -z "${PW_WINE_USE}" ] && export PW_WINE_USE=${PW_PROTON_STEAM_VER} fi case "${PW_VULKAN_USE}" in - "dxvk") export PW_DEFAULT_VULKAN_USE='DXVK (DX 9-11 to Vulkan)!VULKAN (DXVK and VKD3D)!OPENGL ' ;; - "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)!DXVK (DX 9-11 to Vulkan)' ;; - *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!DXVK (DX 9-11 to Vulkan)!OPENGL ' ;; + "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)' ;; + *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL ' ;; esac case "${PW_WINE_USE}" in - "PROTON_GE") export PW_DEFAULT_WINE_USE="PROTON_GE (${PW_GE_VER})!PROTON_STEAM (${PW_STEAM_VER})${DIST_ADD_TO_GUI}" ;; - "PROTON_STEAM") export PW_DEFAULT_WINE_USE="PROTON_STEAM (${PW_STEAM_VER})!PROTON_GE (${PW_GE_VER})${DIST_ADD_TO_GUI}" ;; + "${PW_PROTON_GE_VER}") export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" ;; + "${PW_PROTON_STEAM_VER}") export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" ;; *) 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}!PROTON_STEAM (${PW_STEAM_VER})!PROTON_GE (${PW_GE_VER})${DIST_ADD_TO_GUI}" ;; + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" ;; esac else - export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!DXVK (DX 9-11 to Vulkan)!OPENGL ' - export PW_DEFAULT_WINE_USE="PROTON_STEAM (${PW_STEAM_VER})!PROTON_GE (${PW_GE_VER})${DIST_ADD_TO_GUI}" + export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL ' + export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" unset PW_GUI_DISABLED_CS fi if [ ! -z "${portwine_exe}" ]; then @@ -355,11 +357,11 @@ 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)!DXVK (DX 9-11 to Vulkan)!OPENGL" \ + --field=":CB" "VULKAN (DXVK and VKD3D)!OPENGL" \ --field=":LBL" "" \ --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \ --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \ - --field=":CB" "PROTON_STEAM (${PW_STEAM_VER})!PROTON_GE (${PW_GE_VER})${DIST_ADD_TO_GUI}" \ + --field=":CB" "${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" \ --field=":LBL" "" \ --field='WINEFILE'!!"${loc_winefile}":"BTN" '@bash -c "button_click WINEFILE"' \ --field='WINECMD'!!"${loc_winecmd}":"BTN" '@bash -c "button_click WINECMD"' \ @@ -385,11 +387,10 @@ else try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" fi fi -if [ ! -z "${VULKAN_MOD}" ] ; then - if [ "${VULKAN_MOD}" = "DXVK" ] ; then export PW_VULKAN_USE="dxvk" - elif [ "${VULKAN_MOD}" = "VULKAN" ]; then export PW_VULKAN_USE="1" - elif [ "${VULKAN_MOD}" = "OPENGL" ]; then export PW_VULKAN_USE="0" - fi + +if [[ ! -z "${VULKAN_MOD}" && "${VULKAN_MOD}" = "OPENGL" ]] +then export PW_VULKAN_USE="0" +else export PW_VULKAN_USE="1" fi init_wine_ver diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 6d2c24f..849f3a0 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=2048 +#SCRIPTS_NEXT_VERSION=2049 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1 @@ -21,7 +21,7 @@ export PW_FORCE_USE_VSYNC=2 export PW_LOG=0 export PW_TERM="" export PW_USE_TERMINAL=0 -export PW_MUST_HAVE_DLL="d3dx9_43 physx mfc42 vcrun2019 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9" +export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019" export PW_WINEDBG_DISABLE=1 export PW_WINDOWS_VER="10" export WINEARCH="win64" @@ -33,16 +33,13 @@ export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export WINE_WIN_START="start.exe /i /unix" ###DEFAULT_WINE### export PW_WINE_USE=PROTON_STEAM +export PW_PLUGINS_VER="_v1" ###WINE_PROTON_STEAM### -export PW_STEAM_VER="6.3-8" +export PW_STEAM_VER="6.3-7" export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" -export PW_MONO_VER="6.4.1" -export PW_GECKO_VER="2.47.2" ###WINE_PROTON_GE### -export PW_GE_VER="6.19-4" +export PW_GE_VER="6.19-5" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" -export PW_MONO_GE_VER="6.4.0" -export PW_GECKO_GE_VER="2.47.2" export WINE_FULLSCREEN_FSR="1" export WINE_FULLSCREEN_FSR_STRENGTH="2" #################################################################