Commit c818fdb2 authored by Mikhail Tergoev's avatar Mikhail Tergoev

###Scripts version 1091###

parent aec5cd60
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
* добавлено отображение скорости интернета и примерный остаток времени при скачивании библиотек libs, gecko, mono * добавлено отображение скорости интернета и примерный остаток времени при скачивании библиотек libs, gecko, mono
* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
----------------------------------------- -----------------------------------------
###Scripts version 1091###
* Установка xact по умолчанию с любым db файлом
###PortProton-85### 27.05.2021 ###Scripts version 1090### ###PortProton-85### 27.05.2021 ###Scripts version 1090###
* для подготовки к релизу используется стабилная версия wine: Proton 6.3-4 * для подготовки к релизу используется стабилная версия wine: Proton 6.3-4
* до 4-x прибавка в ФПС в играх DX12 (на моем железе: HZD - x4; Graven - x2; Cyberpunk2077 - x1,25) * до 4-x прибавка в ФПС в играх DX12 (на моем железе: HZD - x4; Graven - x2; Cyberpunk2077 - x1,25)
...@@ -22,7 +25,7 @@ ...@@ -22,7 +25,7 @@
* в лог файл добавлена информация о текущей версии скриптов и используется ли RUNTIME * в лог файл добавлена информация о текущей версии скриптов и используется ли RUNTIME
* возврат оригинальных значений системных переменных: PATH, LD_LIBRARY_PATH после окончания использования порта * возврат оригинальных значений системных переменных: PATH, LD_LIBRARY_PATH после окончания использования порта
* HOTFIX - убрано повторное исполнение функции START_PORTWINE во время запуска debug * HOTFIX - убрано повторное исполнение функции START_PORTWINE во время запуска debug
* HOTFIX - исправлены возможные проблемы старых игр использующе WMF * HOTFIX - исправлены возможные проблемы старых игр использующие WMF
* HOTFIX - ошибки скачивания vcrun2019 на чистом префиксе * HOTFIX - ошибки скачивания vcrun2019 на чистом префиксе
###PortProton-84### 23.05.2021 ###Scripts version 1089### - BETA ###PortProton-84### 23.05.2021 ###Scripts version 1089### - BETA
......
#!/bin/bash
#Author: xuser
#SR2_pc.exe
#Rating=1-5
#####################examples###########################
##export PW_COMMENT_DB="blablabla"
##export PW_DLL_INSTALL="xact" # 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_USE_BUILD_IN_DXGI=1
##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_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod
##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
##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_LOG=1 # Enable debug mode fo terminal
##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI
##ADD_IN_START_PORTWINE () { commands ; }
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
##export PW_OLD_GL_STRING=1 ##export PW_OLD_GL_STRING=1
##export PW_HIDE_NVIDIA_GPU=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_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
##export PW_USE_BUILD_IN_DXGI=1
##export PW_VIRTUAL_DESKTOP=1 ##export PW_VIRTUAL_DESKTOP=1
##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue ##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue
##export ENABLE_VKBASALT=1 ##export ENABLE_VKBASALT=1
...@@ -27,8 +26,6 @@ ...@@ -27,8 +26,6 @@
##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games ##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games
##export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod
##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
##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_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_HEAP_DELAY_FREE=1
##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread ##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread
...@@ -38,9 +35,8 @@ ...@@ -38,9 +35,8 @@
##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG ##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG
##export PW_USE_TERMINAL=1 # Force run in terminal ##export PW_USE_TERMINAL=1 # Force run in terminal
##export PW_LOG=1 # Enable debug mode fo terminal
##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI
##ADD_IN_START_PORTWINE () { commands ; } ##ADD_IN_START_PORTWINE () { commands ; }
export PW_DLL_INSTALL="vcrun2019 vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9" export PW_DLL_INSTALL="vcrun2019 vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9 xact"
...@@ -135,6 +135,7 @@ pw_clear_pfx () { ...@@ -135,6 +135,7 @@ pw_clear_pfx () {
try_remove_file "${WINEPREFIX}/userdef.reg" try_remove_file "${WINEPREFIX}/userdef.reg"
try_remove_file "${WINEPREFIX}/winetricks.log" try_remove_file "${WINEPREFIX}/winetricks.log"
try_remove_file "${WINEPREFIX}/.update-timestamp" try_remove_file "${WINEPREFIX}/.update-timestamp"
rm -f "${PORT_WINE_TMP_PATH}"/*.bin
try_remove_dir "${WINEPREFIX}/drive_c/windows/" try_remove_dir "${WINEPREFIX}/drive_c/windows/"
} }
sszen() { sszen() {
...@@ -238,9 +239,6 @@ PW_DOWNLOAD_GECKO () { ...@@ -238,9 +239,6 @@ PW_DOWNLOAD_GECKO () {
zenity_error_download && PW_DOWNLOAD_GECKO zenity_error_download && PW_DOWNLOAD_GECKO
fi fi
fi fi
create_new_dir "${WINEDIR}/share/wine/"
try_force_link_dir "${HOME}/.PortWINE/gecko" "${WINEDIR}"/share/wine/
try_force_link_dir "${HOME}/.PortWINE/mono" "${WINEDIR}"/share/wine/
} }
START_PORTWINE () START_PORTWINE ()
{ {
...@@ -255,6 +253,11 @@ START_PORTWINE () ...@@ -255,6 +253,11 @@ START_PORTWINE ()
export WINELOADER="${WINEDIR}/bin/wine" export WINELOADER="${WINEDIR}/bin/wine"
export WINESERVER="${WINEDIR}/bin/wineserver" export WINESERVER="${WINEDIR}/bin/wineserver"
export WINEDLLPATH="${WINEDIR}/lib/wine" export WINEDLLPATH="${WINEDIR}/lib/wine"
create_new_dir "${WINEDIR}/share/wine/"
try_remove_dir"${WINEDIR}"/share/wine/gecko
try_remove_dir"${WINEDIR}"/share/wine/mono
try_force_link_dir "${HOME}/.PortWINE/gecko" "${WINEDIR}"/share/wine/
try_force_link_dir "${HOME}/.PortWINE/mono" "${WINEDIR}"/share/wine/
for pw_winedllpath in "${WINEDIR}/lib/wine/i386-windows" "${WINEDIR}/lib64/wine" "${WINEDIR}/lib64/wine/x86_64-windows" "${WINEDIR}/lib/wine/x86_64-windows"; do for pw_winedllpath in "${WINEDIR}/lib/wine/i386-windows" "${WINEDIR}/lib64/wine" "${WINEDIR}/lib64/wine/x86_64-windows" "${WINEDIR}/lib/wine/x86_64-windows"; do
if [ -d "${pw_winedllpath}" ] if [ -d "${pw_winedllpath}" ]
then export WINEDLLPATH="${pw_winedllpath}:${WINEDLLPATH}" then export WINEDLLPATH="${pw_winedllpath}:${WINEDLLPATH}"
...@@ -293,12 +296,12 @@ START_PORTWINE () ...@@ -293,12 +296,12 @@ START_PORTWINE ()
export MEDIACONV_AUDIO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_audio.foz export MEDIACONV_AUDIO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_audio.foz
export MEDIACONV_VIDEO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/video.foz export MEDIACONV_VIDEO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/video.foz
export MEDIACONV_VIDEO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_video.foz export MEDIACONV_VIDEO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_video.foz
export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" export GST_PLUGIN_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0"
export STAGING_SHARED_MEMORY=1 export STAGING_SHARED_MEMORY=1
export PW_FORCE_LARGE_ADDRESS_AWARE=1 export PW_FORCE_LARGE_ADDRESS_AWARE=1
if [ ! -z "${PW_LOG}" ] && [ "${PW_LOG}" != 0 ] ; then if [ ! -z "${PW_LOG}" ] && [ "${PW_LOG}" != 0 ] ; then
export WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg" export WINEDEBUG="fixme+all,err+loaddll,err+dll,err+file,err+reg"
export DXVK_LOG_LEVEL="info" export DXVK_LOG_LEVEL="info"
export VKD3D_DEBUG="warn" export VKD3D_DEBUG="warn"
export WINE_MONO_TRACE="E:System.NotImplementedException" export WINE_MONO_TRACE="E:System.NotImplementedException"
...@@ -477,6 +480,9 @@ UPDATE_WINETRICKS () { ...@@ -477,6 +480,9 @@ UPDATE_WINETRICKS () {
RUN_WINETRICKS_FROM_DB () { RUN_WINETRICKS_FROM_DB () {
UPDATE_WINETRICKS UPDATE_WINETRICKS
if [ ! -z "${PW_MUST_HAVE_DLL}" ]
then export PW_DLL_INSTALL="${PW_MUST_HAVE_DLL} ${PW_DLL_INSTALL}"
fi
if [ ! -z "${PW_DLL_INSTALL}" ]; then if [ ! -z "${PW_DLL_INSTALL}" ]; then
PW_STOP_PROGRESS_BAR PW_STOP_PROGRESS_BAR
export PW_DLL_NEED_INSTALL="" export PW_DLL_NEED_INSTALL=""
......
...@@ -27,6 +27,8 @@ export WINEDIR="${PORT_WINE_PATH}/data/dist" ...@@ -27,6 +27,8 @@ export WINEDIR="${PORT_WINE_PATH}/data/dist"
export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
export porturl="http://portwine-linux.ru/" export porturl="http://portwine-linux.ru/"
export PW_MUST_HAVE_DLL="xact"
######################################################################## ########################################################################
ADD_IN_START_PORTWINE () ADD_IN_START_PORTWINE ()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment