Compare commits

..

3 Commits

5 changed files with 38 additions and 13 deletions

View File

@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux-
---------------------------------------- ----------------------------------------
Changelog: Changelog:
###Scripts version 2422### / Date: 25.06.2025 / Download update size: 4 megabytes
* fixed work of games in full screen when using native wayland
* fixed work of third-party versions of WINE when using native wayland
* quieter mode when using the variable START_FROM_STEAM="1"
###Scripts version 2421### / Date: 24.06.2025 / Download update size: 380 megabytes ###Scripts version 2421### / Date: 24.06.2025 / Download update size: 380 megabytes
* with new versions of WINE and PROTON, launch under native Wayland has been fixed * with new versions of WINE and PROTON, launch under native Wayland has been fixed
* WINE_LG has been updated to version "10-10-1" (added support for native Wayland) * WINE_LG has been updated to version "10-10-1" (added support for native Wayland)

View File

@ -2,6 +2,11 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
###Scripts version 2422### / Дата: 25.06.2025 / Размер скачиваемого обновления: 4 мегабайта
* исправлена работа игр в полном экране при использовании нативного wayland
* исправлена работа сторонних версий WINE при использовании нативного wayland
* более "тихий" режим при использовании переменной START_FROM_STEAM="1"
###Scripts version 2421### / Дата: 24.06.2025 / Размер скачиваемого обновления: 380 мегабайт ###Scripts version 2421### / Дата: 24.06.2025 / Размер скачиваемого обновления: 380 мегабайт
* с новыми версиями WINE и PROTON исправлен запуск под нативным Wayland * с новыми версиями WINE и PROTON исправлен запуск под нативным Wayland
* обновлен WINE_LG до версии "10-10-1" (добавлена поддержка нативного Wayland) * обновлен WINE_LG до версии "10-10-1" (добавлена поддержка нативного Wayland)

View File

@ -1696,7 +1696,7 @@ init_wine_ver () {
WINE_LIBRARY_PATH="${WINEDIR}/lib" WINE_LIBRARY_PATH="${WINEDIR}/lib"
if [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]] if [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]]
then WINE_LIBRARY_PATH+=":${WINEDIR}/lib64" then WINE_LIBRARY_PATH+=":${WINEDIR}/lib64"
elif [[ -d "${WINEDIR}/lib/x86_64-linux-gnu/gstreamer-1.0" ]] elif [[ -d "${WINEDIR}/lib/x86_64-linux-gnu" ]]
then WINE_LIBRARY_PATH+=":${WINEDIR}/lib/x86_64-linux-gnu:${WINEDIR}/lib/i386-linux-gnu" then WINE_LIBRARY_PATH+=":${WINEDIR}/lib/x86_64-linux-gnu:${WINEDIR}/lib/i386-linux-gnu"
fi fi
export WINE_LIBRARY_PATH export WINE_LIBRARY_PATH
@ -4216,15 +4216,6 @@ start_portwine () {
get_and_set_reg_file --add 'System\CurrentControlSet\Services\winebus' 'Enable SDL' 'REG_DWORD' "1" "system" get_and_set_reg_file --add 'System\CurrentControlSet\Services\winebus' 'Enable SDL' 'REG_DWORD' "1" "system"
fi fi
if [[ $PW_WINE_DPI_VALUE != "disabled" ]] ; then
if [[ $PW_WINE_DPI_VALUE == "recommended" ]] ; then
PW_RECOMMENDED_DPI=$(recommend_dpi "${PW_SCREEN_RESOLUTION:5:8}")
get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_RECOMMENDED_DPI" "user"
else
get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_WINE_DPI_VALUE" "user"
fi
fi
if check_wayland_session \ if check_wayland_session \
&& [[ $PW_USE_NATIVE_WAYLAND == "1" || $PW_USE_DXVK_HDR == "1" ]] && [[ $PW_USE_NATIVE_WAYLAND == "1" || $PW_USE_DXVK_HDR == "1" ]]
then then
@ -4232,11 +4223,31 @@ start_portwine () {
export WINE_WAYLAND_HACKS="1" export WINE_WAYLAND_HACKS="1"
var_winedlloverride_update "winex11.drv=d;winewayland.drv=b" var_winedlloverride_update "winex11.drv=d;winewayland.drv=b"
get_and_set_reg_file --add 'Software\Wine\Drivers' 'Graphics' 'REG_SZ' "x11,wayland" "user" get_and_set_reg_file --add 'Software\Wine\Drivers' 'Graphics' 'REG_SZ' "x11,wayland" "user"
print_warning "Wayland in use. Force dpi=96"
export PW_WINE_DPI_VALUE="96"
if [[ -f "$WINEDIR/lib/libxkbregistry.so" ]] \
|| [[ -f "$WINEDIR/lib/x86_64-linux-gnu/libxkbregistry.so" ]]
then print_info "runtime in use with native wayland."
else
print_warning "Wine is not support native wayland with runtime! Force disabled SLR."
export PW_USE_RUNTIME="0"
fi
else else
unset WINE_WAYLAND_HACKS DXVK_HDR unset WINE_WAYLAND_HACKS DXVK_HDR
get_and_set_reg_file --delete 'Software\Wine\Drivers' 'Graphics' get_and_set_reg_file --delete 'Software\Wine\Drivers' 'Graphics'
fi fi
if [[ $PW_WINE_DPI_VALUE != "disabled" ]] ; then
if [[ $PW_WINE_DPI_VALUE == "recommended" ]] ; then
PW_RECOMMENDED_DPI=$(recommend_dpi "${PW_SCREEN_RESOLUTION:5:8}")
get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_RECOMMENDED_DPI" "user"
else
get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_WINE_DPI_VALUE" "user"
fi
fi
case "$PW_SOUND_DRIVER_USE" in case "$PW_SOUND_DRIVER_USE" in
pulse) get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "pulse" "user" ;; pulse) get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "pulse" "user" ;;
alsa) get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "alsa" "user" ;; alsa) get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "alsa" "user" ;;

View File

@ -315,7 +315,9 @@ fi
if ! check_flatpak ; then if ! check_flatpak ; then
if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then
print_warning "Found lock file: ${PW_TMPFS_PATH}/portproton.lock" print_warning "Found lock file: ${PW_TMPFS_PATH}/portproton.lock"
yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0 if [[ $START_FROM_STEAM != "1" ]]
then yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0
fi
fi fi
touch "${PW_TMPFS_PATH}/portproton.lock" touch "${PW_TMPFS_PATH}/portproton.lock"
rm_lock_file () { rm_lock_file () {
@ -417,7 +419,9 @@ EOF
fi fi
done < "$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/.create_shortcut" done < "$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/.create_shortcut"
fi fi
yad_info "${translations[Unpack is DONE for prefix:]} <b>\"${PW_PREFIX_NAME}\"</b>." if [[ $START_FROM_STEAM != "1" ]]
then yad_info "${translations[Unpack is DONE for prefix:]} <b>\"${PW_PREFIX_NAME}\"</b>."
fi
exit 0 exit 0
fi fi
fi fi

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru) #Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2421 #SCRIPTS_NEXT_VERSION=2422
#SCRIPTS_STABLE_VERSION=2419 #SCRIPTS_STABLE_VERSION=2419
######################################################################## ########################################################################
export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT" export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT"