v0.78.1.2

VHSgunzo · Oct 2, 2023 · 7cf83c8 · 7cf83c8
1 parent f2b45ba
commit 7cf83c8
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v0.78.1.2
+
+* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
+* Force use msiexec for MSI install
+* Fix symlinks for Proton libvkd3d-1 libvkd3d-shader-1 dlls
+* Minor fixes
+
 # v0.78.1.1
 
 * Add MSI install with wine-staging (hotfix)

diff --git a/lutris-wine b/lutris-wine
@@ -1 +1 @@
-LW_VERSION="0.78.1.1"
+LW_VERSION="0.78.1.2"
diff --git a/lux-wine b/lux-wine
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export LW_VERSION="0.78.1.1"
+export LW_VERSION="0.78.1.2"
 export LW_DEVELOPERS="VHSgunzo"
 
 export RED='\033[1;91m'
@@ -2321,7 +2321,12 @@ lu_run() {
 
 lu_prestart() {
     export LU_EXE="$LU_START"
-    if [ "$LU_BAT" == 1 ]
+    if [ "$LU_MSI" == 1 ]
+        then
+            dis_debug_msg
+            UNSET_CMPSTR_SW=1
+            lu_run msiexec /i "$LU_EXE"
+    elif [ "$LU_BAT" == 1 ]
         then
             dis_debug_msg
             LOADBAR=0
@@ -2412,25 +2417,18 @@ check_db_script() {
         then
             if [ ! -f "$EXE_LWDBFL" ]
                 then
-                    if [ "$LU_MSI" == 1 ]
-                        then
-                            dis_debug_msg
-                            UNSET_CMPSTR_SW=1
-                            export EXE_LWDBFL="$LW_DB_DIR/setup.lwdb"
-                        else
-                            local EXE_PATH_LWDB="$(ipath "$EXE_PATH/$EXE_NAME.lwdb")"
-                            local LW_PATH_LWDB="$(ipath "$LW_DB_DIR/$EXE_NAME.lwdb")"
-                            if [ -f "$EXE_PATH_LWDB" ]
-                                then export EXE_LWDBFL="$EXE_PATH_LWDB"
-                            elif [ -f "$LW_PATH_LWDB" ]
-                                then export EXE_LWDBFL="$LW_PATH_LWDB"
-                            else
-                                case "${EXE_NAME,,}" in
-                                    *'league of legends'*) export EXE_LWDBFL="$LW_DB_DIR/LeagueClient.lwdb" ;;
-                                    gog_galaxy*) export EXE_LWDBFL="$LW_DB_DIR/setup.lwdb" ;;
-                                    wemod-*) export EXE_LWDBFL="$LW_DB_DIR/WeMod.lwdb" ;;
-                                esac
-                            fi
+                    local EXE_PATH_LWDB="$(ipath "$EXE_PATH/$EXE_NAME.lwdb")"
+                    local LW_PATH_LWDB="$(ipath "$LW_DB_DIR/$EXE_NAME.lwdb")"
+                    if [ -f "$EXE_PATH_LWDB" ]
+                        then export EXE_LWDBFL="$EXE_PATH_LWDB"
+                    elif [ -f "$LW_PATH_LWDB" ]
+                        then export EXE_LWDBFL="$LW_PATH_LWDB"
+                    else
+                        case "${EXE_NAME,,}" in
+                            *'league of legends'*) export EXE_LWDBFL="$LW_DB_DIR/LeagueClient.lwdb" ;;
+                            gog_galaxy*) export EXE_LWDBFL="$LW_DB_DIR/setup.lwdb" ;;
+                            wemod-*) export EXE_LWDBFL="$LW_DB_DIR/WeMod.lwdb" ;;
+                        esac
                     fi
             fi
             if [ -f "$EXE_LWDBFL" ]
@@ -4436,12 +4434,6 @@ check_wined3d() {
                     fi
             fi
             try_ln_wine_build_dll d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d12 d3d12core
-            for libvkd3d in libvkd3d-1 libvkd3d-shader-1
-                do
-                    try_ln "$WINEDIR/lib/vkd3d/${libvkd3d}.dll" "$PFX_DLL32_PTH/${libvkd3d}.dll" &>/dev/null
-                    [ "$WINEARCH" != "win32" ] && \
-                    try_ln "$WINEDIR/lib64/vkd3d/${libvkd3d}.dll" "$PFX_DLL64_PTH/${libvkd3d}.dll" &>/dev/null
-            done
     fi
 }
 
@@ -4455,24 +4447,6 @@ check_dxvk_async() {
     fi
 }
 
-try_cp_proton_libvkd3d() {
-    for libvkd3d in libvkd3d-1 libvkd3d-shader-1
-        do
-            for arch in 32 64
-                do
-                    local RDLL="$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION/x${arch}/${libvkd3d}.dll"
-                    local WDLL="$WINEDIR/lib${arch%32}/vkd3d/${libvkd3d}.dll"
-                    if [[ -f "$WDLL" && ! -f "$RDLL" ]]
-                        then
-                            try_mkdir "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION"
-                            try_cp "$WDLL" "$RDLL"
-                            export NEEDCHKDLL=1
-                            rm -rf "${RDLL%x${arch}/${libvkd3d}.dll}.all_dlls"
-                    fi
-            done
-    done
-}
-
 get_proton_d3dlib() {
     unset P_DXVK P_NVAPI P_VKD3D
     if [ -d "$WINEDIR" ]
@@ -4499,7 +4473,6 @@ get_proton_d3dlib() {
                     try_mkdir "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION"
                     try_$1 "$WINEDIR/lib/wine/vkd3d-proton" "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION/x32"
                     try_$1 "$WINEDIR/lib64/wine/vkd3d-proton" "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION/x64"
-                    try_cp_proton_libvkd3d
                     export P_VKD3D=1
             fi
     fi
@@ -4571,10 +4544,10 @@ check_dxvk() {
                                             try_ln "$WINEDIR/lib64/wine/x86_64-windows/dxgi.dll" "$PFX_DLL64_PTH" &>/dev/null
                                     fi
                             fi
-                            wdllover_upd "$(echo $check_dlls_slk|sed 's/ dxgi//'|sed 's/.dll//g'|tr ' ' ',')=n;dxgi=b"
+                            wdllover_upd "$(echo $check_dlls_slk|sed 's| dxgi||i;s|.dll||gi;s| |,|g')=n;dxgi=b"
                             print_info notify "Used DXGI from Wine!"
                         else
-                            wdllover_upd "$(echo $check_dlls_slk|sed 's/.dll//g'|tr ' ' ',')=n"
+                            wdllover_upd "$(echo $check_dlls_slk|sed 's|.dll||g;s| |,|g')=n"
                     fi
                     if [[ ! -f "$LW_RUNTIME_DIR/dxvk/$DXVK_VERSION/x64/d3d10_1.dll" || \
                         ! -f "$LW_RUNTIME_DIR/dxvk/$DXVK_VERSION/x32/d3d10_1.dll" ]]
@@ -4612,11 +4585,11 @@ check_dxvk() {
 }
 
 check_vkd3d() {
+    local ret=1
     [ -n "$1" ] && export VKD3D="$1"
     [ -n "$2" ] && export VKD3D_VERSION="$2"
     export ALLVKD3DDLLS="d3d12,d3d12core"
     export ALLLIBVKD3DDLLS="libvkd3d-1,libvkd3d-shader-1"
-    try_cp_proton_libvkd3d
     if [[ "$VKD3D" == 1 && "$WINED3D" != 1 ]]
         then
             [ "$VKD3D_VERSION" == "Default" ] && \
@@ -4631,23 +4604,42 @@ check_vkd3d() {
             GIT_RELEASE_URL="$VKD3D_GIT_RELEASE_URL"
             if dll_manager "vkd3d" "$VKD3D_VERSION"
                 then
-                    wdllover_upd "$(echo $check_dlls_slk|sed 's/.dll//g'|tr ' ' ',')=n"
+                    wdllover_upd "$(echo $check_dlls_slk|sed 's|.dll||g;s| |,|g')=n"
+                    wdllover_upd "${ALLLIBVKD3DDLLS}=n"
                     export VKD3D_FEATURE_LEVEL=12_1
                     try_mkdir "$LW_DEF_CACHE/vkd3d_cache"
                     export VKD3D_SHADER_CACHE_PATH="$LW_DEF_CACHE/vkd3d_cache"
                     unset GIT_RELEASE_URL
+                    local ret=0
                 else
                     export VKD3D=0
                     wdllover_upd "${ALLVKD3DDLLS}=b;${ALLLIBVKD3DDLLS}=n"
                     print_error yad "VKD3D is disabled!"
-                    return 1
             fi
         else
             export VKD3D=0
             wdllover_upd "${ALLVKD3DDLLS}=b;${ALLLIBVKD3DDLLS}=n"
             print_info "VKD3D is disabled!"
-            return 1
     fi
+    if [[ -n "$WINEDIR" && "$NEEDCHKDLL" == 1 ]]
+        then
+            unset libvkd3dpdll64 libvkd3dwdll64
+            for libvkd3d in libvkd3d-1 libvkd3d-shader-1
+                do
+                    if [ "$WINEARCH" == 'win64' ]
+                        then
+                            local libvkd3dpdll64="$PFX_DLL64_PTH/${libvkd3d}.dll"
+                            local libvkd3dwdll64="$WINEDIR/lib64/vkd3d/${libvkd3d}.dll"
+                    fi
+                    local libvkd3dpdll32="$PFX_DLL32_PTH/${libvkd3d}.dll"
+                    local libvkd3dwdll32="$WINEDIR/lib/vkd3d/${libvkd3d}.dll"
+                    [[ -f "$libvkd3dwdll32" && ! "$(ls -l "$libvkd3dpdll32" 2>/dev/null)" =~ "$WINE_VERSION" ]] && \
+                        try_ln "$libvkd3dwdll32" "$libvkd3dpdll32" && local ret=0
+                    [[ -f "$libvkd3dwdll64" && ! "$(ls -l "$libvkd3dpdll64" 2>/dev/null)" =~ "$WINE_VERSION" ]] && \
+                        try_ln "$libvkd3dwdll64" "$libvkd3dpdll64" && local ret=0
+            done
+    fi
+    return $ret
 }
 
 check_wine_nvml() {
@@ -4662,7 +4654,7 @@ check_wine_nvml() {
             GIT_RELEASE_URL="$NVML_GIT_RELEASE_URL"
             if dll_manager "wine_nvml" "$WINE_NVML_VERSION"
                 then
-                    wdllover_upd "$(echo $check_dlls_slk|sed 's/.dll//g'|tr ' ' ',')=n"
+                    wdllover_upd "$(echo $check_dlls_slk|sed 's|.dll||g;s| |,|g')=n"
                     return 0
                 else
                     return 1
@@ -4736,7 +4728,7 @@ check_d3d_extras() {
             GIT_RELEASE_URL="$D3D_GIT_RELEASE_URL"
             if dll_manager "d3d_extras" "$D3D_EXTRAS_VERSION"
                 then
-                    wdllover_upd "$(echo $check_dlls_slk|sed 's/.dll//g'|tr ' ' ',')=n"
+                    wdllover_upd "$(echo $check_dlls_slk|sed 's|.dll||g;s| |,|g')=n"
                 else
                     export D3D_EXTRAS=0
                     wdllover_upd "${ALLD3DEXTRADLLS}=b"
@@ -4763,7 +4755,7 @@ check_dgvoodoo2() {
             if dll_manager "dgvoodoo2" "$DGVOODOO2_VERSION"
                 then
                     print_info "DGVOODOO2 is enabled!"
-                    wdllover_upd "$(echo $check_dlls_slk|sed 's/.dll//g'|tr ' ' ',')=n"
+                    wdllover_upd "$(echo $check_dlls_slk|sed 's|.dll||g;s| |,|g')=n"
                     DGVOODOO2_CFG="$LW_DIR/runtime/dgvoodoo2/$DGVOODOO2_VERSION/dgVoodoo.conf"
                     PFX_DGVOODOO2_CFG="$PFX_DLL32_PTH/dgVoodoo.conf"
                     [[ -f "$DGVOODOO2_CFG" && ! -f "$PFX_DGVOODOO2_CFG" ]] && \
@@ -5769,7 +5761,7 @@ export_all_functions() {
         check_reset_pulse export_all_functions check_win_version check_hold_terminal dll_manager check_dll_symlink try_ln check_git_release cleanrun \
         runtime_manager upd_battleye is_exe_exist which_exe try_ln_wine_build_dll find_vk_icd btntls_run get_app_exe check_driprime greptardlurl get_wlu_releases \
         upd_d3d_extras upd_dgvoodoo2 upd_dxvk upd_dxvk_nvapi upd_vkd3d upd_all is_loadbar lu_runapp lu_lsapp set_wine_version get_pge_releases get_wge_releases \
-        check_wined3d check_vkbasalt_eff check_luwine_wcfg_cenv check_videodrv check_startfile check_def_config try_cp_proton_libvkd3d get_wk4_releases \
+        check_wined3d check_vkbasalt_eff check_luwine_wcfg_cenv check_videodrv check_startfile check_def_config get_wk4_releases \
         settingbar_nostdout check_freespace initbar check_network_status print_question print_input loadbar_cover check_first_run check_eac check_loadbar_cover \
         check_db_script stop_loadbar check_wmonover wmonover_upd check_exe_wcfg_cenv lu_appcfg try_fix_wrtx try_shutdown_wine check_steamapps is_winepfx \
         check_display check_restore_resol resol_sw check_restore_gamma dis_displ_sw restore_resol check_virt_desktop check_vkbasalt_cfg exeargs_upd check_exe_args \

diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='lwrap'
 pkgver='0.78.1'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='Lux Wine wrapper for RunImage container'
 arch=('x86_64')
 url='https://github.com/VHSgunzo/lux-wine'