diff --git a/LICENSE b/LICENSE index cf25da6..b624f83 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Castro-Fidel (PortWINE-Linux.ru) +Copyright (c) 2022 Castro-Fidel (linux-gaming.ru) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 8dbf22e..7176f84 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -1,7 +1,10 @@ -You can help us in the development of the project on the website: boosty.to/portwine-linux.ru +You can help us in the development of the project on the website: boosty.to/linux-gaming.ru ----------------------------------------- Changelog: +* updated "plugins_v7" (updated libraries for FAKE DLSS - FSR 2.1 operation) +* updated PROTON_GE_7-33 (updated dxvk and vkd3d) + ###Scripts version 2127### * updated "plugins_v6" (added libraries for FAKE DLS) * added the ability to enable support for USE_FAKE_DLSS in the EDIT_DB menu (Works on ANY video card with Vulkan support) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 03a894b..b569eb7 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -1,14 +1,21 @@ -Вы можете помочь развитию проекта: portwine-linux.ru/donate/ +Вы можете помочь развитию проекта: https://linux-gaming.ru/donate/ ----------------------------------------- История изменений: +###Scripts version 2128### +* обновлен "plugins_v7" +* обновлены библиотеки для работы FAKE DLSS (обновлена версия FSR до 2.1) +* добавлена функция подмены видеокарты для значительного увеличения списка поддержки игр с FAKE_DLSS (активируется автоматически при включении USE_FAKE_DLSS в EDIT_DB) +* ускорено создание нового префикса +* обновлен "PROTON_GE" до версии 7-33 (версии dxvk и vkd3d обновлены) + ###Scripts version 2127### * обновлен "plugins_v6" (добавлены библиотеки для работы FAKE DLSS) * добавлена возможность включения поддержки USE_FAKE_DLSS в меню EDIT_DB (Работает на ЛЮБОЙ видеокарте с поддержкой Vulkan) ###Scripts version 2126### * обновлен "PROTON_GE" до версии 7-30 (версии dxvk и vkd3d используются из PROTON_STEAM_7.0-4) -* обновлен список платных подписчиков в разделе "Авторы и спасибы" которые поддерживают развитие проекта на https://boosty.to/portwine-linux.ru +* обновлен список платных подписчиков в разделе "Авторы и спасибы" которые поддерживают развитие проекта на https://boosty.to/linux-gaming.ru ###Scripts version 2125### * HOTFIX - start.sh @@ -464,7 +471,7 @@ ###Scripts version 2022### * добавлен фикc для работы EVE Online * добавлен в GUI вывод версий WINE используемых по умолчанию -* в функцию "GET OTHER WINE" добавлена вкладка с версиями WINE от PortWINE-Linux.ru (тест) +* в функцию "GET OTHER WINE" добавлена вкладка с версиями WINE от linux-gaming.ru (тест) * исправлено завершение тихого режима установки ###Scripts version 2021### @@ -909,7 +916,7 @@ PS: не забывает для активации добавить перем * в AUTOINSTALL добавлены установки "Origin" и "Battle.net Launcher" * увеличено время ожидания ответа при проверки связи с интернетом (ping -w5 -c1 github.com) * увеличено количество попыток скачивания для неустойчивого интернет соединения (wget -c -t 10 -T 1) -* в GUI PortProton добавлена кнопка F.A.Q. для открытия справочной страницы portwine-linux.ru +* в GUI PortProton добавлена кнопка F.A.Q. для открытия справочной страницы linux-gaming.ru ###Scripts version 1046### * обновлена верси VKD3D используемая по умолчанию до версии 2.3.1 (скрипт var, переменная export PW_DEF_VKD3D_VER=2.3.1) @@ -992,7 +999,7 @@ PS: не забывает для активации добавить перем * убран xterm из debug (иначе ломает шрифты) * добавлена кнопка редактирования найденного db файла * ТЕСТ: автоудаление PINNED_LIBS и отключение setup.sh --force -* изменение сравнения версий скриптов и портов "$(curl -s --list-only "portwine-linux.ru/ftp/current_version/blabla_ver")" +* изменение сравнения версий скриптов и портов "$(curl -s --list-only "linux-gaming.ru/ftp/current_version/blabla_ver")" * автоматическая установка в префикс порта PW_DLL_INSTALL="vcrun2017 mfc42" * исправлено создание db файла при создании ярлыков, в именах которых присутствует одниковвые названия запускаемого файла * исправили создания префикса на некоторых системах при использования встроенного xterm из ~/PortWINE/libs @@ -1004,7 +1011,7 @@ PS: не забывает для активации добавить перем * добавлен прогресс загрузки библиотек с интернета * добавлен в debug полный путь до запускаемой игры/программы вместе с именем файла * исправлено дублирование db файлов при создании ярлыков -* перенос libs с сервера PortWINE-Linux.ru на github.com/Castro-Fidel/PortWINE/releases/ +* перенос libs с сервера linux-gaming.ru на github.com/Castro-Fidel/PortWINE/releases/ * скачивание mono оф. github mono * скачивание gecko оф. ftp winehq * в /data/scripts/vars/PortProton_vars добавлена переменная PW_MANGOHUD=1 что включает HUD для монитроринга FPS, нагрузку на CPU, GPU и т.п (при условии что в системе предустановлен пакет mangohud) diff --git a/data_from_portwine/dxvk.conf b/data_from_portwine/dxvk.conf index 85d1661..04962fc 100755 --- a/data_from_portwine/dxvk.conf +++ b/data_from_portwine/dxvk.conf @@ -24,19 +24,18 @@ # # Supported values: Any four-digit hex number. -# dxgi.customDeviceId = 0000 -# dxgi.customVendorId = 0000 - -# d3d9.customDeviceId = 0000 -# d3d9.customVendorId = 0000 +dxgi.customDeviceId = 222F +dxgi.customVendorId = 10de +# d3d9.customDeviceId = 222F +# d3d9.customVendorId = 10de # Report Nvidia GPUs as AMD GPUs by default. This is enabled by default # to work around issues with NVAPI, but may cause issues in some games. # # Supported values: True, False -# dxgi.nvapiHack = False +dxgi.nvapiHack = False # Override maximum amount of device memory and shared system memory # reported to the application. This may fix texture streaming issues @@ -311,13 +310,13 @@ # Force enable/disable floating point quirk emulation -# +# # Force toggle anything * 0 emulation # Tristate # Supported values: # - True/False -# d3d9.floatEmulation = +# d3d9.floatEmulation = # Enable dialog box mode @@ -331,7 +330,7 @@ # d3d9.enableDialogMode = False # Overrides the application's MSAA level on the swapchain -# +# # Supported values: -1 (application) and 0 to 16 (user override) # d3d9.forceSwapchainMSAA = -1 diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index a1409a7..5f6f7c5 100644 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: chal55rus, Castro-Fidel (PortWINE-Linux.ru) +# Author: chal55rus, Castro-Fidel (linux-gaming.ru) ######################################################################## if [ "${update_loc}" = "RUS" ] then @@ -10,9 +10,9 @@ then --text-align=center --scroll --text="PortProton v. ${install_ver} scripts v. ${scripts_install_ver} -https://portwine-linux.ru +https://linux-gaming.ru -Авторские права © 2022 Castro-Fidel (PortWINE-Linux.ru) +Авторские права © 2022 Castro-Fidel (linux-gaming.ru) Эта программа поставляется без каких-либо гарантий. Подробнее см. в Лицензия." & @@ -40,7 +40,7 @@ zorn "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) - Авторские права (©) 2022 Castro-Fidel (PortWINE-Linux.ru) + Авторские права (©) 2022 Castro-Fidel (linux-gaming.ru) Настоящим предоставляется бесплатное разрешение любому лицу, получившему копию данного программного обеспечения и связанных с ним файлов документации (Программное @@ -64,7 +64,7 @@ zorn "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \ <<< ' Проект поддержали: - https://boosty.to/portwine-linux.ru + https://boosty.to/linux-gaming.ru 1 1 A B @@ -264,12 +264,12 @@ zorn "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ --text-info --scroll <<< \ -"Website: http://portwine-linux.ru +"Website: https://linux-gaming.ru/ Discord: http://discord.gg/yJSEFjF -VK: https://vk.com/portwinelinux +VK: https://vk.com/linuxgamingru ------------------------------------------- Стать платным подписчиком: -boosty: https://boosty.to/portwine-linux.ru +boosty: https://boosty.to/linux-gaming.ru patreon: https://www.patreon.com/portproton Кошельки WebMoney: WMZ-Z135951244401 WME-E325631629973 Yandex кошелек: 410012267513818 @@ -306,9 +306,9 @@ else scripts v. ${scripts_install_ver} -https://portwine-linux.ru +https://linux-gaming.ru -Copyright © 2022 Castro-Fidel (PortWINE-Linux.ru) +Copyright © 2022 Castro-Fidel (linux-gaming.ru) This program comes with absolutely no warranty. See the License for details." & @@ -336,7 +336,7 @@ zorn "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License -Copyright (©) 2022 Castro-Fidel (PortWINE-Linux.ru) +Copyright (©) 2022 Castro-Fidel (linux-gaming.ru) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -359,7 +359,7 @@ SOFTWARE." & "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \ <<< ' The project was supported: - https://boosty.to/portwine-linux.ru: + https://boosty.to/linux-gaming.ru: 1 1 A B @@ -557,12 +557,12 @@ SOFTWARE." & "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Do you want to join and help in the development of the project:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ --text-info --scroll <<< \ -"Website: http://portwine-linux.ru +"Website: http://linux-gaming.ru Discord: http://discord.gg/yJSEFjF VK: https://vk.com/portwinelinux ------------------------------------------- Become a paid subscriber: -boosty: https://boosty.to/portwine-linux.ru +boosty: https://boosty.to/linux-gaming.ru patreon: https://www.patreon.com/portproton WebMoney wallets: WMZ-Z135951244401 WME-E325631629973 Yandex wallet: 410012267513818 diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index a83f116..d2bbec3 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## pw_ping_test () { ping -w3 -c1 github.com &> /dev/null @@ -16,7 +16,6 @@ print_info () { } export -f print_info - print_var () { for vp in $@ ; do echo "${vp}=${!vp}" ; done } @@ -326,6 +325,14 @@ init_wine_ver () { echo "${WINEDIR}/share/wine/${mono_gecko_chk} is broken symlink. Repair... OK." fi done + grep 'Global,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' "${WINEDIR}/share/wine/wine.inf" + if [[ "$?" != "0" ]] ; then + echo 'HKLM,Software\NVIDIA Corporation\Global,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' >> "${WINEDIR}/share/wine/wine.inf" + fi + grep 'nvlddmkm,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' "${WINEDIR}/share/wine/wine.inf" + if [[ "$?" != "0" ]] ; then + echo 'HKLM,System\ControlSet001\Services\nvlddmkm,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' >> "${WINEDIR}/share/wine/wine.inf" + fi fi return 0 } diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index ee109f9..7adab1c 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: PortWINE-Linux.ru +# Author: linux-gaming.ru read "update_loc" < "${PORT_WINE_TMP_PATH}/${portname}_loc" export update_loc=${update_loc} @@ -34,7 +34,7 @@ then export inst_succ="Установка завершена успешно!" export port_upd1="Обновление PortWINE" - export port_upd2="На сайте portwine-linux.ru вышло обновление для ${portname}\n" + export port_upd2="На сайте linux-gaming.ru вышло обновление для ${portname}\n" export port_upd3="Действие:" export port_upd4="Перейти на сайт" export port_upd5="Напомнить позже" @@ -163,7 +163,7 @@ then export inst_succ="The installation was successful." export port_upd1="New update PortWINE" - export port_upd2="On portwine-linux.ru site published an update to the ${portname}\n" + export port_upd2="On linux-gaming.ru site published an update to the ${portname}\n" export port_upd3="Action:" export port_upd4="Go to the website" export port_upd5="Remind me later" diff --git a/data_from_portwine/scripts/portwine_db/DOOM Eternal b/data_from_portwine/scripts/portwine_db/DOOM Eternal index 8b1672a..5d80ad5 100755 --- a/data_from_portwine/scripts/portwine_db/DOOM Eternal +++ b/data_from_portwine/scripts/portwine_db/DOOM Eternal @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #DOOMEternalx64vk.exe #Rating=? ################################################ diff --git a/data_from_portwine/scripts/portwine_db/Far Cry 1 b/data_from_portwine/scripts/portwine_db/Far Cry 1 index 6d73acd..bb8ae2a 100755 --- a/data_from_portwine/scripts/portwine_db/Far Cry 1 +++ b/data_from_portwine/scripts/portwine_db/Far Cry 1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #FarCry.exe #Rating=5 ################################# diff --git a/data_from_portwine/scripts/portwine_db/Hades b/data_from_portwine/scripts/portwine_db/Hades index 35f2b6d..6a3e6a0 100755 --- a/data_from_portwine/scripts/portwine_db/Hades +++ b/data_from_portwine/scripts/portwine_db/Hades @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #Hades.exe #Rating=1-5 #export PW_COMMENT_DB="blablabla" diff --git a/data_from_portwine/scripts/portwine_db/Mafia DE b/data_from_portwine/scripts/portwine_db/Mafia DE index 15cca2a..fbf7672 100755 --- a/data_from_portwine/scripts/portwine_db/Mafia DE +++ b/data_from_portwine/scripts/portwine_db/Mafia DE @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #mafiadefinitiveedition.exe #Rating=4 ################################################ diff --git a/data_from_portwine/scripts/portwine_db/Sirus Launcher b/data_from_portwine/scripts/portwine_db/Sirus Launcher index c363712..76c532f 100755 --- a/data_from_portwine/scripts/portwine_db/Sirus Launcher +++ b/data_from_portwine/scripts/portwine_db/Sirus Launcher @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #Sirus Launcher.exe #Rating=4 #####################examples########################### diff --git a/data_from_portwine/scripts/portwine_db/Terminator Resistance b/data_from_portwine/scripts/portwine_db/Terminator Resistance index f90db16..2e01053 100755 --- a/data_from_portwine/scripts/portwine_db/Terminator Resistance +++ b/data_from_portwine/scripts/portwine_db/Terminator Resistance @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #Rating=5 #Terminator.exe ################################################ diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default index 3b6bf9b..9c6a6c4 100755 --- a/data_from_portwine/scripts/portwine_db/default +++ b/data_from_portwine/scripts/portwine_db/default @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #name_exe_file.exe #Rating=1-5 #####################examples########################### diff --git a/data_from_portwine/scripts/portwine_db/eve b/data_from_portwine/scripts/portwine_db/eve index bae854a..48894c5 100755 --- a/data_from_portwine/scripts/portwine_db/eve +++ b/data_from_portwine/scripts/portwine_db/eve @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #eve.exe #evelauncher.exe #Rating=5 diff --git a/data_from_portwine/scripts/portwine_db/setup b/data_from_portwine/scripts/portwine_db/setup index a60eeca..0823ff8 100755 --- a/data_from_portwine/scripts/portwine_db/setup +++ b/data_from_portwine/scripts/portwine_db/setup @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#Author: PortWINE-Linux.ru +#Author: linux-gaming.ru #setup.exe #Setup.exe #SETUP.exe diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET index 6f9b362..6ba9dc2 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## [ "${update_loc}" = "RUS" ] && export BN_LOC=ruRU || export BN_LOC=enUS export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU index 8093da8..890e134 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: PortWINE-Linux.ru +# Author: linux-gaming.ru ######################################################################## export PW_URL_CEMU=($(curl -s "https://cemu.info" | grep "zip" | cut -d \" -f 2)) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/`echo ${PW_URL_CEMU} | awk -F/ '{print $5}'`" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index 4867e5b..fa8dcc8 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## export LAUNCH_PARAMETERS=("/q" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EpicGamesLauncherInstaller.msi" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE index c3e8621..e09ee58 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: chal55rus (Sergey P.), cefeiko, Castro-Fidel (PortWINE-Linux.ru) +# Author: chal55rus (Sergey P.), cefeiko, Castro-Fidel (linux-gaming.ru) ########################################################################## pw_shutdown_please () { if [ "$PW_USE_RUNTIME" != 1 ] diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG index cb9eae4..94aede3 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## export LAUNCH_PARAMETERS=("/VERYSILENT") export GOG_VER=2.0.48.63 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index 6ffe98d..b4cc759 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## export PW_PREFIX_NAME="LEAGUE_OF_LEGENDS" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/live.na.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN index eb8a966..b616d19 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## export LAUNCH_PARAMETERS=("/silent" "/NoLaunch" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/OriginSetup.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM index dafe206..6cddc67 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Steam") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SteamSetup.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_UBC b/data_from_portwine/scripts/pw_autoinstall/PW_UBC index 2047cbc..4160dc1 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_UBC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_UBC @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Ubisoft Game Launcher") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 0252909..2a82ce7 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) # Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord ######################################################################## echo ' @@ -17,7 +17,7 @@ if [[ $(id -u) = 0 ]] ; then fi if [[ "${s_install}" != "1" && ! -x "`which "zenity" 2>/dev/null`" ]] ; then echo "You will need to install: zenity, and restart the port." - xdg-open "portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 + xdg-open "linux-gaming.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 fi . "$(dirname $(readlink -f "$0"))/functions_helper" @@ -73,7 +73,7 @@ start_portwine () { export DXVK_LOG_LEVEL="warn" export VKD3D_DEBUG="warn" export WINE_MONO_TRACE="E:System.NotImplementedException" - export VK_LOADER_DEBUG=all + export VK_LOADER_DEBUG="warn" else export WINEDEBUG="-all" export DXVK_LOG_LEVEL="none" @@ -114,26 +114,22 @@ start_portwine () { export RADV_DEBUG="llvm" var_vkd3d_config_update single_queue fi + + if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/winmm.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" + then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/winmm.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" + fi if [[ ! -z "${PW_USE_FAKE_DLSS}" && "${PW_USE_FAKE_DLSS}" == 1 && -d "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/" ]] then try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.ini" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/winmm.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - grep 'Global,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' "${WINEDIR}/share/wine/wine.inf" - if [[ "$?" != "0" ]] ; then - echo 'HKLM,Software\NVIDIA Corporation\Global,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' >> "${WINEDIR}/share/wine/wine.inf" - fi - grep 'nvlddmkm,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' "${WINEDIR}/share/wine/wine.inf" - if [[ "$?" != "0" ]] ; then - echo 'HKLM,System\ControlSet001\Services\nvlddmkm,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' >> "${WINEDIR}/share/wine/wine.inf" - fi + sed -i /'dxgi.customDeviceId =/c dxgi.customDeviceId = 222F' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.customVendorId =/c dxgi.customVendorId = 10de' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.nvapiHack =/c dxgi.nvapiHack = False' "${DXVK_CONFIG_FILE}" + export DXVK_NVAPIHACK=0 elif [[ ! -z "${PW_USE_NVAPI_AND_DLSS}" && "${PW_USE_NVAPI_AND_DLSS}" == 1 && -d "${WINEDIR}/lib/wine/nvapi/" ]] then try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x32/nvapi.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x64/nvapi64.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/winmm.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/winmm.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - fi try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvngx.ini" var_winedlloverride_update "nvapi,nvapi64,nvml=n;nvcuda=b" if [[ ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvngx.dll" || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/_nvngx.dll" ]] ; then @@ -144,8 +140,14 @@ start_portwine () { try_force_link_file "${PW_PLUGINS_PATH}"/nvml/lib/wine/nvml.dll.so "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/nvml.dll" try_force_link_file "${PW_PLUGINS_PATH}"/nvml/lib64/wine/nvml.dll.so "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvml.dll" export DXVK_NVAPIHACK=0 + sed -i /'dxgi.customDeviceId =/c # dxgi.customDeviceId = 222F' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.customVendorId =/c # dxgi.customVendorId = 10de' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.nvapiHack =/c # dxgi.nvapiHack = False' "${DXVK_CONFIG_FILE}" else var_winedlloverride_update "nvapi,nvapi64,nvml,nvngx,nvcuda=" + sed -i /'dxgi.customDeviceId =/c # dxgi.customDeviceId = 222F' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.customVendorId =/c # dxgi.customVendorId = 10de' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.nvapiHack =/c # dxgi.nvapiHack = False' "${DXVK_CONFIG_FILE}" fi if [[ ! -z "${PW_WINEDBG_DISABLE}" && "${PW_WINEDBG_DISABLE}" != 0 ]] ; then var_winedlloverride_update "winedbg.exe=" @@ -212,7 +214,6 @@ start_portwine () { export __GL_SYNC_TO_VBLANK=1 ;; esac create_new_dir "${PORT_WINE_TMP_PATH}"/gl_shader_cache - export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" export int_xneur=0 if [[ ! -z "`pgrep xneur`" ]]; then killall xneur @@ -550,6 +551,7 @@ start_portwine () { echo "Disable EAC" [[ -z "${LAUNCH_PARAMETERS}" ]] && export LAUNCH_PARAMETERS+="-eac-nop-loaded " fi + sleep 1 pw_stop_progress_bar && pw_tray_icon && if [[ "${PW_CHECK_AUTOINSTAL}" != "1" ]] ; then @@ -667,7 +669,7 @@ fi . "${PORT_SCRIPTS_PATH}"/lang . "${PORT_SCRIPTS_PATH}"/zen_yad_gui -export urlg="https://portwine-linux.ru/portwine-faq/" +export urlg="https://linux-gaming.ru/portwine-faq/" export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" try_remove_dir "${PW_WINELIB}/var" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh index 3f259e7..73617de 100755 --- a/data_from_portwine/scripts/setup.sh +++ b/data_from_portwine/scripts/setup.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: PortWINE-Linux.ru +# Author: linux-gaming.ru . "$(dirname $(readlink -f "$0"))/runlib" name_desktop="PortProton" @@ -61,6 +61,6 @@ if [ "${PW_SILENT_INSTALL}" = "1" ] ; then fi else `zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1 - xdg-open "portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 + xdg-open "linux-gaming.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 fi unset INSTALLING_PORT \ No newline at end of file diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 61bbf3f..dcc2c06 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: PortWINE-Linux.ru +# Author: linux-gaming.ru export NO_AT_BRIDGE=1 export pw_full_command_line=("$0" $*) if [ -f "$1" ]; then diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 86e0a1f..7c128c4 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash -#Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2127 +#Author: Castro-Fidel (linux-gaming.ru) +#SCRIPTS_NEXT_VERSION=2128 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -22,7 +22,7 @@ export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" export PW_LIBS_VER="_v32" -export PORTWINE_URL="https://portwine-linux.ru/" +export PORTWINE_URL="https://linux-gaming.ru/" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" @@ -33,13 +33,13 @@ export STAGING_SHARED_MEMORY="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1" ###DEFAULT_WINE### export PW_WINE_USE="PROTON_GE" -export PW_PLUGINS_VER="_v6" -export PW_FAKE_DLSS_VER="133-1-0-0-3-1661059799" +export PW_PLUGINS_VER="_v7" +export PW_FAKE_DLSS_VER="2.1-3001-0-7-5-1662667880" ###WINE_PROTON_STEAM### export PW_STEAM_VER="7.0-4" export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" ###WINE_PROTON_GE### -export PW_GE_VER="7-30" +export PW_GE_VER="7-33" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_WINE_FULLSCREEN_FSR="0" ###WINE_PROTON_PW_FOR_GALLIUM_NINE### @@ -51,6 +51,8 @@ export PW_WINE_KRON4EK_VER="WINE-7.13-STAGING-TKG-AMD64" export DOTPFX_VER="48v1" export DEFPFX_VER="v1" ################################################################# +export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" +################################################################# pw_install_dll_in_prefix () { case $PW_PREFIX_NAME in diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index ad7d9e1..2cfbe6a 100644 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) ######################################################################## zenity_info () { echo "INFO: $@" diff --git a/portwine_install_script/PortProton_1.0 b/portwine_install_script/PortProton_1.0 index 226eb43..a12242c 100644 --- a/portwine_install_script/PortProton_1.0 +++ b/portwine_install_script/PortProton_1.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Author: Castro-Fidel (PortWINE-Linux.ru) +# Author: Castro-Fidel (linux-gaming.ru) # License MIT ######################################################################## unset PW_AUTOPLAY PW_SET_LANG PW_SILENT_INSTALL