summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Tsampas2023-11-07 22:22:21 +0200
committerStelios Tsampas2023-11-07 22:22:21 +0200
commit643640c87630f96bab511178d07c4c342652ca98 (patch)
treec1e0fc964db78ab6e2f8e11d391d9cc2b4a7cf98
parent112a395d31bd5b7f719ae753fecccbb94040bb38 (diff)
downloadaur-643640c87630f96bab511178d07c4c342652ca98.tar.gz
[proton] Pkgrel bump
-rw-r--r--.SRCINFO12
-rw-r--r--0001-AUR-Pkgbuild-changes.patch38
-rw-r--r--0002-AUR-Do-not-update-cargo-crates.patch4
-rw-r--r--0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch4
-rw-r--r--0004-AUR-Strip-binaries-early.patch6
-rw-r--r--0005-AUR-Fix-hwnd-redefinition.patch4
-rw-r--r--PKGBUILD12
-rw-r--r--PKGBUILD.testing4
8 files changed, 42 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6e2516c5b3c5..8dfe47831c83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = proton
pkgdesc = Compatibility tool for Steam Play based on Wine and additional components
pkgver = 8.0.4.3
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://github.com/ValveSoftware/Proton
install = proton.install
@@ -174,10 +174,10 @@ pkgbase = proton
sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
sha256sums = 83f65c9292137a740c4b8ea730b61cee0dbbb82e4eb3607590ba2f4377827464
- sha256sums = c77102316c60d65b61be44c64ae3e8f2d5e5aadd0fa19965c8a46bb247effd89
- sha256sums = f6ee756585a63ad4f1e05a6778b1bf4bb955ae2148cd38b8daf29e4be74a96f5
- sha256sums = fa5ac1680eebfe38e392d85b1b2f655c0f2039da393e7c5f3237f6df38368df6
- sha256sums = 3503a51c55b93fbbffc4b09ad89e54febbf1b4eeebab4ae750af4357e1aa4297
- sha256sums = 8a0d13276a71ed8e6d1a41435a8313170fed377a8280cf18ab56a10728a0ccc5
+ sha256sums = 683462973f99826b1b52d788ce8d7225b07a007dcb4556c28b17662184b7304e
+ sha256sums = a7071f070d668351955759082cb0785ff94ead8a2631068ef14f0e1b6270c4b6
+ sha256sums = d9a4b281f629f9ff1ee450fa46e7017514b673e903da4b5a98c79dbb2f83b4fb
+ sha256sums = 86bf4be7c90242ba652dff929447e24a95408758f5becc4abfab03dd339b6db7
+ sha256sums = f14e5b2f9159fe557a53f39e29e29fc41c00c52a422b47362c2665cf68c8d2de
pkgname = proton
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 25d61aee1c3f..3e0268497859 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,4 +1,4 @@
-From 4d8a9f7fad342a14db10f53be8c03805a8e3165c Mon Sep 17 00:00:00 2001
+From 854da9533d94a9cce1e70e1092532584e1a1d547 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Tue, 7 Feb 2023 21:58:22 +0200
Subject: [PATCH 1/5] AUR Pkgbuild changes
@@ -19,7 +19,7 @@ Subject: [PATCH 1/5] AUR Pkgbuild changes
12 files changed, 83 insertions(+), 39 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 83fc995d..b6a97743 100644
+index 83fc995d..5d0206ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,11 +50,12 @@ else
@@ -69,21 +69,19 @@ index 83fc995d..b6a97743 100644
-Dorc-test=disabled
$(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc))
-@@ -115,9 +125,14 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -115,7 +125,12 @@ $(eval $(call rules-meson,gst_orc,64))
##
GSTREAMER_MESON_ARGS := \
+ $(GST_LTO) \
-+ -Ddoc=disabled \
-Dgst_parse=false \
- -Dbenchmarks=disabled \
- -Dtools=disabled \
+ -Dptp-helper-permissions=capabilities \
+ -Ddbghelp=disabled \
+ -Dintrospection=disabled \
++ -Ddoc=disabled \
+ -Dbenchmarks=disabled \
+ -Dtools=disabled \
-Dbash-completion=disabled
-
- GSTREAMER_DEPENDS = gst_orc
@@ -131,6 +146,11 @@ $(eval $(call rules-meson,gstreamer,64))
## graphene
##
@@ -96,25 +94,27 @@ index 83fc995d..b6a97743 100644
$(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
$(eval $(call rules-meson,graphene,32))
$(eval $(call rules-meson,graphene,64))
-@@ -141,6 +161,9 @@ $(eval $(call rules-meson,graphene,64))
+@@ -141,7 +161,10 @@ $(eval $(call rules-meson,graphene,64))
##
GST_BASE_MESON_ARGS := \
+ $(GST_LTO) \
+ -Dauto_features=disabled \
+ -Ddoc=disabled \
+ -Dtools=disabled \
- -Dauto_features=disabled \
-Dadder=enabled \
-Dapp=enabled \
-@@ -173,6 +196,8 @@ $(eval $(call rules-meson,gst_base,64))
+ -Daudioconvert=enabled \
+@@ -173,7 +196,9 @@ $(eval $(call rules-meson,gst_base,64))
##
GST_GOOD_MESON_ARGS := \
+ $(GST_LTO) \
-+ -Ddoc=disabled \
-Dauto_features=disabled \
++ -Ddoc=disabled \
-Daudioparsers=enabled \
-Dautodetect=enabled \
+ -Davi=enabled \
@@ -203,11 +228,17 @@ $(eval $(call rules-meson,gst_good,64))
FFMPEG_CONFIGURE_ARGS := \
@@ -165,16 +165,16 @@ index 83fc995d..b6a97743 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))
-@@ -566,6 +607,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
+@@ -570,6 +611,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+ VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
+ endif
+VKD3D_PROTON_CPPFLAGS = -msse -msse2
+VKD3D_PROTON_LDFLAGS = -static -static-libgcc -static-libstdc++
+
- ifneq ($(UNSTRIPPED_BUILD),)
- VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
- endif
+ $(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))
@@ -866,14 +910,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
@@ -467,5 +467,5 @@ index beddcbbb..b6f36788 100644
- "compatmanager_layer_name" "proton"
}
--
-2.42.0
+2.42.1
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index cbc18f3e46ab..477e2552c108 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 8f975262e9eec74b7088c0bf2ec2b855b15baf1e Mon Sep 17 00:00:00 2001
+From 6b8789b0fc4ca3add44f5add0893bb748ce9e46f 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/5] AUR Do not update cargo crates
@@ -21,5 +21,5 @@ index 00fa99fc..225ab528 100644
-j$$(SUBJOBS) --locked --offline --verbose \
--target "$$(CARGO_TARGET_$(3))" \
--
-2.42.0
+2.42.1
diff --git a/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
index 4cb466259d6c..88848c655f47 100644
--- a/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+++ b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
@@ -1,4 +1,4 @@
-From bd60e922f127f01554cb87be227d9dcb84129a90 Mon Sep 17 00:00:00 2001
+From 13c95c2f0dd360ade1fdc4804759752f0860d862 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Wed, 12 Jul 2023 03:16:34 +0300
Subject: [PATCH 3/5] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
@@ -40,5 +40,5 @@ index b2aad366..09c05510 100755
if use_wined3d:
dxvkfiles = []
--
-2.42.0
+2.42.1
diff --git a/0004-AUR-Strip-binaries-early.patch b/0004-AUR-Strip-binaries-early.patch
index 3ebc69c5d991..00cda13cf553 100644
--- a/0004-AUR-Strip-binaries-early.patch
+++ b/0004-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From 9abaa5a7a4d8e28ca19b8b4cbf17d1747fd19431 Mon Sep 17 00:00:00 2001
+From 28d16726bd4762d166dfa2319ab18f78e4368194 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Wed, 23 Aug 2023 19:31:35 +0300
Subject: [PATCH 4/5] AUR Strip binaries early
@@ -8,7 +8,7 @@ Subject: [PATCH 4/5] AUR Strip binaries early
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
-index b6a97743..9d70928b 100644
+index 5d0206ab..6b9ee103 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,7 +54,7 @@ CFLAGS ?= -O2 -march=nocona -mtune=core-avx2
@@ -21,5 +21,5 @@ index b6a97743..9d70928b 100644
COMMON_FLAGS64 := -mcmodel=small
CARGO_BUILD_ARGS += --release
--
-2.42.0
+2.42.1
diff --git a/0005-AUR-Fix-hwnd-redefinition.patch b/0005-AUR-Fix-hwnd-redefinition.patch
index 502bb8186be1..9e2cea225dd0 100644
--- a/0005-AUR-Fix-hwnd-redefinition.patch
+++ b/0005-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From 9777bbf78ebdc11224f861a7d097c3e8de6e015f Mon Sep 17 00:00:00 2001
+From 5bc656656ba90691c8a83e0ddb96565662d53dd0 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Thu, 28 Sep 2023 14:16:04 +0300
Subject: [PATCH 5/5] AUR: Fix hwnd redefinition
@@ -34,5 +34,5 @@ index 83fd2ec0..64d209a2 100644
WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
--
-2.42.0
+2.42.1
diff --git a/PKGBUILD b/PKGBUILD
index 5483025b32d6..ca645dc7e814 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=
pkgver=8.0.4.3 # pkgver=${_srctag//-/.}
_geckover=2.47.3
_monover=8.0.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
url="https://github.com/ValveSoftware/Proton"
@@ -262,11 +262,11 @@ sha256sums=('SKIP'
'08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
'0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
'83f65c9292137a740c4b8ea730b61cee0dbbb82e4eb3607590ba2f4377827464'
- 'c77102316c60d65b61be44c64ae3e8f2d5e5aadd0fa19965c8a46bb247effd89'
- 'f6ee756585a63ad4f1e05a6778b1bf4bb955ae2148cd38b8daf29e4be74a96f5'
- 'fa5ac1680eebfe38e392d85b1b2f655c0f2039da393e7c5f3237f6df38368df6'
- '3503a51c55b93fbbffc4b09ad89e54febbf1b4eeebab4ae750af4357e1aa4297'
- '8a0d13276a71ed8e6d1a41435a8313170fed377a8280cf18ab56a10728a0ccc5')
+ '683462973f99826b1b52d788ce8d7225b07a007dcb4556c28b17662184b7304e'
+ 'a7071f070d668351955759082cb0785ff94ead8a2631068ef14f0e1b6270c4b6'
+ 'd9a4b281f629f9ff1ee450fa46e7017514b673e903da4b5a98c79dbb2f83b4fb'
+ '86bf4be7c90242ba652dff929447e24a95408758f5becc4abfab03dd339b6db7'
+ 'f14e5b2f9159fe557a53f39e29e29fc41c00c52a422b47362c2665cf68c8d2de')
# Optional patches
sha256sums+=(
)
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index 8cf42ab0b978..f59e6103edfa 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -6,7 +6,7 @@ _commit=
pkgver=8.0.4.3 # pkgver=${_srctag//-/.}
_geckover=2.47.3
_monover=8.0.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
url="https://github.com/ValveSoftware/Proton"
@@ -269,7 +269,7 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- '8a0d13276a71ed8e6d1a41435a8313170fed377a8280cf18ab56a10728a0ccc5')
+ 'SKIP')
# Optional patches
sha256sums+=(
)