From fb40efdb360fe4b226ad7f6d4c3cf49656656ec7 Mon Sep 17 00:00:00 2001 From: VHSgunzo Date: Mon, 18 Dec 2023 21:42:08 +0300 Subject: [PATCH] v0.78.2.1 --- CHANGELOG.md | 12 ++++++++++++ db/Battle.net Launcher.lwdb | 1 + db/Battle.net-Setup.exe.lwdb | 1 + db/LeagueClient.lwdb | 3 +-- lutris-wine | 2 +- lux-wine | 23 ++++++++++++++++------- lwrap/PKGBUILD | 6 +++--- 7 files changed, 35 insertions(+), 13 deletions(-) create mode 120000 db/Battle.net Launcher.lwdb create mode 100644 db/Battle.net-Setup.exe.lwdb diff --git a/CHANGELOG.md b/CHANGELOG.md index 52a1ecb..7d00340 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.78.2.1 + +* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages +* Update [obs-vkcapture-lw](https://github.com/VHSgunzo/obs-vkcapture-lw/releases/tag/v1.4.7) `v1.4.7` +* Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v8.25) `v8.25` +* Speedup `lite_init()` +* Add DB script for `Battle.net` +* Update DB script for `League of Legends` +* Update lwrap `PKGBUILD` +* Fix `dll_manager()` for set old local `Wine` runtime DLLs +* Fix open `Settings` with different versions of `Wine` in the same `prefix` + # v0.78.1.9 * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages diff --git a/db/Battle.net Launcher.lwdb b/db/Battle.net Launcher.lwdb new file mode 120000 index 0000000..cd48bcb --- /dev/null +++ b/db/Battle.net Launcher.lwdb @@ -0,0 +1 @@ +Battle.net-Setup.exe.lwdb \ No newline at end of file diff --git a/db/Battle.net-Setup.exe.lwdb b/db/Battle.net-Setup.exe.lwdb new file mode 100644 index 0000000..6a061a3 --- /dev/null +++ b/db/Battle.net-Setup.exe.lwdb @@ -0,0 +1 @@ +WINE_SIMULATE_WRITECOPY=1 diff --git a/db/LeagueClient.lwdb b/db/LeagueClient.lwdb index f49eea9..78a7008 100644 --- a/db/LeagueClient.lwdb +++ b/db/LeagueClient.lwdb @@ -1,12 +1,11 @@ WIN_VER=10 DIS_NETCORE=1 WINEARCH=win64 -LWMANGOHUD=DLSYM WINE_THEME=Disabled WPREFIX_NAME=lolpfx USE_DEFPFX_BACKUP=1 MUST_HAVE_DLL=Disabled -WINE_VERSION=wine-lutris-ge-lol-p8-12-x86_64 +WINE_VERSION=wine-lutris-GE-Proton8-27-LoL-x86_64 [ "$EXE_NAME" == "RiotClientServices" ] && \ EXE_ARG='--launch-product=league_of_legends --launch-patchline=live' diff --git a/lutris-wine b/lutris-wine index eae6438..5a8be49 100755 --- a/lutris-wine +++ b/lutris-wine @@ -1 +1 @@ -LW_VERSION="0.78.1.9" +LW_VERSION="0.78.2.1" diff --git a/lux-wine b/lux-wine index 8f3c149..1656580 100755 --- a/lux-wine +++ b/lux-wine @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export LW_VERSION="0.78.1.9" +export LW_VERSION="0.78.2.1" export LW_DEVELOPERS="VHSgunzo" export RED='\033[1;91m' @@ -503,11 +503,13 @@ dll_manager() { do if [ -d "$LW_RUNTIME_DIR/$1/$2/$dlls_arch" ] then - all_dlls="$(ls "$LW_RUNTIME_DIR/$1/$2/$dlls_arch/"*.dll 2>/dev/null|awk -F"/" '{print $NF}' 2>/dev/null)\n$all_dlls" + all_dlls="$(ls "$LW_RUNTIME_DIR/$1/$2/$dlls_arch/"*.dll \ + 2>/dev/null|awk -F"/" '{print $NF}' 2>/dev/null)\n$all_dlls" fi if [ -d "$LW_RUNTIME_DIR/$1/v$2/$dlls_arch" ] then - all_dlls="$(ls "$LW_RUNTIME_DIR"/$1/v$2/$dlls_arch/*.dll 2>/dev/null|awk -F"/" '{print $NF}' 2>/dev/null)\n$all_dlls" + all_dlls="$(ls "$LW_RUNTIME_DIR"/$1/v$2/$dlls_arch/*.dll \ + 2>/dev/null|awk -F"/" '{print $NF}' 2>/dev/null)\n$all_dlls" fi done all_dlls="$(echo -en "$all_dlls"|sort -u)" @@ -520,7 +522,9 @@ dll_manager() { fi fi fi - if [[ -n "$all_dlls" && -n "$(find "$LW_RUNTIME_DIR/$1" -type d -name "$2" -mtime -$CHK_UPDATE -print 2>/dev/null)" ]] + if [[ -n "$all_dlls" && \ + -n "$(find "$LW_RUNTIME_DIR/$1" -type d -name "$2" \ + -mtime -$CHK_UPDATE -print 2>/dev/null)" ]] then check_all_dlls "$1" "$2" elif [[ -n "$all_dlls" && "$CHK_UPDATE" == 0 ]] @@ -541,18 +545,23 @@ dll_manager() { print_error yad "No internet connection, it is not possible to download $1 $2" return 1 elif [[ -n "$all_dlls" && -n "$CHK_UPDATE" && "$CHK_UPDATE" != 0 && "$NETSTATUS" != 0 \ - && ! -n "$(find "$LW_RUNTIME_DIR/$1" -type d -name "$2" -mtime -$CHK_UPDATE -print 2>/dev/null)" ]] \ + && ! -n "$(find "$LW_RUNTIME_DIR/$1" -type d -name "$2" \ + -mtime -$CHK_UPDATE -print 2>/dev/null)" ]] \ || [ -n "$FORCE_DLL_UPDATE" ] then export NEEDCHKDLL=1 - if download_dll_release "$1" "latest" + if [ "$SETT_INIT" == 1 ] || download_dll_release "$1" "latest" then if [ -d "$LW_RUNTIME_DIR/$1/$2" ] then touch "$LW_RUNTIME_DIR/$1/$2" + [ "$SETT_INIT" == 1 ] && \ + dll_manager "$1" "$2" elif [ -d "$LW_RUNTIME_DIR/$1/v$2" ] then touch "$LW_RUNTIME_DIR/$1/v$2" + [ "$SETT_INIT" == 1 ] && \ + dll_manager "$1" "v$2" fi else return 1 @@ -2660,6 +2669,7 @@ lite_init() { check_nvprime check_driprime check_videodrv + [ "$1" == '-config' ]||\ check_def_wine check_proton_d3dlib check_path @@ -2669,7 +2679,6 @@ lite_init() { check_first_run "$@" check_esync check_fsync - check_shrt fi } diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD index 453d6fe..12c7eca 100644 --- a/lwrap/PKGBUILD +++ b/lwrap/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: VHSgunzo pkgname='lwrap' -pkgver='0.78.1' -pkgrel='9' +pkgver='0.78.2' +pkgrel='1' pkgdesc='Lux Wine wrapper for RunImage container' arch=('x86_64') url='https://github.com/VHSgunzo/lux-wine' @@ -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' + 'moninfo' 'perl-image-exiftool' ) optdepends=( 'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'