Skip to content

Commit

Permalink
v0.78.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
VHSgunzo committed Feb 12, 2024
1 parent 05a2bd3 commit cc6be4d
Show file tree
Hide file tree
Showing 27 changed files with 102 additions and 132 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
# v0.78.2.5

* 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/v8.32) `v8.32`
* Update [glibc-eac](https://github.com/VHSgunzo/glibc-eac-rc/releases/tag/v2.39.2) `v2.39.2`
* Update [obs-vkcapture-lw](https://github.com/VHSgunzo/obs-vkcapture-lw/releases/tag/v1.4.9) `v1.4.9`
* Move `lwrun-pkg` to [lwrun](https://github.com/VHSgunzo/lwrun/tree/main/lwrun-pkg)
* Add `init` after update RunImage packages
* Add `xorg-xlsfonts` to `lwrap` depends
* Disable by default `Reduce PulseAudio latency`
* Change default MangoHud options
* Change default `MUST_HAVE_DLL` to `Disabled`
* Remove check free space
* Add DB script for `Anno 1800`
* Add DB script for `Assassin's Creed Odyssey`
* Add DB script for `Soldier of Fortune 2`
* Add DB script for `Direct Commander`
* Update DB script for `Zona`
* Update DB script for `The Honkers Railway` `v2.0.0`
* Update DB script for `WeMod`

# v0.78.2.4

* Update [steam-runtime-libs](https://github.com/VHSgunzo/steam-runtime-libs/releases/tag/v0.0.4) `v0.0.4`
Expand Down
2 changes: 2 additions & 0 deletions db/ACOdyssey.lwdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WINE_VERSION=System
GSTREAMER=0
1 change: 1 addition & 0 deletions db/Anno1800.lwdb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LANG=en_US
40 changes: 40 additions & 0 deletions db/Direct Commander.lwdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
pre_launch() {
if [[ "${EXE_NAME,,}" == 'direct commander setup'* ]]
then
cleandcmdtmp() { [ -d "$dcmdtmp" ] && rm -rf "$dcmdtmp" ; }
dcmdtmp="$LW_DEF_TMP/dcmd-$RANDOM"
dcmddir="$WINEPREFIX/dosdevices/c:/Program Files/Direct Commander"
dcmdexe="$dcmddir/Direct Commander.exe"
cleandcmdtmp
mkdir -p "$dcmdtmp"
if (7z x "$LU_EXE" '*.nupkg' -o"$dcmdtmp" ; \
unzip -o "$dcmdtmp"/*.nupkg 'lib/net*/*' -d "$dcmdtmp")
then
[ -d "$dcmddir" ] && rm -f "$dcmddir"
mkdir -p "$(dirname "$dcmddir")"
if mv -f "$dcmdtmp/lib/net"* "$dcmddir" && \
[ -f "$dcmdexe" ]
then
cleandcmdtmp
export LU_EXE="$dcmdexe"
lu_shortcut "$LU_EXE" 'Direct Commander'
cleanrun "$LW_SOURCE" "$LU_EXE"
exit $?
else
print_error yad "Failed to install: $EXE_NAME"
cleandcmdtmp
exit 1
fi
cleandcmdtmp
else
print_error yad "Failed to extract: $EXE_NAME"
cleandcmdtmp
exit 1
fi
fi
}

WIN_VER=10
WINEARCH=win64
MUST_HAVE_DLL=Disabled
WPREFIX_NAME=defprefix_dotnet
4 changes: 4 additions & 0 deletions db/SoF2.lwdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
SUM=($(sha256sum SoF2.exe 2>/dev/null))
PATCH_SUM='bf8225821e1b0e27ea97a7507034a575d93e3e190adbc9f162510bb547a52bbb'
[ "$SUM" == "$PATCH_SUM" ] && \
dd if=/dev/zero of=SoF2.exe bs=1 count=1 seek=987627 conv=notrunc
4 changes: 2 additions & 2 deletions db/WeMod.lwdb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ pre_launch() {
wemodexe="$wemoddir/WeMod.exe"
cleanwemodtmp
mkdir -p "$wemodtmp"
if (unzip -o "$LU_EXE" *.nupkg -d "$wemodtmp" ; \
unzip -o "$wemodtmp"/*.nupkg lib/net*/* -d "$wemodtmp")
if (unzip -o "$LU_EXE" '*.nupkg' -d "$wemodtmp" ; \
unzip -o "$wemodtmp"/*.nupkg 'lib/net*/*' -d "$wemodtmp")
then
[ -d "$wemoddir" ] && rm -f "$wemoddir"
mkdir -p "$(dirname "$wemoddir")"
Expand Down
12 changes: 12 additions & 0 deletions db/Zona.lwdb
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
WIN_VER=10
ZUPDATER="$WINEPREFIX/drive_c/users/steamuser/AppData/Roaming/Zona/plugins/zupdater"
if [ -n "$(lspci|grep -o 'NVIDIA')" ]
then
unset VK_ICD_FILENAMES
HIDE_NVIDIA_GPU=1
VKICDFILES=Lvp
fi

pre_launch() { [ -d "$ZUPDATER" ] && rm -rf "$ZUPDATER" && ln -sf /dev/null "$ZUPDATER" && return 0 ; }

if [[ "${EXE_NAME,,}" == 'zonasetup'* ]]
then
(while kill -0 $LWPID
do
pre_launch && break
sleep 3
done) &
fi
2 changes: 1 addition & 1 deletion db/launcher.lwdb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
srlauncher() {
SR_PATCH_VER=v3.0.12
SR_PATCH_VER=v3.1.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")"
Expand Down
2 changes: 1 addition & 1 deletion lutris-wine
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LW_VERSION="0.78.2.4"
LW_VERSION="0.78.2.5"
25 changes: 9 additions & 16 deletions lux-wine
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

export LW_VERSION="0.78.2.4"
export LW_VERSION="0.78.2.5"
export LW_DEVELOPERS="VHSgunzo"

export RED='\033[1;91m'
Expand Down Expand Up @@ -143,10 +143,10 @@ done
[ ! -n "$ZSTD_CMPRSS_LVL" ] && export ZSTD_CMPRSS_LVL="1"
[ ! -n "$SYS_LDLIBPTH" ] && export SYS_LDLIBPTH="$LD_LIBRARY_PATH"
[ ! -n "$SYS_STM_COMPAT_DIR" ] && export SYS_STM_COMPAT_DIR="/usr/share/steam/compatibilitytools.d"
[ ! -n "$DEF_MANGOHUDCFG" ] && export DEF_MANGOHUDCFG="no_display,time,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,gpu_power,gpu_load_change,gpu_text=GPU,\
cpu_stats,cpu_temp,cpu_load_change,core_load_change,cpu_color=2e97cb,cpu_text=CPU,io_color=a491d3,vram,vram_color=ad64c1,ram,ram_color=c26693,fps,\
engine_version,engine_color=eb5b5b,gpu_name,gpu_color=2e9762,vulkan_driver,wine,wine_color=eb5b5b,arch,frame_timing=1,frametime_color=00ff00,\
resolution,vkbasalt,gamemode,background_alpha=0.4,background_color=020202,position=top-right,text_color=ffffff,toggle_hud=Shift_R+F12"
[ ! -n "$DEF_MANGOHUDCFG" ] && export DEF_MANGOHUDCFG="gpu_text=GPU,cpu_color=2e97cb,cpu_text=CPU,io_color=a491d3,vram_color=ad64c1,ram_color=c26693,\
engine_color=eb5b5b,gpu_color=2e9762,wine_color=eb5b5b,frametime_color=00ff00,background_alpha=0.4,background_color=020202,position=top-right,\
text_color=ffffff,toggle_hud=Shift_R+F12,gpu_load_change,cpu_load_change,core_load_change,arch,cpu_mhz,cpu_temp,engine_version,gamemode,\
gpu_core_clock,gpu_mem_clock,gpu_name,gpu_power,gpu_temp,no_display,ram,resolution,show_fps_limit,time,vkbasalt,vram,vulkan_driver,wine"
[[ ! -n "$NOT_TERM" && ! -n "$(tty|grep -v 'not a'|grep -Eo 'tty|pts')" ]] && \
NOT_TERM=1||NOT_TERM=0

Expand All @@ -165,7 +165,6 @@ check_def_config() {
[ ! -n "$FSYNC" ] && export FSYNC=1
[ ! -n "$FSR_MODE" ] && export FSR_MODE='Enabled'
[ ! -n "$VSYNC" ] && export VSYNC="Default"
[ ! -n "$PULSE_LTCY" ] && export PULSE_LTCY=1
[ ! -n "$VKBASALT" ] && export VKBASALT=1
[ ! -n "$WIN_VER" ] && export WIN_VER="10"
[ ! -n "$VKD3DCFG" ] && export VKD3DCFG="Disabled"
Expand All @@ -188,7 +187,7 @@ check_def_config() {
[ ! -n "$BATTLEYE" ] && export BATTLEYE=1
[ ! -n "$EAC" ] && export EAC=1
[ ! -n "$EXE_LWDB" ] && export EXE_LWDB=1
[ ! -n "$MUST_HAVE_DLL" ] && export MUST_HAVE_DLL='corefonts vcrun2022 mfc42 mfc140'
[ ! -n "$MUST_HAVE_DLL" ] && export MUST_HAVE_DLL='Disabled'
[ ! -n "$VKBASALT_FFX_CAS" ] && export VKBASALT_FFX_CAS="0.6"
export DXVK_GIT_RELEASE_URL="https://api.github.com/repos/doitsujin/dxvk/releases"
export VKD3D_GIT_RELEASE_URL="https://api.github.com/repos/HansKristian-Work/vkd3d-proton/releases"
Expand Down Expand Up @@ -769,17 +768,10 @@ try_rm() {
return 1
}

check_freespace() {
USEDDS="$(echo "$(df -h 2>/dev/null|grep "$(echo $(mount|grep -w "on $(stat -c %m -- "$(dirname "$1")")")|awk '{print$1}')")"|awk '{print$5}'|head -1|sed 's/.$//')"
[ "$USEDDS" -ge "95" ] \
&& print_error yad "Disk space error" "There [ $(stat -c %m -- "$(dirname "$1")") ] is little free disk space left, you need to free up disk space!"
}

try_download() {
set -o pipefail
[ ! -n "$1" ] && print_error "Specify download URL!" && return 1 || DLFLNAME="$(basename "$1")"
[ ! -n "$2" ] && DLPTH="./" || DLPTH="$2"
check_freespace "$DLPTH"
try_mkdir "$DLPTH"
if [ "$LW_DOWNLOADER" == "aria2c" ]
then
Expand Down Expand Up @@ -2423,6 +2415,8 @@ check_db_script() {
*'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" ;;
zonasetup*) export EXE_LWDBFL="$LW_DB_DIR/Zona.lwdb" ;;
'direct commander setup'*) export EXE_LWDBFL="$LW_DB_DIR/Direct Commander.lwdb" ;;
esac
fi
fi
Expand Down Expand Up @@ -2639,7 +2633,6 @@ lite_init() {
fi
[[ -n "$SETT_INIT" || "$1" == "-init" ]] && \
initbar && rm -rf "$LW_DIR/.lwcfgchksum"
check_freespace "$HOME/.local"
check_exe_wcfg_cenv "$@"
check_luwine_wcfg_cenv
check_def_config
Expand Down Expand Up @@ -5873,7 +5866,7 @@ export_all_functions() {
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 get_wk4_releases \
settingbar check_freespace initbar check_network_status print_question print_input loadbar_cover check_first_run check_eac check_loadbar_cover \
settingbar 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 \
check_wine_nvml check_resizable_bar check_latencyflex get_proton_d3dlib makesquash_zstd makesquash_xz lu_pfxbackup lu_pfxrestore lu_backupmnt lu_backupunmnt \
Expand Down
4 changes: 2 additions & 2 deletions lwrap/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pkgname='lwrap'
pkgver='0.78.2'
pkgrel='4'
pkgrel='5'
pkgdesc='Lux Wine wrapper for RunImage container'
arch=('x86_64')
url='https://github.com/VHSgunzo/lux-wine'
Expand Down Expand Up @@ -33,7 +33,7 @@ depends=(
'dos2unix' 'lw-runtime' 'wine-gecko' 'wine-mono' 'libdvdread' 'a52dec' 'wavpack' 'lib32-wavpack'
'libmpeg2' 'twolame' 'lib32-twolame' 'gst-plugin-msdk' 'lib32-libdv' 'libdv' 'GE-Proton'
'xxd-standalone' 'obs-vkcapture-lw' 'lib32-obs-vkcapture-lw' 'egl-wayland' 'gstreamer-vaapi'
'moninfo' 'perl-image-exiftool'
'moninfo' 'perl-image-exiftool' 'xorg-xlsfonts'
)
optdepends=(
'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'
Expand Down
7 changes: 7 additions & 0 deletions lwrap/lwrap
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,13 @@ update_lwrun() {
then
update_runimage
local pkgret=$?
if [ "$pkgret" == 0 ]
then
if [ "$ENABLE_HOSTEXEC" == 1 ]
then hostexec ptyspawn importenv '$RUNPID' "$LWRAP" -init
else "$LWRAP" -init
fi
fi
fi
[[ "$dlret" == 0 || "$pkgret" == 0 ]] && \
local ret=0
Expand Down
Empty file removed lwrun-pkg/RunDir/Run
Empty file.
71 changes: 0 additions & 71 deletions lwrun-pkg/RunDir/Run.sh

This file was deleted.

Empty file removed lwrun-pkg/RunDir/lwrun.tar.zst
Empty file.
11 changes: 0 additions & 11 deletions lwrun-pkg/RunDir/static/.binaries_version

This file was deleted.

1 change: 0 additions & 1 deletion lwrun-pkg/RunDir/static/.version

This file was deleted.

Empty file removed lwrun-pkg/RunDir/static/bash
Empty file.
Empty file removed lwrun-pkg/RunDir/static/cat
Empty file.
Empty file removed lwrun-pkg/RunDir/static/cp
Empty file.
Empty file removed lwrun-pkg/RunDir/static/mkdir
Empty file.
Empty file removed lwrun-pkg/RunDir/static/mv
Empty file.
Empty file removed lwrun-pkg/RunDir/static/tar
Empty file.
Empty file removed lwrun-pkg/RunDir/static/zstd
Empty file.
27 changes: 0 additions & 27 deletions lwrun-pkg/build.sh

This file was deleted.

Empty file removed lwrun-pkg/lwrun
Empty file.
Empty file removed lwrun-pkg/runtime-fuse2-all
Empty file.

0 comments on commit cc6be4d

Please sign in to comment.