summarylogtreecommitdiffstats
path: root/0001-AUR-Pkgbuild-changes.patch
diff options
context:
space:
mode:
authorStelios Tsampas2023-07-02 21:33:19 +0300
committerStelios Tsampas2023-07-02 21:47:21 +0300
commitb715ebad4972739c318f018ee8712dc7ab4acc5e (patch)
tree7474213be075298c39866993a9d76010e38878f3 /0001-AUR-Pkgbuild-changes.patch
parent0e99adf199b5e87a03811a0f6fe03667f44bab81 (diff)
downloadaur-b715ebad4972739c318f018ee8712dc7ab4acc5e.tar.gz
[proton-ge-custom] Remove opensft vosk and kaldi because of missing lib32 blas and lapack
Diffstat (limited to '0001-AUR-Pkgbuild-changes.patch')
-rw-r--r--0001-AUR-Pkgbuild-changes.patch32
1 files changed, 16 insertions, 16 deletions
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 3456b6bd998a..73db6447a7c9 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,7 +1,7 @@
-From 5bba6921f77f08de4c4c17fc74718cc1ae7b7bf8 Mon Sep 17 00:00:00 2001
+From b41ec35863a8d8f197dda3b509164663e0bb3db9 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
+Subject: [PATCH 1/3] AUR Pkgbuild changes
---
Makefile.in | 78 +++++++++++++++++++++++++++-------
@@ -19,7 +19,7 @@ Subject: [PATCH 1/2] AUR Pkgbuild changes
12 files changed, 90 insertions(+), 40 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 7ee81fe9..bc5d0131 100644
+index 9726d2f1..cbebe144 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,7 +24,6 @@ SHELL := /bin/bash
@@ -169,7 +169,7 @@ index 7ee81fe9..bc5d0131 100644
-Ddoc='disabled' \
-Dtests=disabled \
-Dgobject-cast-checks=disabled \
-@@ -530,7 +567,11 @@ WINE_SOURCE_ARGS = \
+@@ -605,7 +642,11 @@ WINE_SOURCE_ARGS = \
--exclude dlls/winevulkan/winevulkan.spec
WINE_CONFIGURE_ARGS = \
@@ -181,7 +181,7 @@ index 7ee81fe9..bc5d0131 100644
--disable-tests
WINE_CONFIGURE_ARGS32 = \
-@@ -600,6 +641,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -675,6 +716,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
DXVK_DEPENDS = glslang
@@ -191,7 +191,7 @@ index 7ee81fe9..bc5d0131 100644
$(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
$(eval $(call rules-meson,dxvk,32,CROSS))
$(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -622,6 +666,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -702,6 +746,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
@@ -201,7 +201,7 @@ index 7ee81fe9..bc5d0131 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))
-@@ -692,6 +739,9 @@ VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
+@@ -772,6 +819,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
@@ -211,7 +211,7 @@ index 7ee81fe9..bc5d0131 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))
-@@ -947,14 +997,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -1031,14 +1081,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
@@ -229,7 +229,7 @@ index 7ee81fe9..bc5d0131 100644
mv $@.tmp $@
$(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -964,12 +1014,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -1048,12 +1098,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)
@@ -245,7 +245,7 @@ index 7ee81fe9..bc5d0131 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) \
-@@ -1095,8 +1145,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1179,8 +1229,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
@@ -256,7 +256,7 @@ index 7ee81fe9..bc5d0131 100644
rm -rf $(abspath $(DIST_PREFIX))
python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
-@@ -1238,7 +1288,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1322,7 +1372,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
@@ -264,7 +264,7 @@ index 7ee81fe9..bc5d0131 100644
override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
endif
-@@ -1253,9 +1302,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1337,9 +1386,6 @@ ifeq ($(CONTAINER_ENGINE),)
CONTAINER_ENGINE := docker
endif
@@ -460,7 +460,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 9b4a92b0..4908dc48 100755
+index 0e6fde18..789e1cec 100755
--- a/proton
+++ b/proton
@@ -423,7 +423,6 @@ class Proton:
@@ -471,7 +471,7 @@ index 9b4a92b0..4908dc48 100755
def path(self, d):
return self.base_dir + d
-@@ -1798,8 +1797,6 @@ if __name__ == "__main__":
+@@ -1827,8 +1826,6 @@ if __name__ == "__main__":
g_proton = Proton(os.path.dirname(sys.argv[0]))
@@ -480,7 +480,7 @@ index 9b4a92b0..4908dc48 100755
g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
-@@ -1808,7 +1805,8 @@ if __name__ == "__main__":
+@@ -1837,7 +1834,8 @@ if __name__ == "__main__":
g_session.init_wine()
if g_proton.missing_default_prefix():
@@ -503,5 +503,5 @@ index beddcbbb..b6f36788 100644
- "compatmanager_layer_name" "proton"
}
--
-2.40.1
+2.41.0