contrib: move the build and source folders in the MESON command

This simplifies the meson calls without worrying where the files will be put.

(cherry picked from commit 159d8609) (edited)
edited:
- 3.0 doesn't build libplacebo with meson
- 3.0 doesn't have basu
- 3.0 doesn't have librist
- 3.0 doesn't have medialibrary

contrib/src/dav1d/rules.mak

@@ -22,6 +22,6 @@ dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
 
 .dav1d: dav1d crossfile.meson
 	rm -rf $</build
-	$(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF) $</build $<
+	$(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF)
 	$(MESONBUILD)
 	touch $@

contrib/src/fribidi/rules.mak

@@ -19,6 +19,6 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
 # FIXME: DEPS_fribidi = iconv $(DEPS_iconv)
 .fribidi: fribidi crossfile.meson
 	rm -rf $</build
-	$(HOSTVARS_MESON) $(MESON) -Ddocs=false -Dbin=false -Dtests=false $</build $<
+	$(HOSTVARS_MESON) $(MESON) -Ddocs=false -Dbin=false -Dtests=false
 	$(MESONBUILD)
 	touch $@

contrib/src/harfbuzz/rules.mak

@@ -33,6 +33,6 @@ endif
 
 .harfbuzz: harfbuzz crossfile.meson
 	rm -rf $</build
-	$(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF) $</build $<
+	$(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF)
 	$(MESONBUILD)
 	touch $@

contrib/src/libdsm/rules.mak

@@ -28,6 +28,6 @@ endif
 
 .libdsm: libdsm crossfile.meson
 	rm -rf $</build
-	$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled -Dbinaries=false $</build $<
+	$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled -Dbinaries=false
 	$(MESONBUILD)
 	touch $@

contrib/src/main.mak

@@ -425,8 +425,8 @@ ifeq ($(findstring mingw32,$(BUILD)),mingw32)
 CMAKE += -DCMAKE_LINK_LIBRARY_SUFFIX:STRING=.a
 endif
 
-MESONFLAGS = --default-library static --prefix "$(PREFIX)" --backend ninja \
-	-Dlibdir=lib
+MESONFLAGS = $</build $< --default-library static --prefix "$(PREFIX)" \
+	--backend ninja -Dlibdir=lib
 ifndef WITH_OPTIMIZATION
 MESONFLAGS += --buildtype debug
 else

contrib/src/microdns/rules.mak

@@ -23,6 +23,6 @@ microdns: microdns-$(LIBMICRODNS_VERSION).tar.xz .sum-microdns
 
 .microdns: microdns crossfile.meson
 	rm -rf $</build
-	$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled $</build $<
+	$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled
 	$(MESONBUILD)
 	touch $@