From 0c81978c5b5b927d1026e48e88e1746775209e91 Mon Sep 17 00:00:00 2001 From: Htylol Date: Fri, 1 Aug 2025 20:38:19 +0500 Subject: [PATCH 01/13] OpenGL nvidia hook moved to start_portwine --- data_from_portwine/scripts/functions_helper | 34 +++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index eac5ff8b..ad005913 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2921,13 +2921,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]} @@ -3043,7 +3036,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 @@ -3775,8 +3768,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 +3993,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 +4606,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 +4614,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 @@ -6707,8 +6707,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]}" From 98cbc018aed171082e4388f6886c148a4924ef94 Mon Sep 17 00:00:00 2001 From: Htylol Date: Fri, 1 Aug 2025 23:53:25 +0500 Subject: [PATCH 02/13] Fixed long startup of setup files --- data_from_portwine/scripts/functions_helper | 1 + 1 file changed, 1 insertion(+) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index eac5ff8b..ba9f50ad 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") From 1e290d0c55ff1036a56ac7884bdb6592e816e9f6 Mon Sep 17 00:00:00 2001 From: Muzifs Date: Tue, 5 Aug 2025 13:47:49 +0300 Subject: [PATCH 03/13] fixes for autoinstall Azahar --- data_from_portwine/scripts/pw_autoinstall/PW_AZAHAR | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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}" From a94d0b06222a461cf8c2a01e944257034c9debf5 Mon Sep 17 00:00:00 2001 From: Muzifs Date: Fri, 8 Aug 2025 14:43:54 +0300 Subject: [PATCH 04/13] fixes for autoinstall GGD --- .../scripts/pw_autoinstall/PW_GOOSE_GOOSE_DUCK | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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}" From aab1ebd2c1f8f72369c4b2b035ac37502be0b1bb Mon Sep 17 00:00:00 2001 From: Muzifs Date: Fri, 8 Aug 2025 15:40:47 +0300 Subject: [PATCH 05/13] new Tanki Online icon --- data_from_portwine/img/gui/tankionline.png | Bin 4782 -> 5103 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data_from_portwine/img/gui/tankionline.png b/data_from_portwine/img/gui/tankionline.png index 111a3da0ab75a4c267580397d340f3def98ed7ce..581857854e726558811ff174776873e7fd0080b2 100644 GIT binary patch literal 5103 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

1~j3-$Bl(ubKK$%$^)ZET7Dy)stss%!u-H2ewLk zodEI?ank@=+>IWKdgAsW$x8Ffp6m;Eat4{L4^nENchSlocSG7FY~_AUE{Bzp^h)f zlV1JsPpBYVOw4zFytn|{&rZei_vWIwq=5e3u4qUKBkA+iYXvAw-G$eleF`-c*pP2V z$-*62`|+4Mno`K$QN-kq@N9H75P;jrTw&IB@HheFMn!2j(Q_4F4ha4}Dpv58o!8f1^~Du!Us&>46mH;RW@LYKKMk7^F!8~PbD-V7Un znoB28!PFTRJ5C+yp~j}A+zcKrDT`S$lSkIiB$3+ZvSuAFr2j3`{QR(c-9WNciPvXM z_wJay@S!lZ=9g{aLnHpgAmrym1t>|%VGwG98(KBv`4JO%pG$co6v9L;i!vg@gRmWo z>UylebLiZ$oq}>+PHSr2gX7yet2N^FXtj<_jcFi&s_}T96OCI^u5bbq=FFU;pdfYn z){g;A6!Khb&x5Z$m2z2@e*$@^^|~k8N{d zYvgfVh;;%2Z3;HlL*8}ha@l<8NV$GyZ%b9y@#QkO;`_tcw>2K?{O2k&t3}Itd5h*n z7%~5y@pNrIS9xg&+-91a?a$A6yn%4F-A-eV#AUm-dN3b64+sGEq>v_CyVbH+?+Y;l2 zT3YIzdN7tJ4FMF+%EQ}v4cg>GER?hOuoBQrtiO*5b$z6*aOFP2#efIzAC6KjOF`Ml zyr1*AsxF^AQPm-z&(NC_qiC?HwX!!fH0@#|F68wuDc27CaH8VTn*1JPcQ)NLQx0bSj5tGXy z)y2%UbdY0-!`j^4gS_=;sVx_Co^TwUmfmnSeo3g&c={~b|LU{(JO$}f*XQ7tUOd6x zOUv4k5w#g7_IF3oS9{a~wqHK|x4Mo#g`b5GPMmNkJsS;3-rAL#n2gnnK2R_c%~dgY zS@UlcH^zsaJePb09yZK~Ixu>+A2VFv#s zN$oJ;^Rb*S!nMRKCVD|+Kx4{$gIe%u85humryKQ`hZ}Mm+CS4BMt2~sMMvo|!g{e7 zrAb+8%$8+~v3KZnd~`=B>{rWJ=gD*BrbXA&s4rbt0At%OLwRKUgU8{-lc%E*+Oh;` z6Z&BHp<@aLI*^2r!c-l_u%G}eNE?ik%#Os0aTvj6`a15NFcse?9iVFr)ce*h3bB%R zv>a=m-}?jp8S@yRj1i0C>B%mast)el^y~6@-3CSd#v22)Dx;jlqUnGeG44|{f}3-f zBojAcQckHghAsI6-!EO#kE?>?8%`}77JuH?a+>47*IjVwgG7aY&Na`Im+|8DXf~ws zbG=%{K18Um6;1I!5uo{?&IpNZ!F--9@IOMx!IpX(WBM0v7|1mm@jxLA&G z%Udt&Z@pZ8@(N0mvw12f2_&KAGIU2_M(WS8Ra^J(1(2RmQ9%ZTUSg?b?Lc|go<{iA z3B!$)+pt;8SBHANED(}Qm{CP)%#(NSSMl~!uqslGe)99HJo)EaX_{diTVx}wn3u_X zAAJ;SYB};UD%zAf^=4heF*+?#23txzMs3iqWxf%Y|35$f1w{#k2;oxJBLDyZ07*qo IM6N<$f=fp;cK`qY From ceb4dfb53655f0a9c352a0d83f656b67317634e7 Mon Sep 17 00:00:00 2001 From: Boris Yumankulov Date: Fri, 15 Aug 2025 21:13:54 +0500 Subject: [PATCH 06/13] fix: use focused monitor as primary on hyprland Signed-off-by: Boris Yumankulov --- data_from_portwine/scripts/functions_helper | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 8d2e1784..f602c05a 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2870,7 +2870,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 From b3b76c799f2619cabc4d57c388b5b794ea212311 Mon Sep 17 00:00:00 2001 From: Htylol Date: Tue, 19 Aug 2025 01:26:54 +0500 Subject: [PATCH 07/13] Use compare_versions for glibc --- data_from_portwine/scripts/functions_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index eac5ff8b..532ae23d 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -5625,7 +5625,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" From 892d3eae4debb7bebb4eade99f9a9ff309343a0a Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 26 Aug 2025 15:03:22 +0300 Subject: [PATCH 08/13] updated var: LSFG-VK --- data_from_portwine/scripts/functions_helper | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index eac5ff8b..509b6821 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1859,9 +1859,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" From 303408157a09b4e9e4d5811ad39071eac627b525 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 26 Aug 2025 15:57:55 +0300 Subject: [PATCH 09/13] PROTON_MEDIA_USE_GST=1 by default --- data_from_portwine/scripts/functions_helper | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 14639d2c..23a2dae7 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3423,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" From 031da4301db6b395b8a2212676d9ad82a15e2df3 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 26 Aug 2025 15:58:35 +0300 Subject: [PATCH 10/13] updated PROTON_LG, DXVK and VKD3D --- data_from_portwine/scripts/var | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index f22f7f0e..3f030543 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-13" 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-44" 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### From 97b6d58b032b90d7feee1a0eda77eb59cf16d8cf Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Tue, 26 Aug 2025 22:15:35 +0500 Subject: [PATCH 11/13] Trim whitespace when parsing SteamAppId --- data_from_portwine/scripts/add_in_steam.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4da7f6b13271d40d35cd43175157bcf38c9bdd32 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 28 Aug 2025 11:51:02 +0300 Subject: [PATCH 12/13] updated PROTON_LG and DXVK --- data_from_portwine/scripts/var | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 3f030543..b655722d 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -52,13 +52,13 @@ 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-13" +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-44" +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-4707" From c193e64f6c05e796f4cef6206659fb69ec44265f Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 28 Aug 2025 12:39:55 +0300 Subject: [PATCH 13/13] winebth.sys=d by default --- data_from_portwine/scripts/functions_helper | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 23a2dae7..04409e94 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3445,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