diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 26001355..46f05efa 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,12 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2225### Date: 08.10.2023 / Download update size: 8 megabytes +* improved log creation mode +* the inclusion of "USE_SYSTEM_VK_LAYERS" has been added to the "SETTINGS" tab, which makes it possible to use the system mangohud, vkBasalt, obs-vkcapture and others +* the inclusion of "USE_OBS_VKCAPTURE" has been added to the "SETTINGS" tab, which makes it possible to write to OBS Studio using obs-vkcapture (ATTENTION: the forced use of system mangohud, vkBasalt, obs-vkcapture and other applications using vulkan layers will be enabled) +* updated autoinstall for League of Legends + ###Scripts version 2224### Date: 28.09.2023 / Download update size: 210 megabytes * global cleaning of database files (thanks to Boria138) * updated PROTON_LG to version 8-17 (fixed community and support tabs in the Genshin Impact game) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 8bb4250c..6aca11eb 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,12 @@ ----------------------------------------- История изменений: +###Scripts version 2225### Дата: 08.10.2023 / Размер скачиваемого обновления: 8 мегабайт +* улучшен режим создания лога +* во вкладку "НАСТРОИТЬ" добавлено включение "USE_SYSTEM_VK_LAYERS" что дает возможность использовать системные mangohud, vkBasalt, obs-vkcapture и прочие +* во вкладку "НАСТРОИТЬ" добавлена включение "USE_OBS_VKCAPTURE" что дает возможность записи в OBS Studio с помощью obs-vkcapture (ВНИМАНИЕ: будет включено принудительное использование системных mangohud, vkBasalt, obs-vkcapture и прочих приложений использующих vulkan layers) +* обновлена установка League of Legends + ###Scripts version 2224### Дата: 28.09.2023 / Размер скачиваемого обновления: 210 мегабайт * глобальная чистка database файлов (спасибо Boria138) * обновлен PROTON_LG до версии 8-17 (исправлены вкладки сообщество и поддержка в игре Genshin Impact) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 49cb42af..8de2e074 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -410,17 +410,15 @@ init_wine_ver () { pw_init_runtime () { - if [[ ! -z "$(grep -E '(ROSA Fresh|RED OS)' "/etc/os-release")" ]] ; then + if grep -q -E '(ROSA Fresh|RED OS)' "/etc/os-release" ; then export LOCPATH="/run/host/usr/share/locale/" - elif [[ ! -z "$(grep "altlinux" "/etc/os-release")" ]] ; then + elif grep -q "altlinux" "/etc/os-release" ; then export LIBGL_DRIVERS_PATH="/usr/lib/X11/modules/dri:/usr/lib64/X11/modules/dri" fi PW_PV_OVERRIDES="/usr/lib/pressure-vessel/overrides/lib" export PW_LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${PW_WINELIB}/portable/lib/lib64:${PW_WINELIB}/portable/lib/lib32:${PW_PV_OVERRIDES}/x86_64-linux-gnu/aliases:${PW_PV_OVERRIDES}/i386-linux-gnu/aliases" - export PW_VK_LAYER_PATH="${PW_WINELIB}/portable/share/vulkan/implicit_layer.d" - if [ ! -z ${PATH_TMP} ] then export PATH="${PATH_TMP}" else export PATH_TMP="${PATH}" @@ -455,7 +453,14 @@ pw_init_runtime () { ${PW_ADD_TO_ARGS_IN_RUNTIME} --" fi - export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=0 + if [[ "$PW_USE_SYSTEM_VK_LAYERS" == "1" ]] ; then + export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=1 + unset PW_VK_LAYER_PATH + else + export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=0 + export PW_VK_LAYER_PATH="${PW_WINELIB}/portable/share/vulkan/implicit_layer.d" + fi + # export PRESSURE_VESSEL_GRAPHICS_PROVIDER="/" unset PRESSURE_VESSEL_RUNTIME_ARCHIVE diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 4cd253cb..873805fb 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -135,6 +135,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then 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. Принудительное использование английской раскладки (полезно для игр в которых управление верно работает исключительно на английской раскладке)' + export PW_USE_SYSTEM_VK_LAYERS_INFO='Использовать системные mangohud, vkBasalt, obs-vkcapture и прочие приложения использующие vulkan layers' + export PW_USE_OBS_VKCAPTURE_INFO='Включить возможность записи в OBS Studio с помощью obs-vkcapture (ВНИМАНИЕ: будет включено принудительное использование системных mangohud, vkBasalt, obs-vkcapture и прочих приложений использующих vulkan layers)' export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)' export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместно с CAS' @@ -389,6 +391,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then 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)' + export PW_USE_SYSTEM_VK_LAYERS_INFO='Use system mangohud, vkBasalt, obs-vkcapture and other applications using vulkan layers' + export PW_USE_OBS_VKCAPTURE_INFO='Enable the ability to write to OBS Studio using obs-vkcapture (ATTENTION: the forced use of system mangohud, vkBasalt, obs-vkcapture and other applications using vulkan layers will be enabled)' export PW_3DFX_INFO='Simulation of an old 3dfx graphics accelerator (adds horizontal stripes)' export PW_AdaptiveSharpen_INFO='Sharpness increase, can be used with CAS' diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index be2acb4e..679d4eac 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -12,7 +12,7 @@ export TEXT_OPSSL="" [[ -z `which openssl` ]] && export TEXT_OPSSL="Install openssl in your system!!!\n" export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legends can take a long time" export WINEDLLOVERRIDES="mscoree,mshtml=" -export LAUNCH_PARAMETERS="--launch-product=league_of_legends --launch-patchline=live" # Additional launch options +export LAUNCH_PARAMETERS="--launch-product=league_of_legends --launch-patchline=live" export PW_WINE_USE=WINE_LOL_GE_8.12 export PW_VULKAN_USE=1 export PW_MUST_HAVE_DLL="" @@ -22,8 +22,8 @@ export PW_NO_ESYNC=1 export PW_DISABLED_CREATE_DB=1 export PW_USE_D3D_EXTRAS=1 export PW_USE_EAC_AND_BE="0" -export DXVK_STABLE_VER="1.10.3-28" -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +# export DXVK_STABLE_VER="1.10.3-28" +export DISABLE_CP_DEFPFX=1 try_remove_dir "${PORT_WINE_PATH}/data/dist/WINE_LOL_GE_8.7-1" gui_proton_downloader silent "${PW_WINE_USE}" diff --git a/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher b/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher index d5d19f6b..add9a435 100755 --- a/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher +++ b/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher @@ -5,8 +5,8 @@ #LauncherPatcher.exe #Rating=? ################################################ -export PW_VULKAN_USE=1 -export PW_DLL_INSTALL="vcrun2019" +export PW_VULKAN_USE=2 +export PW_DLL_INSTALL="vcrun2022" export WINEDLLOVERRIDES="vulkan-1=n,b" # add_in_start_portwine () { # regdlloverrides "RDR2.exe:vulkan-1=n,b" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT b/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT index 3a284597..403a512f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Castro-Fidel (linux-gaming.ru) ######################################################################## -export PW_VULKAN_USE=1 +export PW_VULKAN_USE=2 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/gi_installer.exe" export PW_PREFIX_NAME="GENSHIN_IMPACT" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index ea94e0f7..064fd823 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -9,6 +9,7 @@ export PW_VULKAN_USE=1 export PW_WINE_USE=WINE_LOL_GE_8.12 export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_USE_D3D_EXTRAS=1 +export DISABLE_CP_DEFPFX=1 gui_proton_downloader silent "${PW_WINE_USE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 5295c8e6..4f35ba60 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -60,6 +60,12 @@ start_portwine () { xrdb -merge "${HOME}/.Xresources" fi + if [[ "$PW_USE_OBS_VKCAPTURE" == "1" ]] ; then + export OBS_VKCAPTURE="1" + export PW_USE_SYSTEM_VK_LAYERS="1" + print_warning "System mangohud, vkBasalt, obs-vk capture and other applications using vulkan layers are forcibly used." + fi + pw_init_runtime if [[ "${PW_LOG}" == 1 ]] ; then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index c2622888..50ce4080 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -149,13 +149,14 @@ portwine_start_debug () { echo "Graphic cards and drivers:" >> "${PORT_WINE_PATH}/${portname}.log" echo 'lspci -k | grep -EA3 VGA|3D|Display :' >> "${PORT_WINE_PATH}/${portname}.log" echo "$(lspci -k | grep -EA3 'VGA|3D|Display')" >> "${PORT_WINE_PATH}/${portname}.log" + echo "----" >> "${PORT_WINE_PATH}/${portname}.log" [[ `command -v glxinfo` ]] && glxinfo -B >> "${PORT_WINE_PATH}/${portname}.log" - echo " " >> "${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" -Gc0 >> "${PORT_WINE_PATH}/${portname}.log" echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log" - [[ `command -v vulkaninfo` ]] && vulkaninfo | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" + [[ `command -v vulkaninfo` ]] && vulkaninfo --summary 2>/dev/null | grep -E '^GPU|deviceName|driverName' >> "${PORT_WINE_PATH}/${portname}.log" "${PW_WINELIB}/portable/bin/vkcube" --c 50 if [ $? -eq 0 ]; then echo "Vulkan cube test passed successfully" >> "${PORT_WINE_PATH}/${portname}.log" @@ -167,6 +168,12 @@ portwine_start_debug () { echo "---------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "!!!gamemod not found!!!" >> "${PORT_WINE_PATH}/${portname}.log" fi + echo "---------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo 'locale :' >> "${PORT_WINE_PATH}/${portname}.log" + locale >> "${PORT_WINE_PATH}/${portname}.log" + echo "---" >> "${PORT_WINE_PATH}/${portname}.log" + echo 'locale -a | grep -i "$(locale | grep -e '^LANG=' | sed 's/LANG=//' | sed 's/\-8//')" :' >> "${PORT_WINE_PATH}/${portname}.log" + locale -a | grep -i "$(locale | grep -e '^LANG=' | sed 's/LANG=//' | sed 's/\-8//')" >> "${PORT_WINE_PATH}/${portname}.log" echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" if [[ "${PW_USE_D3D_EXTRAS}" != 1 ]] then echo "D3D_EXTRAS - disabled" >> "${PORT_WINE_PATH}/${portname}.log" @@ -427,8 +434,9 @@ 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_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_PRIME_RENDER_OFFLOAD 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 PW_USE_WINE_DXGI PW_USE_EAC_AND_BE + PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD 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 \ + PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE if [ "$?" == 0 ] ; then print_info "Restarting PP after update ppdb file..." /usr/bin/env bash -c ${pw_full_command_line[*]} & diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 9326b58e..ddfeedf6 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=2224 +#SCRIPTS_NEXT_VERSION=2225 ######################################################################## 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