From 7dc1358a8564f52bf79823a8d30ab112b4859d8e Mon Sep 17 00:00:00 2001
From: Arta48 <nik_artamonov_2017@mail.ru>
Date: Mon, 22 Jan 2024 15:09:20 +0300
Subject: [PATCH 1/5] Add PW_VKBASALT_USER_CONF and Fix quotes in vkBasalt.conf
---
data_from_portwine/scripts/functions_helper | 14 +++++---------
data_from_portwine/scripts/lang | 2 ++
data_from_portwine/scripts/runlib | 1 +
data_from_portwine/scripts/start.sh | 4 ++--
data_from_portwine/scripts/var | 6 ++++--
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 76ec408a..36a5cc46 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -532,16 +532,12 @@ pw_mangohud_check () {
pw_vkbasalt_check () {
if [[ "${ENABLE_VKBASALT}" == 1 ]] && [[ "${PW_VULKAN_USE}" != "0" ]] && [[ "${PW_VULKAN_USE}" != "3" ]] ; then
- export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf"
- if [[ -z "${PW_VKBASALT_EFFECTS}" ]] ; then
- export PW_VKBASALT_EFFECTS="Curves:cas"
+ if [ ! -z "${PW_VKBASALT_EFFECTS}" ] && [ ! -z "${PW_VKBASALT_FFX_CAS}" ]; then
+ export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf"
+ sed -ri "s/effects = .*/effects = ${PW_VKBASALT_EFFECTS}/g" "${VKBASALT_CONFIG_FILE}"
+ sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${VKBASALT_CONFIG_FILE}"
+ sed -ri "s|= .*/reshade|= \"${PW_WINELIB}\"/pressure-vessel/reshade|g" "${VKBASALT_CONFIG_FILE}"
fi
- sed -ri "s/effects = .*/effects = ${PW_VKBASALT_EFFECTS}/g" "${VKBASALT_CONFIG_FILE}"
- if [[ -z "${PW_VKBASALT_FFX_CAS}" ]] ; then
- export PW_VKBASALT_FFX_CAS="0.7"
- fi
- sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${VKBASALT_CONFIG_FILE}"
- sed -ri "s|= .*/reshade|= \"${PW_WINELIB}/pressure-vessel/reshade\"|g" "${VKBASALT_CONFIG_FILE}"
var_vk_istance_layers_config_update "VK_LAYER_VKBASALT_post_processing64:VK_LAYER_VKBASALT_post_processing32"
print_info "vkBasalt is enabled"
else
diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang
index 14877238..3a4b125a 100755
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -140,6 +140,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export PW_USE_GAMEMODE_INFO='Использование автоматической оптимизации системы для увеличения производительности в играх (при условии установленного пакета gamemode в системе)'
export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)'
export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)'
+ export PW_VKBASALT_USER_CONF_INFO='Принудительное использование системных настроек VKBASALT (GOverlay и т.п.)'
export PW_USE_D3D_EXTRAS_INFO='Включить принудительное использование сторонних библиотек DirectX'
export PW_USE_WINDOWS_7_INFO='Изменить версию WINDOWS 10 на WINDOWS 7 в префиксе'
export PW_USE_SHADER_CACHE_INFO='Использовать кеширование шейдеров средствами WINE (отключать только при наличии микрофризов в игре)'
@@ -541,6 +542,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
export PW_USE_GAMEMODE_INFO='Using automatic system optimization to improve performance in games (provided the gamemode package is installed on the system)'
export PW_USE_WINE_DXGI_INFO='Forced use of built-in DXGI library (in rare cases it solves problems with DX12 games)'
export PW_MANGOHUD_USER_CONF_INFO='Forced use of MANGOHUD system settings (GOverlay, etc.)'
+ export PW_VKBASALT_USER_CONF_INFO='Forced use of VKBASALT system settings (GOverlay, etc.)'
export PW_USE_D3D_EXTRAS_INFO='Enable forced use of third-party DirectX libraries'
export PW_USE_WINDOWS_7_INFO='Change the version of WINDOWS 10 to WINDOWS 7 in the prefix'
export PW_USE_SHADER_CACHE_INFO='Use WINE shader caching (disable only if there are microfreezes in the game)'
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index eb493fad..c8c2b673 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -203,6 +203,7 @@ start_portwine () {
fi
[[ "${PW_MANGOHUD_USER_CONF}" == 1 ]] && unset MANGOHUD_CONFIG
+ [[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && unset PW_VKBASALT_EFFECTS && unset PW_VKBASALT_FFX_CAS
if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then
var_vkd3d_config_update dxr,dxr11
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 93249984..9cbd1fa4 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -462,14 +462,14 @@ pw_create_prefix_backup () {
pw_edit_db () {
if [[ "${XDG_SESSION_TYPE}" == "wayland" ]] ; then
pw_gui_for_edit_db \
- PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \
+ PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_VKBASALT_USER_CONF PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \
PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \
PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY \
PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \
PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_GAMESCOPE
else
pw_gui_for_edit_db \
- PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \
+ PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_VKBASALT_USER_CONF PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \
PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \
PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \
PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index ba5ffcc2..ed84936f 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -2,8 +2,10 @@
#Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2246
########################################################################
-export PW_MANGOHUD=0
-export DEFAULT_MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode
+export PW_MANGOHUD="0"
+export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode"
+export PW_VKBASALT_EFFECTS="Curves:cas"
+export PW_VKBASALT_FFX_CAS="0.75"
export PW_RT_MOUNT_RO=("")
export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}")
#export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}"
From 6569e52e89d7fdf517c7d8244ddff8b642f3c0d6 Mon Sep 17 00:00:00 2001
From: Arta <63291774+Arta48@users.noreply.github.com>
Date: Mon, 22 Jan 2024 16:40:43 +0300
Subject: [PATCH 2/5] Fix
---
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 36a5cc46..d0721cea 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -532,7 +532,7 @@ pw_mangohud_check () {
pw_vkbasalt_check () {
if [[ "${ENABLE_VKBASALT}" == 1 ]] && [[ "${PW_VULKAN_USE}" != "0" ]] && [[ "${PW_VULKAN_USE}" != "3" ]] ; then
- if [ ! -z "${PW_VKBASALT_EFFECTS}" ] && [ ! -z "${PW_VKBASALT_FFX_CAS}" ]; then
+ if [[ ! -z "${PW_VKBASALT_EFFECTS}" ]] && [[ ! -z "${PW_VKBASALT_FFX_CAS}" ]] ; then
export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf"
sed -ri "s/effects = .*/effects = ${PW_VKBASALT_EFFECTS}/g" "${VKBASALT_CONFIG_FILE}"
sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${VKBASALT_CONFIG_FILE}"
From d20fdfd0879530786ff522848b7996d4b1cfb8e9 Mon Sep 17 00:00:00 2001
From: Arta <63291774+Arta48@users.noreply.github.com>
Date: Mon, 22 Jan 2024 17:04:30 +0300
Subject: [PATCH 3/5] Fix
---
data_from_portwine/scripts/runlib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index c8c2b673..1b2473e2 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -203,7 +203,7 @@ start_portwine () {
fi
[[ "${PW_MANGOHUD_USER_CONF}" == 1 ]] && unset MANGOHUD_CONFIG
- [[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && unset PW_VKBASALT_EFFECTS && unset PW_VKBASALT_FFX_CAS
+ [[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && unset PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS
if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then
var_vkd3d_config_update dxr,dxr11
From acc28326490c85b4cba551dbe9d0f6f7055b1016 Mon Sep 17 00:00:00 2001
From: Arta48 <nik_artamonov_2017@mail.ru>
Date: Mon, 22 Jan 2024 21:44:47 +0300
Subject: [PATCH 4/5] Move Default Gamescope Args
---
data_from_portwine/scripts/functions_helper | 2 --
data_from_portwine/scripts/var | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index d0721cea..b3d5cdb8 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -916,8 +916,6 @@ pw_init_db () {
fi
[[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1
[[ "${START_FROM_PP_GUI}" == 1 ]] && export PW_GUI_DISABLED_CS=0 && unset START_FROM_PP_GUI
-
- [[ -z "$GAMESCOPE_ARGS" ]] && export GAMESCOPE_ARGS="-F fsr"
return 0
}
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index ed84936f..80c9b923 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -6,6 +6,7 @@ export PW_MANGOHUD="0"
export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode"
export PW_VKBASALT_EFFECTS="Curves:cas"
export PW_VKBASALT_FFX_CAS="0.75"
+export GAMESCOPE_ARGS="-F fsr"
export PW_RT_MOUNT_RO=("")
export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}")
#export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}"
From f3bf1ef7cbf6c01088e27d837185a13ba8dcbecf Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Fri, 26 Jan 2024 20:31:34 +0300
Subject: [PATCH 5/5] Scripts version 2248
---
data_from_portwine/changelog_eng | 8 ++++
data_from_portwine/changelog_rus | 8 ++++
data_from_portwine/img/gui/eve.png | Bin 3498 -> 415 bytes
data_from_portwine/scripts/functions_helper | 5 +-
data_from_portwine/scripts/lang | 6 ++-
data_from_portwine/scripts/portwine_db/eve | 17 +++++--
.../scripts/pw_autoinstall/PW_EVE | 45 ++++++++++++++----
data_from_portwine/scripts/runlib | 8 ++--
data_from_portwine/scripts/start.sh | 9 ++--
data_from_portwine/scripts/var | 2 +-
data_from_portwine/scripts/zen_yad_gui | 10 +++-
11 files changed, 94 insertions(+), 24 deletions(-)
diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index d4c8647e..c5a8f252 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,14 @@ You can help us in the development of the project on the website: https://linux-
----------------------------------------
Changelog:
+###Scripts version 2248### Date: 26.01.2024 / Download update size: 8 megabytes
+* creating a shortcut in the "MENU -> Games" is separate from creating on the "Desktop"
+* added a condition for using fonts from WINE Proton only if there are no original fonts in the prefix
+* fixed the choice of installing libraries in the PortProton prefix manager
+* the creation of symlinks in PortProton has been transferred from direct paths to relative ones
+* added the "VKBASALT_USER_CONF" setting to use vkBasalt system settings (thanks Arta48)
+* updated the "EVE Online Launcher" installer to the current version (thanks cefeiko)
+
###Scripts version 2247### Date: 23.01.2024 / Download update size: 8 megabytes
* improved operation of the portable version of gamemode
* added cleaning of the data/tmp directory from broken (undocumented) archives before launching PortProton
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index b692f58e..1df10044 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,14 @@
-----------------------------------------
История изменений:
+###Scripts version 2248### Дата: 26.01.2024 / Размер скачиваемого обновления: 8 мегабайт
+* создание ярлыка в "МЕНЮ -> Игры" отделены от создания на "Рабочем столе"
+* добавлено условие использования шрифтов из WINE Proton, только если нет оригинальных шрифтов в префиксе
+* исправлен выбор установки библиотек в префикс менеджере PortProton
+* создание симлинков в PortProton переведены с прямых путей, на относительные
+* добавлена настройка "VKBASALT_USER_CONF" для использования системных настроек vkBasalt (спасибо Arta48)
+* обновлен установщик "EVE Online Launcher" на актуальную версию (спасибо cefeiko)
+
###Scripts version 2247### Дата: 23.01.2024 / Размер скачиваемого обновления: 8 мегабайт
* улучшена работа портативной версии gamemode
* исправление опечаток
diff --git a/data_from_portwine/img/gui/eve.png b/data_from_portwine/img/gui/eve.png
index 97f93901483eda099a73d4a9208eb9954b191992..29488bc4881716facfaa4e711e2ac882bb054049 100644
GIT binary patch
delta 389
zcmV;00eb$b8=nJ^BYy#ANkl<ZXo2mRze@sP7{|XS4nf5&8hAr(L9_lJ4NcvD&=dqM
zfpoUGgwWLOElv(WW8j`O7TgpLLO6*((CKY45PBcsJYOFlcs`TdvwS}AKD^#}SfEl5
zBf#835Z>PpiSocaK&m_dc#`D-ASYQK0CL;{S<wJ)#0TW5!GH0=5%za>H|esJ_wJ|l
zIT>(&c7>8(bS9LB-k^`u$4l!>{1MUsZo~(WOH47GO_2P2J5ZtN4f^CPbwE4m;O-^P
zB(zS*0IGU49Xpd*1+P*+H{23g5WmFY1IQhCzIf2T5}QB+xX}P^^djR%d;oco#bFhJ
z<sxe*Z)m(eIewK&0~rwb1(f{4zvp{f^rZq=;eDWdc!D^rx^N*GPRF=zHLSDL0fAq%
z9xazFdm|IS#2Ubj_yBT=qb>UKFq%!s85!`={c<9+Zp0rU4d6xtSTQD&8(>V-xoOs9
j2F&FFiAQKb9sqs;JCj@U%5)WB00000NkvXXu0mjfkI1ek
literal 3498
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
JRcqKi`xmHJv;P19
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index a0d10295..049a2c68 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -77,7 +77,7 @@ try_force_link_file () {
if [ ! -f "$1" ] ; then :
elif [ -z "$2" ] ; then print_error "no way to link file $1"
else
- ln -sf "$1" "$2"
+ ln -s -f -r "$1" "$2"
[ "$?" != 0 ] && print_error "failed to link file $1 to $2" || return 0
fi
return 1
@@ -102,7 +102,7 @@ try_force_link_dir () {
if [ ! -d "$1" ] ; then print_info "directory $1 not found for link"
elif [ -z "$2" ] ; then print_error "no way to link directory $1"
else
- ln -sf "$1" "$2"
+ ln -s -f -r "$1" "$2"
[ "$?" != 0 ] && print_error "failed to link directory $1 to $2" || return 0
fi
return 1
@@ -493,6 +493,7 @@ pw_init_runtime () {
export PRESSURE_VESSEL_RUNTIME_BASE="${PW_WINELIB}"
export PRESSURE_VESSEL_VARIABLE_DIR="${PW_WINELIB}/var"
export PRESSURE_VESSEL_PREFIX="${PW_WINELIB}/pressure-vessel"
+ export FONTCONFIG_PATH=''
unset PRESSURE_VESSEL_FILESYSTEMS_RO PRESSURE_VESSEL_FILESYSTEMS_RW
for PWRTMRO in ${PW_RT_MOUNT_RO[*]} ; do
diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang
index d3fac7af..f7b6e10d 100755
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -60,7 +60,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export inst_set_top="Установка ${portname}"
export sc_info="Ярлык будет создан в каталоге ${portname}."
export sc_name="Название"
- export sc_menu_desktop="Добавить ярлык в МЕНЮ -> Игры и на Рабочий стол"
+ export sc_menu_desktop="Добавить ярлык в МЕНЮ -> Игры"
+ export sc_desktop_desktop="Добавить ярлык на Рабочий стол"
export sc_add_in_steam="Добавить ярлык в библиотеку STEAM"
export sc_restert_steam="Для добавления ярлыка в STEAM, необходим перезапуск.\n\nПерезапустить STEAM?"
@@ -462,7 +463,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
export inst_set_top="Instaling ${portname}"
export sc_info="The shortcut will be created in the ${portname} directory."
export sc_name="Name"
- export sc_menu_desktop="Add shortcut to MENU -> GAMES and Desktop"
+ export sc_menu_desktop="Add shortcut to MENU -> GAMES"
+ export sc_desktop_desktop="Add shortcut to Desktop"
export sc_add_in_steam="Add shortcut to STEAM library"
export sc_restert_steam="For adding shortcut to STEAM, needed restart.\n\nRestart STEAM now?"
diff --git a/data_from_portwine/scripts/portwine_db/eve b/data_from_portwine/scripts/portwine_db/eve
index a35601e4..1ad2681c 100755
--- a/data_from_portwine/scripts/portwine_db/eve
+++ b/data_from_portwine/scripts/portwine_db/eve
@@ -2,8 +2,19 @@
#Author: linux-gaming.ru
#eve.exe
#evelauncher.exe
+#eve-online.exe
#Rating=5
#####################examples###########################
-export PW_VULKAN_USE=1
-export PW_DLL_INSTALL="vcrun2019 d3dcompiler_47" # Install DLL in port prefix (used winetricks)
-export WINEDLLOVERRIDES="concrt140,msvcp140,msvcp140_1,msvcp140_2,d3dcompiler_47=n"
+export PW_WINDOWS_VER="10"
+export PW_WINE_USE="WINE_LG"
+export PW_USE_WINE_DXGI="1"
+export PW_VULKAN_USE="1"
+export PW_USE_GSTREAMER="0"
+export PW_PREFIX_NAME="EVE_ONLINE"
+export PW_WINE_FULLSCREEN_FSR="0"
+export PW_USE_D3D_EXTRAS="1"
+export PW_FORCE_LARGE_ADDRESS_AWARE="0"
+export PW_USE_SHADER_CACHE="0"
+export PW_USE_EAC_AND_BE="1"
+export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 tahoma arial" # msdelta
+export WINEDLLOVERRIDES="msvcp140,msvcp140_1=n"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE
index 651aac40..d4e2fbf8 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE
@@ -1,15 +1,44 @@
#!/usr/bin/env bash
# Author: cefeiko
########################################################################
-export PW_WINDOWS_VER=10
-export PW_DLL_INSTALL="vcrun2017"
-export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EveLauncher-2198233.exe"
+export PW_WINDOWS_VER="10"
+export PW_WINE_USE="WINE_LG"
+export PW_USE_WINE_DXGI="1"
+export PW_VULKAN_USE="1"
+export PW_USE_GSTREAMER="0"
+export PW_PREFIX_NAME="EVE_ONLINE"
+export PW_WINE_FULLSCREEN_FSR="0"
+export PW_USE_GAMEMODE="0"
+export PW_USE_D3D_EXTRAS="1"
+export PW_FORCE_LARGE_ADDRESS_AWARE="0"
+export PW_USE_SHADER_CACHE="0"
+export PW_USE_EAC_AND_BE="1"
+export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 arial tahoma" # msdelta
+export WINEDLLOVERRIDES="msvcp140,msvcp140_1=n"
+export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/eve-online-latest+Setup.exe"
+export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher"
+
start_portwine
-if try_download_game "https://binaries.eveonline.com/EveLauncher-2198233.exe" "${PW_AUTOINSTALL_EXE}"
-then
- pw_kill_autostart evelauncher.exe &
- pw_run "${PW_AUTOINSTALL_EXE}"
- portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "evelauncher.exe"`
+if try_download_game "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" ; then
+ pw_start_progress_bar_block "${loc_gui_installing_the} EVE Online Launcher. ${loc_gui_please_wait} "
+ EVE_LAUNCHER_DIR="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/eve-online"
+
+ $pw_7z x "${PW_USER_TEMP}/eve-online-latest+Setup.exe" -o"${EVE_LAUNCHER_DIR}" -y
+ $pw_7z x "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" -o"${EVE_LAUNCHER_DIR}/tmp" -y
+
+ APP_DIR="app-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`"
+
+ create_new_dir "${EVE_LAUNCHER_DIR}/$APP_DIR"
+ create_new_dir "${EVE_LAUNCHER_DIR}/packages/SquirrelTemp"
+
+ cp -r "${EVE_LAUNCHER_DIR}/tmp/lib/net45/." "${EVE_LAUNCHER_DIR}/$APP_DIR"
+ cp "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" "${EVE_LAUNCHER_DIR}/packages"
+ mv "${EVE_LAUNCHER_DIR}/${APP_DIR}/eve-online_ExecutionStub.exe" "${EVE_LAUNCHER_DIR}/eve-online.exe"
+ cp "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/packages"
+ mv "${EVE_LAUNCHER_DIR}/setupIcon.ico" "${EVE_LAUNCHER_DIR}/app.ico"
+ rm -rf "${EVE_LAUNCHER_DIR}/background.gif" "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/tmp"
+
+ portwine_exe="${EVE_LAUNCHER_DIR}/eve-online.exe"
pw_stop_progress_bar
portwine_create_shortcut
try_remove_file "${PW_AUTOINSTALL_EXE}"
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 6e504273..227a8ef1 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -302,7 +302,9 @@ start_portwine () {
create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/"
LN_FONTS="arialbd.ttf courbd.ttf georgia.ttf micross.ttf msyh.ttf simsun.ttc arial.ttf cour.ttf malgun.ttf msgothic.ttc nirmala.ttf times.ttf"
for link_font in $LN_FONTS ; do
- try_force_link_file "${WINEDIR}/share/fonts/${link_font}" "${WINEPREFIX}/drive_c/windows/Fonts/${link_font}"
+ if [[ ! -f "${WINEPREFIX}/drive_c/windows/Fonts/${link_font}" ]] ; then
+ try_force_link_file "${WINEDIR}/share/fonts/${link_font}" "${WINEPREFIX}/drive_c/windows/Fonts/${link_font}"
+ fi
done
find "${WINEPREFIX}/dosdevices" -xtype l -maxdepth 1 2>/dev/null -exec rm {} \;
@@ -638,7 +640,7 @@ start_portwine () {
echo "START WINETRICKS..." >> "${PORT_WINE_TMP_PATH}/update_pfx_log"
echo "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" >> "${PORT_WINE_TMP_PATH}/update_pfx_log"
print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}"
- ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
+ ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \
"${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
wait_wineserver
kill_portwine
@@ -649,7 +651,7 @@ start_portwine () {
if [[ ! -z "${PW_WINDOWS_VER}" && `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ]] ; then
export PW_WINDOWS_VER="xp64"
fi
- ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
+ ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \
"${WINELOADER}" winecfg -v `echo "win${PW_WINDOWS_VER}" | sed 's/.*/\L&/'`
wait_wineserver
kill_portwine
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index d8d16d71..25c211a7 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -255,6 +255,7 @@ portwine_start_debug () {
pw_winecfg () {
start_portwine
+ export GST_PLUGIN_SYSTEM_PATH_1_0=""
pw_run winecfg
}
@@ -273,6 +274,7 @@ pw_winecmd () {
pw_winereg () {
start_portwine
+ export GST_PLUGIN_SYSTEM_PATH_1_0=""
pw_run regedit
}
@@ -362,8 +364,8 @@ pw_prefix_manager () {
if [[ ! -z ${SET_FROM_PFX_MANAGER} ]] ; then
export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm"
pw_init_runtime
- ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
- "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
+ ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \
+ "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${SET_FROM_PFX_MANAGER} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
gui_prefix_manager
else
print_info "Nothing to do. Restarting PortProton..."
@@ -395,7 +397,8 @@ pw_winetricks () {
fi
done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v12_3}" --text-info --tail --no-buttons --title="WINETRICKS" \
--auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y 2>/dev/null &
- "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
+ ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \
+ "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log"
kill -s SIGTERM "$(pgrep -a yad_v12_3 | grep "title=WINETRICKS" | awk '{print $1}')" > /dev/null 2>&1
stop_portwine
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 1c41a584..bdb76d98 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2247
+#SCRIPTS_NEXT_VERSION=2248
########################################################################
export PW_MANGOHUD="0"
export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode"
diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui
index 8170d92f..e97f305a 100755
--- a/data_from_portwine/scripts/zen_yad_gui
+++ b/data_from_portwine/scripts/zen_yad_gui
@@ -623,6 +623,7 @@ portwine_create_shortcut () {
--field="${sc_info}":LBL "" \
--field=" ${name_desktop}":LBL "" \
--field=" ${sc_menu_desktop}":CHK "TRUE" \
+ --field=" ${sc_desktop_desktop}":CHK "TRUE" \
--field=" ${sc_add_in_steam}":CHK "FALSE" \
--button="$loc_gui_create_shortcut":0)
PW_YAD_OUT=$?
@@ -634,6 +635,7 @@ portwine_create_shortcut () {
--field="${sc_info}":LBL "" \
--field="${sc_name}:" "${name_desktop}" \
--field=" ${sc_menu_desktop}":CHK "TRUE" \
+ --field=" ${sc_desktop_desktop}":CHK "TRUE" \
--field=" ${sc_add_in_steam}":CHK "FALSE" \
--button="$loc_gui_create_shortcut":0)
PW_YAD_OUT=$?
@@ -645,7 +647,8 @@ portwine_create_shortcut () {
else name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $2}')
fi
create_menu_desktop_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $3}')
- create_menu_steam_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $4}')
+ create_desktop_desktop_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $4}')
+ create_menu_steam_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $5}')
try_remove_file "${PORT_WINE_PATH}/${name_desktop}.desktop"
@@ -663,9 +666,12 @@ portwine_create_shortcut () {
echo "Icon="${PORT_WINE_PATH}/data/img/${name_desktop}.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
- if [[ "${create_menu_desktop_shortcut}" == "TRUE" ]]; then
+ if [[ "${create_menu_desktop_shortcut}" == "TRUE" ]] ; then
try_remove_file "${HOME}/.local/share/applications/${name_desktop}.desktop"
cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" "${HOME}/.local/share/applications/"
+ fi
+
+ if [[ "${create_desktop_desktop_shortcut}" == "TRUE" ]] ; then
if [[ -d "${HOME}/Desktop" ]] ; then
cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" "${HOME}/Desktop/"
elif [[ -d "${HOME}/Рабочий стол" ]] ; then