diff --git a/data_from_portwine/scripts/add_in_steam.sh b/data_from_portwine/scripts/add_in_steam.sh index 3e15ff03..6ffdfdb4 100755 --- a/data_from_portwine/scripts/add_in_steam.sh +++ b/data_from_portwine/scripts/add_in_steam.sh @@ -86,7 +86,7 @@ getSteamId() { local file=$(find "$(dirname "${NOSTAPPPATH}")" -type f \( ${conditions# -o} \) -print -quit 2>/dev/null) if [[ -n "${file}" ]]; then if [[ "${file}" == *"steam_appid.txt" ]]; then - SteamAppId=$(cat "${file}" | tr -d '\r\n') + SteamAppId=$(cat "${file}" | tr -d '[:space:]\r\n') else SteamAppId=$(grep -i "^AppId=" "${file}" | cut -d'=' -f2 | head -1 | tr -d '\r\n') fi diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index eac5ff8b..04409e94 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1002,6 +1002,7 @@ fix_icon_name_png () { # Поиск нужного .desktop файла по $portwine_exe (для показа в комментариях нужного времени) # Параллельное создание базы по времени после завершения приложения search_desktop_file () { + [[ $PW_USE_SETUP_FILE == "1" ]] && return 0 local desktop_file desktop_file_new line1 line2 FILE_SHA256SUM_ARRAY EXEC_DESKTOP ICON_NAME BROKEN_LINE FILE_SHA256SUM_FOUND FILE_SHA256SUM_NOT_FOUND if [[ -z $FILE_SHA256SUM ]] ; then read -r -a FILE_SHA256SUM_ARRAY < <(sha256sum "$portwine_exe") @@ -1859,9 +1860,10 @@ pw_lsfg_vk_check () { fi fi - export PW_WINE_FULLSCREEN_FSR="0" + # export PW_WINE_FULLSCREEN_FSR="0" export LSFG_DLL_PATH="$lsfg_vk_path/Lossless.dll" + check_variables LSFG_LEGACY "1" check_variables LSFG_MULTIPLIER "2" check_variables LSFG_FLOW_SCALE "0.1" check_variables LSFG_PERF_MODE "1" @@ -2921,13 +2923,6 @@ pw_check_dxvk () { fi fi done - # если используется nvidia, со встройкой opengl будет работать через встройку, с этим будет работать через nvidia - if [[ ${PW_VULKAN_DRIVER_ARRAY_CHECK[3],,} =~ nvidia ]] ; then - export __NV_PRIME_RENDER_OFFLOAD="1" - export __GLX_VENDOR_LIBRARY_NAME="nvidia" - else - export __NV_PRIME_RENDER_OFFLOAD="0" - fi # если PW_GPU_USE изначально не было if [[ -z $PW_GPU_USE ]] ; then export PW_GPU_USE=${PW_VULKAN_DRIVER_ARRAY_CHECK[2]} @@ -3021,7 +3016,17 @@ pw_skip_get_info () { PW_SCREEN_RESOLUTION="$(<"${PW_TMPFS_PATH}/xrandr.tmp" sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')" PW_SCREEN_PRIMARY="$(grep -e 'primary' "${PW_TMPFS_PATH}/xrandr.tmp" | awk '{print $1}')" fi + + if [[ $PW_SCREEN_RESOLUTION != *x* ]] ; then + if command -v hyprctl >/dev/null 2>&1 ; then + monitor_info=$(hyprctl monitors -j 2>/dev/null | jq -r '.[] | select(.focused==true)') + PW_SCREEN_PRIMARY=$(echo "$monitor_info" | jq -r '.name') + PW_SCREEN_RESOLUTION=$(echo "$monitor_info" | jq -r '"\(.width)x\(.height)"') + fi + fi + [[ $PW_SCREEN_RESOLUTION != *x* ]] && PW_SCREEN_RESOLUTION="1920x1080" + export PW_SCREEN_PRIMARY PW_SCREEN_RESOLUTION if [[ -f "${PW_TMPFS_PATH}/locale.tmp" ]] ; then @@ -3043,7 +3048,7 @@ pw_skip_get_info () { unset AMD_VULKAN_DRIVER_LIST if ! check_flatpak \ - && [[ $(check_vendor_gpu) =~ amd ]] + && [[ $(check_vendor_gpu) == "amd" ]] then for DRIVER in $GET_AMD_VULKAN_DRIVER_LIST; do case "$DRIVER" in @@ -3418,6 +3423,8 @@ start_portwine () { export STEAM_COMPAT_TRANSCODED_MEDIA_PATH="${PORT_WINE_TMP_PATH}/gstreamer_tmp" export MEDIACONV_AUDIO_DUMP_FILE="$STEAM_COMPAT_TRANSCODED_MEDIA_PATH/audiov2.foz" export MEDIACONV_VIDEO_DUMP_FILE="$STEAM_COMPAT_TRANSCODED_MEDIA_PATH/video.foz" + + export PROTON_MEDIA_USE_GST="1" fi check_variables VKD3D_DEBUG "none" @@ -3438,6 +3445,9 @@ start_portwine () { unset WINE_MONO_TRACE fi + #disable winebth.sys as it crashes winedevice.exe + var_winedlloverride_update "winebth.sys=d" + pw_wineboot () { LIST_NATIVE_WINE_DLL_LINKS="winevulkan ir50_32 amd_ags_x64 wined3d vulkan-1" for dll in $LIST_NATIVE_WINE_DLL_LINKS ; do @@ -3775,8 +3785,15 @@ start_portwine () { export int_xneur=1 fi - #https://github.com/flathub/net.lutris.Lutris/pull/368#issuecomment-1751381312 - [[ $(check_vendor_gpu) =~ nvidia ]] && export WEBKIT_DISABLE_DMABUF_RENDERER=1 + if [[ $(check_vendor_gpu) == "nvidia" ]] ; then + #https://github.com/flathub/net.lutris.Lutris/pull/368#issuecomment-1751381312 + export WEBKIT_DISABLE_DMABUF_RENDERER="1" + #Для того чтобы OpenGL всегда работал через nvidia (если в PW_GPU_USE выбрана nvidia) + export __NV_PRIME_RENDER_OFFLOAD="1" + export __GLX_VENDOR_LIBRARY_NAME="nvidia" + else + export __NV_PRIME_RENDER_OFFLOAD="0" + fi if check_gamescope_session ; then export PW_GAMEMODERUN_SLR="" @@ -3993,7 +4010,7 @@ fi then export LIBGL_KOPPER_DRI2="1" fi - [[ $(check_vendor_gpu) =~ nouveau ]] && export NOUVEAU_USE_ZINK="1" + [[ $(check_vendor_gpu) == "nouveau" ]] && export NOUVEAU_USE_ZINK="1" fi # WINED3D VULKAN @@ -4606,7 +4623,7 @@ fi || check_gamescope_session then export vk_xwayland_wait_ready="false" - if [[ $(check_vendor_gpu) =~ amd ]] ; then + if [[ $(check_vendor_gpu) == "amd" ]] ; then export RADV_DEBUG+="nodcc " export AMD_DEBUG="nodcc" if [[ ! $(<"${PW_TMPFS_PATH}/vulkaninfo.tmp") =~ VK_EXT_image_drm_format_modifier ]] ; then @@ -4614,10 +4631,10 @@ fi grep -e '--backend' "${PW_TMPFS_PATH}/gamescope.tmp" &>/dev/null && PW_GS_BACKEND_SDL="1" fi fi - if [[ $(check_vendor_gpu) =~ intel ]] ; then + if [[ $(check_vendor_gpu) == "intel" ]] ; then export INTEL_DEBUG="norbc" fi - if [[ $(check_vendor_gpu) =~ nvidia ]] ; then + if [[ $(check_vendor_gpu) == "nvidia" ]] ; then PW_GAMESCOPE_VARIABLES_BEFORE+="__GL_THREADED_OPTIMIZATIONS=0 " PW_GAMESCOPE_VARIABLES_AFTER+="__GL_THREADED_OPTIMIZATIONS=1 " fi @@ -5625,7 +5642,7 @@ gui_edit_db () { [[ ! -e "/dev/ntsync" ]] && DISABLE_EDIT_DB_LIST+=" PW_USE_NTSYNC" if ! check_flatpak \ - && [[ $(ldd --version | head -n 1 | awk '{print $4}') < 2.38 ]] + && ! compare_versions "$(ldd --version | head -n 1 | awk '{print $4}')" "2.38" then DISABLE_EDIT_DB_LIST+=" PW_USE_LS_FRAME_GEN" export PW_USE_LS_FRAME_GEN="0" @@ -6707,8 +6724,10 @@ gui_userconf () { export PW_CHANGE_BRANCH="1" export PW_FORCE_UPDATE="1" else - [[ $BRANCH == "DEVEL" ]] && BRANCH="devel" - [[ $BRANCH == "STABLE" ]] && BRANCH="master" + if [[ $BRANCH == "DEVEL" ]] + then BRANCH="devel" + else BRANCH="master" + fi fi PW_GUI_START="${PW_ADD_SETTINGS_UC[2]}" DOWNLOAD_STEAM_GRID="${PW_ADD_SETTINGS_UC[3]}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR b/data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR index e0782d25..f472afd7 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR @@ -6,10 +6,11 @@ # info_en: An open source Nintendo 3DS emulator based on Citra, designed to run games with support for enhanced resolutions and advanced emulation settings. # info_ru: Эмулятор Nintendo 3DS с открытым исходным кодом на основе Citra, созданный для запуска игр с поддержкой улучшенного разрешения и расширенных настроек эмуляции. ########################################################################## -# export LAUNCH_PARAMETERS="/VERYSILENT" -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/azahar-2120.3-windows-msys2-installer.exe" +export PW_AZAHAR_VERSION=$(curl -s "https://github.com/azahar-emu/azahar/releases" | grep -oP '/azahar-emu/azahar/releases/tag/\K[0-9.]+(-[a-z0-9]+)?' | grep -v -- '-[a-z0-9]' | sort -Vu | tail -n1) +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/azahar-$PW_AZAHAR_VERSION-windows-msys2-installer.exe" +export PW_PREFIX_NAME="AZAHAR" start_portwine -if try_download "https://github.com/azahar-emu/azahar/releases/download/2120.3/azahar-2120.3-windows-msys2-installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror +if try_download "https://github.com/azahar-emu/azahar/releases/download/$PW_AZAHAR_VERSION/azahar-$PW_AZAHAR_VERSION-windows-msys2-installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_install_game "Azahar." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOOSE_GOOSE_DUCK b/data_from_portwine/scripts/pw_autoinstall/PW_GOOSE_GOOSE_DUCK index 93100f77..6d2663c2 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOOSE_GOOSE_DUCK +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOOSE_GOOSE_DUCK @@ -6,14 +6,15 @@ # info_en: A multiplayer social deduction game where players take on the roles of ducks or geese, trying to complete tasks and identify the "ducks" — the impostors among them. The game combines elements of strategy and communication, requiring players to coordinate and recognize deception. # info_ru: Многопользовательская игра в жанре социальной дедукции, где игроки выступают в роли уток или гусей, пытаясь выполнить задания и выявить среди них "уток" — предателей. Игра сочетает в себе элементы стратегии и общения, требуя от игроков координации и способности распознавать обман. ######################################################################## -VERSION="3.11.00" export PW_PREFIX_NAME="GOOSE_GOOSE_DUCK" export LAUNCH_PARAMETERS="/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-" -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Goose Goose Duck Installer $VERSION release.exe" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GGDInstaller.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Goose Goose Duck" +VERSION="4.01.02" + start_portwine -if try_download "https://firebasestorage.googleapis.com/v0/b/gaggle-staging.appspot.com/o/Builds%2FGGD%2FGoose%20Goose%20Duck%20Installer%20${VERSION}%20release.exe?alt=media&token=e6c29f8f-bfd8-4592-a740-821aa4cebe00" "${PW_AUTOINSTALL_EXE}" no_mirror +if try_download "https://download-ggd.gaggle.gg/Goose%20Goose%20Duck%20Installer%20${VERSION}%20release.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_install_game "Goose Goose Duck." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index f22f7f0e..b655722d 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -52,16 +52,16 @@ export PW_OPTISCALER_VER="v02-0.7.7-pre12" export PW_GALLIUM_NINE_VER="0.10" export PW_LSFG_VK_VER="3.1-p11-cebe5e2" ###WINE_AND_PROTON_LG### -export PW_PROTON_LG_VER="PROTON_LG_10-10" +export PW_PROTON_LG_VER="PROTON_LG_10-15" export PW_WINE_LG_VER="WINE_LG_10-12" export PW_WINE_FULLSCREEN_FSR="1" export WINE_FULLSCREEN_FSR_MODE="ultra" ###DXVK_AND_VKD3D### export VKD3D_LIMIT_TESS_FACTORS="64" -export DXVK_NEW_VER="2.7-5" +export DXVK_NEW_VER="2.7-46" export DXVK_OLD_VER="2.6.2" export DXVK_SAREK_VER="sarek-1.11.0" -export VKD3D_NEW_VER="1.1-4666" +export VKD3D_NEW_VER="1.1-4707" export VKD3D_OLD_VER="2.14.1" export VKD3D_SAREK_VER="sarek-2.6.0" ###VKBASALT###