VHSgunzo commited on
Commit
31ba1af
·
1 Parent(s): 2b428f5
CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
 
 
 
 
 
 
 
1
  # v0.80.7
2
 
3
  * Update [lwrun](https://github.com/VHSgunzo/runimage/releases/tag/v0.40.7) container `v0.40.7`
 
1
+ # v0.80.8
2
+
3
+ * Update [lwrun](https://github.com/VHSgunzo/lwrun/releases/tag/continuous) packages
4
+ * Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v10.4) `v10.4`
5
+ * Fix library search paths for the new Proton 10+
6
+ * Fix `winetricks` "warning: unknown option -r"
7
+
8
  # v0.80.7
9
 
10
  * Update [lwrun](https://github.com/VHSgunzo/runimage/releases/tag/v0.40.7) container `v0.40.7`
lux-wine CHANGED
@@ -1,6 +1,6 @@
1
  #!/usr/bin/env bash
2
 
3
- export LW_VERSION="0.80.7"
4
  export LW_DEVELOPERS="VHSgunzo"
5
 
6
  export RED='\033[1;91m'
@@ -627,7 +627,7 @@ check_dll_symlink() {
627
  unset NEW32SLK NEW64SLK
628
  for dll_check in $check_dlls_slk
629
  do
630
- PFX_DLL32_VER="$(readlink -f "$PFX_DLL32_PTH/$dll_check"|grep -v "/.*-windows/"|grep -v "/fakedlls/"|grep -wo "$2")"
631
  for x32_x86 in "x32" "x86"
632
  do
633
  if [[ -f "$LW_RUNTIME_DIR/$1/$2/$x32_x86/$dll_check" && "$PFX_DLL32_VER" != "$2" \
@@ -642,7 +642,7 @@ check_dll_symlink() {
642
  done
643
  if [ "$WINEARCH" != "win32" ]
644
  then
645
- PFX_DLL64_VER="$(readlink -f "$PFX_DLL64_PTH/$dll_check"|grep -v "/.*-windows/"|grep -v "/fakedlls/"|grep -wo "$2")"
646
  if [[ -f "$LW_RUNTIME_DIR/$1/$2/x64/$dll_check" && "$PFX_DLL64_VER" != "$2" \
647
  && -f "$PFX_DLL64_PTH/$dll_check" ]] \
648
  || [[ -f "$LW_RUNTIME_DIR/$1/v$2/x64/$dll_check" && "$PFX_DLL64_VER" != "v$2" \
@@ -655,7 +655,7 @@ check_dll_symlink() {
655
  done
656
  for dll_check in $check_dlls_slk
657
  do
658
- PFX_DLL32_VER="$(readlink -f "$PFX_DLL32_PTH/$dll_check"|grep -v "/.*-windows/"|grep -v "/fakedlls/"|grep -wo "$2")"
659
  for x32_x86 in "x32" "x86"
660
  do
661
  if [[ -f "$LW_RUNTIME_DIR/$1/$2/$x32_x86/$dll_check" && "$PFX_DLL32_VER" != "$2" ]]
@@ -677,7 +677,7 @@ check_dll_symlink() {
677
  done
678
  if [ "$WINEARCH" != "win32" ]
679
  then
680
- PFX_DLL64_VER="$(readlink -f "$PFX_DLL64_PTH/$dll_check"|grep -v "/.*-windows/"|grep -v "/fakedlls/"|grep -wo "$2")"
681
  if [[ -f "$LW_RUNTIME_DIR/$1/$2/x64/$dll_check" && "$PFX_DLL64_VER" != "$2" ]]
682
  then
683
  if try_ln "$LW_RUNTIME_DIR/$1/$2/x64/$dll_check" "$PFX_DLL64_PTH/"
@@ -1221,7 +1221,7 @@ check_musthave_dll() {
1221
  then
1222
  export UPDPFX_LOG="$WINEPREFIX/update_pfx.log"
1223
  $TERM_APP $LWSHELL -c "print_info notify 'Try to install DLL in prefix: [ $NEED_INSTALL_DLLS ]'|& tee -a '$UPDPFX_LOG' ; \
1224
- winetricks -q -f -r $NEED_INSTALL_DLLS|& tee -a '$UPDPFX_LOG'"
1225
  while read WTRXDLL
1226
  do
1227
  if [ ! -n "$(grep -wo "$WTRXDLL" "$WTRX_LOG" 2>/dev/null)" ]
@@ -2026,7 +2026,7 @@ check_def_wine() {
2026
  IGNWINE=(
2027
  'Default' 'SETWINE' 'System' 'Proton 7.0'
2028
  'Proton 8.0' 'Proton 9.0' 'Proton 9.0 (Beta)'
2029
- 'Proton - Experimental'
2030
  )
2031
  if [[ -n "$WINE_VERSION" && ! -d "$LW_WINE_DIR/$WINE_VERSION" && "$WINEINUSEDEL" != 1 && \
2032
  ! -L "$LW_WINE_DIR/$WINE_VERSION" && ! "${IGNWINE[@]}" =~ "$WINE_VERSION" ]]
@@ -2705,12 +2705,15 @@ check_latencyflex() {
2705
  for latencydll in {latencyflex_layer,latencyflex_wine}
2706
  do
2707
  sys_latencydll="/usr/lib/wine/x86_64-windows/${latencydll}.dll"
2708
- wine_latencydll="$LW_WINE_DIR/$WINE_VERSION/lib64/wine/x86_64-windows/${latencydll}.dll"
 
 
 
2709
  pfx_latencydll="$WINEPREFIX/drive_c/windows/system32/${latencydll}.dll"
2710
  if [ -f "$sys_latencydll" ]
2711
  then
2712
  if [[ ! -f "$wine_latencydll" \
2713
- && -d "$LW_WINE_DIR/$WINE_VERSION/lib64/wine/x86_64-windows" ]]
2714
  then
2715
  try_ln "$sys_latencydll" "$wine_latencydll" &>/dev/null
2716
  try_ln "$sys_latencydll.a" "$wine_latencydll.a" &>/dev/null
@@ -2719,9 +2722,9 @@ check_latencyflex() {
2719
  fi
2720
  done
2721
  latencyso="/usr/lib/wine/x86_64-unix/latencyflex_layer.so"
2722
- wine_latencyso="$LW_WINE_DIR/$WINE_VERSION/lib64/wine/x86_64-unix/latencyflex_layer.so"
2723
  if [[ -f "$latencyso" && ! -f "$wine_latencyso" \
2724
- && -d "$LW_WINE_DIR/$WINE_VERSION/lib64/wine/x86_64-unix" ]]
2725
  then
2726
  try_ln "$latencyso" "$wine_latencyso" &>/dev/null
2727
  fi
@@ -4795,7 +4798,7 @@ check_gamemode() {
4795
 
4796
  check_gstreamer() {
4797
  disable_gstreamer() {
4798
- [ ! -d "$WINEDIR/lib64/gstreamer-1.0" ] && \
4799
  print_error notify "Wine GSTREAMER not found!"
4800
  unset GSTREAMER
4801
  wdllover_upd "winegstreamer="
@@ -4803,8 +4806,18 @@ check_gstreamer() {
4803
  print_info "GSTREAMER is disabled!"
4804
  }
4805
  [ -n "$1" ] && export GSTREAMER="$1"
 
 
 
 
 
 
 
 
 
 
4806
  if [ "$GSTREAMER" == 1 ] && \
4807
- [[ -d "/usr/lib/gstreamer-1.0" || -d "$WINEDIR/lib64/gstreamer-1.0" ]]
4808
  then
4809
  try_mkdir "$LW_DEF_CACHE/gstreamer-1.0"
4810
  export GST_GL_WINDOW='surfaceless'
@@ -4813,12 +4826,12 @@ check_gstreamer() {
4813
  export MEDIACONV_AUDIO_TRANSCODED_FILE="$WINE_GST_REGISTRY_DIR/transcoded_audio.foz"
4814
  export MEDIACONV_VIDEO_DUMP_FILE="$WINE_GST_REGISTRY_DIR/video.foz"
4815
  export MEDIACONV_VIDEO_TRANSCODED_FILE="$WINE_GST_REGISTRY_DIR/transcoded_video.foz"
4816
- if [[ -d "$WINEDIR" && -d "$WINEDIR/lib64/gstreamer-1.0" ]]
4817
  then
4818
  if [ -d "$WINEDIR/share" ]
4819
  then export ESPEAK_DATA_PATH="$WINEDIR/share"
4820
  fi
4821
- export GST_PLUGIN_SYSTEM_PATH_1_0="$WINEDIR/lib64/gstreamer-1.0:$WINEDIR/lib/gstreamer-1.0"
4822
  if [ -d "$WINEDIR/share/media" ]
4823
  then
4824
  export MEDIACONV_BLANK_VIDEO_FILE="$WINEDIR/share/media/blank.mkv"
@@ -4855,21 +4868,26 @@ check_wd3dmode() {
4855
  try_ln_wine_build_dll() {
4856
  for wine_build_dll in "$@"
4857
  do
 
 
4858
  if [ "$WINE_VERSION" == "System" ]
4859
  then
4860
- try_ln "/usr/lib32/wine/i386-windows/${wine_build_dll}.dll" "$PFX_DLL32_PTH/${wine_build_dll}.dll" &>/dev/null
4861
  [ "$WINEARCH" != "win32" ] && \
4862
- try_ln "/usr/lib/wine/x86_64-windows/${wine_build_dll}.dll" "$PFX_DLL64_PTH/${wine_build_dll}.dll" &>/dev/null
4863
  else
4864
- if ! try_ln "$WINEDIR/lib/wine/${wine_build_dll}.dll" "$PFX_DLL32_PTH/${wine_build_dll}.dll" &>/dev/null
4865
  then
4866
- try_ln "$WINEDIR/lib/wine/i386-windows/${wine_build_dll}.dll" "$PFX_DLL32_PTH/${wine_build_dll}.dll" &>/dev/null
4867
  fi
4868
  if [ "$WINEARCH" != "win32" ]
4869
  then
4870
- if ! try_ln "$WINEDIR/lib64/wine/${wine_build_dll}.dll" "$PFX_DLL64_PTH/${wine_build_dll}.dll" &>/dev/null
4871
  then
4872
- try_ln "$WINEDIR/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "$PFX_DLL64_PTH/${wine_build_dll}.dll" &>/dev/null
 
 
 
4873
  fi
4874
  fi
4875
  fi
@@ -4889,9 +4907,12 @@ check_wined3d() {
4889
  fi
4890
  if [ "$WINEARCH" != "win32" ]
4891
  then
4892
- if ! try_ln "$WINEDIR/lib64/wine/fakedlls/dxgi.dll" "$PFX_DLL64_PTH/dxgi.dll" &>/dev/null
4893
  then
4894
- try_ln "$WINEDIR/lib64/wine/x86_64-windows/dxgi.dll" "$PFX_DLL64_PTH/dxgi.dll" &>/dev/null
 
 
 
4895
  fi
4896
  fi
4897
  try_ln_wine_build_dll d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 d3d12 d3d12core
@@ -4909,33 +4930,34 @@ check_dxvk_async() {
4909
  }
4910
 
4911
  get_proton_d3dlib() {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4912
  unset P_DXVK P_NVAPI P_VKD3D
4913
  if [ -d "$WINEDIR" ]
4914
  then
4915
- if [[ ! -d "$LW_RUNTIME_DIR/dxvk/$WINE_VERSION/x32" && ! -d "$LW_RUNTIME_DIR/dxvk/$WINE_VERSION/x64" ]] \
4916
- && [[ -d "$WINEDIR/lib/wine/dxvk" && -d "$WINEDIR/lib64/wine/dxvk" ]]
4917
- then
4918
- try_mkdir "$LW_RUNTIME_DIR/dxvk/$WINE_VERSION"
4919
- try_$1 "$WINEDIR/lib/wine/dxvk" "$LW_RUNTIME_DIR/dxvk/$WINE_VERSION/x32"
4920
- try_$1 "$WINEDIR/lib64/wine/dxvk" "$LW_RUNTIME_DIR/dxvk/$WINE_VERSION/x64"
4921
- export P_DXVK=1
4922
- fi
4923
- if [[ ! -d "$LW_RUNTIME_DIR/dxvk-nvapi/$WINE_VERSION/x32" && ! -d "$LW_RUNTIME_DIR/dxvk-nvapi/$WINE_VERSION/x64" ]] \
4924
- && [[ -d "$WINEDIR/lib/wine/nvapi" && -d "$WINEDIR/lib64/wine/nvapi" ]]
4925
- then
4926
- try_mkdir "$LW_RUNTIME_DIR/dxvk-nvapi/$WINE_VERSION"
4927
- try_$1 "$WINEDIR/lib/wine/nvapi" "$LW_RUNTIME_DIR/dxvk-nvapi/$WINE_VERSION/x32"
4928
- try_$1 "$WINEDIR/lib64/wine/nvapi" "$LW_RUNTIME_DIR/dxvk-nvapi/$WINE_VERSION/x64"
4929
- export P_NVAPI=1
4930
- fi
4931
- if [[ ! -d "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION/x32" && ! -d "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION/x64" ]] \
4932
- && [[ -d "$WINEDIR/lib/wine/vkd3d-proton" && -d "$WINEDIR/lib64/wine/vkd3d-proton" ]]
4933
- then
4934
- try_mkdir "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION"
4935
- try_$1 "$WINEDIR/lib/wine/vkd3d-proton" "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION/x32"
4936
- try_$1 "$WINEDIR/lib64/wine/vkd3d-proton" "$LW_RUNTIME_DIR/vkd3d/$WINE_VERSION/x64"
4937
- export P_VKD3D=1
4938
- fi
4939
  fi
4940
  }
4941
 
@@ -4980,7 +5002,7 @@ check_proton_d3dlib() {
4980
  check_dxvk() {
4981
  [ -n "$1" ] && export DXVK="$1"
4982
  [ -n "$2" ] && export DXVK_VERSION="$2"
4983
- export ALLDXVKDLLS="d3d11,d3d10,d3d10core,d3d10_1,d3d9,d3d8,dxgi,openvr_api_dxvk,dxvk_config"
4984
  if [[ "$DXVK" == 1 && "$WINED3D" != 1 ]]
4985
  then
4986
  [ "$DXVK_VERSION" == "Default" ] && \
@@ -5000,9 +5022,12 @@ check_dxvk() {
5000
  fi
5001
  if [ "$WINEARCH" == "win64" ]
5002
  then
5003
- if ! try_ln "$WINEDIR/lib64/wine/fakedlls/dxgi.dll" "$PFX_DLL64_PTH" &>/dev/null
5004
  then
5005
- try_ln "$WINEDIR/lib64/wine/x86_64-windows/dxgi.dll" "$PFX_DLL64_PTH" &>/dev/null
 
 
 
5006
  fi
5007
  fi
5008
  wdllover_upd "$(echo $check_dlls_slk|sed 's| dxgi||i;s|.dll||gi;s| |,|g')=n;dxgi=b"
@@ -5093,10 +5118,18 @@ check_vkd3d() {
5093
  if [ "$WINEARCH" == 'win64' ]
5094
  then
5095
  local libvkd3dpdll64="$PFX_DLL64_PTH/${libvkd3d}.dll"
5096
- local libvkd3dwdll64="$WINEDIR/lib64/vkd3d/${libvkd3d}.dll"
 
5097
  fi
5098
  local libvkd3dpdll32="$PFX_DLL32_PTH/${libvkd3d}.dll"
5099
- local libvkd3dwdll32="$WINEDIR/lib/vkd3d/${libvkd3d}.dll"
 
 
 
 
 
 
 
5100
  [[ -f "$libvkd3dwdll32" && ! "$(ls -l "$libvkd3dpdll32" 2>/dev/null)" =~ "$WINE_VERSION" ]] && \
5101
  try_ln "$libvkd3dwdll32" "$libvkd3dpdll32" && local ret=0
5102
  [[ -f "$libvkd3dwdll64" && ! "$(ls -l "$libvkd3dpdll64" 2>/dev/null)" =~ "$WINE_VERSION" ]] && \
@@ -5131,7 +5164,7 @@ check_wine_nvml() {
5131
  check_dxvk-nvapi() {
5132
  [ -n "$1" ] && export DXVK_NVAPI="$1"
5133
  [ -n "$2" ] && export DXVK_NVAPI_VERSION="$2"
5134
- export ALLNVAPIDLLS="nvapi,nvapi64,nvml,nvcuda"
5135
  if [[ "$DISABLE_NVAPI" != 1 && "$DXVK_NVAPI" == 1 && "$DXVK" != 0 && \
5136
  -n "$(lspci|grep -o NVIDIA)" && "$WINED3D" != 1 ]]
5137
  then
@@ -5704,12 +5737,12 @@ check_ld_library() {
5704
  [ -n "$1" ] && ld_lib_upd "$1"
5705
  if [ -n "$LD_LIBRARY_PATH" ]
5706
  then
5707
- if [ ! -n "$(echo $LD_LIBRARY_PATH|grep "$WINEDIR/lib64:$WINEDIR/lib")" ]
5708
  then
5709
- export LD_LIBRARY_PATH="$WINEDIR/lib64:$WINEDIR/lib:$LD_LIBRARY_PATH"
5710
  fi
5711
  else
5712
- ld_lib_upd "$WINEDIR/lib64:$WINEDIR/lib:/usr/lib64:/usr/lib:/usr/lib32:/opt/cuda/lib64:/usr/lib/openmpi:/opt/cuda/extras/CUPTI/lib64:/opt/cuda/nvvm/lib64"
5713
  fi
5714
  }
5715
 
 
1
  #!/usr/bin/env bash
2
 
3
+ export LW_VERSION="0.80.8"
4
  export LW_DEVELOPERS="VHSgunzo"
5
 
6
  export RED='\033[1;91m'
 
627
  unset NEW32SLK NEW64SLK
628
  for dll_check in $check_dlls_slk
629
  do
630
+ PFX_DLL32_VER="$(readlink -f "$PFX_DLL32_PTH/$dll_check"|grep -Ev ".*/wine/(i386|x86_64)?-windows/"|grep -v "/fakedlls/"|grep -wo "$2")"
631
  for x32_x86 in "x32" "x86"
632
  do
633
  if [[ -f "$LW_RUNTIME_DIR/$1/$2/$x32_x86/$dll_check" && "$PFX_DLL32_VER" != "$2" \
 
642
  done
643
  if [ "$WINEARCH" != "win32" ]
644
  then
645
+ PFX_DLL64_VER="$(readlink -f "$PFX_DLL64_PTH/$dll_check"|grep -Ev ".*/wine/(i386|x86_64)?-windows/"|grep -v "/fakedlls/"|grep -wo "$2")"
646
  if [[ -f "$LW_RUNTIME_DIR/$1/$2/x64/$dll_check" && "$PFX_DLL64_VER" != "$2" \
647
  && -f "$PFX_DLL64_PTH/$dll_check" ]] \
648
  || [[ -f "$LW_RUNTIME_DIR/$1/v$2/x64/$dll_check" && "$PFX_DLL64_VER" != "v$2" \
 
655
  done
656
  for dll_check in $check_dlls_slk
657
  do
658
+ PFX_DLL32_VER="$(readlink -f "$PFX_DLL32_PTH/$dll_check"|grep -Ev ".*/wine/(i386|x86_64)?-windows/"|grep -v "/fakedlls/"|grep -wo "$2")"
659
  for x32_x86 in "x32" "x86"
660
  do
661
  if [[ -f "$LW_RUNTIME_DIR/$1/$2/$x32_x86/$dll_check" && "$PFX_DLL32_VER" != "$2" ]]
 
677
  done
678
  if [ "$WINEARCH" != "win32" ]
679
  then
680
+ PFX_DLL64_VER="$(readlink -f "$PFX_DLL64_PTH/$dll_check"|grep -Ev ".*/wine/(i386|x86_64)?-windows/"|grep -v "/fakedlls/"|grep -wo "$2")"
681
  if [[ -f "$LW_RUNTIME_DIR/$1/$2/x64/$dll_check" && "$PFX_DLL64_VER" != "$2" ]]
682
  then
683
  if try_ln "$LW_RUNTIME_DIR/$1/$2/x64/$dll_check" "$PFX_DLL64_PTH/"
 
1221
  then
1222
  export UPDPFX_LOG="$WINEPREFIX/update_pfx.log"
1223
  $TERM_APP $LWSHELL -c "print_info notify 'Try to install DLL in prefix: [ $NEED_INSTALL_DLLS ]'|& tee -a '$UPDPFX_LOG' ; \
1224
+ winetricks -q -f $NEED_INSTALL_DLLS|& tee -a '$UPDPFX_LOG'"
1225
  while read WTRXDLL
1226
  do
1227
  if [ ! -n "$(grep -wo "$WTRXDLL" "$WTRX_LOG" 2>/dev/null)" ]
 
2026
  IGNWINE=(
2027
  'Default' 'SETWINE' 'System' 'Proton 7.0'
2028
  'Proton 8.0' 'Proton 9.0' 'Proton 9.0 (Beta)'
2029
+ 'Proton - Experimental' 'Proton 10.0'
2030
  )
2031
  if [[ -n "$WINE_VERSION" && ! -d "$LW_WINE_DIR/$WINE_VERSION" && "$WINEINUSEDEL" != 1 && \
2032
  ! -L "$LW_WINE_DIR/$WINE_VERSION" && ! "${IGNWINE[@]}" =~ "$WINE_VERSION" ]]
 
2705
  for latencydll in {latencyflex_layer,latencyflex_wine}
2706
  do
2707
  sys_latencydll="/usr/lib/wine/x86_64-windows/${latencydll}.dll"
2708
+ local winelatencydlldirpfx="$LW_WINE_DIR/$WINE_VERSION/lib64"
2709
+ [ -d "$winelatencydlldirpfx" ]||\
2710
+ local winelatencydlldirpfx="$LW_WINE_DIR/$WINE_VERSION/lib"
2711
+ wine_latencydll="$winelatencydlldirpfx/wine/x86_64-windows/${latencydll}.dll"
2712
  pfx_latencydll="$WINEPREFIX/drive_c/windows/system32/${latencydll}.dll"
2713
  if [ -f "$sys_latencydll" ]
2714
  then
2715
  if [[ ! -f "$wine_latencydll" \
2716
+ && -d "$winelatencydlldirpfx/wine/x86_64-windows" ]]
2717
  then
2718
  try_ln "$sys_latencydll" "$wine_latencydll" &>/dev/null
2719
  try_ln "$sys_latencydll.a" "$wine_latencydll.a" &>/dev/null
 
2722
  fi
2723
  done
2724
  latencyso="/usr/lib/wine/x86_64-unix/latencyflex_layer.so"
2725
+ wine_latencyso="$winelatencydlldirpfx/wine/x86_64-unix/latencyflex_layer.so"
2726
  if [[ -f "$latencyso" && ! -f "$wine_latencyso" \
2727
+ && -d "$winelatencydlldirpfx/wine/x86_64-unix" ]]
2728
  then
2729
  try_ln "$latencyso" "$wine_latencyso" &>/dev/null
2730
  fi
 
4798
 
4799
  check_gstreamer() {
4800
  disable_gstreamer() {
4801
+ [[ ! -d "$winegst64dir" && ! -d "$winegst32dir" ]] && \
4802
  print_error notify "Wine GSTREAMER not found!"
4803
  unset GSTREAMER
4804
  wdllover_upd "winegstreamer="
 
4806
  print_info "GSTREAMER is disabled!"
4807
  }
4808
  [ -n "$1" ] && export GSTREAMER="$1"
4809
+ local new_winegst64dir="$WINEDIR/lib/x86_64-linux-gnu/gstreamer-1.0"
4810
+ local old_winegst64dir="$WINEDIR/lib64/gstreamer-1.0"
4811
+ local new_winegst32dir="$WINEDIR/lib/i386-linux-gnu/gstreamer-1.0"
4812
+ local old_winegst32dir="$WINEDIR/lib/gstreamer-1.0"
4813
+ [ -d "$new_winegst64dir" ] && \
4814
+ local winegst64dir="$new_winegst64dir"||\
4815
+ local winegst64dir="$old_winegst64dir"
4816
+ [ -d "$new_winegst32dir" ] && \
4817
+ local winegst32dir="$new_winegst32dir"||\
4818
+ local winegst32dir="$old_winegst32dir"
4819
  if [ "$GSTREAMER" == 1 ] && \
4820
+ [[ -d "/usr/lib/gstreamer-1.0" || -d "$winegst64dir" || -d "$winegst32dir" ]]
4821
  then
4822
  try_mkdir "$LW_DEF_CACHE/gstreamer-1.0"
4823
  export GST_GL_WINDOW='surfaceless'
 
4826
  export MEDIACONV_AUDIO_TRANSCODED_FILE="$WINE_GST_REGISTRY_DIR/transcoded_audio.foz"
4827
  export MEDIACONV_VIDEO_DUMP_FILE="$WINE_GST_REGISTRY_DIR/video.foz"
4828
  export MEDIACONV_VIDEO_TRANSCODED_FILE="$WINE_GST_REGISTRY_DIR/transcoded_video.foz"
4829
+ if [ -d "$WINEDIR" ] && [[ -d "$winegst64dir" || -d "$winegst32dir" ]]
4830
  then
4831
  if [ -d "$WINEDIR/share" ]
4832
  then export ESPEAK_DATA_PATH="$WINEDIR/share"
4833
  fi
4834
+ export GST_PLUGIN_SYSTEM_PATH_1_0="$winegst64dir:$winegst32dir"
4835
  if [ -d "$WINEDIR/share/media" ]
4836
  then
4837
  export MEDIACONV_BLANK_VIDEO_FILE="$WINEDIR/share/media/blank.mkv"
 
4868
  try_ln_wine_build_dll() {
4869
  for wine_build_dll in "$@"
4870
  do
4871
+ local dstdll64pth="$PFX_DLL64_PTH/${wine_build_dll}.dll"
4872
+ local dstdll32pth="$PFX_DLL32_PTH/${wine_build_dll}.dll"
4873
  if [ "$WINE_VERSION" == "System" ]
4874
  then
4875
+ try_ln "/usr/lib32/wine/i386-windows/${wine_build_dll}.dll" "$dstdll32pth" &>/dev/null
4876
  [ "$WINEARCH" != "win32" ] && \
4877
+ try_ln "/usr/lib/wine/x86_64-windows/${wine_build_dll}.dll" "$dstdll64pth" &>/dev/null
4878
  else
4879
+ if ! try_ln "$WINEDIR/lib/wine/${wine_build_dll}.dll" "$dstdll32pth" &>/dev/null
4880
  then
4881
+ try_ln "$WINEDIR/lib/wine/i386-windows/${wine_build_dll}.dll" "$dstdll32pth" &>/dev/null
4882
  fi
4883
  if [ "$WINEARCH" != "win32" ]
4884
  then
4885
+ if [ -d "$WINEDIR/lib64" ]
4886
  then
4887
+ if ! try_ln "$WINEDIR/lib64/wine/${wine_build_dll}.dll" "$dstdll64pth" &>/dev/null
4888
+ then try_ln "$WINEDIR/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "$dstdll64pth" &>/dev/null
4889
+ fi
4890
+ else try_ln "$WINEDIR/lib/wine/x86_64-windows/${wine_build_dll}.dll" "$dstdll64pth" &>/dev/null
4891
  fi
4892
  fi
4893
  fi
 
4907
  fi
4908
  if [ "$WINEARCH" != "win32" ]
4909
  then
4910
+ if [ -d "$WINEDIR/lib64" ]
4911
  then
4912
+ if ! try_ln "$WINEDIR/lib64/wine/fakedlls/dxgi.dll" "$PFX_DLL64_PTH/dxgi.dll" &>/dev/null
4913
+ then try_ln "$WINEDIR/lib64/wine/x86_64-windows/dxgi.dll" "$PFX_DLL64_PTH/dxgi.dll" &>/dev/null
4914
+ fi
4915
+ else try_ln "$WINEDIR/lib/wine/x86_64-windows/dxgi.dll" "$PFX_DLL64_PTH/dxgi.dll" &>/dev/null
4916
  fi
4917
  fi
4918
  try_ln_wine_build_dll d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 d3d12 d3d12core
 
4930
  }
4931
 
4932
  get_proton_d3dlib() {
4933
+ try_get_proton_d3dlib() {
4934
+ if [[ ! -d "$LW_RUNTIME_DIR/$3/$WINE_VERSION/x32" && ! -d "$LW_RUNTIME_DIR/$3/$WINE_VERSION/x64" ]]
4935
+ then
4936
+ local new_d3dlib_dir="$WINEDIR/lib/wine/$2/i386-windows"
4937
+ local new_d3dlib64_dir="$WINEDIR/lib/wine/$2/x86_64-windows"
4938
+ local old_d3dlib_dir="$WINEDIR/lib/wine/$2"
4939
+ local old_d3dlib64_dir="$WINEDIR/lib64/wine/$2"
4940
+ [ -d "$new_d3dlib_dir" ] && \
4941
+ d3dlib_dir="$new_d3dlib_dir"||\
4942
+ d3dlib_dir="$old_d3dlib_dir"
4943
+ [ -d "$new_d3dlib64_dir" ] && \
4944
+ d3dlib64_dir="$new_d3dlib64_dir"||\
4945
+ d3dlib64_dir="$old_d3dlib64_dir"
4946
+ if [[ -d "$d3dlib_dir" && -d "$d3dlib64_dir" ]]
4947
+ then
4948
+ try_mkdir "$LW_RUNTIME_DIR/$3/$WINE_VERSION"
4949
+ try_$1 "$d3dlib_dir" "$LW_RUNTIME_DIR/$3/$WINE_VERSION/x32"
4950
+ try_$1 "$d3dlib64_dir" "$LW_RUNTIME_DIR/$3/$WINE_VERSION/x64"
4951
+ eval "export $4=1"
4952
+ fi
4953
+ fi
4954
+ }
4955
  unset P_DXVK P_NVAPI P_VKD3D
4956
  if [ -d "$WINEDIR" ]
4957
  then
4958
+ try_get_proton_d3dlib "$1" dxvk dxvk P_DXVK
4959
+ try_get_proton_d3dlib "$1" nvapi dxvk-nvapi P_NVAPI
4960
+ try_get_proton_d3dlib "$1" vkd3d-proton vkd3d P_VKD3D
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4961
  fi
4962
  }
4963
 
 
5002
  check_dxvk() {
5003
  [ -n "$1" ] && export DXVK="$1"
5004
  [ -n "$2" ] && export DXVK_VERSION="$2"
5005
+ export ALLDXVKDLLS="d3d11,d3d10,d3d10core,d3d10_1,d3d9,d3d8,dxgi,openvr_api_dxvk,dxvk_config,openvr_api_dxvk"
5006
  if [[ "$DXVK" == 1 && "$WINED3D" != 1 ]]
5007
  then
5008
  [ "$DXVK_VERSION" == "Default" ] && \
 
5022
  fi
5023
  if [ "$WINEARCH" == "win64" ]
5024
  then
5025
+ if [ -d "$WINEDIR/lib64" ]
5026
  then
5027
+ if ! try_ln "$WINEDIR/lib64/wine/fakedlls/dxgi.dll" "$PFX_DLL64_PTH" &>/dev/null
5028
+ then try_ln "$WINEDIR/lib64/wine/x86_64-windows/dxgi.dll" "$PFX_DLL64_PTH" &>/dev/null
5029
+ fi
5030
+ else try_ln "$WINEDIR/lib/wine/x86_64-windows/dxgi.dll" "$PFX_DLL64_PTH" &>/dev/null
5031
  fi
5032
  fi
5033
  wdllover_upd "$(echo $check_dlls_slk|sed 's| dxgi||i;s|.dll||gi;s| |,|g')=n;dxgi=b"
 
5118
  if [ "$WINEARCH" == 'win64' ]
5119
  then
5120
  local libvkd3dpdll64="$PFX_DLL64_PTH/${libvkd3d}.dll"
5121
+ local new_libvkd3dwdll64="$WINEDIR/lib/vkd3d/x86_64-windows/${libvkd3d}.dll"
5122
+ local old_libvkd3dwdll64="$WINEDIR/lib64/vkd3d/${libvkd3d}.dll"
5123
  fi
5124
  local libvkd3dpdll32="$PFX_DLL32_PTH/${libvkd3d}.dll"
5125
+ local new_libvkd3dwdll32="$WINEDIR/lib/vkd3d/i386-windows/${libvkd3d}.dll"
5126
+ local old_libvkd3dwdll32="$WINEDIR/lib/vkd3d/${libvkd3d}.dll"
5127
+ [ -e "$new_libvkd3dwdll64" ] && \
5128
+ libvkd3dwdll64="$new_libvkd3dwdll64"||\
5129
+ libvkd3dwdll64="$old_libvkd3dwdll64"
5130
+ [ -e "$new_libvkd3dwdll32" ] && \
5131
+ libvkd3dwdll32="$new_libvkd3dwdll32"||\
5132
+ libvkd3dwdll32="$old_libvkd3dwdll32"
5133
  [[ -f "$libvkd3dwdll32" && ! "$(ls -l "$libvkd3dpdll32" 2>/dev/null)" =~ "$WINE_VERSION" ]] && \
5134
  try_ln "$libvkd3dwdll32" "$libvkd3dpdll32" && local ret=0
5135
  [[ -f "$libvkd3dwdll64" && ! "$(ls -l "$libvkd3dpdll64" 2>/dev/null)" =~ "$WINE_VERSION" ]] && \
 
5164
  check_dxvk-nvapi() {
5165
  [ -n "$1" ] && export DXVK_NVAPI="$1"
5166
  [ -n "$2" ] && export DXVK_NVAPI_VERSION="$2"
5167
+ export ALLNVAPIDLLS="nvapi,nvapi64,nvml,nvcuda,nvofapi64"
5168
  if [[ "$DISABLE_NVAPI" != 1 && "$DXVK_NVAPI" == 1 && "$DXVK" != 0 && \
5169
  -n "$(lspci|grep -o NVIDIA)" && "$WINED3D" != 1 ]]
5170
  then
 
5737
  [ -n "$1" ] && ld_lib_upd "$1"
5738
  if [ -n "$LD_LIBRARY_PATH" ]
5739
  then
5740
+ if [ ! -n "$(echo $LD_LIBRARY_PATH|grep "$WINEDIR/lib64:$WINEDIR/lib/x86_64-linux-gnu:$WINEDIR/lib:$WINEDIR/lib/i386-linux-gnu")" ]
5741
  then
5742
+ export LD_LIBRARY_PATH="$WINEDIR/lib64:$WINEDIR/lib/x86_64-linux-gnu:$WINEDIR/lib:$WINEDIR/lib/i386-linux-gnu:$LD_LIBRARY_PATH"
5743
  fi
5744
  else
5745
+ ld_lib_upd "$WINEDIR/lib64:$WINEDIR/lib/x86_64-linux-gnu:$WINEDIR/lib:$WINEDIR/lib/i386-linux-gnu:/usr/lib64:/usr/lib:/usr/lib32:/opt/cuda/lib64:/usr/lib/openmpi:/opt/cuda/extras/CUPTI/lib64:/opt/cuda/nvvm/lib64"
5746
  fi
5747
  }
5748
 
lwrap/PKGBUILD CHANGED
@@ -1,8 +1,8 @@
1
  # Maintainer: VHSgunzo <vhsgunzo.github.io>
2
 
3
  pkgname='lwrap'
4
- pkgver='0.80.7'
5
- pkgrel='7'
6
  pkgdesc='Lux Wine wrapper for RunImage container'
7
  arch=('x86_64')
8
  url='https://github.com/VHSgunzo/lux-wine'
 
1
  # Maintainer: VHSgunzo <vhsgunzo.github.io>
2
 
3
  pkgname='lwrap'
4
+ pkgver='0.80.8'
5
+ pkgrel='1'
6
  pkgdesc='Lux Wine wrapper for RunImage container'
7
  arch=('x86_64')
8
  url='https://github.com/VHSgunzo/lux-wine'
registry_patch/disable_firefox.reg ADDED
Binary file (488 Bytes). View file
 
registry_patch/enable_firefox.reg ADDED
Binary file (552 Bytes). View file