From 088cdecda34f88a6fa35fa7b038555bdfd9aaf72 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Fri, 16 Jul 2021 20:31:05 +0300 Subject: [PATCH] ###Scripts version 1119### --- data_from_portwine/changelog | 7 +++- data_from_portwine/img/gui/osu.png | Bin 0 -> 2670 bytes data_from_portwine/scripts/autoinstall | 21 ++++++++++++ .../scripts/portwine_db/Esprit_Games | 32 ++++++++++++++++++ .../scripts/portwine_db/Singularity | 6 ++++ data_from_portwine/scripts/portwine_db/XR_3DA | 3 +- .../scripts/portwine_db/default | 2 +- data_from_portwine/scripts/portwine_db/eve | 5 ++- data_from_portwine/scripts/portwine_db/osu | 9 ++--- data_from_portwine/scripts/portwine_db/steam | 8 +++-- data_from_portwine/scripts/start.sh | 3 +- data_from_portwine/scripts/var | 19 ++++------- data_from_portwine/vkBasalt.conf | 2 +- 13 files changed, 90 insertions(+), 27 deletions(-) create mode 100644 data_from_portwine/img/gui/osu.png create mode 100644 data_from_portwine/scripts/portwine_db/Esprit_Games create mode 100644 data_from_portwine/scripts/portwine_db/Singularity diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index a02bf82f..b7db3b66 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -6,8 +6,13 @@ * добавить контроль за окнами для правильного отключения прогресс бара * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 1119### +* ESYNC отключен по умолчанию из за частой ошибки CXX на некоторых системах. +* при включении vkBasalt вместо эффекта Curves используется FakeHDR (минимальное затемнение при увеличении глубины цветопередачи) +* при включении vkBasalt уменьшена резкость casSharpness с 0.8 до 0.75 + ###Scripts version 1118### -* Обновлены libs_v17 с интеграцией MANGOHUD, vkBasalt + reshade +* обновлены libs_v17 с интеграцией MANGOHUD, vkBasalt + reshade * MANGOHUD и vkBasalt польностью интегрированы в контейнер * MANGOHUD снова работает под всеми режимами запуска (OpenGL и Vulkan) включая 32-ух битные игры. * HOTFIX - user.conf корректно переопределяет все переменные diff --git a/data_from_portwine/img/gui/osu.png b/data_from_portwine/img/gui/osu.png new file mode 100644 index 0000000000000000000000000000000000000000..74b560f267e371673bbf43c814dd83a6aa863d9d GIT binary patch literal 2670 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 literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/autoinstall b/data_from_portwine/scripts/autoinstall index 92632aff..c9c2ea0a 100644 --- a/data_from_portwine/scripts/autoinstall +++ b/data_from_portwine/scripts/autoinstall @@ -186,3 +186,24 @@ PW_STEAM () { fi STOP_PORTWINE } + +PW_OSU () { + export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_dotnet" + export PW_DLL_INSTALL="dotnet40" + mkdir -p "${WINEPREFIX}/drive_c/Program Files (x86)/OSU/" + export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files (x86)/OSU/osu!.exe" + START_PORTWINE + if try_download "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" + then + PW_START_PROGRESS_BAR_BLOCK "Installing the OSU!. Please wait..." + if [ -f "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" ]; then + mv -f "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!.exe" + fi + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/OSU/osu!.exe" + PORTWINE_CREATE_SHORTCUT + PW_RUN "${PW_AUTOINSTALL_EXE}" + PW_STOP_PROGRESS_BAR + KILL_PORTWINE + fi + STOP_PORTWINE +} \ No newline at end of file diff --git a/data_from_portwine/scripts/portwine_db/Esprit_Games b/data_from_portwine/scripts/portwine_db/Esprit_Games new file mode 100644 index 00000000..87d2a535 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Esprit_Games @@ -0,0 +1,32 @@ +#!/bin/bash +#Author: fff555w +#Esprit Games.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +##export WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXR_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_NVAPI_DISABLE=1 +##export PW_OLD_GL_STRING=1 +##export PW_HIDE_NVIDIA_GPU=1 +##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +##export ENABLE_VKBASALT=1 +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HEAP_DELAY_FREE=1 +##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=1 # Force run in terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/Singularity b/data_from_portwine/scripts/portwine_db/Singularity new file mode 100644 index 00000000..62572cf1 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Singularity @@ -0,0 +1,6 @@ +#!/bin/bash +#Author: esa +#Singularity.exe +#Rating=1-5 +################################################ +export PW_DLL_INSTALL="physx" diff --git a/data_from_portwine/scripts/portwine_db/XR_3DA b/data_from_portwine/scripts/portwine_db/XR_3DA index 0675f1b9..bd31356d 100644 --- a/data_from_portwine/scripts/portwine_db/XR_3DA +++ b/data_from_portwine/scripts/portwine_db/XR_3DA @@ -3,6 +3,7 @@ #XR_3DA.exe #Rating=1-5 ################################################ -export PW_VULKAN_USE=0 +export PW_VULKAN_USE=dxvk export LAUNCH_PARAMETERS="-nointro -noprefetch" # -nointro command line option to skip intro movies # -noprefetch command line option to shorten load times +#export PW_DLL_INSTALL="vcrun2019 vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9 \ No newline at end of file diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default index e4adb5e6..60993f63 100644 --- a/data_from_portwine/scripts/portwine_db/default +++ b/data_from_portwine/scripts/portwine_db/default @@ -22,7 +22,7 @@ ##export ENABLE_VKBASALT=1 ##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives ##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games diff --git a/data_from_portwine/scripts/portwine_db/eve b/data_from_portwine/scripts/portwine_db/eve index 17fb6128..4042675f 100644 --- a/data_from_portwine/scripts/portwine_db/eve +++ b/data_from_portwine/scripts/portwine_db/eve @@ -5,9 +5,8 @@ #Rating=5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" - -export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -export PW_DLL_INSTALL="vcrun2017 d3dcompiler_47" # Install DDL in port prefix (used winetricks) +export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP +export PW_DLL_INSTALL="vcrun2019 d3dcompiler_47" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="concrt140,msvcp140,msvcp140_1,msvcp140_2,d3dcompiler_47=n" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options diff --git a/data_from_portwine/scripts/portwine_db/osu b/data_from_portwine/scripts/portwine_db/osu index c4f88ea4..7721f101 100644 --- a/data_from_portwine/scripts/portwine_db/osu +++ b/data_from_portwine/scripts/portwine_db/osu @@ -1,19 +1,21 @@ #!/bin/bash #Author: xuser #osu!.exe +#osu!install.exe #Rating=1-5 ######################################################## export PW_VULKAN_USE=0 +export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_dotnet" +export PW_DLL_INSTALL="dotnet40" +export PW_COMMENT_DB="OSU!" #####################examples########################### -##export PW_COMMENT_DB="blablabla" ##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -export PW_DLL_INSTALL="dotnet40" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_DXR_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI=0 +##export PW_NVAPI_DISABLE=1 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT @@ -27,7 +29,6 @@ export PW_DLL_INSTALL="dotnet40" # Install DDL in port prefix (use ##export PW_HEAP_DELAY_FREE=1 ##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread ##export WINEARCH=win32 # defaut = win64 -export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_dotnet" ##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG ##export PW_USE_TERMINAL=1 # Force run in terminal ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI diff --git a/data_from_portwine/scripts/portwine_db/steam b/data_from_portwine/scripts/portwine_db/steam index b894f3e2..b89ee79a 100644 --- a/data_from_portwine/scripts/portwine_db/steam +++ b/data_from_portwine/scripts/portwine_db/steam @@ -1,8 +1,10 @@ #!/bin/bash -#Author: MrM0der +#Author: Cefeiko #steam.exe #Rating=5 ################################################ -export LAUNCH_PARAMETERS="" +export PW_COMMENT_DB="Steam" +export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP +export PW_DLL_INSTALL="vcrun2019 d3dcompiler_46" export WINEDLLOVERRIDES="libglesv2=" -export LAUNCH_PARAMETERS"-no-cef-sandbox" +export LAUNCH_PARAMETERS="-no-cef-sandbox" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index f4d65aec..48699331 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -323,7 +323,8 @@ else --field=" Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png":"BTN" '@bash -c "button_click PW_UBC"' \ --field=" Steam Client Launcher"!"$PW_GUI_ICON_PATH/steam.png":"BTN" '@bash -c "button_click PW_STEAM"' \ --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png":"BTN" '@bash -c "button_click PW_EVE"' \ - --field=" Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png":"BTN" '@bash -c "button_click PW_ORIGIN"' & \ + --field=" Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png":"BTN" '@bash -c "button_click PW_ORIGIN"' \ + --field=" OSU"!"$PW_GUI_ICON_PATH/osu.png":"BTN" '@bash -c "button_click PW_OSU"' & \ "${pw_yad}" --plug=${KEY} --tabnum=1 --columns=3 --form --separator=";" \ --image "$PW_GUI_ICON_PATH/port_proton.png" \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index c3e2d046..a357e97f 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_VERSION=1118 +#SCRIPTS_VERSION=1119 ######################################################################## export PW_MANGOHUD=1 export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display @@ -19,25 +19,20 @@ export PW_FORCE_USE_VSYNC=2 export PW_LOG=0 export PW_TERM="" export PW_USE_TERMINAL=0 - +export PW_MUST_HAVE_DLL="" export PW_WINEDBG_DISABLE=1 - export PW_WINDOWS_VER="10" export WINEARCH="win64" +export pw_libs_ver="_v17" +export porturl="http://portwine-linux.ru/" +export GDK_BACKEND="x11" + export mono_ver=6.1.2 export gecko_ver=2.47.2 -export pw_libs_ver="_v17" - export WINEDIR="${PORT_WINE_PATH}/data/dist" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export WINE_WIN_START="start.exe /i /unix" - -export porturl="http://portwine-linux.ru/" - -export PW_MUST_HAVE_DLL="" - -export GDK_BACKEND="x11" -######################################################################## +################################################################# ADD_IN_START_PORTWINE () { echo " " diff --git a/data_from_portwine/vkBasalt.conf b/data_from_portwine/vkBasalt.conf index 5f8c4401..c0d1513d 100644 --- a/data_from_portwine/vkBasalt.conf +++ b/data_from_portwine/vkBasalt.conf @@ -16,4 +16,4 @@ FakeHDR = /usr/local/share/reshade/shaders/FakeHDR.fx casSharpness=0.75 toggleKey = Home -effects = Curves:cas +effects = FakeHDR:cas