diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index e1dd82e..34b824e 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,13 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2237### Date: 08.12.2023 / Download update size: 8 megabytes +* combined the inclusion of MANGOHUD in the settings (32-bit and 64-bit) +* fixed vkBasalt working with gamescope +* fixed the launch of some games that worked only in the DEBUG mode +* fixed the choice of video card when launching from gamescope (thanks to Boria138) +* new versions of wine are downloaded only if it is selected after launch, and not before launching PortProton + ###Scripts version 2236### Date: 07.12.2023 / Download update size: 8 megabytes * the ability to enable GAMESCOPE has been added to the settings before starting the game (provided that it is installed on the system) * the installation of the Citra emulator has been fixed diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index c7ac267..c1f9b16 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,13 @@ ----------------------------------------- История изменений: +###Scripts version 2237### Дата: 08.12.2023 / Размер скачиваемого обновления: 8 мегабайт +* объединено включение MANGOHUD в настройках (32-х и 64-х битные) +* исправлена работа vkBasalt совместно с gamescope +* исправлен запуск некоторых игр, которые работали только в режиме создания лога +* исправлен выбор видеокарты при запуска с gamescope (спасибо Boria138) +* новые версии wine скачиваются только при условии его выбора после запуска, а не перед запуском PortProton + ###Scripts version 2236### Дата: 07.12.2023 / Размер скачиваемого обновления: 8 мегабайт * в настройках перед запуском игры добавлена возможность включения GAMESCOPE (при условии что он установлен в системе) * исправлена установка эмулятора Citra diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d872d58..5f1d76b 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -506,7 +506,7 @@ pw_init_runtime () { } pw_mangohud_check () { - if [[ "${PW_MANGOHUD}" == "1" ]] || [[ "${PW_MANGOHUD_x32}" = "1" ]]; then + if [[ "${PW_MANGOHUD}" == "1" ]] ; then export PW_MANGOHUD_SLR='MANGOHUD=1' MANGOHUD_LIB_NAME="libMangoHud.so" if [[ "${PW_VULKAN_USE}" = "0" ]] ; then @@ -516,10 +516,7 @@ pw_mangohud_check () { then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${MANGOHUD_LIB_NAME}" else export PW_LD_PRELOAD="${MANGOHUD_LIB_NAME}" fi - var_vk_istance_layers_config_update "VK_LAYER_MANGOHUD_overlay64" - if [[ "${PW_MANGOHUD_x32}" = "1" ]] ; then - var_vk_istance_layers_config_update "VK_LAYER_MANGOHUD_overlay32" - fi + var_vk_istance_layers_config_update "VK_LAYER_MANGOHUD_overlay64:VK_LAYER_MANGOHUD_overlay32" print_info "MANGOHUD is enabled" else export PW_MANGOHUD_SLR='DISABLE_MANGOHUD=1' diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index f3834a4..bf6d2cb 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -50,7 +50,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_mg_autoinstall="АВТОУСТАНОВКА" export loc_mg_emulators="ЭМУЛЯТОРЫ" export loc_mg_wine_settings="НАСТРОЙКИ WINE" - export loc_mg_portproton_settings="НАСТРОЙКИ ${portname}" + export loc_mg_portproton_settings="НАСТРОЙКИ PORTPROTON" export loc_mg_installed="УСТАНОВЛЕННЫЕ" export PW_CHANGELOG_FILE="changelog_rus" @@ -146,7 +146,6 @@ if [[ "${update_loc}" == "RUS" ]] ; then export PW_USE_SHADER_CACHE_INFO='Использовать кеширование шейдеров средствами WINE (отключать только при наличии микрофризов в игре)' export PW_WINE_FULLSCREEN_FSR_INFO='Работает во время использования любой версии ProtonGE в полноэкранном режиме при разрешении ниже стандартного для экрана' export PW_USE_FAKE_DLSS_INFO='Включить транслятор DLSS в FSR 2 в играх DirectX 12' - export PW_MANGOHUD_x32_INFO='Включить MANGOHUD для 32 битных приложений и игр' export PW_USE_EAC_AND_BE_INFO='Включить Easy Anti-Cheat and BattlEye Anti-Cheat (требуется если игра использует какой-то из этих античитов)' export PW_REDUCE_PULSE_LATENCY_INFO='Уменьшить задержку pulseaudio для исправления прерывистого звука' export PW_USE_US_LAYOUT_INFO='Работает только под x11. Принудительное использование английской раскладки (полезно для игр в которых управление верно работает исключительно на английской раскладке)' @@ -177,7 +176,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export PW_HighPassSharpen_INFO='Повышения резкости с использованием высокочастотных частот' export PW_HQ4X_INFO='Сглаживание близлежащих пикселей с дорисовкой недостающих частей (в обычных играх картинка размывается)' export PW_HSLShift_INFO='Усовершенствованный сдвиг HSL (для каждого оттенка)' - export PW_Layer_INFO='Наложение изображения на игру (изображение лежит в папке ~/PortProton/data/tmp/libs_v43/pressure-vessel/reshade/textures)' + export PW_Layer_INFO="Наложение изображения на игру (изображение лежит в папке $PORT_WINE_TMP_PATH/libs_v$PW_LIBS_VER/pressure-vessel/reshade/textures)" export PW_Levels_INFO='Увеличивает контрастность, но некоторые детали в тенях или бликах могут быть потеряны' export PW_LevelsPlus_INFO='Тоже что и Levels, но с меньшей потерей деталей' export PW_LiftGammaGain_INFO='Коррекция гаммы по отдельным цветовым каналам: красному, зелёному и синему' @@ -269,13 +268,12 @@ if [[ "${update_loc}" == "RUS" ]] ; then -W, -H: установите разрешение, используемое game scope. Изменение размера окна gamescope обновит эти настройки. Если указано -H, а -W нет, предполагается соотношение сторон 16:9. По умолчанию установлено значение 1280×720. -w, -h: установите разрешение, используемое в игре. Если указано -h, а -w нет, предполагается соотношение сторон 16:9. По умолчанию используются значения, указанные в -W и -H. -r: установите ограничение частоты кадров для игры. По умолчанию значение неограниченно. --F fsr: используйте Fidelity FX Super Resolution 1.0 для увеличения масштаба --F nis: используйте NVIDIA Image Scaling версии 1.0.3 для увеличения масштаба --S integer: используйте целочисленное масштабирование --S stretch: используйте масштабирование по ширине, игра заполнит окно. (например, с 4:3 до 16:9) +-F fsr: используйте Fidelity FX Super Resolution 1.0 для увеличения масштаба. +-F nis: используйте NVIDIA Image Scaling версии 1.0.3 для увеличения масштаба. +-S integer: используйте целочисленное масштабирование. +-S stretch: используйте масштабирование по ширине, игра заполнит окно. (например, с 4:3 до 16:9). -b: создайте окно без полей. --f: создайте полноэкранное окно. ---prefer-vk-device: предпочитаемое устройство Vulkan для композитинга (например: 1002:7300) (1002 это vendor id, 7300 это device id из vulkaninfo)" +-f: создайте полноэкранное окно." export PW_USE_GAMESCOPE_INFO="Включение использования gamescope для запуска приложения. Горячие клавиши: @@ -361,7 +359,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export loc_mg_autoinstall="AUTOINSTALL" export loc_mg_emulators="EMULATORS" export loc_mg_wine_settings="WINE SETTINGS" - export loc_mg_portproton_settings="${portname} SETTINGS" + export loc_mg_portproton_settings="PORTPROTON SETTINGS" export loc_mg_installed="INSTALLED" export PW_CHANGELOG_FILE="changelog_eng" @@ -457,7 +455,6 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export PW_USE_SHADER_CACHE_INFO='Use WINE shader caching (disable only if there are microfreezes in the game)' export PW_WINE_FULLSCREEN_FSR_INFO='Works while using any version of ProtonGE in full screen mode at a resolution below the standard screen' export PW_USE_FAKE_DLSS_INFO='Enable DLSS translator in FSR 2 in DirectX 12 games' - export PW_MANGOHUD_x32_INFO='Enable MANGOHUD for 32 bit applications and games' export PW_USE_EAC_AND_BE_INFO='Enable Easy Anti-Cheat and BattlEye Anti-Cheat runtimes (required if game used this anti-cheats)' export PW_REDUCE_PULSE_LATENCY_INFO='Reduce pulseaudio latency to fix intermittent sound' export PW_USE_US_LAYOUT_INFO='Works only x11. Forced use of the us layout (useful for games in which the control works correctly only on the us layout)' @@ -487,7 +484,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export PW_HighPassSharpen_INFO='Another method of sharpening using highpass frequencies' export PW_HQ4X_INFO='Smoothing of nearby pixels with the drawing of missing parts (in normal games the picture is blurred)' export PW_HSLShift_INFO='Advanced HSL shift (for each shade)' - export PW_Layer_INFO='Image overlay on the game (the image is in the ~/PortProton/data/tmp/libs_v43/pressure-vessel/reshade/textures folder)' + export PW_Layer_INFO="Image overlay on the game (the image is in the $PORT_WINE_TMP_PATH/libs_v$PW_LIBS_VER/pressure-vessel/reshade/textures folder)" export PW_Levels_INFO='Increases contrast, but some detail in shadows or highlights may be lost' export PW_LevelsPlus_INFO='Same as Levels, but with less loss of detail' export PW_LiftGammaGain_INFO='Gamma correction by individual color channels: red, green and blue' @@ -580,13 +577,12 @@ A brief instruction: -w, -h: set the resolution used by the game. If -h is specified but -w isn't, a 16:9 aspect ratio is assumed. Defaults to the values specified in -W and -H. -r: set a frame-rate limit for the game. Specified in frames per second. Defaults to unlimited. -o: set a frame-rate limit for the game when unfocused. Specified in frames per second. Defaults to unlimited. --F fsr: use AMD FidelityFX™ Super Resolution 1.0 for upscaling --F nis: use NVIDIA Image Scaling v1.0.3 for upscaling +-F fsr: use AMD FidelityFX™ Super Resolution 1.0 for upscaling. +-F nis: use NVIDIA Image Scaling v1.0.3 for upscaling. -S integer: use integer scaling. --S stretch: use stretch scaling, the game will fill the window. (e.g. 4:3 to 16:9) +-S stretch: use stretch scaling, the game will fill the window. (e.g. 4:3 to 16:9). -b: create a border-less window. --f: create a full-screen window. ---prefer-vk-device: prefer Vulkan device for compositing (ex: 1002:7300) (1002 is vendor id, 7300 is device id from vulkaninfo)" +-f: create a full-screen window." export PW_USE_GAMESCOPE_INFO=" Super + F : Toggle fullscreen diff --git a/data_from_portwine/scripts/portwine_db/Genshin Impact b/data_from_portwine/scripts/portwine_db/Genshin Impact index 26c22f1..341a9a5 100644 --- a/data_from_portwine/scripts/portwine_db/Genshin Impact +++ b/data_from_portwine/scripts/portwine_db/Genshin Impact @@ -19,7 +19,6 @@ export PW_USE_TERMINAL="0" export PW_GUI_DISABLED_CS="0" export PW_PREFIX_NAME="GENSHIN_IMPACT" export PW_MANGOHUD="0" -export PW_MANGOHUD_x32="0" export PW_MANGOHUD_USER_CONF="0" export PW_USE_RAY_TRACING="0" export PW_USE_NVAPI_AND_DLSS="0" diff --git a/data_from_portwine/scripts/portwine_db/warframe b/data_from_portwine/scripts/portwine_db/warframe index e68fbe9..ab280ca 100644 --- a/data_from_portwine/scripts/portwine_db/warframe +++ b/data_from_portwine/scripts/portwine_db/warframe @@ -19,7 +19,6 @@ export PW_USE_TERMINAL="0" export PW_GUI_DISABLED_CS="0" export PW_PREFIX_NAME="DEFAULT" export PW_MANGOHUD="0" -export PW_MANGOHUD_x32="0" export PW_MANGOHUD_USER_CONF="0" export PW_USE_RAY_TRACING="0" export PW_USE_NVAPI_AND_DLSS="0" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index 442648a..2c76151 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -21,7 +21,7 @@ then if [[ "${update_loc}" == "RUS" ]] ; then export portwine_exe="$WINEPREFIX/drive_c/users/$USER/AppData/Local/Wosb Launcher/launcher.exe" - export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle (RU)" + export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle RU" pw_create_unique_exe "wosb_launcher_ru" try_remove_file "${portwine_exe}.ppdb" export PW_SKIP_RESTART_STEAM=1 @@ -29,7 +29,7 @@ then fi export portwine_exe="$WINEPREFIX/drive_c/users/$USER/AppData/Local/Wosb Launcher/launcher.exe" - export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle (EN)" + export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle EN" pw_create_unique_exe "wosb_launcher_en" try_remove_file "${portwine_exe}.ppdb" portwine_create_shortcut block_name diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 8c6188c..7e2c593 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -116,13 +116,17 @@ start_portwine () { if [[ "${PW_USE_GAMESCOPE}" == 1 ]] && command -v gamescope &>/dev/null ; then # Workaround for https://gitlab.freedesktop.org/mesa/mesa/-/issues/6029 - if grep -q "i915" <<< $(lsmod); then + if [[ -d "/sys/module/i915" ]] ; then export INTEL_DEBUG=norbc fi - if [[ ! -z "$GAMESCOPE_ARGS" ]] - then export PW_RUN_GAMESCOPE="gamescope -o 30 ${GAMESCOPE_ARGS} --" - else export PW_RUN_GAMESCOPE="gamescope -o 30 --" + if [[ "${PW_GPU_USE}" != "disabled" ]] ; then + PW_vendorID="$(vulkaninfo 2>/dev/null | grep -B3 "${PW_GPU_USE}" | grep vendorID | awk -F'0x' '{print $2}')" + PW_deviceID="$(vulkaninfo 2>/dev/null | grep -B3 "${PW_GPU_USE}" | grep deviceID | awk -F'0x' '{print $2}')" + PW_ID_VIDEO="--prefer-vk-device ${PW_vendorID}:${PW_deviceID}" + else + unset PW_ID_VIDEO fi + export PW_RUN_GAMESCOPE="gamescope -o 30 ${PW_ID_VIDEO} ${GAMESCOPE_ARGS} --" export PW_WINE_FULLSCREEN_FSR=0 else export PW_USE_GAMESCOPE=0 @@ -666,7 +670,7 @@ pw_run () { pw_vkbasalt_check PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VKD3D_CONFIG" \ - "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" "WINEDLLPATH" "WINE_CPU_TOPOLOGY" + "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" &>/dev/null if [[ "${PW_LOG}" == 1 ]] ; then echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}" @@ -690,6 +694,7 @@ pw_run () { pw_init_runtime fi echo "" + echo "Log WINE:" > "${PW_LOG_TO_FILE}" print_debug "Log from RUNTIME and WINE:" ${PW_GAMEMODERUN_SLR} \ ${PW_RUN_GAMESCOPE} \ @@ -700,7 +705,8 @@ pw_run () { LD_PRELOAD="${PW_LD_PRELOAD}" \ VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \ VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \ - "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} + "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" + cat "${PW_LOG_TO_FILE}" fi } export -f pw_run @@ -734,6 +740,7 @@ export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" echo "" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then + try_remove_file "${PORT_WINE_PATH}/data/dist/VERSION" orig_IFS="$IFS" IFS=$'\n' for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist/") ; do @@ -791,7 +798,7 @@ if [[ -z "${INSTALLING_PORT}" ]] ; then . "${USER_CONF}" pw_port_update pw_download_libs - pw_check_and_download_wine ${PW_PROTON_LG_VER} + # pw_check_and_download_wine ${PW_PROTON_LG_VER} pw_check_and_download_plugins pw_init_db . "${PORT_SCRIPTS_PATH}"/lang diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index f34cb50..5cca226 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -464,7 +464,7 @@ pw_create_prefix_backup () { pw_edit_db () { pw_gui_for_edit_db \ - PW_MANGOHUD PW_MANGOHUD_x32 PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ + PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 6fbfe05..fe3eca0 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2236 +#SCRIPTS_NEXT_VERSION=2237 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -28,7 +28,6 @@ export PW_WINE_CPU_TOPOLOGY="disabled" export STAGING_SHARED_MEMORY="1" export PROTON_DISABLE_LSTEAMCLIENT="0" export PW_FORCE_LARGE_ADDRESS_AWARE="1" -export PW_MANGOHUD_x32="0" export PW_USE_EAC_AND_BE="1" export PW_USE_US_LAYOUT="0" export PW_GPU_USE="disabled" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index e997681..9d95170 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -153,7 +153,7 @@ pw_gui_for_edit_db () { else FPS_LIMIT_VAR="disabled" fi - if [[ ! -z "${PW_WINE_CPU_TOPOLOGY}" ]] && [[ "${PW_WINE_CPU_TOPOLOGY}" != "disabled" ]] ; then + if [[ "${PW_WINE_CPU_TOPOLOGY}" == *[0-9]:* ]] && [[ "${PW_WINE_CPU_TOPOLOGY}" != "disabled" ]] ; then CPU_LIMIT_VAR="`echo ${PW_WINE_CPU_TOPOLOGY%%:*}`" else CPU_LIMIT_VAR="disabled" @@ -166,8 +166,6 @@ pw_gui_for_edit_db () { if [[ ! -z "${PW_GPU_USE}" ]] && [[ "${PW_GPU_USE}" != "disabled" ]] ; then GPU_VAR="${PW_GPU_USE}" - elif [[ ! -z "${PW_USE_GAMESCOPE}" ]] ; then - GPU_VAR="disabled" else GPU_VAR="disabled" fi