From 2ccd2478612ca78ab4b76312f18e4b86cd2f0d1d Mon Sep 17 00:00:00 2001 From: VHSgunzo Date: Sun, 28 Jul 2024 12:57:01 +0300 Subject: [PATCH] v0.78.5.2 --- CHANGELOG.md | 9 +++++++ db/StarRail.lwdb | 18 ++++++++++++++ db/launcher.lwdb | 29 --------------------- lux-wine | 25 +++++++++++++++---- lwrap/PKGBUILD | 2 +- registry_patch/steam.reg | 54 +++------------------------------------- 6 files changed, 51 insertions(+), 86 deletions(-) create mode 100644 db/StarRail.lwdb diff --git a/CHANGELOG.md b/CHANGELOG.md index b2590eb..3d725da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v0.78.5.2 + +* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages +* Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v9.9) `v9.11` +* Add `winepath()` and `winpath()` functions +* Add gstreamer fixes +* Update DB script for `Honkai: Star Rail` (for StarRail.exe) +* Minor fixes + # v0.78.5.1 * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages diff --git a/db/StarRail.lwdb b/db/StarRail.lwdb new file mode 100644 index 0000000..6dc569c --- /dev/null +++ b/db/StarRail.lwdb @@ -0,0 +1,18 @@ +#DB# Honkai: Star Rail # DB_EXES=('StarRail.exe') + +SR_PATCH_URL="https://codeberg.org/mkrsym1/jadeite/releases" +SR_PATCH_VER="$(curl -sL "$SR_PATCH_URL" 2>/dev/null|grep -o '>v[0-9].*[0-9]<'|sed 's|<||g;s|>||g'|head -1)" +SR_PATCH_DIR="$LW_DEF_TMP/srpatch_$SR_PATCH_VER" +SREXE="$(winpath "$LU_EXE")" +EXE_WRAPPER=("$SR_PATCH_DIR/jadeite.exe" "$SREXE" "$SREXE") +if [ ! -f "${EXE_WRAPPER[0]}" ] + then + if ! (try_download "$SR_PATCH_URL/download/$SR_PATCH_VER/$SR_PATCH_VER.zip" "$LW_DEF_TMP" && \ + unzip "$LW_DEF_TMP/$SR_PATCH_VER.zip" -d "$SR_PATCH_DIR") + then + try_rm "$SR_PATCH_DIR" &>/dev/null + print_error yad "Failed to download SR patch!" + exit 1 + fi + try_rm "$LW_DEF_TMP/$SR_PATCH_VER.zip" &>/dev/null +fi diff --git a/db/launcher.lwdb b/db/launcher.lwdb index 854416b..d8e0ae8 100644 --- a/db/launcher.lwdb +++ b/db/launcher.lwdb @@ -1,33 +1,5 @@ #DB# Crossout # DB_EXES=('launcher.exe') #DB# Dark Sector # DB_EXES=('DS.exe' 'launcher.exe') -#DB# Honkai: Star Rail # DB_EXES=('launcher.exe') !'StarRail.exe' - -srlauncher() { - SR_PATCH_URL="https://codeberg.org/mkrsym1/jadeite/releases" - SR_PATCH_VER="$(curl -sL "$SR_PATCH_URL" 2>/dev/null|grep -o '>v[0-9].*[0-9]<'|sed 's|<||g;s|>||g'|head -1)" - SR_PATCH_DIR="$LW_DEF_TMP/srpatch_$SR_PATCH_VER" - EXE_DRIVE="$(grep -oi '[a-z]:'<<<"$LU_EXE")" - SRLAUNCHER="$EXE_DRIVE\\$(sed 's|.*/[a-z]:||i;s|\/|\\|g'<<<"$LU_EXE")" - SREXE="$(sed 's|launcher|Games\\StarRail|'<<<"$SRLAUNCHER")" - EXE_WRAPPER=("$SR_PATCH_DIR/jadeite.exe" "$SREXE" "$SRLAUNCHER") - if [[ ! -f "$LW_APPS_DIR/Honkai SR Launcher.desktop" || \ - ! -f "$EXE_PATH/sr_launcher.exe" ]] - then - ln -sfr "$LU_EXE" "$EXE_PATH/sr_launcher.exe" - lu_shortcut "$EXE_PATH/sr_launcher.exe" "Honkai SR Launcher" - fi - if [ ! -f "${EXE_WRAPPER[0]}" ] - then - if ! (try_download "$SR_PATCH_URL/download/$SR_PATCH_VER/$SR_PATCH_VER.zip" "$LW_DEF_TMP" && \ - unzip "$LW_DEF_TMP/$SR_PATCH_VER.zip" -d "$SR_PATCH_DIR") - then - try_rm "$SR_PATCH_DIR" &>/dev/null - print_error yad "Failed to download SR patch!" - exit 1 - fi - try_rm "$LW_DEF_TMP/$SR_PATCH_VER.zip" &>/dev/null - fi -} set_dxvk_ver() { if [ "$DXVK" != '0' ] @@ -48,7 +20,6 @@ set_dxvk_ver() { pre_launch() { case "$EXE_DIR" in Crossout|'Dark Sector') set_dxvk_ver '1.10.3' ;; - 'Star Rail') srlauncher ;; esac } diff --git a/lux-wine b/lux-wine index 946d2c8..61210e2 100755 --- a/lux-wine +++ b/lux-wine @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export LW_VERSION="0.78.5.1" +export LW_VERSION="0.78.5.2" export LW_DEVELOPERS="VHSgunzo" export RED='\033[1;91m' @@ -1684,6 +1684,14 @@ create_shortcut() { fi } +winpath() { + WINEDEBUG='-all' "$WINE" winepath -w "$@" 2>/dev/null +} + +winepath() { + WINEDEBUG='-all' "$WINE" winepath "$@" 2>/dev/null +} + lu_debug() { if [[ -n "$DEBUG" && "$DEBUG" != 0 ]] then @@ -4758,13 +4766,20 @@ check_gstreamer() { [[ -d "/usr/lib/gstreamer-1.0" || -d "$WINEDIR/lib64/gstreamer-1.0" ]] then try_mkdir "$LW_DEF_CACHE/gstreamer-1.0" + export GST_GL_WINDOW='surfaceless' export WINE_GST_REGISTRY_DIR="$LW_DEF_CACHE/gstreamer-1.0" export MEDIACONV_AUDIO_DUMP_FILE="$WINE_GST_REGISTRY_DIR/audio.foz" export MEDIACONV_AUDIO_TRANSCODED_FILE="$WINE_GST_REGISTRY_DIR/transcoded_audio.foz" export MEDIACONV_VIDEO_DUMP_FILE="$WINE_GST_REGISTRY_DIR/video.foz" export MEDIACONV_VIDEO_TRANSCODED_FILE="$WINE_GST_REGISTRY_DIR/transcoded_video.foz" if [[ -d "$WINEDIR" && -d "$WINEDIR/lib64/gstreamer-1.0" ]] - then export GST_PLUGIN_SYSTEM_PATH_1_0="$WINEDIR/lib64/gstreamer-1.0:$WINEDIR/lib/gstreamer-1.0" + then + export GST_PLUGIN_SYSTEM_PATH_1_0="$WINEDIR/lib64/gstreamer-1.0:$WINEDIR/lib/gstreamer-1.0" + if [ -d "$WINEDIR/share/media" ] + then + export MEDIACONV_BLANK_VIDEO_FILE="$WINEDIR/share/media/blank.mkv" + export MEDIACONV_BLANK_AUDIO_FILE="$WINEDIR/share/media/blank.ptna" + fi elif [ -d '/usr/lib/gstreamer-1.0' ] then export GST_PLUGIN_SYSTEM_PATH_1_0='/usr/lib/gstreamer-1.0:/usr/lib32/gstreamer-1.0' else disable_gstreamer @@ -4835,7 +4850,7 @@ check_wined3d() { try_ln "$WINEDIR/lib64/wine/x86_64-windows/dxgi.dll" "$PFX_DLL64_PTH/dxgi.dll" &>/dev/null fi fi - try_ln_wine_build_dll d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d12 d3d12core + try_ln_wine_build_dll d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 d3d12 d3d12core fi } @@ -4921,7 +4936,7 @@ check_proton_d3dlib() { check_dxvk() { [ -n "$1" ] && export DXVK="$1" [ -n "$2" ] && export DXVK_VERSION="$2" - export ALLDXVKDLLS="d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi,openvr_api_dxvk,dxvk_config" + export ALLDXVKDLLS="d3d11,d3d10,d3d10core,d3d10_1,d3d9,d3d8,dxgi,openvr_api_dxvk,dxvk_config" if [[ "$DXVK" == 1 && "$WINED3D" != 1 ]] then [ "$DXVK_VERSION" == "Default" ] && \ @@ -6277,7 +6292,7 @@ export_all_functions() { check_display check_restore_resol resol_sw check_restore_gamma dis_displ_sw restore_resol check_virt_desktop check_vkbasalt_cfg check_exe_args \ check_wine_nvml check_resizable_bar check_latencyflex get_proton_d3dlib makesquash_zstd makesquash_xz lu_pfxbackup lu_pfxrestore lu_backupmnt lu_backupunmnt \ check_dxvk_async check_vsync get_wine_git_lst try_dl_install_wine exeargs_parse try_add_reg_cdrom shrt_loop shrt_from_url shrt_from_lnk check_shrt \ - get_shrt_data check_autostart_tray check_config_only check_gamescope + get_shrt_data check_autostart_tray check_config_only check_gamescope winpath winepath } initbar() { diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD index 548df13..7a8671c 100644 --- a/lwrap/PKGBUILD +++ b/lwrap/PKGBUILD @@ -2,7 +2,7 @@ pkgname='lwrap' pkgver='0.78.5' -pkgrel='1' +pkgrel='2' pkgdesc='Lux Wine wrapper for RunImage container' arch=('x86_64') url='https://github.com/VHSgunzo/lux-wine' diff --git a/registry_patch/steam.reg b/registry_patch/steam.reg index 00b68d0..6553f7d 100644 --- a/registry_patch/steam.reg +++ b/registry_patch/steam.reg @@ -6,59 +6,11 @@ Windows Registry Editor Version 5.00 [HKEY_CURRENT_USER\Software\Wine\AppDefaults\steam.exe] "Version"="win10" +[HKEY_CURRENT_USER\Software\Wine\DllOverrides] +"msxml3"="native,builtin" + [HKEY_CURRENT_USER\Software\Valve\Steam] "DWriteEnable"="dword:00000000" -[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements] -"Lucida Console"="MS Sans Serif" - -HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements -"Meiryo"="Source Han Sans TC" - -[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements] -"Meiryo"="Source Han Sans SC" - [HKEY_CURRENT_USER\Software\Valve\Steam] "GPUAccelWebViews"="dword:1" - -[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements] -"Meiryo"="Microsoft YaHei" - -[HKEY_CURRENT_USER\Software\Wine\DllOverrides] -"msxml3"="native,builtin" - -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Fonts] -"Source Han Sans SC Bold"="C:\Windows\fonts\SourceHanSansSC-Bold.otf" - -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Fonts] -"Source Han Sans SC ExtraLight"="C:\Windows\fonts\SourceHanSansSC-ExtraLight.otf" - -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Fonts] -"Source Han Sans SC Heavy"="C:\Windows\fonts\SourceHanSansSC-Heavy.otf" - -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Fonts] -"Source Han Sans SC Light"="C:\Windows\fonts\SourceHanSansSC-Light.otf" - -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Fonts] -"Source Han Sans SC Medium"="C:\Windows\fonts\SourceHanSansSC-Medium.ot" - -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Fonts] -"Source Han Sans SC Normal"="C:\Windows\fonts\SourceHanSansSC-Normal.otf" - -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Fonts] -"Source Han Sans SC Regular"="C:\Windows\fonts\SourceHanSansSC-Regular.otf" - -[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements] -"SimSun"="Source Han Sans SC Regular" - -[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements] -"宋体"="Source Han Sans SC Regular" - -[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements] -"新宋体"="Source Han Sans SC Regular" - -[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements] -"NSimSun"="Source Han Sans SC Regular" - -[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements] -"Microsoft YaHei UI"="Source Han Sans SC"