From 2bf119af6a6bdaebc220798fb39c4de1bb377b0a Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Wed, 26 Feb 2025 22:43:52 +0300
Subject: [PATCH] dropped legacy gallium nine
---
data_from_portwine/locales/PortProton.pot | 3 -
.../locales/es/LC_MESSAGES/PortProton.po | 3 -
.../locales/ru/LC_MESSAGES/PortProton.po | 3 -
data_from_portwine/scripts/functions_helper | 60 +------------------
data_from_portwine/scripts/start.sh | 15 ++---
data_from_portwine/scripts/var | 1 -
6 files changed, 8 insertions(+), 77 deletions(-)
diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot
index 3277e86c..eaf194ef 100644
--- a/data_from_portwine/locales/PortProton.pot
+++ b/data_from_portwine/locales/PortProton.pot
@@ -79,9 +79,6 @@ msgstr ""
msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
msgstr ""
-msgid "Gallium Nine (DirectX 9 for MESA)"
-msgstr ""
-
msgid "Gallium Zink (OpenGL to Vulkan)"
msgstr ""
diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po
index a4e499cd..ff21c015 100644
--- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po
+++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po
@@ -90,9 +90,6 @@ msgstr "DXVK estable, VKD3D (Vulkan v1.2)"
msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
msgstr "Más nuevo DXVK, VKD3D, D8VK (Vulkan v1.3+)"
-msgid "Gallium Nine (DirectX 9 for MESA)"
-msgstr "Gallium Nine (DirectX 9 para MESA)"
-
msgid "Gallium Zink (OpenGL to Vulkan)"
msgstr "Gallium Zink (OpenGL a Vulkan)"
diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
index aed6b4bc..25b57a75 100644
--- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
+++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
@@ -98,9 +98,6 @@ msgstr "Стабильные DXVK, VKD3D (Vulkan v1.2)"
msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
msgstr "Новейшие DXVK, VKD3D, D8VK (Vulkan v1.3+)"
-msgid "Gallium Nine (DirectX 9 for MESA)"
-msgstr "Gallium Nine (поддержка DirectX 9 для MESA)"
-
msgid "Gallium Zink (OpenGL to Vulkan)"
msgstr "Gallium Zink (трансляция OpenGL в Vulkan)"
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 7b37a54e..1ca1f8ad 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -3617,8 +3617,7 @@ start_portwine () {
try_force_link_file "${PHYSX_PATH}/cudart64_65.dll" "${WINEPREFIX}/drive_c/windows/system32/cudart64_65.dll"
# 3D API
- unset CP_VKD3D_FILES CP_DXVK_FILES CP_DGV2_FILES CP_WINE_FILES
- unset CP_GALLIUM_NINE_FILES PATH_TO_DXVK_FILES PATH_TO_VKD3D_FILES
+ unset CP_VKD3D_FILES CP_DXVK_FILES CP_DGV2_FILES CP_WINE_FILES PATH_TO_DXVK_FILES PATH_TO_VKD3D_FILES
case "${PW_VULKAN_USE}" in
0)
# WINED3D OPENGL
@@ -3651,20 +3650,6 @@ start_portwine () {
CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1"
CP_WINE_FILES="d3d10_1 d3d10"
;;
- 3)
- # GALLIUM NINE
- print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)"
- PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}"
- CP_GALLIUM_NINE_FILES="d3d9"
- CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
- CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d8 dxgi"
- export __GL_YIELD="NOTHING"
- export mesa_glthread="true"
- export WINE_D3D_CONFIG="renderer=gl"
- export PW_VKBASALT="0"
- export PW_MANGOHUD="0"
- export PW_WINE_FULLSCREEN_FSR="0"
- ;;
4)
# GALLIUM ZINK
print_info "Use GALLIUM-ZINK (OpenGL on MESA vulkan drivers)"
@@ -3730,10 +3715,6 @@ start_portwine () {
2)
rm_from_var CP_DXVK_FILES "d3d9 d3d8"
;;
- 3)
- rm_from_var CP_GALLIUM_NINE_FILES "d3d9"
- rm_from_var CP_WINE_FILES "d3d8"
- ;;
4)
rm_from_var CP_WINE_FILES "d3d9 d3d8"
;;
@@ -3974,36 +3955,6 @@ start_portwine () {
export VKD3D_SHADER_CACHE_PATH="${PATH_TO_VKD3D_FILES}/vkd3d_cache"
fi
- if [[ "$CP_GALLIUM_NINE_FILES" == "d3d9" ]] ; then
- print_info "Try create symlink GALLIUM_NINE files..."
- PATH_TO_GALLIUM_NINE_FILES="${PW_PLUGINS_PATH}/gallium_nine_v.${PW_GALLIUM_NINE_VER}"
- try_force_link_file "${PATH_TO_GALLIUM_NINE_FILES}/lib32/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/syswow64/d3d9.dll"
- try_force_link_file "${PATH_TO_GALLIUM_NINE_FILES}/lib64/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/system32/d3d9.dll"
- unset FIND_D3D_MODULE D3D_MODULE_PATH
- if ! check_flatpak ; then
- FIND_D3D_MODULE=$(dirname $(find /usr/ -maxdepth 4 -type f -name "d3dadapter9.so.*") 2>/dev/null)
- if [[ -n "$FIND_D3D_MODULE" ]] ; then
- IFS=$'\n'
- for D3D_MP in $FIND_D3D_MODULE ; do
- if [[ -n "$D3D_MODULE_PATH" ]]
- then export D3D_MODULE_PATH="$D3D_MODULE_PATH:/run/host${D3D_MP}"
- else export D3D_MODULE_PATH="/run/host${D3D_MP}"
- fi
- done
- IFS="$orig_IFS"
- print_info "D3D_MODULE_PATH=${D3D_MODULE_PATH}"
- else
- pw_stop_progress_bar
- yad_error "${translations[d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing package: <b>d3dadapter9</b>]}"
- stop_portwine
- fi
- else
- export D3D_MODULE_PATH="/app/lib/i386-linux-gnu/GL/default/lib/d3d:/usr/lib/x86_64-linux-gnu/GL/default/lib/d3d"
- print_info "D3D_MODULE_PATH=${D3D_MODULE_PATH}"
- fi
- var_winedlloverride_update "d3d9=n"
- fi
-
if [[ ! -d "${WINEPREFIX}/drive_c/vrclient/bin" ]] ; then
create_new_dir "${WINEPREFIX}/drive_c/vrclient/bin"
try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/vrclient.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient.dll"
@@ -5150,13 +5101,6 @@ gui_edit_db () {
# Stable, Newest
VKD3D_CB="CB"
;;
- 3)
- # Gallium Nine
- VKD3D_CB="DCB"
- DISABLE_EDIT_DB_LIST="PW_MANGOHUD PW_MANGOHUD_USER_CONF PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_WINE_FULLSCREEN_FSR
- PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE
- "
- ;;
4|5|6)
# Galliun Zink, Legacy, WineD3D Vulkan
VKD3D_CB="DCB"
@@ -6596,7 +6540,7 @@ pw_prefix_manager () {
IFS=$'\n'
try_remove_file "${PW_TMPFS_PATH}/dll_list_tmp"
while read -r PW_BOOL_IN_DLL_LIST ; do
- if [[ ! ${PW_BOOL_IN_DLL_LIST} =~ (d3d|directx9|dont_use|dxvk|vkd3d|galliumnine|faudio1|Foundation) ]] ; then
+ if [[ ! ${PW_BOOL_IN_DLL_LIST} =~ (d3d|directx9|dont_use|dxvk|vkd3d|faudio1|Foundation) ]] ; then
if grep ^"$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{print $1}')"$ "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ; then
echo -e "true\n$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{print $1}')\n$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{ $1 = ""; print substr($0, 2) }')" >> "${PW_TMPFS_PATH}/dll_list_tmp"
else
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index e0107d15..e7682a89 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -484,17 +484,15 @@ SORT_VULKAN="${translations[WineD3D Vulkan (Damavand experimental)]}"
SORT_LEGACY="${translations[Legacy DXVK (Vulkan v1.1)]}"
SORT_STABLE="${translations[Stable DXVK, VKD3D (Vulkan v1.2)]}"
SORT_NEWEST="${translations[Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)]}"
-SORT_G_NINE="${translations[Gallium Nine (DirectX 9 for MESA)]}"
SORT_G_ZINK="${translations[Gallium Zink (OpenGL to Vulkan)]}"
case "$PW_VULKAN_USE" in
- 0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_G_NINE!$SORT_VULKAN" ;;
- 6) PW_DEFAULT_VULKAN_USE="$SORT_VULKAN!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_G_NINE!$SORT_OPENGL" ;;
- 1) PW_DEFAULT_VULKAN_USE="$SORT_STABLE!$SORT_NEWEST!$SORT_LEGACY!$SORT_G_ZINK!$SORT_G_NINE!$SORT_OPENGL!$SORT_VULKAN" ;;
- 5) PW_DEFAULT_VULKAN_USE="$SORT_LEGACY!$SORT_NEWEST!$SORT_STABLE!$SORT_G_ZINK!$SORT_G_NINE!$SORT_OPENGL!$SORT_VULKAN" ;;
- 4) PW_DEFAULT_VULKAN_USE="$SORT_G_ZINK!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_NINE!$SORT_OPENGL!$SORT_VULKAN" ;;
- 3) PW_DEFAULT_VULKAN_USE="$SORT_G_NINE!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_OPENGL!$SORT_VULKAN" ;;
- *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_G_NINE!$SORT_OPENGL!$SORT_VULKAN" ;;
+ 0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_VULKAN" ;;
+ 6) PW_DEFAULT_VULKAN_USE="$SORT_VULKAN!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_OPENGL" ;;
+ 1) PW_DEFAULT_VULKAN_USE="$SORT_STABLE!$SORT_NEWEST!$SORT_LEGACY!$SORT_G_ZINK!$SORT_OPENGL!$SORT_VULKAN" ;;
+ 5) PW_DEFAULT_VULKAN_USE="$SORT_LEGACY!$SORT_NEWEST!$SORT_STABLE!$SORT_G_ZINK!$SORT_OPENGL!$SORT_VULKAN" ;;
+ 4) PW_DEFAULT_VULKAN_USE="$SORT_G_ZINK!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_OPENGL!$SORT_VULKAN" ;;
+ *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_OPENGL!$SORT_VULKAN" ;;
esac
if [[ $PW_WINE_USE == PROTON_LG ]] ; then
@@ -906,7 +904,6 @@ case "${VULKAN_MOD}" in
"$SORT_OPENGL" ) export PW_VULKAN_USE="0" ;;
"$SORT_STABLE" ) export PW_VULKAN_USE="1" ;;
"$SORT_NEWEST" ) export PW_VULKAN_USE="2" ;;
- "$SORT_G_NINE" ) export PW_VULKAN_USE="3" ;;
"$SORT_G_ZINK" ) export PW_VULKAN_USE="4" ;;
"$SORT_LEGACY" ) export PW_VULKAN_USE="5" ;;
"$SORT_VULKAN" ) export PW_VULKAN_USE="6" ;;
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 4c983a40..393c6a38 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -43,7 +43,6 @@ export PW_WINE_USE="PROTON_LG"
export PW_PLUGINS_VER="_v18"
export PW_FAKE_DLSS_VER="230506"
export PW_FAKE_DLSS_3_VER="0.9.1-plus"
-export PW_GALLIUM_NINE_VER="0.10"
###WINE_AND_PROTON_LG###
export PW_PROTON_LG_VER="PROTON_LG_9-19"
export PW_WINE_LG_VER="WINE_LG_9-12-2"