diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | 0001-AUR-Pkgbuild-changes.patch | 2 | ||||
-rw-r--r-- | 0002-AUR-Do-not-update-cargo-crates.patch | 2 | ||||
-rw-r--r-- | 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch | 2 | ||||
-rw-r--r-- | 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch | 2 | ||||
-rw-r--r-- | 0005-AUR-Strip-binaries-early.patch | 12 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | PKGBUILD.testing | 14 |
8 files changed, 49 insertions, 29 deletions
@@ -1,7 +1,7 @@ pkgbase = proton-ge-custom pkgdesc = Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build pkgver = GE.Proton8.13 - pkgrel = 3 + pkgrel = 4 epoch = 2 url = https://github.com/GloriousEggroll/proton-ge-custom install = proton-ge-custom.install @@ -93,6 +93,10 @@ pkgbase = proton-ge-custom makedepends = lib32-libsoup makedepends = libgudev makedepends = lib32-libgudev + makedepends = blas + makedepends = lib32-blas + makedepends = lapack + makedepends = lib32-lapack makedepends = desktop-file-utils makedepends = python makedepends = steam-native-runtime @@ -127,6 +131,10 @@ pkgbase = proton-ge-custom depends = lib32-libsoup depends = libgudev depends = lib32-libgudev + depends = blas + depends = lib32-blas + depends = lapack + depends = lib32-lapack depends = desktop-file-utils depends = python depends = steam-native-runtime @@ -171,17 +179,17 @@ pkgbase = proton-ge-custom source = 0002-AUR-Do-not-update-cargo-crates.patch source = 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch source = 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch - source = fix_hwnd_changes_meaning.patch source = 0005-AUR-Strip-binaries-early.patch + source = fix_hwnd_changes_meaning.patch sha256sums = SKIP sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3 sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75 sha256sums = 83f65c9292137a740c4b8ea730b61cee0dbbb82e4eb3607590ba2f4377827464 - sha256sums = 5bf0acdcf42aba4cd6f51d9d10d875a1f49ee06978c12c3a66ab6c697fb42185 - sha256sums = 278ca05ea2507fa78e9da28bab2089b967694c795bf12c75ac70dd4ab0569315 - sha256sums = d455f8a28a7db526cb46c3f6955bafdc3301e28230ae85269feb287168ac737a - sha256sums = 2996051c31609205f154142da04112d9b17d742dbf7104f7fcd286b75aa0b83f + sha256sums = 8c48af68d7a36d70df5c5b359d60f40115e59fce4349ae40a039a3c9dc122049 + sha256sums = df3251bb0f5aa320628b7da6c196bd1922a55e9685d438afba37997fa49e5c82 + sha256sums = 1a50ab72a45638260e98775ed677f364f5eff2508aeb3602bdebf66212d9d944 + sha256sums = 62fd190f318c1049d1d4929459280159974471d2b7cdf3840f6282bada24630d + sha256sums = a294a6ddf0b09f48bf2cb88476933b5b197101dfb14ba68814761aa617b507f2 sha256sums = 20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f - sha256sums = SKIP pkgname = proton-ge-custom diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch index db28e2de462f..b9f25e1ee686 100644 --- a/0001-AUR-Pkgbuild-changes.patch +++ b/0001-AUR-Pkgbuild-changes.patch @@ -1,7 +1,7 @@ From cd7eec9087139562cd631b9c91f0ed903ac4753f 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/4] AUR Pkgbuild changes +Subject: [PATCH 1/5] AUR Pkgbuild changes --- Makefile.in | 80 +++++++++++++++++++++++++++------- diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch index fe1a41aadbd5..62fc145cddbe 100644 --- a/0002-AUR-Do-not-update-cargo-crates.patch +++ b/0002-AUR-Do-not-update-cargo-crates.patch @@ -1,7 +1,7 @@ From 04f8061c0abd6046cbf8b06d642073b8c67358fc Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> Date: Sun, 19 Mar 2023 10:56:59 +0200 -Subject: [PATCH 2/4] AUR Do not update cargo crates +Subject: [PATCH 2/5] AUR Do not update cargo crates --- make/rules-cargo.mk | 2 -- diff --git a/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch index 5437bd66511e..d877e55330cb 100644 --- a/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch +++ b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch @@ -1,7 +1,7 @@ From e7677cb3eb6839cb83fc9dc3fbf8f6576ae6bf84 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> Date: Wed, 12 Jul 2023 17:56:34 +0300 -Subject: [PATCH 3/4] AUR Remove kaldi, openfst, vosk-api modules because of +Subject: [PATCH 3/5] AUR Remove kaldi, openfst, vosk-api modules because of missing blas, lapack lib32 from Arch --- diff --git a/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch index 79bc5d6a0e75..93b63e6f0293 100644 --- a/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch +++ b/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch @@ -1,7 +1,7 @@ From 66f31afeb2382946ad50bd3e53baf8ed9d876cf3 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> Date: Wed, 12 Jul 2023 03:16:34 +0300 -Subject: [PATCH 4/4] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the +Subject: [PATCH 4/5] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the correct location in the prefix For some unknown to me reason, 32bit vkd3d (not vkd3d-proton) always links diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch index 2234ed5d33b4..03c62dced943 100644 --- a/0005-AUR-Strip-binaries-early.patch +++ b/0005-AUR-Strip-binaries-early.patch @@ -1,3 +1,12 @@ +From 57a6b4cede0e7a34f05fc5fbf2305d408d3d3367 Mon Sep 17 00:00:00 2001 +From: Stelios Tsampas <loathingkernel@gmail.com> +Date: Wed, 23 Aug 2023 19:31:35 +0300 +Subject: [PATCH 5/5] AUR Strip binaries early + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/Makefile.in b/Makefile.in index 6587982f..e87bb4eb 100644 --- a/Makefile.in @@ -11,3 +20,6 @@ index 6587982f..e87bb4eb 100644 COMMON_FLAGS32 := -mstackrealign -mno-avx COMMON_FLAGS64 := -mcmodel=small CARGO_BUILD_ARGS += --release +-- +2.41.0 + @@ -6,7 +6,7 @@ _commit=ac6be1b9c3c1d402874e604b8d13c9652306b93f pkgver=${_srctag//-/.} _geckover=2.47.3 _monover=8.0.1 -pkgrel=3 +pkgrel=4 epoch=2 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build" url="https://github.com/GloriousEggroll/proton-ge-custom" @@ -30,8 +30,8 @@ depends=( 'sdl2>=2.0.16' 'lib32-sdl2>=2.0.16' libsoup lib32-libsoup libgudev lib32-libgudev -# blas lib32-blas -# lapack lib32-lapack + blas lib32-blas + lapack lib32-lapack desktop-file-utils python steam-native-runtime @@ -91,11 +91,11 @@ source=( 0002-AUR-Do-not-update-cargo-crates.patch 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch + 0005-AUR-Strip-binaries-early.patch fix_hwnd_changes_meaning.patch ) # Optional patches source+=( - 0005-AUR-Strip-binaries-early.patch ) noextract=( wine-gecko-${_geckover}-{x86,x86_64}.tar.xz @@ -164,10 +164,10 @@ prepare() { patch -p1 -i "$srcdir"/0001-AUR-Pkgbuild-changes.patch patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch - patch -p1 -i "$srcdir"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch + #patch -p1 -i "$srcdir"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch patch -p1 -i "$srcdir"/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch - patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch patch -p1 -i "$srcdir"/0005-AUR-Strip-binaries-early.patch + patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch } build() { @@ -263,13 +263,13 @@ sha256sums=('SKIP' '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3' '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75' '83f65c9292137a740c4b8ea730b61cee0dbbb82e4eb3607590ba2f4377827464' - '5bf0acdcf42aba4cd6f51d9d10d875a1f49ee06978c12c3a66ab6c697fb42185' - '278ca05ea2507fa78e9da28bab2089b967694c795bf12c75ac70dd4ab0569315' - 'd455f8a28a7db526cb46c3f6955bafdc3301e28230ae85269feb287168ac737a' - '2996051c31609205f154142da04112d9b17d742dbf7104f7fcd286b75aa0b83f' + '8c48af68d7a36d70df5c5b359d60f40115e59fce4349ae40a039a3c9dc122049' + 'df3251bb0f5aa320628b7da6c196bd1922a55e9685d438afba37997fa49e5c82' + '1a50ab72a45638260e98775ed677f364f5eff2508aeb3602bdebf66212d9d944' + '62fd190f318c1049d1d4929459280159974471d2b7cdf3840f6282bada24630d' + 'a294a6ddf0b09f48bf2cb88476933b5b197101dfb14ba68814761aa617b507f2' '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f') # Optional patches sha256sums+=( - 'SKIP' ) diff --git a/PKGBUILD.testing b/PKGBUILD.testing index e6f4c0653625..e6f2d9734d69 100644 --- a/PKGBUILD.testing +++ b/PKGBUILD.testing @@ -6,7 +6,7 @@ _commit=ac6be1b9c3c1d402874e604b8d13c9652306b93f pkgver=${_srctag//-/.} _geckover=2.47.3 _monover=8.0.1 -pkgrel=3 +pkgrel=4 epoch=2 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build" url="https://github.com/GloriousEggroll/proton-ge-custom" @@ -30,8 +30,8 @@ depends=( 'sdl2>=2.0.16' 'lib32-sdl2>=2.0.16' libsoup lib32-libsoup libgudev lib32-libgudev -# blas lib32-blas -# lapack lib32-lapack + blas lib32-blas + lapack lib32-lapack desktop-file-utils python steam-native-runtime @@ -91,11 +91,11 @@ source=( 0002-AUR-Do-not-update-cargo-crates.patch 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch + 0005-AUR-Strip-binaries-early.patch fix_hwnd_changes_meaning.patch ) # Optional patches source+=( - 0005-AUR-Strip-binaries-early.patch ) noextract=( wine-gecko-${_geckover}-{x86,x86_64}.tar.xz @@ -164,10 +164,10 @@ prepare() { patch -p1 -i "$srcdir"/0001-AUR-Pkgbuild-changes.patch patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch - patch -p1 -i "$srcdir"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch + #patch -p1 -i "$srcdir"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch patch -p1 -i "$srcdir"/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch - patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch patch -p1 -i "$srcdir"/0005-AUR-Strip-binaries-early.patch + patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch } build() { @@ -270,9 +270,9 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f') # Optional patches sha256sums+=( - 'SKIP' ) |