0001-AUR-Pkgbuild-changes.patch
unknown
diff
a year ago
18 kB
28
Indexable
From 1c4eecfd69f1cae1ffe269c9681a705f85cd77c2 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
---
Makefile.in | 80 +++++++++++++++++++++++++++-------
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-configure.mk | 4 +-
make/rules-meson.mk | 3 +-
make/rules-winemaker.mk | 2 +-
proton | 6 +--
toolmanifest_runtime.vdf | 3 --
12 files changed, 93 insertions(+), 39 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 9cc159cd..149f9f62 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,11 +50,12 @@ else
endif
CROSSLDFLAGS += -Wl,--file-alignment,4096
-OPTIMIZE_FLAGS := -O2 -march=nocona -mtune=core-avx2 -mfpmath=sse
+CFLAGS ?= -O2 -march=nocona -mtune=core-avx2
+OPTIMIZE_FLAGS := $(CFLAGS) -mfpmath=sse
SANITY_FLAGS := -fwrapv -fno-strict-aliasing
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_ARGS += --release
@@ -62,6 +63,14 @@ ifneq ($(SUPPRESS_WARNINGS),)
COMMON_FLAGS += -w
endif
+ifneq ($(USE_LTO), 1)
+GST_LTO :=
+FFMPEG_LTO :=
+else
+GST_LTO := -Db_lto=true
+FFMPEG_LTO := --enable-lto
+endif
+
$(DST_DIR):
mkdir -p $@
@@ -72,7 +81,7 @@ all: all-dist | $(DST_DIR)
all-dist: | $(DST_DIR)
dist: all
-J = $(patsubst -j%,%,$(filter -j%,$(MAKEFLAGS)))
+J = $(patsubst -j%,%,$(SUBJOBS))
include $(SRC)/make/utility.mk
include $(SRC)/make/rules-source.mk
@@ -103,6 +112,7 @@ $(eval $(call rules-meson,dav1d,64))
##
GST_ORC_MESON_ARGS := \
+ $(GST_LTO) \
-Dorc-test=disabled \
-Dexamples=disabled \
-Dtests=disabled \
@@ -118,10 +128,14 @@ $(eval $(call rules-meson,gst_orc,64))
##
GSTREAMER_MESON_ARGS := \
+ $(GST_LTO) \
+ -Ddoc=disabled \
-Dgst_parse=false \
-Dbenchmarks=disabled \
-Dtools=disabled \
-Dbash-completion=disabled \
+ -Dptp-helper-permissions=capabilities \
+ -Ddbghelp=disabled \
-Dexamples=disabled \
-Dtests=disabled \
-Dintrospection=disabled \
@@ -142,6 +156,11 @@ $(eval $(call rules-meson,gstreamer,64))
## graphene
##
+GRAPHENE_MESON_ARGS := \
+ -Dtests=false \
+ -Dintrospection=disabled \
+ -Dinstalled_tests=false
+
$(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
$(eval $(call rules-meson,graphene,32))
$(eval $(call rules-meson,graphene,64))
@@ -152,6 +171,9 @@ $(eval $(call rules-meson,graphene,64))
##
GST_BASE_MESON_ARGS := \
+ $(GST_LTO) \
+ -Ddoc=disabled \
+ -Dtools=disabled \
-Dalsa=disabled \
-Daudiomixer=disabled \
-Daudiorate=disabled \
@@ -196,6 +218,8 @@ $(eval $(call rules-meson,gst_base,64))
##
GST_GOOD_MESON_ARGS := \
+ $(GST_LTO) \
+ -Ddoc=disabled \
-Daalib=disabled \
-Dalpha=disabled \
-Dapetag=disabled \
@@ -270,6 +294,7 @@ $(eval $(call rules-meson,gst_good,64))
FFMPEG_CONFIGURE_ARGS := \
--enable-shared \
+ $(FFMPEG_LTO) \
--disable-static \
--disable-everything \
--disable-programs \
@@ -293,6 +318,11 @@ FFMPEG_CONFIGURE_ARGS := \
--enable-decoder=aac \
--enable-demuxer=xwma
+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))
@@ -337,6 +367,8 @@ $(OBJ)/.gst_plugins_rs-post-build32:
##
GST_BAD_MESON_ARGS := \
+ $(GST_LTO) \
+ -Ddoc=disabled \
-Dfbdev=disabled \
-Ddecklink=disabled \
-Dcurl=disabled \
@@ -356,7 +388,12 @@ GST_BAD_MESON_ARGS := \
-Dvoamrwbenc=disabled \
-Dnvcodec=disabled \
-Dx265=disabled \
+ -Dopenexr=disabled \
+ -Dzxing=disabled \
+ -Dva=disabled \
+ -Dexamples=disabled \
-Dtests=disabled \
+ -Dintrospection=disabled \
-Dgobject-cast-checks=disabled \
-Dglib-asserts=disabled \
-Dglib-checks=disabled \
@@ -374,6 +411,7 @@ $(eval $(call rules-meson,gst_bad,64))
##
GST_UGLY_MESON_ARGS := \
+ $(GST_LTO) \
-Ddoc='disabled' \
-Dtests=disabled \
-Dgobject-cast-checks=disabled \
@@ -549,6 +587,9 @@ OPENFST_CONFIGURE_ARGS = \
--with-pic \
--disable-bin \
+OPENFST_CFLAGS = -mno-bmi2
+OPENFST_CXXFLAGS = -mno-bmi2
+
$(eval $(call rules-source,openfst,$(SRCDIR)/openfst))
$(eval $(call rules-autoconf,openfst,32))
$(eval $(call rules-autoconf,openfst,64))
@@ -611,7 +652,11 @@ WINE_SOURCE_ARGS = \
--exclude dlls/winevulkan/winevulkan.spec
WINE_CONFIGURE_ARGS = \
+ --with-x \
+ --with-gstreamer \
--with-mingw \
+ --without-oss \
+ --disable-win16 \
--disable-tests
WINE_CONFIGURE_ARGS32 = \
@@ -681,6 +726,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
DXVK_DEPENDS = glslang
+DXVK_CPPFLAGS = -msse -msse2
+DXVK_LDFLAGS = -static -static-libgcc -static-libstdc++
+
$(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
$(eval $(call rules-meson,dxvk,32,CROSS))
$(eval $(call rules-meson,dxvk,64,CROSS))
@@ -708,6 +756,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
+DXVK_NVAPI_CPPFLAGS = -msse -msse2
+DXVK_NVAPI_LDFLAGS = -static -static-libgcc -static-libstdc++
+
$(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))
@@ -782,6 +833,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++
+
$(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))
@@ -1062,14 +1116,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
- afdko makeotfexe -f $($(notdir $@)_CIDFONT) -omitMacNames -ff $($(notdir $@)_FEATURES) \
+ makeotfexe -f $($(notdir $@)_CIDFONT) -omitMacNames -ff $($(notdir $@)_FEATURES) \
-lic ADOBE -mf $($(notdir $@)_MENUNAMEDB) -r -nS -cs 25 -ch $($(notdir $@)_UNISOURCE) \
-ci $($(notdir $@)_SEQUENCES) -o $@.tmp
- afdko tx -cff +S -no_futile $($(notdir $@)_CIDFONT) $@.cff
+ tx -cff +S -no_futile $($(notdir $@)_CIDFONT) $@.cff
# sftnedit uses a hardcoded temporary file in the local directory, so we have
# to run it in a dedicated temporary directory to prevent concurrent instances
# to step onto each other's feet
- (TEMP_DIR=`mktemp -d` && cd $$TEMP_DIR && afdko sfntedit -a CFF=$(abspath $($(notdir $@)).cff) $(abspath $@.tmp) && rm -fr $$TEMP_DIR)
+ (TEMP_DIR=`mktemp -d` && cd $$TEMP_DIR && sfntedit -a CFF=$(abspath $($(notdir $@)).cff) $(abspath $@.tmp) && rm -fr $$TEMP_DIR)
mv $@.tmp $@
$(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
@@ -1079,12 +1133,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 $@.tmp $^
- afdko otf2ttf -o $@ $@.tmp
+ otf2otc -o $@.tmp $^
+ otf2ttf -o $@ $@.tmp
rm $@.tmp
$(msgothic.ttc): $(msgothic.ttf) $(mspgothic.ttf) $(msuigothic.ttf)
- afdko otf2otc -o $@ $^
+ otf2otc -o $@ $^
$(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) \
@@ -1210,8 +1264,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))
@@ -1353,7 +1407,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
@@ -1368,9 +1421,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
+++ b/compatibilitytool.vdf.template
@@ -14,7 +14,7 @@
"install_path" "."
// For this template, we're going to substitute the display_name key in here, e.g.:
- "display_name" "##BUILD_NAME##"
+ "display_name" "##BUILD_NAME## (Unsupported AUR package [native])"
"from_oslist" "windows"
"to_oslist" "linux"
diff --git a/configure.sh b/configure.sh
index bc3ccc65..faa4d6e3 100755
--- a/configure.sh
+++ b/configure.sh
@@ -128,6 +128,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" "$steamrt_image" || die "Specified container engine \"$arg_container_engine\" doesn't work"
else
@@ -140,6 +141,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 ad04eeb8..53eda5bc 100644
--- a/make/rules-autoconf.mk
+++ b/make/rules-autoconf.mk
@@ -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)) \
- $$(MAKE)
+ $$(MAKE) -j$$(SUBJOBS)
cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
- $$(MAKE) install
+ $$(MAKE) -j$$(SUBJOBS) install
touch $$@
endef
diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk
index ff7f4e03..e6529e2c 100644
--- a/make/rules-cargo.mk
+++ b/make/rules-cargo.mk
@@ -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)) \
+ cargo update --locked --offline --verbose --workspace
+ cd $$($(2)_SRC) && env $$($(2)_ENV$(3)) \
cargo build \
- $$(filter -j%,$$(MAKEFLAGS)) \
+ -j$$(SUBJOBS) --locked --offline --verbose \
--target "$$(CARGO_TARGET_$(3))" \
--target-dir $$($(2)_OBJ$(3)) \
$$(CARGO_BUILD_ARGS) \
diff --git a/make/rules-cmake.mk b/make/rules-cmake.mk
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
$$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2
cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
- $$(MAKE)
+ $$(MAKE) -j$$(SUBJOBS)
cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
- $$(MAKE) install
+ $$(MAKE) -j$$(SUBJOBS) install
touch $$@
endef
diff --git a/make/rules-common.mk b/make/rules-common.mk
index b057bb72..fc995910 100644
--- a/make/rules-common.mk
+++ b/make/rules-common.mk
@@ -104,7 +104,11 @@ $(2)_LIBFLAGS$(3) = $$(foreach d,$$($(2)_DEPS$(3)),-L$$($$(d)_LIBDIR$(3))) \
# native version doesn't exist.
$(2)_ENV$(3) = \
+ WINEDEBUG="-all" \
+ WINEPREFIX="$$(OBJ)/pfx-wine$(3)" \
+ WINEDLLOVERRIDES="winemenubuilder=d;" \
CARGO_TARGET_$$(call toupper,$$(CARGO_TARGET_$(3)))_LINKER="$$(TARGET_$(4)$(3))-gcc" \
+ CARGO_TARGET_$$(call toupper,$$(CARGO_TARGET_$(3)))_RUSTFLAGS="$$(RUSTFLAGS)" \
CCACHE_BASEDIR="$$(CCACHE_BASEDIR)" \
STRIP="$$(STRIP)" \
AR="$$(TARGET_$(4)$(3))-ar" \
@@ -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))" \
- PKG_CONFIG_LIBDIR="/usr/lib/$$(PKG_CONFIG_TARGET_$(4)$(3))/pkgconfig:/usr/share/pkgconfig" \
+ PKG_CONFIG_LIBDIR="/usr/lib$(3)/pkgconfig:/usr/share/pkgconfig" \
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" \
@@ -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)" \
- CROSSPKG_CONFIG_LIBDIR="/usr/lib/$$(PKG_CONFIG_TARGET_CROSS$(3))/pkgconfig:/usr/share/pkgconfig" \
+ CROSSPKG_CONFIG_LIBDIR="/usr/lib$(3)/pkgconfig:/usr/share/pkgconfig" \
endif
@@ -155,14 +159,14 @@ else
install-strip = objcopy --file-alignment=4096 --strip-debug $(1) $(2)/$(notdir $(1)) && rm -f $(2)/$(notdir $(1)).debug
endif
-TARGET_32 := i686-linux-gnu
-TARGET_64 := x86_64-linux-gnu
+TARGET_32 := i686-pc-linux-gnu
+TARGET_64 := x86_64-pc-linux-gnu
TARGET_CROSS32 := i686-w64-mingw32
TARGET_CROSS64 := x86_64-w64-mingw32
-PKG_CONFIG_TARGET_32 := i386-linux-gnu
-PKG_CONFIG_TARGET_64 := x86_64-linux-gnu
-PKG_CONFIG_TARGET_CROSS32 := i386-w64-mingw32
+PKG_CONFIG_TARGET_32 := i686-pc-linux-gnu
+PKG_CONFIG_TARGET_64 := x86_64-pc-linux-gnu
+PKG_CONFIG_TARGET_CROSS32 := i686-w64-mingw32
PKG_CONFIG_TARGET_CROSS64 := x86_64-w64-mingw32
LIBDIR_WINE_32 := wine/i386-unix
diff --git a/make/rules-configure.mk b/make/rules-configure.mk
index 29eee132..642c6d70 100644
--- a/make/rules-configure.mk
+++ b/make/rules-configure.mk
@@ -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)) \
- $$(MAKE)
+ $$(MAKE) -j$$(SUBJOBS)
cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
- $$(MAKE) install
+ $$(MAKE) -j$$(SUBJOBS) install
touch $$@
endef
diff -Nruw proton-ge-custom/make/rules-meson.mk proton-ge-custom.orig/make/rules-meson.mk
--- a/make/rules-meson.mk 2023-08-05 02:13:18.366097503 +0300
+++ b/make/rules-meson.mk 2023-08-05 02:10:54.909541979 +0300
@@ -48,6 +48,7 @@
env $$($(2)_ENV$(3)) \
meson "$$($(2)_OBJ$(3))" "$$($(2)_SRC)" \
+ --wrap-mode=nodownload \
--prefix="$$($(2)_DST$(3))" \
--libdir="lib$(subst 32,,$(3))" \
--buildtype=plain \
@@ -61,7 +62,7 @@
$$(OBJ)/.$(1)-build$(3):
@echo ":: building $(3)bit $(1)..." >&2
+env $$($(2)_ENV$(3)) \
- ninja -C "$$($(2)_OBJ$(3))" install
+ ninja -j$$(SUBJOBS) -C "$$($(2)_OBJ$(3))" install $(-v?)
touch $$@
endef
diff --git a/make/rules-winemaker.mk b/make/rules-winemaker.mk
index 5c3b59a3..ed6589e0 100644
--- a/make/rules-winemaker.mk
+++ b/make/rules-winemaker.mk
@@ -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)) \
- $$(MAKE) -C "$$($(2)_OBJ$(3))" LIBRARIES="$$($(2)_LDFLAGS)"
+ $$(MAKE) -j$$(SUBJOBS) -C "$$($(2)_OBJ$(3))" LIBRARIES="$$($(2)_LDFLAGS)"
cd "$$($(2)_OBJ$(3))" && touch "$(basename $(4)).spec" && env $$($(2)_ENV$(3)) \
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 7f142f86..4af0c40c 100755
--- a/proton
+++ b/proton
@@ -423,7 +423,6 @@ class Proton:
self.wine_bin = self.bin_dir + "wine"
self.wine64_bin = self.bin_dir + "wine64"
self.wineserver_bin = self.bin_dir + "wineserver"
- self.dist_lock = FileLock(self.path("dist.lock"), timeout=-1)
def path(self, d):
return self.base_dir + d
@@ -1827,8 +1826,6 @@ if __name__ == "__main__":
g_proton = Proton(os.path.dirname(sys.argv[0]))
- g_proton.cleanup_legacy_dist()
- g_proton.do_steampipe_fixups()
g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
@@ -1837,7 +1834,8 @@ if __name__ == "__main__":
g_session.init_wine()
if g_proton.missing_default_prefix():
- g_proton.make_default_prefix()
+ log("Default prefix is missing, something is very wrong.")
+ sys.exit(1)
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.41.0