-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
proton-cachy: Update nvidia-reflex patches, fixup compilation, update…
… branch to bleeding edge Signed-off-by: Peter Jung <[email protected]>
- Loading branch information
Showing
10 changed files
with
1,142 additions
and
536 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| From 51d4010480d581842ac324415f24b4b8a6a657d2 Mon Sep 17 00:00:00 2001 | ||
| From 3056186c67e1708550d8321843650a106a88d776 Mon Sep 17 00:00:00 2001 | ||
| From: Stelios Tsampas <[email protected]> | ||
| Date: Wed, 26 Apr 2023 14:22:23 +0300 | ||
| Subject: [PATCH 1/6] AUR Pkgbuild changes | ||
|
|
||
| --- | ||
| Makefile.in | 74 ++++++++++++++++++++++++++-------- | ||
| Makefile.in | 75 ++++++++++++++++++++++++++-------- | ||
| compatibilitytool.vdf.template | 2 +- | ||
| configure.sh | 2 + | ||
| make/rules-autoconf.mk | 4 +- | ||
| make/rules-cargo.mk | 4 +- | ||
| make/rules-cmake.mk | 4 +- | ||
| make/rules-common.mk | 18 +++++---- | ||
| make/rules-common.mk | 18 ++++---- | ||
| make/rules-configure.mk | 4 +- | ||
| make/rules-makedep.mk | 4 +- | ||
| make/rules-meson.mk | 3 +- | ||
| make/rules-winemaker.mk | 2 +- | ||
| proton | 6 +-- | ||
| toolmanifest_runtime.vdf | 3 -- | ||
| 13 files changed, 88 insertions(+), 42 deletions(-) | ||
| 13 files changed, 89 insertions(+), 42 deletions(-) | ||
|
|
||
| diff --git a/Makefile.in b/Makefile.in | ||
| index 7ec939df..32211119 100644 | ||
| index 7ec939df..3636f22c 100644 | ||
| --- a/Makefile.in | ||
| +++ b/Makefile.in | ||
| @@ -50,11 +50,12 @@ else | ||
|
|
@@ -164,7 +164,12 @@ index 7ec939df..32211119 100644 | |
| --disable-tests | ||
|
|
||
| WINE_CONFIGURE_ARGS32 = \ | ||
| @@ -527,6 +564,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk | ||
| @@ -523,10 +560,14 @@ $(eval $(call rules-makedep,vrclient,64)) | ||
| ## dxvk | ||
| ## | ||
|
|
||
| +DXVK_MESON_ARGS = --force-fallback-for=libdisplay-info | ||
| DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk | ||
| DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk | ||
| DXVK_DEPENDS = glslang | ||
|
|
||
|
|
@@ -174,7 +179,7 @@ index 7ec939df..32211119 100644 | |
| $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk)) | ||
| $(eval $(call rules-meson,dxvk,32,CROSS)) | ||
| $(eval $(call rules-meson,dxvk,64,CROSS)) | ||
| @@ -554,6 +594,9 @@ $(OBJ)/.dxvk-post-build32: | ||
| @@ -554,6 +595,9 @@ $(OBJ)/.dxvk-post-build32: | ||
| DXVK_NVAPI_MESON_ARGS32 = --bindir=$(DXVK_NVAPI_DST32)/lib/wine/nvapi | ||
| DXVK_NVAPI_MESON_ARGS64 = --bindir=$(DXVK_NVAPI_DST64)/lib64/wine/nvapi | ||
|
|
||
|
|
@@ -184,7 +189,7 @@ index 7ec939df..32211119 100644 | |
| $(eval $(call rules-source,dxvk-nvapi,$(SRCDIR)/dxvk-nvapi)) | ||
| $(eval $(call rules-meson,dxvk-nvapi,32,CROSS)) | ||
| $(eval $(call rules-meson,dxvk-nvapi,64,CROSS)) | ||
| @@ -628,6 +671,9 @@ ifneq ($(UNSTRIPPED_BUILD),) | ||
| @@ -628,6 +672,9 @@ ifneq ($(UNSTRIPPED_BUILD),) | ||
| VKD3D_PROTON_MESON_ARGS = -Denable_trace=true | ||
| endif | ||
|
|
||
|
|
@@ -194,7 +199,7 @@ index 7ec939df..32211119 100644 | |
| $(eval $(call rules-source,vkd3d-proton,$(SRCDIR)/vkd3d-proton)) | ||
| $(eval $(call rules-meson,vkd3d-proton,32,CROSS)) | ||
| $(eval $(call rules-meson,vkd3d-proton,64,CROSS)) | ||
| @@ -924,14 +970,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ | ||
| @@ -924,14 +971,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ | ||
| mkdir -p $(FONTS_OBJ)/source-han | ||
| # Do not immediately create the target file, so that make is interrupted | ||
| # it will restart again | ||
|
|
@@ -212,7 +217,7 @@ index 7ec939df..32211119 100644 | |
| mv [email protected] $@ | ||
|
|
||
| $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) | ||
| @@ -941,12 +987,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) | ||
| @@ -941,12 +988,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) | ||
| ttx -o $@ -m $($(notdir $@)_FONT) $(FONTS_OBJ)/ume-gothic/$(notdir $(basename $($(notdir $@)_NAMETABLE_PATCH))).ttx | ||
|
|
||
| $(simsun.ttc): $(simsun.ttf) $(nsimsun.ttf) | ||
|
|
@@ -228,7 +233,7 @@ index 7ec939df..32211119 100644 | |
|
|
||
| $(micross.ttf): $(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_arabic.ttf) $(noto_sans_armenian.ttf) $(noto_sans_bengali.ttf) $(noto_sans_coptic.ttf) \ | ||
| $(noto_sans_georgian.ttf) $(noto_sans_gujarati.ttf) $(noto_sans_hebrew.ttf) $(noto_sans_khmer.ttf) $(noto_sans_tamil.ttf) \ | ||
| @@ -1072,8 +1118,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64) | ||
| @@ -1072,8 +1119,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64) | ||
| ## | ||
|
|
||
| default_pfx: wine gst_good gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr dxvk dxvk-nvapi vkd3d-proton | ||
|
|
@@ -239,15 +244,15 @@ index 7ec939df..32211119 100644 | |
| rm -rf $(abspath $(DIST_PREFIX)) | ||
| python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR)) | ||
|
|
||
| @@ -1205,7 +1251,6 @@ ifeq ($(ENABLE_CCACHE),1) | ||
| @@ -1205,7 +1252,6 @@ ifeq ($(ENABLE_CCACHE),1) | ||
| export CCACHE_DIR := $(if $(CCACHE_DIR),$(CCACHE_DIR),$(HOME)/.ccache) | ||
| override DOCKER_OPTS := -v $(CCACHE_DIR):$(CCACHE_DIR)$(CONTAINER_MOUNT_OPTS) $(CCACHE_ENV) -e CCACHE_DIR=$(CCACHE_DIR) $(DOCKER_OPTS) | ||
| else | ||
| - export CCACHE_DISABLE := 1 | ||
| override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS) | ||
| endif | ||
|
|
||
| @@ -1220,9 +1265,6 @@ ifeq ($(CONTAINER_ENGINE),) | ||
| @@ -1220,9 +1266,6 @@ ifeq ($(CONTAINER_ENGINE),) | ||
| CONTAINER_ENGINE := docker | ||
| endif | ||
|
|
||
|
|
@@ -459,7 +464,7 @@ index 5c3b59a3..ed6589e0 100644 | |
| winebuild --$(lastword $(subst ., ,$(4))) --fake-module -E "$(basename $(4)).spec" -o "$(4).fake" | ||
| mkdir -p $$($(2)_LIBDIR$(3))/$(LIBDIR_WINE_$(3)) | ||
| diff --git a/proton b/proton | ||
| index f93f545f..e4713eec 100755 | ||
| index 2faa16b6..87b13577 100755 | ||
| --- a/proton | ||
| +++ b/proton | ||
| @@ -423,7 +423,6 @@ class Proton: | ||
|
|
@@ -470,7 +475,7 @@ index f93f545f..e4713eec 100755 | |
|
|
||
| def path(self, d): | ||
| return self.base_dir + d | ||
| @@ -1742,8 +1741,6 @@ if __name__ == "__main__": | ||
| @@ -1752,8 +1751,6 @@ if __name__ == "__main__": | ||
|
|
||
| g_proton = Proton(os.path.dirname(sys.argv[0])) | ||
|
|
||
|
|
@@ -479,7 +484,7 @@ index f93f545f..e4713eec 100755 | |
|
|
||
| g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"]) | ||
|
|
||
| @@ -1752,7 +1749,8 @@ if __name__ == "__main__": | ||
| @@ -1762,7 +1759,8 @@ if __name__ == "__main__": | ||
| g_session.init_wine() | ||
|
|
||
| if g_proton.missing_default_prefix(): | ||
|
|
@@ -502,5 +507,5 @@ index beddcbbb..b6f36788 100644 | |
| - "compatmanager_layer_name" "proton" | ||
| } | ||
| -- | ||
| 2.43.0 | ||
| 2.43.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| From 81224ebacaefd19d894afbcde000bda0745ec32b Mon Sep 17 00:00:00 2001 | ||
| From 8f433c2161a800e24dcc7c5dd9adb48dad2d6745 Mon Sep 17 00:00:00 2001 | ||
| From: Stelios Tsampas <[email protected]> | ||
| Date: Sun, 19 Mar 2023 10:56:59 +0200 | ||
| Subject: [PATCH 2/6] AUR Do not update cargo crates | ||
|
|
@@ -21,5 +21,5 @@ index 00fa99fc..225ab528 100644 | |
| -j$$(SUBJOBS) --locked --offline --verbose \ | ||
| --target "$$(CARGO_TARGET_$(3))" \ | ||
| -- | ||
| 2.43.0 | ||
| 2.43.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| From 4141a175920b6bb81d589141a04185b9a25509a8 Mon Sep 17 00:00:00 2001 | ||
| From 9c69ddbb3082515a94761f1aef10542d4a92c3ac Mon Sep 17 00:00:00 2001 | ||
| From: Stelios Tsampas <[email protected]> | ||
| Date: Wed, 12 Jul 2023 17:53:47 +0300 | ||
| Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of | ||
|
|
@@ -9,7 +9,7 @@ Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of | |
| 1 file changed, 1 insertion(+), 81 deletions(-) | ||
|
|
||
| diff --git a/Makefile.in b/Makefile.in | ||
| index 32211119..1f196b49 100644 | ||
| index 3636f22c..ea505e39 100644 | ||
| --- a/Makefile.in | ||
| +++ b/Makefile.in | ||
| @@ -403,86 +403,6 @@ $(OBJ)/.steamexe-post-build64: | ||
|
|
@@ -109,5 +109,5 @@ index 32211119..1f196b49 100644 | |
| $(eval $(call rules-source,wine,$(SRCDIR)/wine)) | ||
| $(eval $(call rules-autoconf,wine,32)) | ||
| -- | ||
| 2.43.0 | ||
| 2.43.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| From 98c97d55154566292875f73c05e0062a95dee02b Mon Sep 17 00:00:00 2001 | ||
| From 70c31f5f82163bbf18cb8338e14f80b9de78b620 Mon Sep 17 00:00:00 2001 | ||
| From: Stelios Tsampas <[email protected]> | ||
| Date: Wed, 12 Jul 2023 03:16:34 +0300 | ||
| Subject: [PATCH 4/6] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the | ||
|
|
@@ -20,10 +20,10 @@ a runtime dependency. | |
| 1 file changed, 9 insertions(+) | ||
|
|
||
| diff --git a/proton b/proton | ||
| index e4713eec..b489aa96 100755 | ||
| index 87b13577..8d13f941 100755 | ||
| --- a/proton | ||
| +++ b/proton | ||
| @@ -918,6 +918,15 @@ class CompatData: | ||
| @@ -921,6 +921,15 @@ class CompatData: | ||
| prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) | ||
| try_copy(g_proton.lib_dir + "vkd3d/libvkd3d-shader-1.dll", "drive_c/windows/syswow64", | ||
| prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) | ||
|
|
@@ -40,5 +40,5 @@ index e4713eec..b489aa96 100755 | |
| if use_wined3d: | ||
| dxvkfiles = [] | ||
| -- | ||
| 2.43.0 | ||
| 2.43.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| From 230c3144ea0894e9b0e692cef5b913801b967ff7 Mon Sep 17 00:00:00 2001 | ||
| From c8de8d2e84662b3eca41111d84a3d74bc363a955 Mon Sep 17 00:00:00 2001 | ||
| From: Stelios Tsampas <[email protected]> | ||
| Date: Wed, 23 Aug 2023 19:31:35 +0300 | ||
| Subject: [PATCH 5/6] AUR Strip binaries early | ||
|
|
@@ -8,7 +8,7 @@ Subject: [PATCH 5/6] AUR Strip binaries early | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/Makefile.in b/Makefile.in | ||
| index 1f196b49..b70e1e48 100644 | ||
| index ea505e39..892d78b1 100644 | ||
| --- a/Makefile.in | ||
| +++ b/Makefile.in | ||
| @@ -54,7 +54,7 @@ CFLAGS ?= -O2 -march=nocona -mtune=core-avx2 | ||
|
|
@@ -21,5 +21,5 @@ index 1f196b49..b70e1e48 100644 | |
| COMMON_FLAGS64 := -mcmodel=small | ||
| CARGO_BUILD_ARGS += --release | ||
| -- | ||
| 2.43.0 | ||
| 2.43.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| From d898a375310be217a70b818b772ccdd375716b85 Mon Sep 17 00:00:00 2001 | ||
| From 9def0147d49fc860d0ba590bd1e7f90fe8a8e410 Mon Sep 17 00:00:00 2001 | ||
| From: Stelios Tsampas <[email protected]> | ||
| Date: Thu, 28 Sep 2023 14:16:04 +0300 | ||
| Subject: [PATCH 6/6] AUR: Fix hwnd redefinition | ||
|
|
@@ -48,5 +48,5 @@ index 627fbbb4..3b3ccf15 100644 | |
|
|
||
| WINE_DEFAULT_DEBUG_CHANNEL(vrclient); | ||
| -- | ||
| 2.43.0 | ||
| 2.43.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.