diff options
Diffstat (limited to '0001-AUR-Pkgbuild-changes.patch')
-rw-r--r-- | 0001-AUR-Pkgbuild-changes.patch | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch index 4854fec9c72f..24a3bdccaca8 100644 --- a/0001-AUR-Pkgbuild-changes.patch +++ b/0001-AUR-Pkgbuild-changes.patch @@ -1,24 +1,24 @@ -From 4c73b29e3567fe2c9fc1db2bbd4a7fbe0721fb26 Mon Sep 17 00:00:00 2001 +From 5cc6721a31ee563373f28f39ae8f83cd4060275c Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> Date: Tue, 7 Feb 2023 22:00:48 +0200 Subject: [PATCH 1/2] 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-meson.mk | 3 +- make/rules-winemaker.mk | 2 +- proton | 6 +-- - 11 files changed, 91 insertions(+), 32 deletions(-) + 11 files changed, 92 insertions(+), 32 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 528dcf6f..17ff8abe 100644 +index 528dcf6f..34fefe06 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,7 +63,6 @@ ifeq ($(ENABLE_CCACHE),1) @@ -161,18 +161,19 @@ index 528dcf6f..17ff8abe 100644 -Dfbdev=disabled \ -Ddecklink=disabled \ -Dcurl=disabled \ -@@ -696,7 +731,10 @@ GST_BAD_MESON_ARGS := \ +@@ -696,7 +731,11 @@ GST_BAD_MESON_ARGS := \ -Dvoamrwbenc=disabled \ -Dnvcodec=disabled \ -Dx265=disabled \ + -Dopenexr=disabled \ + -Dzxing=disabled \ ++ -Dva=disabled \ -Dtests=disabled \ + -Dintrospection=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -Dglib-checks=disabled \ -@@ -714,6 +752,7 @@ $(eval $(call rules-meson,gst_bad,64)) +@@ -714,6 +753,7 @@ $(eval $(call rules-meson,gst_bad,64)) ## GST_UGLY_MESON_ARGS := \ @@ -180,7 +181,7 @@ index 528dcf6f..17ff8abe 100644 -Ddoc='disabled' \ -Dtests=disabled \ -Dgobject-cast-checks=disabled \ -@@ -889,7 +928,11 @@ WINE_SOURCE_ARGS = \ +@@ -889,7 +929,11 @@ WINE_SOURCE_ARGS = \ --exclude include/config.h.in \ WINE_CONFIGURE_ARGS = \ @@ -192,7 +193,7 @@ index 528dcf6f..17ff8abe 100644 --disable-tests WINE_CONFIGURE_ARGS64 = --enable-win64 -@@ -953,6 +996,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk +@@ -953,6 +997,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk DXVK_DEPENDS = glslang @@ -202,7 +203,7 @@ index 528dcf6f..17ff8abe 100644 $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk)) $(eval $(call rules-meson,dxvk,32,CROSS)) $(eval $(call rules-meson,dxvk,64,CROSS)) -@@ -975,6 +1021,9 @@ $(OBJ)/.dxvk-post-build32: +@@ -975,6 +1022,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 @@ -212,7 +213,7 @@ index 528dcf6f..17ff8abe 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)) -@@ -1042,6 +1091,9 @@ VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton +@@ -1042,6 +1092,9 @@ VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton VKD3D_PROTON_MESON_ARGS64 = --bindir=$(VKD3D_PROTON_DST64)/lib64/wine/vkd3d-proton VKD3D_PROTON_DEPENDS = glslang @@ -222,7 +223,7 @@ index 528dcf6f..17ff8abe 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)) -@@ -1284,14 +1336,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ +@@ -1284,14 +1337,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 @@ -240,7 +241,7 @@ index 528dcf6f..17ff8abe 100644 mv $@.tmp $@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) -@@ -1301,10 +1353,10 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) +@@ -1301,10 +1354,10 @@ $(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) @@ -439,7 +440,7 @@ index 69688a03..1c0d1d3b 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 6e24c6af..c2a26b44 100755 +index 3ec0429e..547f10d5 100755 --- a/proton +++ b/proton @@ -423,7 +423,6 @@ class Proton: @@ -450,7 +451,7 @@ index 6e24c6af..c2a26b44 100755 def path(self, d): return self.base_dir + d -@@ -1806,8 +1805,6 @@ if __name__ == "__main__": +@@ -1807,8 +1806,6 @@ if __name__ == "__main__": g_proton = Proton(os.path.dirname(sys.argv[0])) @@ -459,7 +460,7 @@ index 6e24c6af..c2a26b44 100755 g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"]) -@@ -1816,7 +1813,8 @@ if __name__ == "__main__": +@@ -1817,7 +1814,8 @@ if __name__ == "__main__": g_session.init_wine() if g_proton.missing_default_prefix(): |