v0.78.5.5

VHSgunzo · Dec 26, 2024 · 5495369 · 5495369
1 parent 1c13f50
commit 5495369
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v0.78.5.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/v9.9) `v9.21`
+* Add NVK vulkan driver
+* Add AMDVLK vulkan driver
+* Remove DB script for `League of Legends`
+* Fix `lwrap` download GUI
+* Minor fixes
+
 # v0.78.5.4
 
 * Remove `Yandex Cloud` mirrors

diff --git a/lux-wine b/lux-wine
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export LW_VERSION="0.78.5.4"
+export LW_VERSION="0.78.5.5"
 export LW_DEVELOPERS="VHSgunzo"
 
 export RED='\033[1;91m'
@@ -183,7 +183,7 @@ check_def_config() {
     [ ! -n "$DIS_LAYER_AMD" ] && export DIS_LAYER_AMD=1
     [ ! -n "$US_LAYOUT" ] && export US_LAYOUT=1
     [ ! -n "$WMONOVER" ] && export WMONOVER="Microsoft.Xna.Framework.*,Gac=n"
-    [ ! -n "$WDLLOVER" ] && export WDLLOVER='steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,winemenubuilder.exe='
+    [ ! -n "$WDLLOVER" ] && export WDLLOVER='steam_api,steam_api64,steamclient,steamclient64,icu=n;lsteamclient,winemenubuilder.exe=;winhttp,amd_ags_x64.dll=n,b'
     [ ! -n "$WINE_THEME" ] && export WINE_THEME='Breeze Dark'
     [ ! -n "$LWMANGOHUD" ] && export LWMANGOHUD='Enabled'
     [ ! -n "$LWVKCAPTURE" ] && export LWVKCAPTURE='Disabled'
@@ -314,8 +314,8 @@ print_input() {
 
 check_wine_pids() {
     unset WINE_PIDS CHK_WINE_PIDS PROC_EXES
-    if [ "$ENABLE_HOSTEXEC" == 1 ]
-        then PROC_EXES="$(echo 'ls -l /proc/*/exe 2>/dev/null'|hostexec)"
+    if [ "$INSIDE_RUNIMAGE" == 1 ]
+        then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
         else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
     fi
     if [[ "$WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]] \
@@ -361,8 +361,8 @@ check_luwine_sh_pid() {
 
 check_exes() {
     unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE PROC_EXES
-    if [ "$ENABLE_HOSTEXEC" == 1 ]
-        then PROC_EXES="$(echo 'ls -l /proc/*/exe 2>/dev/null'|hostexec)"
+    if [ "$INSIDE_RUNIMAGE" == 1 ]
+        then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
         else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
     fi
     RUN_EXES="$(ps -o pid=,cmd= -p $(echo "$PROC_EXES"|\
@@ -783,13 +783,13 @@ try_download() {
     try_mkdir "$DLPTH"
     if [ "$LW_DOWNLOADER" == "aria2c" ]
         then
-            aria2c -x 13 -s 13 --no-conf --allow-overwrite --summary-interval=1 -o "$DLFLNAME" -d "$DLPTH" "$1"|stdbuf -o0 grep 'ETA'| \
+            aria2c --no-conf -R -x 13 -s 13 --no-conf --allow-overwrite --summary-interval=1 -o "$DLFLNAME" -d "$DLPTH" "$1"|stdbuf -o0 grep 'ETA'| \
             sed -u 's/(.*)/ &/;s/(//;s/)//;s/\[//;s/\]//;s/%//'|stdbuf -o0 awk '{print$3"\n#Downloading at "$2,$5,$6}'| \
             yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \
                 --auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine
     elif [ "$LW_DOWNLOADER" == "wget" ]
         then
-            wget --no-check-certificate --content-disposition -t 3 -T 5 -w 0.5 "$1" --directory-prefix="$DLPTH"|& \
+            wget --no-check-certificate -t 3 -T 5 -w 0.5 "$1" --directory-prefix="$DLPTH"|& \
             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./'| \
             yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \
                 --auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine
@@ -2063,7 +2063,7 @@ check_def_wine() {
                     try_rm "$LW_WINE_DIR/$BINWINE" &>/dev/null
                     print_info notify "Deleted broken Wine: $BINWINE"
                 else
-                    if [ -w "$LW_WINE_DIR/$BINWINE" ]
+                    if [[ -w "$LW_WINE_DIR/$BINWINE" && "$(realpath "$LW_WINE_DIR/$BINWINE")" != '/usr/share/steam/compatibilitytools.d/'* ]]
                         then
                             WFILESDIR="$LW_WINE_DIR/$BINWINE/files"
                             WVERSFL="$LW_WINE_DIR/$BINWINE/version"
@@ -2873,7 +2873,7 @@ lu_config() {
     export LWCFGKEY=$RANDOM
     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"
     WINETHEMESLST="Disabled \n $(ls -1 "$LW_THEMES_DIR" 2>/dev/null|sed 's|.reg||gi')"
-    WDLLOVERLST="steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,winemenubuilder.exe= \n Disabled"
+    WDLLOVERLST="steam_api,steam_api64,steamclient,steamclient64,icu=n;lsteamclient,winemenubuilder.exe=;winhttp,amd_ags_x64=n,b \n Disabled"
     WMONOOVERLST="Microsoft.Xna.Framework.*,Gac=n \n Disabled"
     WINVERLST="11 \n 10 \n \n 8 \n 7 \n xp"
     WARCHLST="win64 \n win32"
@@ -2885,6 +2885,8 @@ lu_config() {
     VKICDFILESLST="AUTO $([ -n "$(find_vk_icd nvidia)" ] && echo '\n Nvidia') \
                         $([ -n "$(find_vk_icd intel)" ] && echo '\n Intel') \
                         $([ -n "$(find_vk_icd radeon)" ] && echo '\n AMD') \
+                        $([ -n "$(find_vk_icd amd)" ] && echo '\n AMDVLK') \
+                        $([ -n "$(find_vk_icd nouveau)" ] && echo '\n NVK') \
                         $([ -n "$(find_vk_icd lvp)" ] && echo '\n Lvp')"
     DXVKLST="$(ls_dlls dxvk) \n v1.10.3 \n v2.3 \n latest $(is_exe_nofirstrun && echo '\n Default')"
     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() {
     setvkicd() {
             case "${1,,}" in
                 nvidia) exportvkicd nvidia ;;
-                intel*|anv) exportvkicd intel ;;
+                nvk) exportvkicd nouveau ;;
                 amd|radv) exportvkicd radeon ;;
+                amdvlk) exportvkicd amd ;;
+                intel*|anv) exportvkicd intel ;;
                 llvmpipe|lvp) exportvkicd lvp ;;
             esac
     }
@@ -6925,7 +6929,7 @@ if [[ "$EUID" == 0 && "$ALLOW_ROOT" != 1 ]]
                             done
                         }
                         IGNPS=(
-                            'tee' 'ls' 'shellsrv' 'cat'
+                            'tee' 'ls' 'ssrv' 'cat' 'tini'
                             'sleep' 'gamemoded' 'bash' 'grep'
                         )
                         find_processes

diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='lwrap'
 pkgver='0.78.5'
-pkgrel='4'
+pkgrel='5'
 pkgdesc='Lux Wine wrapper for RunImage container'
 arch=('x86_64')
 url='https://github.com/VHSgunzo/lux-wine'
@@ -34,6 +34,7 @@ depends=(
     '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' 'xorg-xlsfonts' 'firefox' 'controllermap' 'libayatana-appindicator'
+    'vulkan-nouveau' 'lib32-vulkan-nouveau' 'lib32-amdvlk' 'amdvlk'
 )
 optdepends=(
     'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'

diff --git a/lwrap/lwrap b/lwrap/lwrap
@@ -702,6 +702,7 @@ is_exe_exist() { command -v "$@" &>/dev/null ; }
 which_exe() { command -v "$@" ; }
 
 check_url_stat_code() {
+    set -o pipefail
     if is_exe_exist curl
         then curl -sL -o /dev/null -I -w "%{http_code}" "$@" 2>/dev/null
     elif is_exe_exist wget
@@ -779,7 +780,7 @@ try_dl() {
             fi
             if is_url "$URL"
                 then
-                    WGET_ARGS=(--no-check-certificate --content-disposition -t 3 -T 5 -w 0.5 "$URL" -O "$FILEDIR/$FILENAME")
+                    WGET_ARGS=(--no-check-certificate -t 3 -T 5 -w 0.5 "$URL" -O "$FILEDIR/$FILENAME")
                     [ ! -d "$FILEDIR" ] && \
                         mkdir -p "$FILEDIR"
                     if [[ "$NOT_TERM" == 1 && "$NO_DL_GUI" != 1 ]] && \
@@ -848,7 +849,7 @@ try_dl() {
                             elif is_exe_exist curl
                                 then
                                     curl -R --progress-bar --insecure --fail -L "$URL" -o \
-                                        "$FILEDIR/$FILENAME" |& tr '\r' '\n'|\
+                                        "$FILEDIR/$FILENAME" |& tr '\r' '\n'|sed '0,/100/{/100/d;}'|\
                                         sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g'|\
                                     dl_progress
                             elif is_exe_exist wget2