Merge branch 'Htylol-fixes-for-ananicy' into devel

This commit is contained in:
Mikhail Tergoev 2024-10-23 13:45:10 +03:00
commit 4cad02a67b
4 changed files with 62 additions and 56 deletions

@ -457,7 +457,8 @@ msgid "Using FPS and system load monitoring (Turns on and off by the key "
msgstr "" msgstr ""
msgid "Using automatic system optimization to improve performance in games " msgid "Using automatic system optimization to improve performance in games "
"(provided the gamemode package is installed on the system)" "(provided the gamemode package is installed on the system, doesn't "
"work with ananicy)"
msgstr "" msgstr ""
msgid "Forced use of built-in DXGI library (in rare cases it solves " msgid "Forced use of built-in DXGI library (in rare cases it solves "

@ -526,9 +526,11 @@ msgstr ""
"Uso de monitoreo de FPS y carga del sistema (Se activa y desactiva con la " "Uso de monitoreo de FPS y carga del sistema (Se activa y desactiva con la "
"combinación de teclas - Shift derecho + F12)" "combinación de teclas - Shift derecho + F12)"
#, fuzzy
msgid "" msgid ""
"Using automatic system optimization to improve performance in games " "Using automatic system optimization to improve performance in games "
"(provided the gamemode package is installed on the system)" "(provided the gamemode package is installed on the system, doesn't work with "
"ananicy)"
msgstr "" msgstr ""
"Uso de optimización automática del sistema para mejorar el rendimiento en " "Uso de optimización automática del sistema para mejorar el rendimiento en "
"juegos (siempre que el paquete gamemode esté instalado en el sistema)" "juegos (siempre que el paquete gamemode esté instalado en el sistema)"

@ -533,11 +533,12 @@ msgstr ""
msgid "" msgid ""
"Using automatic system optimization to improve performance in games " "Using automatic system optimization to improve performance in games "
"(provided the gamemode package is installed on the system)" "(provided the gamemode package is installed on the system, doesn't work with "
"ananicy)"
msgstr "" msgstr ""
"Использование автоматической оптимизации системы для повышения " "Использование автоматической оптимизации системы для повышения "
"производительности в играх (при условии, что в системе установлен пакет " "производительности в играх (при условии, что в системе установлен пакет "
"gamemode)" "gamemode, не работает вместе с ananicy)"
msgid "" msgid ""
"Forced use of built-in DXGI library (in rare cases it solves problems with " "Forced use of built-in DXGI library (in rare cases it solves problems with "

@ -2860,60 +2860,62 @@ start_portwine () {
export int_xneur=1 export int_xneur=1
fi fi
if check_gamescope_session ; then if check_gamescope_session ; then
export PW_GAMEMODERUN_SLR="" export PW_GAMEMODERUN_SLR=""
elif [[ "$PW_USE_GAMEMODE" = "1" ]] && [[ -n "$DBUS_SESSION_BUS_ADDRESS" ]]; then elif [[ "$PW_USE_GAMEMODE" = "1" ]] && [[ -n "$DBUS_SESSION_BUS_ADDRESS" ]]; then
if systemctl is-active --quiet ananicy.service \ if ! check_flatpak ; then
|| systemctl is-active --quiet ananicy-cpp.service if systemctl is-active --quiet ananicy.service \
then || systemctl is-active --quiet ananicy-cpp.service
export GAMEMODERUN=0 then
export PW_GAMEMODERUN_SLR="" export GAMEMODERUN=0
export PW_GAMEMODERUN_SLR=""
if command -v powerprofilesctl &>/dev/null ; then if command -v powerprofilesctl &>/dev/null ; then
if powerprofilesctl list | grep -q 'performance:'; then if powerprofilesctl list | grep -q 'performance:'; then
export PW_POWERPROFILECTL_SLR="powerprofilesctl launch -p performance --" export PW_POWERPROFILECTL_SLR="powerprofilesctl launch -p performance --"
print_info "Gamemode replaced by powerprofilectl to avoid conflict with ananicy." print_info "Gamemode replaced by powerprofilectl to avoid conflict with ananicy."
else else
export PW_POWERPROFILECTL_SLR="" export PW_POWERPROFILECTL_SLR=""
fi fi
fi fi
else fi
if command -v gamemoded &>/dev/null ; then else
export GAMEMODERUN=1 if command -v gamemoded &>/dev/null ; then
PW_GAMEMODERUN_SLR="gamemoderun" export GAMEMODERUN=1
systemctl enable --now --user gamemoded &>/dev/null PW_GAMEMODERUN_SLR="gamemoderun"
print_info "Gamemode will be launched." systemctl enable --now --user gamemoded &>/dev/null
elif check_flatpak ; then print_info "Gamemode will be launched."
export GAMEMODERUN=1 elif check_flatpak ; then
PW_GAMEMODERUN_SLR="gamemoderun" export GAMEMODERUN=1
print_info "Gamemode will be launched." PW_GAMEMODERUN_SLR="gamemoderun"
elif [[ "$PW_USE_RUNTIME" == 1 ]] ; then print_info "Gamemode will be launched."
export GAMEMODERUN=1 elif [[ "$PW_USE_RUNTIME" == 1 ]] ; then
if ! pidof gamemoded &>/dev/null ; then export GAMEMODERUN=1
GAMEMODEAUTO_NAME="libgamemodeauto.so.0" if ! pidof gamemoded &>/dev/null ; then
if [[ -n "${PW_LD_PRELOAD}" ]]; then GAMEMODEAUTO_NAME="libgamemodeauto.so.0"
export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${GAMEMODEAUTO_NAME}" if [[ -n "${PW_LD_PRELOAD}" ]]; then
else export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${GAMEMODEAUTO_NAME}"
export PW_LD_PRELOAD="${GAMEMODEAUTO_NAME}" else
fi export PW_LD_PRELOAD="${GAMEMODEAUTO_NAME}"
fi
env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" \ env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" \
"${PW_PLUGINS_PATH}/portable/bin/gamemoded" &>/dev/null & "${PW_PLUGINS_PATH}/portable/bin/gamemoded" &>/dev/null &
print_info "Gamemode will be launched." print_info "Gamemode will be launched."
sleep 0.1 sleep 0.1
fi fi
else else
export GAMEMODERUN=0 export GAMEMODERUN=0
export PW_GAMEMODERUN_SLR="" export PW_GAMEMODERUN_SLR=""
print_info "Gamemode is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE" print_info "Gamemode is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE"
fi fi
fi fi
else else
export GAMEMODERUN=0 export GAMEMODERUN=0
export PW_GAMEMODERUN_SLR="" export PW_GAMEMODERUN_SLR=""
fi fi
pw_other_fixes pw_other_fixes
# enabled BattleEye_Runtime and EasyAntiCheat_Runtime # enabled BattleEye_Runtime and EasyAntiCheat_Runtime
if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then
@ -4466,7 +4468,7 @@ gui_edit_db () {
PW_FORCE_LARGE_ADDRESS_AWARE_INFO=${translations[Increases RAM usage limits for 32-bit applications from two to four gigabytes]} PW_FORCE_LARGE_ADDRESS_AWARE_INFO=${translations[Increases RAM usage limits for 32-bit applications from two to four gigabytes]}
PW_USE_RUNTIME_INFO=${translations[Use container launch mode (It is recommended not to change the value)]} PW_USE_RUNTIME_INFO=${translations[Use container launch mode (It is recommended not to change the value)]}
PW_MANGOHUD_INFO=${translations[Using FPS and system load monitoring (Turns on and off by the key combination - right Shift + F12)]} PW_MANGOHUD_INFO=${translations[Using FPS and system load monitoring (Turns on and off by the key combination - right Shift + F12)]}
PW_USE_GAMEMODE_INFO=${translations[Using automatic system optimization to improve performance in games (provided the gamemode package is installed on the system)]} PW_USE_GAMEMODE_INFO=${translations[Using automatic system optimization to improve performance in games (provided the gamemode package is installed on the system, doesn\'t work with ananicy)]}
PW_USE_WINE_DXGI_INFO=${translations[Forced use of built-in DXGI library (in rare cases it solves problems with DX12 games)]} PW_USE_WINE_DXGI_INFO=${translations[Forced use of built-in DXGI library (in rare cases it solves problems with DX12 games)]}
PW_MANGOHUD_USER_CONF_INFO=${translations[Forced use of MANGOHUD system settings (GOverlay, etc.)]} PW_MANGOHUD_USER_CONF_INFO=${translations[Forced use of MANGOHUD system settings (GOverlay, etc.)]}
PW_VKBASALT_USER_CONF_INFO=${translations[Forced use of VKBASALT system settings (GOverlay, etc.)]} PW_VKBASALT_USER_CONF_INFO=${translations[Forced use of VKBASALT system settings (GOverlay, etc.)]}