VHSgunzo commited on
Commit
562745f
·
1 Parent(s): 367521e
Files changed (7) hide show
  1. CHANGELOG.md +10 -0
  2. README.md +1 -10
  3. index.html +4 -3
  4. lux-wine +16 -5
  5. lwrap/PKGBUILD +2 -2
  6. lwrap/lwrap +1 -0
  7. lwrap/lwrap.install +1 -1
CHANGELOG.md CHANGED
@@ -1,3 +1,13 @@
 
 
 
 
 
 
 
 
 
 
1
  # v0.80.8
2
 
3
  * Update [lwrun](https://github.com/VHSgunzo/lwrun/releases/tag/continuous) packages
 
1
+ # v0.81.1
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.10) `v10.10
5
+ * Create [dgvoodoo2](https://github.com/dege-diosg/dgVoodoo2) releases [repo](https://github.com/VHSgunzo/dgVoodoo2)
6
+ * Add the `lwrun` container unmount mode for `30 minutes` of inactivity
7
+ * Add `StartupWMClass=Steam` to Steam LW `.desktop` file
8
+ * Add `NTsync` option to `Settings`
9
+ * Minor fixes
10
+
11
  # v0.80.8
12
 
13
  * Update [lwrun](https://github.com/VHSgunzo/lwrun/releases/tag/continuous) packages
README.md CHANGED
@@ -1,13 +1,3 @@
1
- ---
2
- title: Git
3
- emoji: 🔥
4
- colorFrom: green
5
- colorTo: blue
6
- sdk: static
7
- pinned: false
8
- license: mit
9
- ---
10
-
11
  # **Lux Wine**
12
  This project allows you to easily run your favorite applications and games for Windows on almost any Linux x86_64 distribution using a specially configured Wine/Proton and [RunImage](https://github.com/VHSgunzo/runimage) container. Lux Wine also comes with a native Steam, which allows you not to think about installing a large number of libraries into your system (especially 32-bit ones) for its work.
13
 
@@ -176,6 +166,7 @@ runimage-lw discord
176
  - [x] [controllermap](https://aur.archlinux.org/packages/controllermap)
177
  - [x] Esync
178
  - [x] Fsync (if linux kernel support)
 
179
  - [x] Vsync settings
180
  - [x] [AMD FidelityFX Super Resolution settings (if Wine support)](https://github.com/GloriousEggroll/proton-ge-custom/releases/tag/GE-Proton7-24)
181
  - [x] BattleEye runtime (if Wine support)
 
 
 
 
 
 
 
 
 
 
 
1
  # **Lux Wine**
2
  This project allows you to easily run your favorite applications and games for Windows on almost any Linux x86_64 distribution using a specially configured Wine/Proton and [RunImage](https://github.com/VHSgunzo/runimage) container. Lux Wine also comes with a native Steam, which allows you not to think about installing a large number of libraries into your system (especially 32-bit ones) for its work.
3
 
 
166
  - [x] [controllermap](https://aur.archlinux.org/packages/controllermap)
167
  - [x] Esync
168
  - [x] Fsync (if linux kernel support)
169
+ - [x] NTsync (if linux kernel support)
170
  - [x] Vsync settings
171
  - [x] [AMD FidelityFX Super Resolution settings (if Wine support)](https://github.com/GloriousEggroll/proton-ge-custom/releases/tag/GE-Proton7-24)
172
  - [x] BattleEye runtime (if Wine support)
index.html CHANGED
@@ -106,8 +106,9 @@ make_install() {
106
  if [[ -d "$RUNROOTFS" && -f "$RSTEAM_DESKF" ]]
107
  then
108
  cp -rf "$RSTEAM_DESKF" "$HSTEAM_DESKF"
109
- sed -i "s|^Exec.*steam-runtime|Exec='$HBIN_DIR/steam-runtime'|g" "$HSTEAM_DESKF"
110
- sed -i "s|^Name=Steam (Runtime)|Name=Steam (RunImage LW)|g" "$HSTEAM_DESKF"
 
111
  sed -i '/RunOnDiscreteGpu/d;/PrefersNonDefaultGPU/d' "$HSTEAM_DESKF"
112
  HICNSTM="$HOME_ICONS/steam.png"
113
  for hi_icon_size in ${HICOLOR_SIZES[@]}
@@ -186,7 +187,7 @@ try_install_lwrun() {
186
  info_msg "Update lwrun link..."
187
  ln -sf "$LWRUN" "$LWRUN_LN"
188
  fi
189
- for steam in {steam,steam-runtime,steam-native}
190
  do
191
  STEAM_LN="$HBIN_DIR/$steam"
192
  if [ "$(readrealpath "$STEAM_LN")" != "$LWRUN" ]
 
106
  if [[ -d "$RUNROOTFS" && -f "$RSTEAM_DESKF" ]]
107
  then
108
  cp -rf "$RSTEAM_DESKF" "$HSTEAM_DESKF"
109
+ sed -i "s|^Exec.*steam.*|Exec='$HBIN_DIR/steam' %U|g" "$HSTEAM_DESKF"
110
+ sed -i "s|^Name=Steam.*|Name=Steam (RunImage LW)|g" "$HSTEAM_DESKF"
111
+ sed -i '/\[Desktop Entry\]/a StartupWMClass=Steam' "$HSTEAM_DESKF"
112
  sed -i '/RunOnDiscreteGpu/d;/PrefersNonDefaultGPU/d' "$HSTEAM_DESKF"
113
  HICNSTM="$HOME_ICONS/steam.png"
114
  for hi_icon_size in ${HICOLOR_SIZES[@]}
 
187
  info_msg "Update lwrun link..."
188
  ln -sf "$LWRUN" "$LWRUN_LN"
189
  fi
190
+ for steam in {steam,steam-native}
191
  do
192
  STEAM_LN="$HBIN_DIR/$steam"
193
  if [ "$(readrealpath "$STEAM_LN")" != "$LWRUN" ]
lux-wine CHANGED
@@ -1,6 +1,6 @@
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'
@@ -172,6 +172,7 @@ check_def_config() {
172
  [ ! -n "$WTRX_LOG" ] && export WTRX_LOG="$WINEPREFIX/winetricks.log"
173
  [ ! -n "$VKICDFILES" ] && export VKICDFILES="AUTO"
174
  [ ! -n "$FSYNC" ] && export FSYNC=1
 
175
  [ ! -n "$FSR_MODE" ] && export FSR_MODE='Enabled'
176
  [ ! -n "$VSYNC" ] && export VSYNC="Default"
177
  [ ! -n "$VKBASALT" ] && export VKBASALT=1
@@ -202,7 +203,7 @@ check_def_config() {
202
  export VKD3D_GIT_RELEASE_URL="https://api.github.com/repos/HansKristian-Work/vkd3d-proton/releases"
203
  export NVAPI_GIT_RELEASE_URL="https://api.github.com/repos/jp7677/dxvk-nvapi/releases"
204
  export D3D_GIT_RELEASE_URL="https://api.github.com/repos/lutris/d3d_extras/releases"
205
- export DGVO_GIT_RELEASE_URL="https://api.github.com/repos/lutris/dgvoodoo2/releases"
206
  export BUILD_GIT_RELEASE_URL="https://api.github.com/repos/lutris/buildbot/releases"
207
  export NVML_GIT_RELEASE_URL="https://api.github.com/repos/VHSgunzo/nvml/releases"
208
  [ ! -n "$DXVK_VERSION" ] && export DXVK_VERSION="latest"
@@ -1718,7 +1719,7 @@ lu_debug() {
1718
  "VKBASALT_EFFECTS" "WINE_MONO_OVERRIDES" "EXE_PATH" "LU_EXE" "VKD3D_CONFIG" "LD_LIBRARY_PATH" "PATH" "WINEDEBUG" "CPU_LIMIT" "VSYNC" \
1719
  "VKD3D_DEBUG" "WINE_MONO_TRACE" "VKBASALT_LOG_LEVEL" "DXVK_LOG_LEVEL" "PULSE_LATENCY_MSEC" "VIRTUAL_DESKTOP" "FPS_LIMIT" "LW_CENV" \
1720
  "LW_DIR" "LW_CFG" "GSTREAMER" "HIDE_NVIDIA_GPU" "EXE_LWDB" "EXE_LWDBFL" "GST_PLUGIN_SYSTEM_PATH_1_0" "WINE_GST_REGISTRY_DIR" "RUNSRC" "RUNROOTFS_VERSION" \
1721
- "WINE_SANDBOX" "WINEFSYNC" "WINEFSYNC_FUTEX2" "WINE_FULLSCREEN_FSR" "WINE_FULLSCREEN_FSR_STRENGTH" "STAGING_SHARED_MEMORY" "WINEESYNC" "VKBASALT_LOG_FILE" \
1722
  "LOG_FILE" "WINE_LARGE_ADDRESS_AWARE" "TERM_APP" "VKBASALT" "DXVK_NVAPIHACK" "MANGOHUD" "MANGOHUD_USER_CONF" "RUN_GAMEMODE" "VKD3D_LOG_FILE" \
1723
  "VKBASALT_CONFIG_FILE" "VK_ICD_FILENAMES" "__GL_THREADED_OPTIMIZATIONS" "DXVK_STATE_CACHE_PATH" "__GLX_VENDOR_LIBRARY_NAME" "__NV_PRIME_RENDER_OFFLOAD" \
1724
  "WINE_FULLSCREEN_FSR_MODE" "DXVK_STATE_CACHE" "__GL_DXVK_OPTIMIZATIONS" "__GL_SHADER_DISK_CACHE_PATH" "__GL_SHADER_DISK_CACHE" "__GL_SHADER_DISK_CACHE_SIZE" \
@@ -2785,6 +2786,7 @@ lite_init() {
2785
  check_exe_args
2786
  check_esync
2787
  check_fsync
 
2788
  check_first_run "$@"
2789
  fi
2790
  }
@@ -2938,7 +2940,7 @@ lu_config() {
2938
  lwconfig_save() {
2939
  LWCFGVAR="WINE_VERSION WIN_VER WINEARCH WINEPREFIX WINE_THEME WDLLOVER WMONOVER WD3DMODE DISABLE_NVAPI WINE_DXGI D3D_EXTRAS DGVOODOO2 \
2940
  DXVK_VERSION VKD3D_VERSION DXVK_NVAPI_VERSION D3D_EXTRAS_VERSION DGVOODOO2_VERSION WINE_NVML_VERSION VKD3DCFG MUST_HAVE_DLL \
2941
- FSR_MODE WINE_SANDBOX ESYNC FSYNC GSTREAMER SHOW_WINEDBG LARGE_ADDRESS OLD_GL_STRING \
2942
  NO_WRITE_WATCH HIDE_NVIDIA_GPU HEAP_DELAY_FREE SHARED_MEMORY ALLOW_XIM DIS_LAYER_AMD DIS_NETCORE \
2943
  VIRTUAL_DESKTOP BATTLEYE EAC DXVKASYNC RESIZABLE_BAR LATENCYFLEX DXR EXEARGS CHK_UPDATE EXE_LWDB EXE_LWDBFL \
2944
  LOADBAR LOADBARGIF CHKSTEAMAPPS LW_STEAMAPPS_DIR CHECK_LW_APPS LOG DEBUG SYS_WINETRICKS CPU_LIMIT CMPRSS_METHOD ZSTD_CMPRSS_LVL \
@@ -3048,6 +3050,7 @@ lu_config() {
3048
  --field="Wine prefix sandbox:CHK" "$WINE_SANDBOX" \
3049
  --field="Esync:CHK" "$ESYNC" \
3050
  --field="Fsync:CHK" "$FSYNC" \
 
3051
  --field="Gstreamer:CHK" "$GSTREAMER" \
3052
  --field="Show crash dialog (WINEDBG):CHK" "$SHOW_WINEDBG" \
3053
  --field="WINE_LARGE_ADDRESS_AWARE:CHK" "$LARGE_ADDRESS" \
@@ -5707,6 +5710,14 @@ check_fsync() {
5707
  fi
5708
  }
5709
 
 
 
 
 
 
 
 
 
5710
  check_vsync() {
5711
  [ -n "$1" ] && export VSYNC="$1"
5712
  case "$VSYNC" in
@@ -6363,7 +6374,7 @@ export_all_functions() {
6363
  lu_killtray lu_killwine lu_killexe lu_clearpfx lu_rmapp lu_shortcut lu_explorer lu_help lu_version lu_tray lu_winemgr updcfgchksum lite_init \
6364
  us_layout_sw check_mangohud check_vkcapture check_wd3dmode check_gamemode check_gstreamer check_dxvk check_vkd3d check_dxvk-nvapi check_d3d_extras check_dgvoodoo2 \
6365
  check_battleye check_winepfx check_vulkan_icd check_crash_dialog lu_update check_fps_limit lu_config full_init upd_winetricks check_shell unpack_squash \
6366
- check_nvprime check_esync check_fsync check_fsr check_path check_terminal check_pulse_latency check_ld_library check_wdllover try_rm_broken_link \
6367
  check_reset_pulse export_all_functions check_win_version check_hold_terminal dll_manager check_dll_symlink try_ln check_git_release cleanrun \
6368
  runtime_manager upd_battleye is_exe_exist which_exe try_ln_wine_build_dll find_vk_icd btntls_run get_app_exe check_driprime greptardlurl get_wlu_releases \
6369
  upd_d3d_extras upd_dgvoodoo2 upd_dxvk upd_dxvk_nvapi upd_vkd3d upd_all is_loadbar lu_runapp lu_lsapp set_wine_version get_pge_releases get_wge_releases \
 
1
  #!/usr/bin/env bash
2
 
3
+ export LW_VERSION="0.81.1"
4
  export LW_DEVELOPERS="VHSgunzo"
5
 
6
  export RED='\033[1;91m'
 
172
  [ ! -n "$WTRX_LOG" ] && export WTRX_LOG="$WINEPREFIX/winetricks.log"
173
  [ ! -n "$VKICDFILES" ] && export VKICDFILES="AUTO"
174
  [ ! -n "$FSYNC" ] && export FSYNC=1
175
+ [ ! -n "$NTSYNC" ] && export NTSYNC=1
176
  [ ! -n "$FSR_MODE" ] && export FSR_MODE='Enabled'
177
  [ ! -n "$VSYNC" ] && export VSYNC="Default"
178
  [ ! -n "$VKBASALT" ] && export VKBASALT=1
 
203
  export VKD3D_GIT_RELEASE_URL="https://api.github.com/repos/HansKristian-Work/vkd3d-proton/releases"
204
  export NVAPI_GIT_RELEASE_URL="https://api.github.com/repos/jp7677/dxvk-nvapi/releases"
205
  export D3D_GIT_RELEASE_URL="https://api.github.com/repos/lutris/d3d_extras/releases"
206
+ export DGVO_GIT_RELEASE_URL="https://api.github.com/repos/VHSgunzo/dgVoodoo2/releases"
207
  export BUILD_GIT_RELEASE_URL="https://api.github.com/repos/lutris/buildbot/releases"
208
  export NVML_GIT_RELEASE_URL="https://api.github.com/repos/VHSgunzo/nvml/releases"
209
  [ ! -n "$DXVK_VERSION" ] && export DXVK_VERSION="latest"
 
1719
  "VKBASALT_EFFECTS" "WINE_MONO_OVERRIDES" "EXE_PATH" "LU_EXE" "VKD3D_CONFIG" "LD_LIBRARY_PATH" "PATH" "WINEDEBUG" "CPU_LIMIT" "VSYNC" \
1720
  "VKD3D_DEBUG" "WINE_MONO_TRACE" "VKBASALT_LOG_LEVEL" "DXVK_LOG_LEVEL" "PULSE_LATENCY_MSEC" "VIRTUAL_DESKTOP" "FPS_LIMIT" "LW_CENV" \
1721
  "LW_DIR" "LW_CFG" "GSTREAMER" "HIDE_NVIDIA_GPU" "EXE_LWDB" "EXE_LWDBFL" "GST_PLUGIN_SYSTEM_PATH_1_0" "WINE_GST_REGISTRY_DIR" "RUNSRC" "RUNROOTFS_VERSION" \
1722
+ "WINE_SANDBOX" "WINEFSYNC" "WINENTSYNC" "WINEFSYNC_FUTEX2" "WINE_FULLSCREEN_FSR" "WINE_FULLSCREEN_FSR_STRENGTH" "STAGING_SHARED_MEMORY" "WINEESYNC" "VKBASALT_LOG_FILE" \
1723
  "LOG_FILE" "WINE_LARGE_ADDRESS_AWARE" "TERM_APP" "VKBASALT" "DXVK_NVAPIHACK" "MANGOHUD" "MANGOHUD_USER_CONF" "RUN_GAMEMODE" "VKD3D_LOG_FILE" \
1724
  "VKBASALT_CONFIG_FILE" "VK_ICD_FILENAMES" "__GL_THREADED_OPTIMIZATIONS" "DXVK_STATE_CACHE_PATH" "__GLX_VENDOR_LIBRARY_NAME" "__NV_PRIME_RENDER_OFFLOAD" \
1725
  "WINE_FULLSCREEN_FSR_MODE" "DXVK_STATE_CACHE" "__GL_DXVK_OPTIMIZATIONS" "__GL_SHADER_DISK_CACHE_PATH" "__GL_SHADER_DISK_CACHE" "__GL_SHADER_DISK_CACHE_SIZE" \
 
2786
  check_exe_args
2787
  check_esync
2788
  check_fsync
2789
+ check_ntsync
2790
  check_first_run "$@"
2791
  fi
2792
  }
 
2940
  lwconfig_save() {
2941
  LWCFGVAR="WINE_VERSION WIN_VER WINEARCH WINEPREFIX WINE_THEME WDLLOVER WMONOVER WD3DMODE DISABLE_NVAPI WINE_DXGI D3D_EXTRAS DGVOODOO2 \
2942
  DXVK_VERSION VKD3D_VERSION DXVK_NVAPI_VERSION D3D_EXTRAS_VERSION DGVOODOO2_VERSION WINE_NVML_VERSION VKD3DCFG MUST_HAVE_DLL \
2943
+ FSR_MODE WINE_SANDBOX ESYNC FSYNC NTSYNC GSTREAMER SHOW_WINEDBG LARGE_ADDRESS OLD_GL_STRING \
2944
  NO_WRITE_WATCH HIDE_NVIDIA_GPU HEAP_DELAY_FREE SHARED_MEMORY ALLOW_XIM DIS_LAYER_AMD DIS_NETCORE \
2945
  VIRTUAL_DESKTOP BATTLEYE EAC DXVKASYNC RESIZABLE_BAR LATENCYFLEX DXR EXEARGS CHK_UPDATE EXE_LWDB EXE_LWDBFL \
2946
  LOADBAR LOADBARGIF CHKSTEAMAPPS LW_STEAMAPPS_DIR CHECK_LW_APPS LOG DEBUG SYS_WINETRICKS CPU_LIMIT CMPRSS_METHOD ZSTD_CMPRSS_LVL \
 
3050
  --field="Wine prefix sandbox:CHK" "$WINE_SANDBOX" \
3051
  --field="Esync:CHK" "$ESYNC" \
3052
  --field="Fsync:CHK" "$FSYNC" \
3053
+ --field="NTsync:CHK" "$NTSYNC" \
3054
  --field="Gstreamer:CHK" "$GSTREAMER" \
3055
  --field="Show crash dialog (WINEDBG):CHK" "$SHOW_WINEDBG" \
3056
  --field="WINE_LARGE_ADDRESS_AWARE:CHK" "$LARGE_ADDRESS" \
 
5710
  fi
5711
  }
5712
 
5713
+ check_ntsync() {
5714
+ [ -n "$1" ] && export NTSYNC="$1"
5715
+ if [ "$NTSYNC" == 1 ]
5716
+ then export WINENTSYNC=1
5717
+ else unset WINENTSYNC
5718
+ fi
5719
+ }
5720
+
5721
  check_vsync() {
5722
  [ -n "$1" ] && export VSYNC="$1"
5723
  case "$VSYNC" in
 
6374
  lu_killtray lu_killwine lu_killexe lu_clearpfx lu_rmapp lu_shortcut lu_explorer lu_help lu_version lu_tray lu_winemgr updcfgchksum lite_init \
6375
  us_layout_sw check_mangohud check_vkcapture check_wd3dmode check_gamemode check_gstreamer check_dxvk check_vkd3d check_dxvk-nvapi check_d3d_extras check_dgvoodoo2 \
6376
  check_battleye check_winepfx check_vulkan_icd check_crash_dialog lu_update check_fps_limit lu_config full_init upd_winetricks check_shell unpack_squash \
6377
+ check_nvprime check_esync check_fsync check_ntsync check_fsr check_path check_terminal check_pulse_latency check_ld_library check_wdllover try_rm_broken_link \
6378
  check_reset_pulse export_all_functions check_win_version check_hold_terminal dll_manager check_dll_symlink try_ln check_git_release cleanrun \
6379
  runtime_manager upd_battleye is_exe_exist which_exe try_ln_wine_build_dll find_vk_icd btntls_run get_app_exe check_driprime greptardlurl get_wlu_releases \
6380
  upd_d3d_extras upd_dgvoodoo2 upd_dxvk upd_dxvk_nvapi upd_vkd3d upd_all is_loadbar lu_runapp lu_lsapp set_wine_version get_pge_releases get_wge_releases \
lwrap/PKGBUILD CHANGED
@@ -1,8 +1,8 @@
1
  # Maintainer: VHSgunzo <vhsgunzo.github.io>
2
 
3
  pkgname='lwrap'
4
- pkgver='0.80.8'
5
- pkgrel='2'
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.81.1'
5
+ pkgrel='1'
6
  pkgdesc='Lux Wine wrapper for RunImage container'
7
  arch=('x86_64')
8
  url='https://github.com/VHSgunzo/lux-wine'
lwrap/lwrap CHANGED
@@ -108,6 +108,7 @@ make_install() {
108
  cp -rf "$RSTEAM_DESKF" "$HSTEAM_DESKF"
109
  sed -i "s|^Exec.*steam.*|Exec='$HBIN_DIR/steam' %U|g" "$HSTEAM_DESKF"
110
  sed -i "s|^Name=Steam.*|Name=Steam (RunImage LW)|g" "$HSTEAM_DESKF"
 
111
  sed -i '/RunOnDiscreteGpu/d;/PrefersNonDefaultGPU/d' "$HSTEAM_DESKF"
112
  HICNSTM="$HOME_ICONS/steam.png"
113
  for hi_icon_size in ${HICOLOR_SIZES[@]}
 
108
  cp -rf "$RSTEAM_DESKF" "$HSTEAM_DESKF"
109
  sed -i "s|^Exec.*steam.*|Exec='$HBIN_DIR/steam' %U|g" "$HSTEAM_DESKF"
110
  sed -i "s|^Name=Steam.*|Name=Steam (RunImage LW)|g" "$HSTEAM_DESKF"
111
+ sed -i '/\[Desktop Entry\]/a StartupWMClass=Steam' "$HSTEAM_DESKF"
112
  sed -i '/RunOnDiscreteGpu/d;/PrefersNonDefaultGPU/d' "$HSTEAM_DESKF"
113
  HICNSTM="$HOME_ICONS/steam.png"
114
  for hi_icon_size in ${HICOLOR_SIZES[@]}
lwrap/lwrap.install CHANGED
@@ -70,7 +70,7 @@ post_upgrade() {
70
  then sed -i 's| nocap||' /usr/lib/steam/steam
71
  fi
72
 
73
- sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=0|' /var/RunDir/sharun/bin/uruntime
74
  echo RIM_CMPRS_BSIZE=18 >> "$RIMENVFL"
75
 
76
  return 0
 
70
  then sed -i 's| nocap||' /usr/lib/steam/steam
71
  fi
72
 
73
+ sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=2|' /var/RunDir/sharun/bin/uruntime
74
  echo RIM_CMPRS_BSIZE=18 >> "$RIMENVFL"
75
 
76
  return 0