diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 1c3bed43fb21bc34445f125f09cf363000c27a5a..3cd4d79dfed073813f68a6abcfcb2e2cef2ee465 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://boosty ----------------------------------------- Changelog: +###Scripts version 2068### +* HOTFIX - WINE download fixed +* NV_PRIME_RENDER_OFFLOAD is disabled by default (can be enabled using EDIT_DB) + ###Scripts version 2067### * updated libs to v20 (uses new Steam Runtime Sniper container + updated: MANGOHUD, vkBasalt and additional packages required for PortProton) * fixed GOG installation diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index c668ff6ce7a95ad4334d9bda7f18d82c7859e851..8a94c936bf18f65981b3e64b31554c8f49ad2c5c 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -6,6 +6,10 @@ * добавить выбор языка в PortProton и about us * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2068### +* HOTFIX - исправлено скачивание WINE +* по умолчанию отключена переменная NV_PRIME_RENDER_OFFLOAD (можно включить с помощью EDIT_DB) + ###Scripts version 2067### * обновлены libs до версии v20 (используется новый контейнер Steam Runtime Sniper + обновлены: MANGOHUD, vkBasalt и доп. пакеты необходимые для PortProton) * исправлена установка GOG diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index fcb48e27aca23ea2c64d5cfbedbc2abb72a0c629..6f9508faeecfe084be69d1286f5a4fd2bcbac727 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -528,7 +528,7 @@ pw_check_and_download_wine () { fi if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then print_info "Download and install ${PW_WINE_USE}..." - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" ; then + if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}/version" try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 925396d3d2b19094e79d7e43890dce47e1811e53..cec2e173874652b907d93a05137a48b43937a170 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -170,6 +170,9 @@ start_portwine () { if [[ ! -z "${PW_HIDE_NVIDIA_GPU}" && "${PW_HIDE_NVIDIA_GPU}" != 0 ]] ; then export WINE_HIDE_NVIDIA_GPU="1" fi + if [[ ! -z "${PW_PRIME_RENDER_OFFLOAD}" && "${PW_PRIME_RENDER_OFFLOAD}" != 0 ]] ; then + export __NV_PRIME_RENDER_OFFLOAD=1 + fi if [[ ! -z "${PW_HEAP_DELAY_FREE}" && "${PW_HEAP_DELAY_FREE}" != 0 ]] then export WINE_HEAP_DELAY_FREE="1" else export WINE_HEAP_DELAY_FREE="0" @@ -211,7 +214,6 @@ start_portwine () { export optirun_on="prime-run" check_vk_icd_file elif [[ -x "`which nvidia-settings 2>/dev/null`" ]] ; then - export __NV_PRIME_RENDER_OFFLOAD=1 export __GLX_VENDOR_LIBRARY_NAME=nvidia check_vk_icd_file fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index b6204b2c7660545fdaa4b0cdc02cf785012234bf..fce87db9e33bd3f32c40c5a0c2ba7a991702c4e2 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -239,7 +239,7 @@ pw_edit_db () { pw_gui_for_edit_db PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \ PW_VULKAN_NO_ASYNC PW_USE_NVAPI_AND_DLSS PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP \ PW_WINEDBG_DISABLE PW_USE_TERMINAL PW_WINE_ALLOW_XIM PW_HEAP_DELAY_FREE PW_NO_WRITE_WATCH PW_GUI_DISABLED_CS \ - PW_USE_GSTREAMER PW_USE_RUNTIME PW_USE_GAMEMODE PW_DX12_DISABLE PW_USE_WINE_DXGI + PW_USE_GSTREAMER PW_USE_RUNTIME PW_USE_GAMEMODE PW_DX12_DISABLE PW_USE_WINE_DXGI PW_PRIME_RENDER_OFFLOAD if [ "$?" == 0 ] ; then /bin/bash -c ${pw_full_command_line[*]} & exit 0 diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 469585f58d842939b9943ea458dc751067d11c41..b12ab6493f401ab0fd6afaf6aa2d73a49c89208a 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2067 +#SCRIPTS_NEXT_VERSION=2068 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1