Skip to content

Commit 5495369

Browse files
VHSgunzoVHSgunzo
committed
v0.78.5.5
1 parent 1c13f50 commit 5495369

4 files changed

Lines changed: 31 additions & 15 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# v0.78.5.5
2+
3+
* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
4+
* Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v9.9) `v9.21`
5+
* Add NVK vulkan driver
6+
* Add AMDVLK vulkan driver
7+
* Remove DB script for `League of Legends`
8+
* Fix `lwrap` download GUI
9+
* Minor fixes
10+
111
# v0.78.5.4
212

313
* Remove `Yandex Cloud` mirrors

‎lux-wine‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
export LW_VERSION="0.78.5.4"
3+
export LW_VERSION="0.78.5.5"
44
export LW_DEVELOPERS="VHSgunzo"
55

66
export RED='\033[1;91m'
@@ -183,7 +183,7 @@ check_def_config() {
183183
[ ! -n "$DIS_LAYER_AMD" ] && export DIS_LAYER_AMD=1
184184
[ ! -n "$US_LAYOUT" ] && export US_LAYOUT=1
185185
[ ! -n "$WMONOVER" ] && export WMONOVER="Microsoft.Xna.Framework.*,Gac=n"
186-
[ ! -n "$WDLLOVER" ] && export WDLLOVER='steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,winemenubuilder.exe='
186+
[ ! -n "$WDLLOVER" ] && export WDLLOVER='steam_api,steam_api64,steamclient,steamclient64,icu=n;lsteamclient,winemenubuilder.exe=;winhttp,amd_ags_x64.dll=n,b'
187187
[ ! -n "$WINE_THEME" ] && export WINE_THEME='Breeze Dark'
188188
[ ! -n "$LWMANGOHUD" ] && export LWMANGOHUD='Enabled'
189189
[ ! -n "$LWVKCAPTURE" ] && export LWVKCAPTURE='Disabled'
@@ -314,8 +314,8 @@ print_input() {
314314

315315
check_wine_pids() {
316316
unset WINE_PIDS CHK_WINE_PIDS PROC_EXES
317-
if [ "$ENABLE_HOSTEXEC" == 1 ]
318-
then PROC_EXES="$(echo 'ls -l /proc/*/exe 2>/dev/null'|hostexec)"
317+
if [ "$INSIDE_RUNIMAGE" == 1 ]
318+
then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
319319
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
320320
fi
321321
if [[ "$WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]] \
@@ -361,8 +361,8 @@ check_luwine_sh_pid() {
361361

362362
check_exes() {
363363
unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE PROC_EXES
364-
if [ "$ENABLE_HOSTEXEC" == 1 ]
365-
then PROC_EXES="$(echo 'ls -l /proc/*/exe 2>/dev/null'|hostexec)"
364+
if [ "$INSIDE_RUNIMAGE" == 1 ]
365+
then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
366366
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
367367
fi
368368
RUN_EXES="$(ps -o pid=,cmd= -p $(echo "$PROC_EXES"|\
@@ -783,13 +783,13 @@ try_download() {
783783
try_mkdir "$DLPTH"
784784
if [ "$LW_DOWNLOADER" == "aria2c" ]
785785
then
786-
aria2c -x 13 -s 13 --no-conf --allow-overwrite --summary-interval=1 -o "$DLFLNAME" -d "$DLPTH" "$1"|stdbuf -o0 grep 'ETA'| \
786+
aria2c --no-conf -R -x 13 -s 13 --no-conf --allow-overwrite --summary-interval=1 -o "$DLFLNAME" -d "$DLPTH" "$1"|stdbuf -o0 grep 'ETA'| \
787787
sed -u 's/(.*)/ &/;s/(//;s/)//;s/\[//;s/\]//;s/%//'|stdbuf -o0 awk '{print$3"\n#Downloading at "$2,$5,$6}'| \
788788
yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \
789789
--auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine
790790
elif [ "$LW_DOWNLOADER" == "wget" ]
791791
then
792-
wget --no-check-certificate --content-disposition -t 3 -T 5 -w 0.5 "$1" --directory-prefix="$DLPTH"|& \
792+
wget --no-check-certificate -t 3 -T 5 -w 0.5 "$1" --directory-prefix="$DLPTH"|& \
793793
tr '\r' '\n'|sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./'| \
794794
yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \
795795
--auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine
@@ -2063,7 +2063,7 @@ check_def_wine() {
20632063
try_rm "$LW_WINE_DIR/$BINWINE" &>/dev/null
20642064
print_info notify "Deleted broken Wine: $BINWINE"
20652065
else
2066-
if [ -w "$LW_WINE_DIR/$BINWINE" ]
2066+
if [[ -w "$LW_WINE_DIR/$BINWINE" && "$(realpath "$LW_WINE_DIR/$BINWINE")" != '/usr/share/steam/compatibilitytools.d/'* ]]
20672067
then
20682068
WFILESDIR="$LW_WINE_DIR/$BINWINE/files"
20692069
WVERSFL="$LW_WINE_DIR/$BINWINE/version"
@@ -2873,7 +2873,7 @@ lu_config() {
28732873
export LWCFGKEY=$RANDOM
28742874
WINELST="$(ls -1 -t "$LW_WINE_DIR" 2>/dev/null|grep -v '.*.tar.*') $(is_exe_nofirstrun && echo '\n Default') $([ -n "$SYS_WINE" ] && echo '\n System') \n GE-Proton7-55"
28752875
WINETHEMESLST="Disabled \n $(ls -1 "$LW_THEMES_DIR" 2>/dev/null|sed 's|.reg||gi')"
2876-
WDLLOVERLST="steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,winemenubuilder.exe= \n Disabled"
2876+
WDLLOVERLST="steam_api,steam_api64,steamclient,steamclient64,icu=n;lsteamclient,winemenubuilder.exe=;winhttp,amd_ags_x64=n,b \n Disabled"
28772877
WMONOOVERLST="Microsoft.Xna.Framework.*,Gac=n \n Disabled"
28782878
WINVERLST="11 \n 10 \n \n 8 \n 7 \n xp"
28792879
WARCHLST="win64 \n win32"
@@ -2885,6 +2885,8 @@ lu_config() {
28852885
VKICDFILESLST="AUTO $([ -n "$(find_vk_icd nvidia)" ] && echo '\n Nvidia') \
28862886
$([ -n "$(find_vk_icd intel)" ] && echo '\n Intel') \
28872887
$([ -n "$(find_vk_icd radeon)" ] && echo '\n AMD') \
2888+
$([ -n "$(find_vk_icd amd)" ] && echo '\n AMDVLK') \
2889+
$([ -n "$(find_vk_icd nouveau)" ] && echo '\n NVK') \
28882890
$([ -n "$(find_vk_icd lvp)" ] && echo '\n Lvp')"
28892891
DXVKLST="$(ls_dlls dxvk) \n v1.10.3 \n v2.3 \n latest $(is_exe_nofirstrun && echo '\n Default')"
28902892
VKD3DLST="$(ls_dlls vkd3d) \n v2.1 \n v2.5 \n \n v2.10 \n latest $(is_exe_nofirstrun && echo '\n Default')"
@@ -5571,8 +5573,10 @@ check_vulkan_icd() {
55715573
setvkicd() {
55725574
case "${1,,}" in
55735575
nvidia) exportvkicd nvidia ;;
5574-
intel*|anv) exportvkicd intel ;;
5576+
nvk) exportvkicd nouveau ;;
55755577
amd|radv) exportvkicd radeon ;;
5578+
amdvlk) exportvkicd amd ;;
5579+
intel*|anv) exportvkicd intel ;;
55765580
llvmpipe|lvp) exportvkicd lvp ;;
55775581
esac
55785582
}
@@ -6925,7 +6929,7 @@ if [[ "$EUID" == 0 && "$ALLOW_ROOT" != 1 ]]
69256929
done
69266930
}
69276931
IGNPS=(
6928-
'tee' 'ls' 'shellsrv' 'cat'
6932+
'tee' 'ls' 'ssrv' 'cat' 'tini'
69296933
'sleep' 'gamemoded' 'bash' 'grep'
69306934
)
69316935
find_processes

‎lwrap/PKGBUILD‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pkgname='lwrap'
44
pkgver='0.78.5'
5-
pkgrel='4'
5+
pkgrel='5'
66
pkgdesc='Lux Wine wrapper for RunImage container'
77
arch=('x86_64')
88
url='https://github.com/VHSgunzo/lux-wine'
@@ -34,6 +34,7 @@ depends=(
3434
'libmpeg2' 'twolame' 'lib32-twolame' 'gst-plugin-msdk' 'lib32-libdv' 'libdv' 'GE-Proton'
3535
'xxd-standalone' 'obs-vkcapture-lw' 'lib32-obs-vkcapture-lw' 'egl-wayland' 'gstreamer-vaapi'
3636
'moninfo' 'perl-image-exiftool' 'xorg-xlsfonts' 'firefox' 'controllermap' 'libayatana-appindicator'
37+
'vulkan-nouveau' 'lib32-vulkan-nouveau' 'lib32-amdvlk' 'amdvlk'
3738
)
3839
optdepends=(
3940
'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'

‎lwrap/lwrap‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,7 @@ is_exe_exist() { command -v "$@" &>/dev/null ; }
702702
which_exe() { command -v "$@" ; }
703703

704704
check_url_stat_code() {
705+
set -o pipefail
705706
if is_exe_exist curl
706707
then curl -sL -o /dev/null -I -w "%{http_code}" "$@" 2>/dev/null
707708
elif is_exe_exist wget
@@ -779,7 +780,7 @@ try_dl() {
779780
fi
780781
if is_url "$URL"
781782
then
782-
WGET_ARGS=(--no-check-certificate --content-disposition -t 3 -T 5 -w 0.5 "$URL" -O "$FILEDIR/$FILENAME")
783+
WGET_ARGS=(--no-check-certificate -t 3 -T 5 -w 0.5 "$URL" -O "$FILEDIR/$FILENAME")
783784
[ ! -d "$FILEDIR" ] && \
784785
mkdir -p "$FILEDIR"
785786
if [[ "$NOT_TERM" == 1 && "$NO_DL_GUI" != 1 ]] && \
@@ -848,7 +849,7 @@ try_dl() {
848849
elif is_exe_exist curl
849850
then
850851
curl -R --progress-bar --insecure --fail -L "$URL" -o \
851-
"$FILEDIR/$FILENAME" |& tr '\r' '\n'|\
852+
"$FILEDIR/$FILENAME" |& tr '\r' '\n'|sed '0,/100/{/100/d;}'|\
852853
sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g'|\
853854
dl_progress
854855
elif is_exe_exist wget2

0 commit comments

Comments
 (0)