VHSgunzo
commited on
Commit
·
6635d66
1
Parent(s):
c206bc4
v0.78.5.5
Browse files- CHANGELOG.md +10 -0
- index.html +3 -2
- lux-wine +16 -12
- lwrap/PKGBUILD +2 -1
- lwrap/lwrap +3 -2
- main.zip +2 -2
CHANGELOG.md
CHANGED
@@ -1,3 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
# v0.78.5.4
|
2 |
|
3 |
* Remove `Yandex Cloud` mirrors
|
|
|
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 |
+
|
11 |
# v0.78.5.4
|
12 |
|
13 |
* Remove `Yandex Cloud` mirrors
|
index.html
CHANGED
@@ -702,6 +702,7 @@ is_exe_exist() { command -v "$@" &>/dev/null ; }
|
|
702 |
which_exe() { command -v "$@" ; }
|
703 |
|
704 |
check_url_stat_code() {
|
|
|
705 |
if is_exe_exist curl
|
706 |
then curl -sL -o /dev/null -I -w "%{http_code}" "$@" 2>/dev/null
|
707 |
elif is_exe_exist wget
|
@@ -779,7 +780,7 @@ try_dl() {
|
|
779 |
fi
|
780 |
if is_url "$URL"
|
781 |
then
|
782 |
-
WGET_ARGS=(--no-check-certificate
|
783 |
[ ! -d "$FILEDIR" ] && \
|
784 |
mkdir -p "$FILEDIR"
|
785 |
if [[ "$NOT_TERM" == 1 && "$NO_DL_GUI" != 1 ]] && \
|
@@ -848,7 +849,7 @@ try_dl() {
|
|
848 |
elif is_exe_exist curl
|
849 |
then
|
850 |
curl -R --progress-bar --insecure --fail -L "$URL" -o \
|
851 |
-
"$FILEDIR/$FILENAME" |& tr '\r' '\n'|\
|
852 |
sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g'|\
|
853 |
dl_progress
|
854 |
elif is_exe_exist wget2
|
|
|
702 |
which_exe() { command -v "$@" ; }
|
703 |
|
704 |
check_url_stat_code() {
|
705 |
+
set -o pipefail
|
706 |
if is_exe_exist curl
|
707 |
then curl -sL -o /dev/null -I -w "%{http_code}" "$@" 2>/dev/null
|
708 |
elif is_exe_exist wget
|
|
|
780 |
fi
|
781 |
if is_url "$URL"
|
782 |
then
|
783 |
+
WGET_ARGS=(--no-check-certificate -t 3 -T 5 -w 0.5 "$URL" -O "$FILEDIR/$FILENAME")
|
784 |
[ ! -d "$FILEDIR" ] && \
|
785 |
mkdir -p "$FILEDIR"
|
786 |
if [[ "$NOT_TERM" == 1 && "$NO_DL_GUI" != 1 ]] && \
|
|
|
849 |
elif is_exe_exist curl
|
850 |
then
|
851 |
curl -R --progress-bar --insecure --fail -L "$URL" -o \
|
852 |
+
"$FILEDIR/$FILENAME" |& tr '\r' '\n'|sed '0,/100/{/100/d;}'|\
|
853 |
sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g'|\
|
854 |
dl_progress
|
855 |
elif is_exe_exist wget2
|
lux-wine
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
#!/usr/bin/env bash
|
2 |
|
3 |
-
export LW_VERSION="0.78.5.
|
4 |
export LW_DEVELOPERS="VHSgunzo"
|
5 |
|
6 |
export RED='\033[1;91m'
|
@@ -183,7 +183,7 @@ check_def_config() {
|
|
183 |
[ ! -n "$DIS_LAYER_AMD" ] && export DIS_LAYER_AMD=1
|
184 |
[ ! -n "$US_LAYOUT" ] && export US_LAYOUT=1
|
185 |
[ ! -n "$WMONOVER" ] && export WMONOVER="Microsoft.Xna.Framework.*,Gac=n"
|
186 |
-
[ ! -n "$WDLLOVER" ] && export WDLLOVER='steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,winemenubuilder.exe='
|
187 |
[ ! -n "$WINE_THEME" ] && export WINE_THEME='Breeze Dark'
|
188 |
[ ! -n "$LWMANGOHUD" ] && export LWMANGOHUD='Enabled'
|
189 |
[ ! -n "$LWVKCAPTURE" ] && export LWVKCAPTURE='Disabled'
|
@@ -314,8 +314,8 @@ print_input() {
|
|
314 |
|
315 |
check_wine_pids() {
|
316 |
unset WINE_PIDS CHK_WINE_PIDS PROC_EXES
|
317 |
-
if [ "$
|
318 |
-
then PROC_EXES="$(
|
319 |
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
|
320 |
fi
|
321 |
if [[ "$WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]] \
|
@@ -361,8 +361,8 @@ check_luwine_sh_pid() {
|
|
361 |
|
362 |
check_exes() {
|
363 |
unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE PROC_EXES
|
364 |
-
if [ "$
|
365 |
-
then PROC_EXES="$(
|
366 |
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
|
367 |
fi
|
368 |
RUN_EXES="$(ps -o pid=,cmd= -p $(echo "$PROC_EXES"|\
|
@@ -783,13 +783,13 @@ try_download() {
|
|
783 |
try_mkdir "$DLPTH"
|
784 |
if [ "$LW_DOWNLOADER" == "aria2c" ]
|
785 |
then
|
786 |
-
aria2c -x 13 -s 13 --no-conf --allow-overwrite --summary-interval=1 -o "$DLFLNAME" -d "$DLPTH" "$1"|stdbuf -o0 grep 'ETA'| \
|
787 |
sed -u 's/(.*)/ &/;s/(//;s/)//;s/\[//;s/\]//;s/%//'|stdbuf -o0 awk '{print$3"\n#Downloading at "$2,$5,$6}'| \
|
788 |
yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \
|
789 |
--auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine
|
790 |
elif [ "$LW_DOWNLOADER" == "wget" ]
|
791 |
then
|
792 |
-
wget --no-check-certificate
|
793 |
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./'| \
|
794 |
yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \
|
795 |
--auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine
|
@@ -2063,7 +2063,7 @@ check_def_wine() {
|
|
2063 |
try_rm "$LW_WINE_DIR/$BINWINE" &>/dev/null
|
2064 |
print_info notify "Deleted broken Wine: $BINWINE"
|
2065 |
else
|
2066 |
-
if [ -w "$LW_WINE_DIR/$BINWINE" ]
|
2067 |
then
|
2068 |
WFILESDIR="$LW_WINE_DIR/$BINWINE/files"
|
2069 |
WVERSFL="$LW_WINE_DIR/$BINWINE/version"
|
@@ -2873,7 +2873,7 @@ lu_config() {
|
|
2873 |
export LWCFGKEY=$RANDOM
|
2874 |
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"
|
2875 |
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"
|
2877 |
WMONOOVERLST="Microsoft.Xna.Framework.*,Gac=n \n Disabled"
|
2878 |
WINVERLST="11 \n 10 \n \n 8 \n 7 \n xp"
|
2879 |
WARCHLST="win64 \n win32"
|
@@ -2885,6 +2885,8 @@ lu_config() {
|
|
2885 |
VKICDFILESLST="AUTO $([ -n "$(find_vk_icd nvidia)" ] && echo '\n Nvidia') \
|
2886 |
$([ -n "$(find_vk_icd intel)" ] && echo '\n Intel') \
|
2887 |
$([ -n "$(find_vk_icd radeon)" ] && echo '\n AMD') \
|
|
|
|
|
2888 |
$([ -n "$(find_vk_icd lvp)" ] && echo '\n Lvp')"
|
2889 |
DXVKLST="$(ls_dlls dxvk) \n v1.10.3 \n v2.3 \n latest $(is_exe_nofirstrun && echo '\n Default')"
|
2890 |
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() {
|
|
5571 |
setvkicd() {
|
5572 |
case "${1,,}" in
|
5573 |
nvidia) exportvkicd nvidia ;;
|
5574 |
-
|
5575 |
amd|radv) exportvkicd radeon ;;
|
|
|
|
|
5576 |
llvmpipe|lvp) exportvkicd lvp ;;
|
5577 |
esac
|
5578 |
}
|
@@ -6925,7 +6929,7 @@ if [[ "$EUID" == 0 && "$ALLOW_ROOT" != 1 ]]
|
|
6925 |
done
|
6926 |
}
|
6927 |
IGNPS=(
|
6928 |
-
'tee' 'ls' '
|
6929 |
'sleep' 'gamemoded' 'bash' 'grep'
|
6930 |
)
|
6931 |
find_processes
|
|
|
1 |
#!/usr/bin/env bash
|
2 |
|
3 |
+
export LW_VERSION="0.78.5.5"
|
4 |
export LW_DEVELOPERS="VHSgunzo"
|
5 |
|
6 |
export RED='\033[1;91m'
|
|
|
183 |
[ ! -n "$DIS_LAYER_AMD" ] && export DIS_LAYER_AMD=1
|
184 |
[ ! -n "$US_LAYOUT" ] && export US_LAYOUT=1
|
185 |
[ ! -n "$WMONOVER" ] && export WMONOVER="Microsoft.Xna.Framework.*,Gac=n"
|
186 |
+
[ ! -n "$WDLLOVER" ] && export WDLLOVER='steam_api,steam_api64,steamclient,steamclient64,icu=n;lsteamclient,winemenubuilder.exe=;winhttp,amd_ags_x64.dll=n,b'
|
187 |
[ ! -n "$WINE_THEME" ] && export WINE_THEME='Breeze Dark'
|
188 |
[ ! -n "$LWMANGOHUD" ] && export LWMANGOHUD='Enabled'
|
189 |
[ ! -n "$LWVKCAPTURE" ] && export LWVKCAPTURE='Disabled'
|
|
|
314 |
|
315 |
check_wine_pids() {
|
316 |
unset WINE_PIDS CHK_WINE_PIDS PROC_EXES
|
317 |
+
if [ "$INSIDE_RUNIMAGE" == 1 ]
|
318 |
+
then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
|
319 |
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
|
320 |
fi
|
321 |
if [[ "$WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]] \
|
|
|
361 |
|
362 |
check_exes() {
|
363 |
unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE PROC_EXES
|
364 |
+
if [ "$INSIDE_RUNIMAGE" == 1 ]
|
365 |
+
then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
|
366 |
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
|
367 |
fi
|
368 |
RUN_EXES="$(ps -o pid=,cmd= -p $(echo "$PROC_EXES"|\
|
|
|
783 |
try_mkdir "$DLPTH"
|
784 |
if [ "$LW_DOWNLOADER" == "aria2c" ]
|
785 |
then
|
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'| \
|
787 |
sed -u 's/(.*)/ &/;s/(//;s/)//;s/\[//;s/\]//;s/%//'|stdbuf -o0 awk '{print$3"\n#Downloading at "$2,$5,$6}'| \
|
788 |
yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \
|
789 |
--auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine
|
790 |
elif [ "$LW_DOWNLOADER" == "wget" ]
|
791 |
then
|
792 |
+
wget --no-check-certificate -t 3 -T 5 -w 0.5 "$1" --directory-prefix="$DLPTH"|& \
|
793 |
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./'| \
|
794 |
yad --progress --percentage=0 --text="Download:\t$DLFLNAME\n$1" --auto-close --no-escape --selectable-labels \
|
795 |
--auto-kill --center --on-top --fixed --no-buttons --undecorated --skip-taskbar Lux Wine
|
|
|
2063 |
try_rm "$LW_WINE_DIR/$BINWINE" &>/dev/null
|
2064 |
print_info notify "Deleted broken Wine: $BINWINE"
|
2065 |
else
|
2066 |
+
if [[ -w "$LW_WINE_DIR/$BINWINE" && "$(realpath "$LW_WINE_DIR/$BINWINE")" != '/usr/share/steam/compatibilitytools.d/'* ]]
|
2067 |
then
|
2068 |
WFILESDIR="$LW_WINE_DIR/$BINWINE/files"
|
2069 |
WVERSFL="$LW_WINE_DIR/$BINWINE/version"
|
|
|
2873 |
export LWCFGKEY=$RANDOM
|
2874 |
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"
|
2875 |
WINETHEMESLST="Disabled \n $(ls -1 "$LW_THEMES_DIR" 2>/dev/null|sed 's|.reg||gi')"
|
2876 |
+
WDLLOVERLST="steam_api,steam_api64,steamclient,steamclient64,icu=n;lsteamclient,winemenubuilder.exe=;winhttp,amd_ags_x64=n,b \n Disabled"
|
2877 |
WMONOOVERLST="Microsoft.Xna.Framework.*,Gac=n \n Disabled"
|
2878 |
WINVERLST="11 \n 10 \n \n 8 \n 7 \n xp"
|
2879 |
WARCHLST="win64 \n win32"
|
|
|
2885 |
VKICDFILESLST="AUTO $([ -n "$(find_vk_icd nvidia)" ] && echo '\n Nvidia') \
|
2886 |
$([ -n "$(find_vk_icd intel)" ] && echo '\n Intel') \
|
2887 |
$([ -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') \
|
2890 |
$([ -n "$(find_vk_icd lvp)" ] && echo '\n Lvp')"
|
2891 |
DXVKLST="$(ls_dlls dxvk) \n v1.10.3 \n v2.3 \n latest $(is_exe_nofirstrun && echo '\n Default')"
|
2892 |
VKD3DLST="$(ls_dlls vkd3d) \n v2.1 \n v2.5 \n \n v2.10 \n latest $(is_exe_nofirstrun && echo '\n Default')"
|
|
|
5573 |
setvkicd() {
|
5574 |
case "${1,,}" in
|
5575 |
nvidia) exportvkicd nvidia ;;
|
5576 |
+
nvk) exportvkicd nouveau ;;
|
5577 |
amd|radv) exportvkicd radeon ;;
|
5578 |
+
amdvlk) exportvkicd amd ;;
|
5579 |
+
intel*|anv) exportvkicd intel ;;
|
5580 |
llvmpipe|lvp) exportvkicd lvp ;;
|
5581 |
esac
|
5582 |
}
|
|
|
6929 |
done
|
6930 |
}
|
6931 |
IGNPS=(
|
6932 |
+
'tee' 'ls' 'ssrv' 'cat' 'tini'
|
6933 |
'sleep' 'gamemoded' 'bash' 'grep'
|
6934 |
)
|
6935 |
find_processes
|
lwrap/PKGBUILD
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
|
3 |
pkgname='lwrap'
|
4 |
pkgver='0.78.5'
|
5 |
-
pkgrel='
|
6 |
pkgdesc='Lux Wine wrapper for RunImage container'
|
7 |
arch=('x86_64')
|
8 |
url='https://github.com/VHSgunzo/lux-wine'
|
@@ -34,6 +34,7 @@ depends=(
|
|
34 |
'libmpeg2' 'twolame' 'lib32-twolame' 'gst-plugin-msdk' 'lib32-libdv' 'libdv' 'GE-Proton'
|
35 |
'xxd-standalone' 'obs-vkcapture-lw' 'lib32-obs-vkcapture-lw' 'egl-wayland' 'gstreamer-vaapi'
|
36 |
'moninfo' 'perl-image-exiftool' 'xorg-xlsfonts' 'firefox' 'controllermap' 'libayatana-appindicator'
|
|
|
37 |
)
|
38 |
optdepends=(
|
39 |
'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'
|
|
|
2 |
|
3 |
pkgname='lwrap'
|
4 |
pkgver='0.78.5'
|
5 |
+
pkgrel='5'
|
6 |
pkgdesc='Lux Wine wrapper for RunImage container'
|
7 |
arch=('x86_64')
|
8 |
url='https://github.com/VHSgunzo/lux-wine'
|
|
|
34 |
'libmpeg2' 'twolame' 'lib32-twolame' 'gst-plugin-msdk' 'lib32-libdv' 'libdv' 'GE-Proton'
|
35 |
'xxd-standalone' 'obs-vkcapture-lw' 'lib32-obs-vkcapture-lw' 'egl-wayland' 'gstreamer-vaapi'
|
36 |
'moninfo' 'perl-image-exiftool' 'xorg-xlsfonts' 'firefox' 'controllermap' 'libayatana-appindicator'
|
37 |
+
'vulkan-nouveau' 'lib32-vulkan-nouveau' 'lib32-amdvlk' 'amdvlk'
|
38 |
)
|
39 |
optdepends=(
|
40 |
'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'
|
lwrap/lwrap
CHANGED
@@ -702,6 +702,7 @@ is_exe_exist() { command -v "$@" &>/dev/null ; }
|
|
702 |
which_exe() { command -v "$@" ; }
|
703 |
|
704 |
check_url_stat_code() {
|
|
|
705 |
if is_exe_exist curl
|
706 |
then curl -sL -o /dev/null -I -w "%{http_code}" "$@" 2>/dev/null
|
707 |
elif is_exe_exist wget
|
@@ -779,7 +780,7 @@ try_dl() {
|
|
779 |
fi
|
780 |
if is_url "$URL"
|
781 |
then
|
782 |
-
WGET_ARGS=(--no-check-certificate
|
783 |
[ ! -d "$FILEDIR" ] && \
|
784 |
mkdir -p "$FILEDIR"
|
785 |
if [[ "$NOT_TERM" == 1 && "$NO_DL_GUI" != 1 ]] && \
|
@@ -848,7 +849,7 @@ try_dl() {
|
|
848 |
elif is_exe_exist curl
|
849 |
then
|
850 |
curl -R --progress-bar --insecure --fail -L "$URL" -o \
|
851 |
-
"$FILEDIR/$FILENAME" |& tr '\r' '\n'|\
|
852 |
sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g'|\
|
853 |
dl_progress
|
854 |
elif is_exe_exist wget2
|
|
|
702 |
which_exe() { command -v "$@" ; }
|
703 |
|
704 |
check_url_stat_code() {
|
705 |
+
set -o pipefail
|
706 |
if is_exe_exist curl
|
707 |
then curl -sL -o /dev/null -I -w "%{http_code}" "$@" 2>/dev/null
|
708 |
elif is_exe_exist wget
|
|
|
780 |
fi
|
781 |
if is_url "$URL"
|
782 |
then
|
783 |
+
WGET_ARGS=(--no-check-certificate -t 3 -T 5 -w 0.5 "$URL" -O "$FILEDIR/$FILENAME")
|
784 |
[ ! -d "$FILEDIR" ] && \
|
785 |
mkdir -p "$FILEDIR"
|
786 |
if [[ "$NOT_TERM" == 1 && "$NO_DL_GUI" != 1 ]] && \
|
|
|
849 |
elif is_exe_exist curl
|
850 |
then
|
851 |
curl -R --progress-bar --insecure --fail -L "$URL" -o \
|
852 |
+
"$FILEDIR/$FILENAME" |& tr '\r' '\n'|sed '0,/100/{/100/d;}'|\
|
853 |
sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g'|\
|
854 |
dl_progress
|
855 |
elif is_exe_exist wget2
|
main.zip
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:26dfe1d0518d215e634fbfc7ed06df9572b8c2778bb6b48e54e41d6cf20e8723
|
3 |
+
size 589365
|