Scripts version 2285

data_from_portwine/changelog_en

@@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2285### Date: 25.04.2024 / Download update size: 3 megabytes
+* added the inclusion of "DGVOODOO2" in the "3D API" (thanks Htylol)
+* improved archive unpacking function (thanks to Boria138)
+
 ###Scripts version 2284### Date: 23.04.2024 / Download update size: 240 megabytes
 * added new functionality to the PortProton menu -> PORTPROTON SETTINGS -> Change Mirror (to switch downloads from CDN to GITHUB and back)
 * updated WINE_LG to version 9-7

data_from_portwine/changelog_ru

@@ -2,6 +2,11 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2285### Дата: 25.04.2024 / Размер скачиваемого обновления: 3 мегабайта
+* добавлено включение "DGVOODOO2" в "3D API" что дает возможность трансляции старых игр в Vulkan c использованием улучшения графики с помощью vkBasalt (спасибо Htylol)
+* улучшена функция распаковки архивов (спасибо Boria138)
+* оптимизированы и улучшены анимации (спасибо Dervart)
+
 ###Scripts version 2284### Дата: 23.04.2024 / Размер скачиваемого обновления: 240 мегабайт
 * добавлен новый функционал в меню PortProton -> НАСТРОЙКИ PORTPROTON -> Сменить зеркало (для переключения скачивания с CDN на GITHUB и обратно)
 * обновлен WINE_LG до версии 9-7

data_from_portwine/scripts/functions_helper

@@ -344,21 +344,14 @@ export -f check_flatpak
 
 unpack () {
     case $1 in
-        *.tar.xz)
+         *.tar.xz) local command="tar -Jxhf";;
-            command="tar -Jxhf";;
+         *.tar.gz) local command="tar -xhzf" ;;
-        *.tar.gz)
+        *.tar.zst) local command="tar -I zstd -xhf" ;;
-            command="tar -xhzf" ;;
+            *.tar) local command="tar -xhf" ;;
-        *.tar.zst)
-            if command -v zstd &>/dev/null
-            then command="tar -I zstd -xhf"
-            else command="env LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib tar -I ${PW_PLUGINS_PATH}/portable/bin/zstd -xhf"
-            fi ;;
-        *.tar)
-            command="tar -xhf" ;;
     esac
 
     case $3 in
-        silent) silent=true ;;
+        silent) local silent=true ;;
     esac
 
     if [[ "$silent" != "true" ]] ; then
@@ -1001,16 +994,16 @@ pw_check_and_download_dxvk_and_vkd3d () {
     fi
 
     #Download DGVOODOO2
-    if [ ! -d "${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}" ] ; then
+    if [ ! -d "${PW_VULKAN_DIR}/dgvoodoo2-v${DGV2_VER}" ] ; then
         print_info "Download and install DGVOODOO2 v.${DGV2_VER}"
-        if try_download "https://github.com/lutris/dgvoodoo2/releases/download/${DGV2_VER}/dgvoodoo2-${DGV2_VER}.tar.xz" "${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}.tar.xz" \
+        if try_download "https://github.com/lutris/dgvoodoo2/releases/download/v${DGV2_VER}/dgvoodoo2-v${DGV2_VER}.tar.xz" \
-        "${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}.tar.xz"
+        "${PW_VULKAN_DIR}/dgvoodoo2-v${DGV2_VER}.tar.xz"
         then
-            if unpack_tar_xz "${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}.tar.xz" "${PW_VULKAN_DIR}" ; then
+            if unpack "${PW_VULKAN_DIR}/dgvoodoo2-v${DGV2_VER}.tar.xz" "${PW_VULKAN_DIR}" ; then
-                try_remove_file "${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}.tar.xz"
+                try_remove_file "${PW_VULKAN_DIR}/dgvoodoo2-v${DGV2_VER}.tar.xz"
             else
-                try_remove_file "${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}.tar.xz"
+                try_remove_file "${PW_VULKAN_DIR}/dgvoodoo2-v${DGV2_VER}.tar.xz"
-                try_remove_dir "${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}"
+                try_remove_dir "${PW_VULKAN_DIR}/dgvoodoo2-v${DGV2_VER}"
 
                 yad_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1
             fi
@@ -1989,7 +1982,6 @@ start_portwine () {
         export WINE_D3D_CONFIG='renderer=vulkan'
     else
         print_info "Use VKD3D-PROTON, DXVK and D8VK (DirectX 8-12 to vulkan)"
-        check_variables DXVK_HDR 0
         if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then
             export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config" # openvr_api_dxvk
             export CP_WINE_FILES="d3d10_1 d3d10 dxgi"
@@ -1999,7 +1991,12 @@ start_portwine () {
             export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config" # openvr_api_dxvk
             export CP_WINE_FILES="d3d10_1 d3d10"
         fi
+
         check_variables VKD3D_FEATURE_LEVEL "12_1"
+        check_variables DXVK_HDR
+
+        print_info "D8VK v.${D8VK_VER} in use"
+
         if [[ "${PW_VULKAN_USE}" == "1" ]] ; then
             export PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}"
             export PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}"
@@ -2015,11 +2012,11 @@ start_portwine () {
             export PATH_TO_DGV2_FILES="${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}"
             print_info "DXVK v.${DXVK_STABLE_VER} in use"
             print_info "DGVOODOO2 ${DGV2_VER} in use"
-            try_copy_file "$PATH_TO_DGV2_FILES/x32/d3dimm.dll" "${PATH_TO_GAME}"
+            for DGV2_DLL in d3dimm ddraw glide glide2x glide3x ; do
-            try_copy_file "$PATH_TO_DGV2_FILES/x32/ddraw.dll" "${PATH_TO_GAME}"
+                try_copy_file "$PATH_TO_DGV2_FILES/x32/${DGV2_DLL}.dll" "${PATH_TO_GAME}"
-            try_copy_file "$PATH_TO_DGV2_FILES/x32/glide.dll" "${PATH_TO_GAME}"
+            done
-            try_copy_file "$PATH_TO_DGV2_FILES/x32/glide2x.dll" "${PATH_TO_GAME}"
+
-            try_copy_file "$PATH_TO_DGV2_FILES/x32/glide3x.dll" "${PATH_TO_GAME}"
+            if [[ ! -f "${PATH_TO_GAME}/dgVoodoo.conf" ]] ; then
             echo "[General]
 OutputAPI                            = d3d11_fl11_0
 [Glide]
@@ -2027,13 +2024,12 @@ OutputAPI                            = d3d11_fl11_0
 3DfxSplashScreen                    = false
 [DirectX]
 dgVoodooWatermark                   = false" > "${PATH_TO_GAME}/dgVoodoo.conf"
+            fi
             var_winedlloverride_update ddraw=n
         fi
-        PATH_TO_D8VK_FILES="${PW_VULKAN_DIR}/d8vk-${D8VK_VER}"
-        print_info "D8VK v.${D8VK_VER} in use"
 
         print_info "Try copy WINE files..."
-        for copy_wine_dll in $CP_WINE_FILES "vulkan-1" ; do
+        for copy_wine_dll in $CP_WINE_FILES vulkan-1 ; do
             try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${copy_wine_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${copy_wine_dll}.dll"
             try_copy_file "${WINEDIR}/lib/wine/i386-windows/${copy_wine_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${copy_wine_dll}.dll"
         done
@@ -2062,6 +2058,7 @@ dgVoodooWatermark                   = false" > "${PATH_TO_GAME}/dgVoodoo.conf"
             fi
         done
 
+        PATH_TO_D8VK_FILES="${PW_VULKAN_DIR}/d8vk-${D8VK_VER}"
         print_info "Try link native D8VK file..."
         try_force_link_file "${PATH_TO_D8VK_FILES}/x32/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
         try_force_link_file "${PATH_TO_D8VK_FILES}/x64/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/"

data_from_portwine/scripts/setup.sh

@@ -7,7 +7,7 @@ source "$(dirname "$(readlink -f "$0")")/start.sh"
 
 if check_flatpak
 then PW_EXEC="flatpak run ru.linux_gaming.PortProton"
-else PW_EXEC="env ${PORT_SCRIPTS_PATH}/start.sh %F"
+else PW_EXEC="env \"${PORT_SCRIPTS_PATH}/start.sh\" %F"
 fi
 
 cat << EOF > "${PORT_WINE_PATH}/PortProton.desktop"
@@ -28,7 +28,7 @@ chmod u+x "${PORT_WINE_PATH}/PortProton.desktop"
 if [[ ! -f /usr/bin/portproton ]] \
 && ! check_flatpak
 then
-	cp -f "${PORT_WINE_PATH}/PortProton.desktop" ${HOME}/.local/share/applications/
+	cp -f "${PORT_WINE_PATH}/PortProton.desktop" "${HOME}/.local/share/applications/"
 fi
 
 if grep "SteamOS" "/etc/os-release" &>/dev/null \

data_from_portwine/scripts/var

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2284
+#SCRIPTS_NEXT_VERSION=2285
 ########################################################################
 export LANGUAGES_LIST="ru"
 export PW_MANGOHUD="0"
@@ -50,7 +50,7 @@ export PW_WINE_FULLSCREEN_FSR="1"
 ###DXVK_AND_VKD3D###
 export VKD3D_LIMIT_TESS_FACTORS="64"
 export D8VK_VER="1.7.1-2367"
-export DGV2_VER="v2.8.2"
+export DGV2_VER="2.8.2"
 export DXVK_STABLE_VER="1.10.3-28"
 export DXVK_GIT_VER="2.3.1-9"
 export VKD3D_STABLE_VER="1.1-2602"