From 0b2008e9fe3d8235b94c02feb4809dfd0b98b3c8 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 13 Sep 2022 15:37:51 +0200
Subject: [PATCH] contrib: add MESONBUILD similar to CMAKEBUILD

We don't use the '+' in front because it doesn't use the jobserver from our
make call, because of ninja:
https://github.com/ninja-build/ninja/issues/1139
---
 contrib/src/basu/rules.mak         | 2 +-
 contrib/src/dav1d/rules.mak        | 2 +-
 contrib/src/fribidi/rules.mak      | 2 +-
 contrib/src/harfbuzz/rules.mak     | 2 +-
 contrib/src/libdsm/rules.mak       | 2 +-
 contrib/src/libplacebo/rules.mak   | 2 +-
 contrib/src/librist/rules.mak      | 2 +-
 contrib/src/main.mak               | 1 +
 contrib/src/medialibrary/rules.mak | 2 +-
 contrib/src/microdns/rules.mak     | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/contrib/src/basu/rules.mak b/contrib/src/basu/rules.mak
index ae0260ab27c7..a9acf5337397 100644
--- a/contrib/src/basu/rules.mak
+++ b/contrib/src/basu/rules.mak
@@ -26,5 +26,5 @@ basu: basu-$(BASU_VERSION).tar.gz .sum-basu
 .basu: basu crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 	touch $@
diff --git a/contrib/src/dav1d/rules.mak b/contrib/src/dav1d/rules.mak
index 38aed2f6e631..842b71835f56 100644
--- a/contrib/src/dav1d/rules.mak
+++ b/contrib/src/dav1d/rules.mak
@@ -28,5 +28,5 @@ dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
 .dav1d: dav1d crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF) $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 	touch $@
diff --git a/contrib/src/fribidi/rules.mak b/contrib/src/fribidi/rules.mak
index 783f971ae8cd..9d4570f1abfb 100644
--- a/contrib/src/fribidi/rules.mak
+++ b/contrib/src/fribidi/rules.mak
@@ -20,5 +20,5 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
 .fribidi: fribidi crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) -Ddocs=false -Dbin=false -Dtests=false $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 	touch $@
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index b6827dfce77c..c4daffa55a30 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -32,5 +32,5 @@ endif
 .harfbuzz: harfbuzz crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF) $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 	touch $@
diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index 1822a6b33967..0724904435a8 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -29,5 +29,5 @@ endif
 .libdsm: libdsm crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled -Dbinaries=false $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 	touch $@
diff --git a/contrib/src/libplacebo/rules.mak b/contrib/src/libplacebo/rules.mak
index da8b87455aed..bba35702421a 100644
--- a/contrib/src/libplacebo/rules.mak
+++ b/contrib/src/libplacebo/rules.mak
@@ -47,7 +47,7 @@ endif
 .libplacebo: libplacebo crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $(PLACEBOCONF) $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 # Work-around for full paths to static libraries, which libtool does not like
 # See https://github.com/mesonbuild/meson/issues/5479
 	(cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-rewrite-absolute.py -i "$(PREFIX)/lib/pkgconfig/libplacebo.pc")
diff --git a/contrib/src/librist/rules.mak b/contrib/src/librist/rules.mak
index ca6a1902a89e..dce6cb4c6132 100644
--- a/contrib/src/librist/rules.mak
+++ b/contrib/src/librist/rules.mak
@@ -35,5 +35,5 @@ librist: librist-$(LIBRIST_VERSION).tar.gz .sum-librist
 .librist: librist crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $(LIBRIST_CONF) $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 	touch $@
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index cadac403c275..093c6f0638be 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -497,6 +497,7 @@ MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" \
 else
 MESON = meson $(MESONFLAGS)
 endif
+MESONBUILD = meson install -C $</build
 
 ifdef GPL
 REQUIRE_GPL =
diff --git a/contrib/src/medialibrary/rules.mak b/contrib/src/medialibrary/rules.mak
index 9f9afb446dbb..0347ab28238d 100644
--- a/contrib/src/medialibrary/rules.mak
+++ b/contrib/src/medialibrary/rules.mak
@@ -20,6 +20,6 @@ medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2 .sum-medialibrary
 .medialibrary: medialibrary crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) -Dlibvlc=disabled -Dlibtool_workaround=true $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 	touch $@
 
diff --git a/contrib/src/microdns/rules.mak b/contrib/src/microdns/rules.mak
index a0d29c0f6cda..72b1dd486bd7 100644
--- a/contrib/src/microdns/rules.mak
+++ b/contrib/src/microdns/rules.mak
@@ -24,5 +24,5 @@ microdns: microdns-$(LIBMICRODNS_VERSION).tar.xz .sum-microdns
 .microdns: microdns crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled $</build $<
-	meson install -C $</build
+	$(MESONBUILD)
 	touch $@