summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Tsampas2023-04-26 14:45:20 +0300
committerStelios Tsampas2023-04-26 14:45:20 +0300
commit7d9922fd5ef1311e8dfbea7522b42dd5ef450b1e (patch)
tree60571b54851674e328d4a13bc4453cdbcbc73183
parent79e9d5ec802b4c4e4b6c8e0853f14c83ce3269f7 (diff)
downloadaur-7d9922fd5ef1311e8dfbea7522b42dd5ef450b1e.tar.gz
[proton-experimental] Update PKGBUILD to 8.0
-rw-r--r--.SRCINFO26
-rw-r--r--0001-AUR-Pkgbuild-changes.patch214
-rw-r--r--0002-AUR-Do-not-update-cargo-crates.patch6
-rw-r--r--PKGBUILD49
-rw-r--r--PKGBUILD.testing43
5 files changed, 150 insertions, 188 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a53104d7a87a..6ba81eea0066 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = proton-experimental
pkgdesc = Compatibility tool for Steam Play based on Wine and additional components, experimental branch
- pkgver = 7.0.20230330
+ pkgver = 8.0.20230425
pkgrel = 1
epoch = 1
url = https://github.com/ValveSoftware/Proton
@@ -37,10 +37,6 @@ pkgbase = proton-experimental
makedepends = lib32-libxcomposite
makedepends = libxxf86vm
makedepends = lib32-libxxf86vm
- makedepends = libldap
- makedepends = lib32-libldap
- makedepends = openal
- makedepends = lib32-openal
makedepends = v4l-utils
makedepends = lib32-v4l-utils
makedepends = alsa-lib
@@ -137,12 +133,8 @@ pkgbase = proton-experimental
depends = steam-native-runtime
optdepends = giflib
optdepends = lib32-giflib
- optdepends = libldap
- optdepends = lib32-libldap
optdepends = gnutls
optdepends = lib32-gnutls
- optdepends = openal
- optdepends = lib32-openal
optdepends = v4l-utils
optdepends = lib32-v4l-utils
optdepends = libpulse
@@ -170,13 +162,13 @@ pkgbase = proton-experimental
provides = proton
noextract = wine-gecko-2.47.3-x86.tar.xz
noextract = wine-gecko-2.47.3-x86_64.tar.xz
- noextract = wine-mono-7.4.0-x86.tar.xz
+ noextract = wine-mono-7.4.1-x86.tar.xz
options = !staticlibs
options = !lto
options = emptydirs
- source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-7.0-20230330
+ source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-8.0-20230425
source = wine-valve::git+https://github.com/ValveSoftware/wine.git
- source = dxvk::git+https://github.com/doitsujin/dxvk.git
+ source = dxvk-valve::git+https://github.com/ValveSoftware/dxvk.git
source = openvr::git+https://github.com/ValveSoftware/openvr.git
source = liberation-fonts::git+https://github.com/liberationfonts/liberation-fonts.git
source = gstreamer::git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git
@@ -200,8 +192,7 @@ pkgbase = proton-experimental
source = libdisplay-info-dxvk::git+https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info.git
source = https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86.tar.xz
source = https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86_64.tar.xz
- source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.4.0/wine-mono-7.4.0-x86.tar.xz
- source = 0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch
+ source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.4.1/wine-mono-7.4.1-x86.tar.xz
source = 0001-AUR-Pkgbuild-changes.patch
source = 0002-AUR-Do-not-update-cargo-crates.patch
sha256sums = SKIP
@@ -230,9 +221,8 @@ pkgbase = proton-experimental
sha256sums = SKIP
sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
- sha256sums = 9249ece664bcf2fecb1308ea1d2542c72923df9fe3df891986f137b2266a9ba3
- sha256sums = 11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b
- sha256sums = aa3d8d526823224a6690e8ae7bb821d247cd74d80c3e0c9fa05bc27179ce2cc6
- sha256sums = a79f1326e4d166b3b947530dca9dc4ac1e91b43e60d93a2354184beb4acb384c
+ sha256sums = 1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622
+ sha256sums = 4b38b10cca5502594b7582596b5173d9d3ca42f31f35ec1d89750b68e3aa14b6
+ sha256sums = 2b09fee9dedddf24ad96772ca8c98fe99a146d5c4a22d27a56564d24549a7fd8
pkgname = proton-experimental
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 824ca52fa2bb..eb0309d03947 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,12 +1,11 @@
-From ac3e648ef1f19fa178d2879722a345dcfc241c1c Mon Sep 17 00:00:00 2001
+From 25873128daf808994902e76ab5216b49225cc6c5 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
-Date: Tue, 7 Feb 2023 22:02:32 +0200
+Date: Wed, 26 Apr 2023 14:22:23 +0300
Subject: [PATCH 1/2] AUR Pkgbuild changes
---
- Makefile.in | 69 ++++++++++++++++++++++++++++------
+ Makefile.in | 71 ++++++++++++++++++++++++++--------
compatibilitytool.vdf.template | 2 +-
- configure.sh | 2 +
make/rules-autoconf.mk | 4 +-
make/rules-cargo.mk | 4 +-
make/rules-cmake.mk | 4 +-
@@ -15,30 +14,22 @@ Subject: [PATCH 1/2] AUR Pkgbuild changes
make/rules-meson.mk | 3 +-
make/rules-winemaker.mk | 2 +-
proton | 6 +--
- 11 files changed, 86 insertions(+), 32 deletions(-)
+ toolmanifest_runtime.vdf | 3 --
+ 11 files changed, 81 insertions(+), 40 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index f984d93d..9278b403 100644
+index d2943e34..d66489ac 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -63,7 +63,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
-
-@@ -125,7 +124,7 @@ container-build:
- all32 $(MAKECMDGOALS32): container-build
- all64 $(MAKECMDGOALS64): container-build
- else
--J = $(patsubst -j%,%,$(filter -j%,$(MAKEFLAGS)))
-+J = $(patsubst -j%,%,$(SUBJOBS))
- endif
+@@ -24,7 +24,6 @@ SHELL := /bin/bash
+ # BUILD_NAME - Name of the build for manifests etc.
+ # STEAMRT_IMAGE - Name of the docker image to use for building
+-STEAMRT_IMAGE ?= registry.gitlab.steamos.cloud/proton/sniper/sdk:0.20221017.1-1
-@@ -175,13 +174,28 @@ else
+ ifeq ($(SRCDIR),)
+ foo := $(error SRCDIR not set, do not include Makefile.in directly, run ./configure.sh to generate Makefile)
+@@ -50,14 +49,23 @@ else
endif
CROSSLDFLAGS += -Wl,--file-alignment,4096
@@ -46,41 +37,34 @@ index f984d93d..9278b403 100644
+CFLAGS ?= -O2 -march=nocona -mtune=core-avx2
+OPTIMIZE_FLAGS := $(CFLAGS) -mfpmath=sse
SANITY_FLAGS := -fwrapv -fno-strict-aliasing
- DEBUG_FLAGS := -gdwarf-2 -gstrict-dwarf
+ DEBUG_FLAGS := -ggdb -ffunction-sections -fdata-sections -fno-omit-frame-pointer
COMMON_FLAGS = $(DEBUG_FLAGS) $(OPTIMIZE_FLAGS) $(SANITY_FLAGS) -ffile-prefix-map=$(CCACHE_BASEDIR)=.
-COMMON_FLAGS32 := -mstackrealign
+COMMON_FLAGS32 := -mstackrealign -mno-avx
+ COMMON_FLAGS64 := -mcmodel=small
CARGO_BUILD_ARG := --release
+ifneq ($(USE_LTO), 1)
+GST_LTO :=
+FFMPEG_LTO :=
-+ifneq (,$(findstring -O3,$(CFLAGS)))
-+FFMPEG_LTO_OPTS32 := --disable-inline-asm
-+else
-+FFMPEG_LTO_OPTS32 :=
-+endif
+else
+GST_LTO := -Db_lto=true
+FFMPEG_LTO := --enable-lto
-+FFMPEG_LTO_OPTS32 := --disable-inline-asm
+endif
+
- ##
- ## Target configs
- ##
-@@ -368,8 +382,8 @@ ALL_TARGETS += dist
- GOAL_TARGETS += dist
+ $(DST_DIR):
+ mkdir -p $@
- dist_prefix: wine gst_good gst_libav gst_plugins_rs
-- find $(DST_LIBDIR32)/wine -type f -execdir chmod a-w '{}' '+'
-- find $(DST_LIBDIR64)/wine -type f -execdir chmod a-w '{}' '+'
-+ find $(DST_LIBDIR32)/wine -type f -execdir chmod go-w '{}' '+'
-+ find $(DST_LIBDIR64)/wine -type f -execdir chmod go-w '{}' '+'
- rm -rf $(abspath $(DIST_PREFIX))
- python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR)) $(STEAM_RUNTIME_RUNSH)
+@@ -68,7 +76,7 @@ all: all-dist | $(DST_DIR)
+ all-dist: | $(DST_DIR)
+ dist: all
+
+-J = $(patsubst -j%,%,$(filter -j%,$(MAKEFLAGS)))
++J = $(patsubst -j%,%,$(SUBJOBS))
-@@ -432,6 +446,7 @@ $(eval $(call rules-meson,dav1d,64))
+ include $(SRC)/make/utility.mk
+ include $(SRC)/make/rules-source.mk
+@@ -99,6 +107,7 @@ $(eval $(call rules-meson,dav1d,64))
##
GST_ORC_MESON_ARGS := \
@@ -88,7 +72,7 @@ index f984d93d..9278b403 100644
-Dorc-test=disabled
$(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc))
-@@ -444,9 +459,14 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -111,9 +120,14 @@ $(eval $(call rules-meson,gst_orc,64))
##
GSTREAMER_MESON_ARGS := \
@@ -103,7 +87,7 @@ index f984d93d..9278b403 100644
-Dbash-completion=disabled
GSTREAMER_DEPENDS = gst_orc
-@@ -460,6 +480,11 @@ $(eval $(call rules-meson,gstreamer,64))
+@@ -127,6 +141,11 @@ $(eval $(call rules-meson,gstreamer,64))
## graphene
##
@@ -115,7 +99,7 @@ index f984d93d..9278b403 100644
$(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
$(eval $(call rules-meson,graphene,32))
$(eval $(call rules-meson,graphene,64))
-@@ -470,6 +495,9 @@ $(eval $(call rules-meson,graphene,64))
+@@ -137,6 +156,9 @@ $(eval $(call rules-meson,graphene,64))
##
GST_BASE_MESON_ARGS := \
@@ -125,7 +109,7 @@ index f984d93d..9278b403 100644
-Dauto_features=disabled \
-Dadder=enabled \
-Dapp=enabled \
-@@ -503,6 +531,8 @@ $(eval $(call rules-meson,gst_base,64))
+@@ -170,6 +192,8 @@ $(eval $(call rules-meson,gst_base,64))
##
GST_GOOD_MESON_ARGS := \
@@ -134,7 +118,7 @@ index f984d93d..9278b403 100644
-Dauto_features=disabled \
-Daudioparsers=enabled \
-Dautodetect=enabled \
-@@ -533,11 +563,15 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -200,11 +224,17 @@ $(eval $(call rules-meson,gst_good,64))
FFMPEG_CONFIGURE_ARGS := \
--enable-shared \
@@ -144,14 +128,16 @@ index f984d93d..9278b403 100644
--disable-programs \
--disable-doc \
-+FFMPEG_CONFIGURE_ARGS64 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS64)"
++FFMPEG_LTO_OPTS64 := --disable-inline-asm
++FFMPEG_LTO_OPTS32 := --disable-inline-asm
++FFMPEG_CONFIGURE_ARGS64 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS64)" $(FFMPEG_LTO_OPTS64)
+FFMPEG_CONFIGURE_ARGS32 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS32)" $(FFMPEG_LTO_OPTS32)
+
$(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
$(eval $(call rules-configure,ffmpeg,32))
$(eval $(call rules-configure,ffmpeg,64))
-@@ -744,7 +778,11 @@ WINE_SOURCE_ARGS = \
- --exclude include/config.h.in \
+@@ -396,7 +426,11 @@ WINE_SOURCE_ARGS = \
+ --exclude dlls/winevulkan/winevulkan.spec
WINE_CONFIGURE_ARGS = \
+ --with-x \
@@ -161,8 +147,8 @@ index f984d93d..9278b403 100644
+ --disable-win16 \
--disable-tests
- WINE_CONFIGURE_ARGS64 = --enable-win64
-@@ -808,6 +846,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+ WINE_CONFIGURE_ARGS32 = \
+@@ -466,6 +500,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
DXVK_DEPENDS = glslang
@@ -172,7 +158,7 @@ index f984d93d..9278b403 100644
$(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
$(eval $(call rules-meson,dxvk,32,CROSS))
$(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -830,6 +871,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -488,6 +525,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
@@ -182,7 +168,7 @@ index f984d93d..9278b403 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))
-@@ -897,6 +941,9 @@ VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
+@@ -558,6 +598,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
@@ -192,7 +178,7 @@ index f984d93d..9278b403 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))
-@@ -1139,14 +1186,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -813,14 +856,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
@@ -210,12 +196,15 @@ index f984d93d..9278b403 100644
mv $@.tmp $@
$(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -1156,10 +1203,10 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -830,12 +873,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)
-- afdko otf2otc -o $@ $^
-+ otf2otc -o $@ $^
+- afdko otf2otc -o $@.tmp $^
+- afdko otf2ttf -o $@ $@.tmp
++ otf2otc -o $@.tmp $^
++ otf2ttf -o $@ $@.tmp
+ rm $@.tmp
$(msgothic.ttc): $(msgothic.ttf) $(mspgothic.ttf) $(msuigothic.ttf)
- afdko otf2otc -o $@ $^
@@ -223,6 +212,35 @@ index f984d93d..9278b403 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) \
+@@ -961,8 +1004,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
+- find $(DST_LIBDIR32)/wine -type f -execdir chmod a-w '{}' '+'
+- find $(DST_LIBDIR64)/wine -type f -execdir chmod a-w '{}' '+'
++ find $(DST_LIBDIR32)/wine -type f -execdir chmod go-w '{}' '+'
++ find $(DST_LIBDIR64)/wine -type f -execdir chmod go-w '{}' '+'
+ rm -rf $(abspath $(DIST_PREFIX))
+ python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
+
+@@ -1094,7 +1137,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
+
+@@ -1109,9 +1151,6 @@ ifeq ($(CONTAINER_ENGINE),)
+ CONTAINER_ENGINE := docker
+ endif
+
+-DOCKER_BASE = $(CONTAINER_ENGINE) run --rm -v $(SRC):$(SRC)$(CONTAINER_MOUNT_OPTS) -v $(OBJ):$(OBJ)$(CONTAINER_MOUNT_OPTS) \
+- -w $(OBJ) -e MAKEFLAGS \
+- $(DOCKER_OPTS) $(STEAMRT_IMAGE)
+
+ .PHONY: dist deploy redist
+ .DEFAULT dist deploy redist:
diff --git a/compatibilitytool.vdf.template b/compatibilitytool.vdf.template
index 5ac60e8b..e580cd20 100644
--- a/compatibilitytool.vdf.template
@@ -236,31 +254,11 @@ index 5ac60e8b..e580cd20 100644
"from_oslist" "windows"
"to_oslist" "linux"
-diff --git a/configure.sh b/configure.sh
-index 34e5bb0f..66bfbb1f 100755
---- a/configure.sh
-+++ b/configure.sh
-@@ -126,6 +126,7 @@ function configure() {
- CONTAINER_MOUNT_OPTS=:Z
- fi
-
-+ if [ "$arg_container_engine" != "none" ]; then
- if [[ -n "$arg_container_engine" ]]; then
- check_container_engine "$arg_container_engine" || die "Specified container engine \"$arg_container_engine\" doesn't work"
- else
-@@ -138,6 +139,7 @@ function configure() {
- die "${arg_container_engine:-Container engine discovery} has failed. Please fix your setup."
- fi
- fi
-+ fi
-
- stat "Using $arg_container_engine."
-
diff --git a/make/rules-autoconf.mk b/make/rules-autoconf.mk
-index 0827caa9..4e6d19f2 100644
+index ad04eeb8..53eda5bc 100644
--- a/make/rules-autoconf.mk
+++ b/make/rules-autoconf.mk
-@@ -31,9 +31,9 @@ $$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure
+@@ -32,9 +32,9 @@ $$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure
$$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2
cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
@@ -270,13 +268,13 @@ index 0827caa9..4e6d19f2 100644
- $$(MAKE) install
+ $$(MAKE) -j$$(SUBJOBS) install
touch $$@
- endif
endef
+
diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk
-index b2af34ca..5ebcf009 100644
+index ea76678b..45bd7381 100644
--- a/make/rules-cargo.mk
+++ b/make/rules-cargo.mk
-@@ -14,8 +14,10 @@ $$(OBJ)/.$(1)-configure$(3):
+@@ -13,8 +13,10 @@ $$(OBJ)/.$(1)-configure$(3):
$$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2
cd $$($(2)_SRC) && env $$($(2)_ENV$(3)) \
@@ -289,7 +287,7 @@ index b2af34ca..5ebcf009 100644
--target-dir $$($(2)_OBJ$(3)) \
$$(CARGO_BUILD_ARG) \
diff --git a/make/rules-cmake.mk b/make/rules-cmake.mk
-index c70751a2..1096dc19 100644
+index 520d88ac..ab898810 100644
--- a/make/rules-cmake.mk
+++ b/make/rules-cmake.mk
@@ -28,9 +28,9 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/CMakeLists.txt
@@ -302,13 +300,13 @@ index c70751a2..1096dc19 100644
- $$(MAKE) install
+ $$(MAKE) -j$$(SUBJOBS) install
touch $$@
- endif
endef
+
diff --git a/make/rules-common.mk b/make/rules-common.mk
-index 115c2b03..c6bf0ef6 100644
+index b057bb72..fc995910 100644
--- a/make/rules-common.mk
+++ b/make/rules-common.mk
-@@ -113,7 +113,11 @@ $(2)_LIBFLAGS$(3) = $$(foreach d,$$($(2)_DEPS$(3)),-L$$($$(d)_LIBDIR$(3))) \
+@@ -104,7 +104,11 @@ $(2)_LIBFLAGS$(3) = $$(foreach d,$$($(2)_DEPS$(3)),-L$$($$(d)_LIBDIR$(3))) \
# native version doesn't exist.
$(2)_ENV$(3) = \
@@ -320,7 +318,7 @@ index 115c2b03..c6bf0ef6 100644
CCACHE_BASEDIR="$$(CCACHE_BASEDIR)" \
STRIP="$$(STRIP)" \
AR="$$(TARGET_$(4)$(3))-ar" \
-@@ -127,7 +131,7 @@ $(2)_ENV$(3) = \
+@@ -118,7 +122,7 @@ $(2)_ENV$(3) = \
PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$$$PATH" \
LD_LIBRARY_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))),,:)$$$$LD_LIBRARY_PATH" \
PKG_CONFIG_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))/pkgconfig))" \
@@ -329,7 +327,7 @@ index 115c2b03..c6bf0ef6 100644
CFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
CPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
CXXFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)) -std=c++17" \
-@@ -151,7 +155,7 @@ $(2)_ENV$(3) += \
+@@ -142,7 +146,7 @@ $(2)_ENV$(3) += \
CROSSCPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
CROSSCXXFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)) -std=c++17" \
CROSSLDFLAGS="$$($(2)_LIBFLAGS$(3)) $$($(2)_LDFLAGS$(3)) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS)" \
@@ -338,7 +336,7 @@ index 115c2b03..c6bf0ef6 100644
endif
-@@ -164,14 +168,14 @@ else
+@@ -155,14 +159,14 @@ else
install-strip = objcopy --file-alignment=4096 --strip-debug $(1) $(2)/$(notdir $(1)) && rm -f $(2)/$(notdir $(1)).debug
endif
@@ -359,10 +357,10 @@ index 115c2b03..c6bf0ef6 100644
LIBDIR_WINE_32 := wine/i386-unix
diff --git a/make/rules-configure.mk b/make/rules-configure.mk
-index d04a3c53..18ac684e 100644
+index 29eee132..642c6d70 100644
--- a/make/rules-configure.mk
+++ b/make/rules-configure.mk
-@@ -26,9 +26,9 @@ $$(OBJ)/.$(1)-configure$(3):
+@@ -25,9 +25,9 @@ $$(OBJ)/.$(1)-configure$(3):
$$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2
cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
@@ -372,13 +370,13 @@ index d04a3c53..18ac684e 100644
- $$(MAKE) install
+ $$(MAKE) -j$$(SUBJOBS) install
touch $$@
- endif
endef
+
diff --git a/make/rules-meson.mk b/make/rules-meson.mk
-index d603bfde..3fd3d47f 100644
+index 2bf2db8c..0fbf9912 100644
--- a/make/rules-meson.mk
+++ b/make/rules-meson.mk
-@@ -47,6 +47,7 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/meson.build
+@@ -48,6 +48,7 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/meson.build
env $$($(2)_ENV$(3)) \
meson "$$($(2)_OBJ$(3))" "$$($(2)_SRC)" \
@@ -386,20 +384,20 @@ index d603bfde..3fd3d47f 100644
--prefix="$$($(2)_DST$(3))" \
--libdir="lib$(subst 32,,$(3))" \
--buildtype=plain \
-@@ -60,7 +61,7 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/meson.build
+@@ -61,7 +62,7 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/meson.build
$$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2
env $$($(2)_ENV$(3)) \
- ninja $$(filter -j%,$$(MAKEFLAGS)) -C "$$($(2)_OBJ$(3))" install $(-v?)
+ ninja -j$$(SUBJOBS) -C "$$($(2)_OBJ$(3))" install $(-v?)
touch $$@
- endif
endef
+
diff --git a/make/rules-winemaker.mk b/make/rules-winemaker.mk
-index 69688a03..1c0d1d3b 100644
+index 5c3b59a3..ed6589e0 100644
--- a/make/rules-winemaker.mk
+++ b/make/rules-winemaker.mk
-@@ -29,7 +29,7 @@ $$(OBJ)/.$(1)-build$(3):
+@@ -28,7 +28,7 @@ $$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2
rsync -arx "$$($(2)_SRC)/" "$$($(2)_OBJ$(3))/"
env $$($(2)_ENV$(3)) \
@@ -409,7 +407,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 67dbb6b6..ab8fd624 100755
+index f011243c..fe793dda 100755
--- a/proton
+++ b/proton
@@ -423,7 +423,6 @@ class Proton:
@@ -420,7 +418,7 @@ index 67dbb6b6..ab8fd624 100755
def path(self, d):
return self.base_dir + d
-@@ -1635,8 +1634,6 @@ if __name__ == "__main__":
+@@ -1627,8 +1626,6 @@ if __name__ == "__main__":
g_proton = Proton(os.path.dirname(sys.argv[0]))
@@ -429,7 +427,7 @@ index 67dbb6b6..ab8fd624 100755
g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
-@@ -1645,7 +1642,8 @@ if __name__ == "__main__":
+@@ -1637,7 +1634,8 @@ if __name__ == "__main__":
g_session.init_wine()
if g_proton.missing_default_prefix():
@@ -439,6 +437,18 @@ index 67dbb6b6..ab8fd624 100755
g_session.init_session(sys.argv[1] != "runinprefix")
+diff --git a/toolmanifest_runtime.vdf b/toolmanifest_runtime.vdf
+index beddcbbb..b6f36788 100644
+--- a/toolmanifest_runtime.vdf
++++ b/toolmanifest_runtime.vdf
+@@ -2,7 +2,4 @@
+ {
+ "version" "2"
+ "commandline" "/proton %verb%"
+- "require_tool_appid" "1628350"
+- "use_sessions" "1"
+- "compatmanager_layer_name" "proton"
+ }
--
2.40.0
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index 40c1e1150f61..d9321f5736fa 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 1b7cc8c0aae4d13dad7a3b8696020924a0b1561a Mon Sep 17 00:00:00 2001
+From 1a9aae88ca69fd8aac67f3652de094d8f97cf39d 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/2] AUR Do not update cargo crates
@@ -8,10 +8,10 @@ Subject: [PATCH 2/2] AUR Do not update cargo crates
1 file changed, 2 deletions(-)
diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk
-index 5ebcf009..4f5c3162 100644
+index 45bd7381..11e36c1d 100644
--- a/make/rules-cargo.mk
+++ b/make/rules-cargo.mk
-@@ -14,8 +14,6 @@ $$(OBJ)/.$(1)-configure$(3):
+@@ -13,8 +13,6 @@ $$(OBJ)/.$(1)-configure$(3):
$$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2
cd $$($(2)_SRC) && env $$($(2)_ENV$(3)) \
diff --git a/PKGBUILD b/PKGBUILD
index c0fff71d9fa2..f51fef4e5ec2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
pkgname=proton-experimental
-_srctag=7.0-20230330
+_srctag=8.0-20230425
_commit=
pkgver=${_srctag//-/.}
_geckover=2.47.3
-_monover=7.4.0
+_monover=7.4.1
pkgrel=1
epoch=1
pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch"
@@ -45,8 +45,6 @@ makedepends=(autoconf bison perl flex mingw-w64-gcc
libxinerama lib32-libxinerama
libxcomposite lib32-libxcomposite
libxxf86vm lib32-libxxf86vm
- libldap lib32-libldap
- openal lib32-openal
v4l-utils lib32-v4l-utils
alsa-lib lib32-alsa-lib
libxcomposite lib32-libxcomposite
@@ -66,9 +64,7 @@ makedepends=(autoconf bison perl flex mingw-w64-gcc
optdepends=(
giflib lib32-giflib
- libldap lib32-libldap
gnutls lib32-gnutls
- openal lib32-openal
v4l-utils lib32-v4l-utils
libpulse lib32-libpulse
alsa-plugins lib32-alsa-plugins
@@ -90,7 +86,7 @@ install=${pkgname}.install
source=(
proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-${_srctag}
wine-valve::git+https://github.com/ValveSoftware/wine.git
- dxvk::git+https://github.com/doitsujin/dxvk.git
+ dxvk-valve::git+https://github.com/ValveSoftware/dxvk.git
openvr::git+https://github.com/ValveSoftware/openvr.git
liberation-fonts::git+https://github.com/liberationfonts/liberation-fonts.git
gstreamer::git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git
@@ -114,7 +110,6 @@ source=(
libdisplay-info-dxvk::git+https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info.git
https://dl.winehq.org/wine/wine-gecko/${_geckover}/wine-gecko-${_geckover}-x86{,_64}.tar.xz
https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz
- 0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch
0001-AUR-Pkgbuild-changes.patch
0002-AUR-Do-not-update-cargo-crates.patch
)
@@ -163,18 +158,17 @@ prepare() {
rm -rf wrappers && mkdir wrappers
_make_wrappers
- [ ! -d gecko ] && mkdir gecko
- mv wine-gecko-${_geckover}-x86{,_64}.tar.xz gecko/
-
- [ ! -d mono ] && mkdir mono
- mv wine-mono-${_monover}-x86.tar.xz mono/
-
[ ! -d build ] && mkdir build
+
cd proton
+ [ ! -d contrib ] && mkdir -p contrib
+ mv "${srcdir}"/wine-gecko-${_geckover}-x86{,_64}.tar.xz contrib/
+ mv "${srcdir}"/wine-mono-${_monover}-x86.tar.xz contrib/
+
_submodules=(
wine-valve::wine
- dxvk
+ dxvk-valve::dxvk
openvr
liberation-fonts::fonts/liberation-fonts
gstreamer
@@ -230,8 +224,6 @@ prepare() {
git submodule init external/Vulkan-Headers
git submodule set-url external/Vulkan-Headers "$srcdir"/Vulkan-Headers
git -c protocol.file.allow=always submodule update external/Vulkan-Headers
- # GCC 12 build failure
- git cherry-pick -n 33bf3c7a6a3dc9e330cd338bf1877b5481c655e3
popd
for submodule in gst-plugins-rs media-converter; do
@@ -243,15 +235,6 @@ prepare() {
popd
done
- pushd wine
- # From Arch Wine
- sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
- # Fix openldap 2.5+ detection
- sed 's/-lldap_r/-lldap/' -i configure
- # Fix wldap32 compilation on 32bit
- patch -p1 -i "$srcdir"/0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch
- popd
-
patch -p1 -i "$srcdir"/0001-AUR-Pkgbuild-changes.patch
patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch
@@ -262,6 +245,7 @@ prepare() {
rm -rf "$srcdir"/dxil-spirv
rm -rf "$srcdir"/Vulkan-Headers
rm -rf "$srcdir"/SPIRV-Headers
+ rm -rf "$srcdir"/libdisplay-info-dxvk
}
build() {
@@ -272,8 +256,6 @@ build() {
../proton/configure.sh \
--container-engine="none" \
--proton-sdk-image="" \
- --steam-runtime=native \
- --no-proton-sdk \
--build-name="${pkgname}"
# By default export FLAGS used by proton and ignore makepkg
@@ -312,8 +294,8 @@ package() {
cd build
local _compatdir="$pkgdir/usr/share/steam/compatibilitytools.d"
- mkdir -p "$_compatdir"
- cp -rf --no-dereference --preserve=mode,links dist "$_compatdir/${pkgname}"
+ mkdir -p "$_compatdir/${pkgname}"
+ rsync --delete -arx dist/* "$_compatdir/${pkgname}"
mkdir -p "$pkgdir/usr/share/licenses/${pkgname}"
mv "$_compatdir/${pkgname}"/LICENSE{,.OFL} \
@@ -368,10 +350,9 @@ sha256sums=('SKIP'
'SKIP'
'08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
'0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
- '9249ece664bcf2fecb1308ea1d2542c72923df9fe3df891986f137b2266a9ba3'
- '11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b'
- 'aa3d8d526823224a6690e8ae7bb821d247cd74d80c3e0c9fa05bc27179ce2cc6'
- 'a79f1326e4d166b3b947530dca9dc4ac1e91b43e60d93a2354184beb4acb384c')
+ '1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622'
+ '4b38b10cca5502594b7582596b5173d9d3ca42f31f35ec1d89750b68e3aa14b6'
+ '2b09fee9dedddf24ad96772ca8c98fe99a146d5c4a22d27a56564d24549a7fd8')
# Optional patches
sha256sums+=(
)
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index 317617f71157..1c21db8deec3 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -1,11 +1,11 @@
# Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
pkgname=proton-experimental
-_srctag=7.0-20230330
+_srctag=8.0-20230425
_commit=
pkgver=${_srctag//-/.}
_geckover=2.47.3
-_monover=7.4.0
+_monover=7.4.1
pkgrel=1
epoch=1
pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch"
@@ -45,8 +45,6 @@ makedepends=(autoconf bison perl flex mingw-w64-gcc
libxinerama lib32-libxinerama
libxcomposite lib32-libxcomposite
libxxf86vm lib32-libxxf86vm
- libldap lib32-libldap
- openal lib32-openal
v4l-utils lib32-v4l-utils
alsa-lib lib32-alsa-lib
libxcomposite lib32-libxcomposite
@@ -66,9 +64,7 @@ makedepends=(autoconf bison perl flex mingw-w64-gcc
optdepends=(
giflib lib32-giflib
- libldap lib32-libldap
gnutls lib32-gnutls
- openal lib32-openal
v4l-utils lib32-v4l-utils
libpulse lib32-libpulse
alsa-plugins lib32-alsa-plugins
@@ -90,7 +86,7 @@ install=${pkgname}.install
source=(
proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-${_srctag}
wine-valve::git+https://github.com/ValveSoftware/wine.git
- dxvk::git+https://github.com/doitsujin/dxvk.git
+ dxvk-valve::git+https://github.com/ValveSoftware/dxvk.git
openvr::git+https://github.com/ValveSoftware/openvr.git
liberation-fonts::git+https://github.com/liberationfonts/liberation-fonts.git
gstreamer::git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git
@@ -114,7 +110,6 @@ source=(
libdisplay-info-dxvk::git+https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info.git
https://dl.winehq.org/wine/wine-gecko/${_geckover}/wine-gecko-${_geckover}-x86{,_64}.tar.xz
https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz
- 0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch
0001-AUR-Pkgbuild-changes.patch
0002-AUR-Do-not-update-cargo-crates.patch
)
@@ -163,18 +158,17 @@ prepare() {
rm -rf wrappers && mkdir wrappers
_make_wrappers
- [ ! -d gecko ] && mkdir gecko
- mv wine-gecko-${_geckover}-x86{,_64}.tar.xz gecko/
-
- [ ! -d mono ] && mkdir mono
- mv wine-mono-${_monover}-x86.tar.xz mono/
-
[ ! -d build ] && mkdir build
+
cd proton
+ [ ! -d contrib ] && mkdir -p contrib
+ mv "${srcdir}"/wine-gecko-${_geckover}-x86{,_64}.tar.xz contrib/
+ mv "${srcdir}"/wine-mono-${_monover}-x86.tar.xz contrib/
+
_submodules=(
wine-valve::wine
- dxvk
+ dxvk-valve::dxvk
openvr
liberation-fonts::fonts/liberation-fonts
gstreamer
@@ -230,8 +224,6 @@ prepare() {
git submodule init external/Vulkan-Headers
git submodule set-url external/Vulkan-Headers "$srcdir"/Vulkan-Headers
git -c protocol.file.allow=always submodule update external/Vulkan-Headers
- # GCC 12 build failure
- git cherry-pick -n 33bf3c7a6a3dc9e330cd338bf1877b5481c655e3
popd
for submodule in gst-plugins-rs media-converter; do
@@ -243,15 +235,6 @@ prepare() {
popd
done
- pushd wine
- # From Arch Wine
- sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
- # Fix openldap 2.5+ detection
- sed 's/-lldap_r/-lldap/' -i configure
- # Fix wldap32 compilation on 32bit
- patch -p1 -i "$srcdir"/0001-wldap32-25946b48148784e8275c1685f6498ab88f553ca3.patch
- popd
-
patch -p1 -i "$srcdir"/0001-AUR-Pkgbuild-changes.patch
patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch
@@ -262,6 +245,7 @@ prepare() {
rm -rf "$srcdir"/dxil-spirv
rm -rf "$srcdir"/Vulkan-Headers
rm -rf "$srcdir"/SPIRV-Headers
+ rm -rf "$srcdir"/libdisplay-info-dxvk
}
build() {
@@ -272,8 +256,6 @@ build() {
../proton/configure.sh \
--container-engine="none" \
--proton-sdk-image="" \
- --steam-runtime=native \
- --no-proton-sdk \
--build-name="${pkgname}"
# By default export FLAGS used by proton and ignore makepkg
@@ -312,8 +294,8 @@ package() {
cd build
local _compatdir="$pkgdir/usr/share/steam/compatibilitytools.d"
- mkdir -p "$_compatdir"
- cp -rf --no-dereference --preserve=mode,links dist "$_compatdir/${pkgname}"
+ mkdir -p "$_compatdir/${pkgname}"
+ rsync --delete -arx dist/* "$_compatdir/${pkgname}"
mkdir -p "$pkgdir/usr/share/licenses/${pkgname}"
mv "$_compatdir/${pkgname}"/LICENSE{,.OFL} \
@@ -372,7 +354,6 @@ sha256sums=('SKIP'
'08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
'0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
'9249ece664bcf2fecb1308ea1d2542c72923df9fe3df891986f137b2266a9ba3'
- '11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b'
'SKIP'
'SKIP')
# Optional patches