From f27157af04cf2a1dc153fb2e300265f661ca6c9a Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Tue, 17 Sep 2024 23:10:47 +0300
Subject: [PATCH 1/3] Scripts version 2348

---
 data_from_portwine/changelog_en | 5 +++++
 data_from_portwine/changelog_ru | 5 +++++
 data_from_portwine/scripts/var  | 6 +++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en
index 67ac2ea3..3bb63270 100755
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2348### / Date: 17.09.2024 / Download update size: 4 megabytes
+* updated versions:
+    * DXVK_GIT "2.3.1-120"
+    * VKD3D_GIT "1.1-4110"
+
 ###Scripts version 2347### / Date: 16.09.2024 / Download update size: 4 megabytes
 * added PW_NO_AUTO_CREATE_SHORTCUT variable to exclude automatic shortcut creation
 * added the ability to reset global user.conf settings (thanks to Htylol)
diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index 0f23fd62..09f8f392 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,6 +2,11 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2348### / Дата: 17.09.2024 / Размер скачиваемого обновления: 4 мегабайт
+* обновлены версии:
+    * DXVK_GIT "2.3.1-120"
+    * VKD3D_GIT "1.1-4110"
+
 ###Scripts version 2347### / Дата: 16.09.2024 / Размер скачиваемого обновления: 4 мегабайт
 * добавлена переменная PW_NO_AUTO_CREATE_SHORTCUT для исключения автоматического создания ярлыка
 * добавлена возможность сброса глобальных настроек user.conf (спасибо Htylol)
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index d0a30b01..75442879 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=2347
+#SCRIPTS_NEXT_VERSION=2348
 #SCRIPTS_STABLE_VERSION=2342
 ########################################################################
 # export PROTON_USE_XALIA="1"
@@ -55,9 +55,9 @@ export PW_VULKAN_USE="2"
 export VKD3D_LIMIT_TESS_FACTORS="64"
 export DXVK_LEGACY_VER="1.6.1"
 export DXVK_STABLE_VER="1.10.3-28"
-export DXVK_GIT_VER="2.4-37"
+export DXVK_GIT_VER="2.4-41"
 export VKD3D_STABLE_VER="1.1-2602"
-export VKD3D_GIT_VER="1.1-4167"
+export VKD3D_GIT_VER="1.1-4177"
 ###VKBASALT###
 export PW_VKBASALT_EFFECTS="Curves:cas"
 export PW_VKBASALT_FFX_CAS="0.66"

From f2ce80f6d511c1bdaeb637f070d6241ac3d49137 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Wed, 18 Sep 2024 14:46:16 +0300
Subject: [PATCH 2/3] Scripts version 2349

---
 data_from_portwine/changelog_en             | 3 +++
 data_from_portwine/changelog_ru             | 3 +++
 data_from_portwine/scripts/functions_helper | 6 +++---
 data_from_portwine/scripts/var              | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en
index 3bb63270..4f000a6d 100755
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2349### / Date: 18.09.2024 / Download update size: 4 megabytes
+* fixed video driver path forwarding for future versions of ALT Linux (p11)
+
 ###Scripts version 2348### / Date: 17.09.2024 / Download update size: 4 megabytes
 * updated versions:
     * DXVK_GIT "2.3.1-120"
diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index 09f8f392..7694d341 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,6 +2,9 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2349### / Дата: 18.09.2024 / Размер скачиваемого обновления: 4 мегабайт
+* исправлено обпередление путей видеодрайвера для будущих версий ALT Linux (p11)
+
 ###Scripts version 2348### / Дата: 17.09.2024 / Размер скачиваемого обновления: 4 мегабайт
 * обновлены версии:
     * DXVK_GIT "2.3.1-120"
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 60b3d8c2..7af526a3 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -840,14 +840,14 @@ pw_init_runtime () {
         return 0
     fi
 
-    if grep -i -E '(ROSA|RED OS)' "/etc/os-release" &>/dev/null ; then
-        export LOCPATH="/run/host/usr/share/locale/"
-    elif grep -i "altlinux" "/etc/os-release" &>/dev/null ; then
+    if grep -i "altlinux" "/etc/os-release" &>/dev/null ; then
         export LIBGL_DRIVERS_PATH="/usr/lib/X11/modules/dri:/usr/lib64/X11/modules/dri"
         if [[ -f "/usr/share/vulkan/icd.d/nvidia_icd.json" ]] ; then
             VK_ADD_DRIVER_FILES="$(realpath /usr/share/vulkan/icd.d/nvidia_icd.json)"
             export VK_ADD_DRIVER_FILES
         fi
+    elif grep -i -E '(ROSA|RED OS)' "/etc/os-release" &>/dev/null ; then
+        export LOCPATH="/run/host/usr/share/locale/"
     fi
 
     PW_PV_OVERRIDES="/usr/lib/pressure-vessel/overrides/lib"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 75442879..719bfff2 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=2348
+#SCRIPTS_NEXT_VERSION=2349
 #SCRIPTS_STABLE_VERSION=2342
 ########################################################################
 # export PROTON_USE_XALIA="1"

From 055d1dd8b28da2c539cdae632996f26f8a196552 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Wed, 18 Sep 2024 14:48:17 +0300
Subject: [PATCH 3/3] fix typos for changeloge

---
 data_from_portwine/changelog_ru | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index 7694d341..cd496587 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -3,7 +3,7 @@
 История изменений:
 
 ###Scripts version 2349### / Дата: 18.09.2024 / Размер скачиваемого обновления: 4 мегабайт
-* исправлено обпередление путей видеодрайвера для будущих версий ALT Linux (p11)
+* исправлено определение путей видеодрайвера для будущих версий ALT Linux (p11)
 
 ###Scripts version 2348### / Дата: 17.09.2024 / Размер скачиваемого обновления: 4 мегабайт
 * обновлены версии: