<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Nov 5, 2020, at 12:33 AM, Alexandre Janniaux <<a href="mailto:ajanni@videolabs.io" class="">ajanni@videolabs.io</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Hi,</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">LGTM, but why is the export CMAKE_GENERATOR needed in the</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">case of msys?</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""></div></blockquote><div><br class=""></div><div><div>commit d7fd6561bed169882b33e15a86aa7cef849a950e</div><div>Author: Steve Lhomme <<a href="mailto:robux4@videolabs.io" class="">robux4@videolabs.io</a>></div><div>Date: Wed Oct 26 17:35:05 2016 +0200</div><div><br class=""></div><div> contribs: fix cmake target on Windows</div><div><br class=""></div><div> On Windows cmake build for a Visual Studio target if it's installed, no matter</div><div> what the target we want to build. Reverting to MSys makefiles allow normal</div><div> autotools builds to be used</div><div><br class=""></div><div> Signed-off-by: Rémi Denis-Courmont <<a href="mailto:remi@remlab.net" class="">remi@remlab.net</a>></div></div><div><br class=""></div><div>We can specify a default CMAKE_GENERATOR for other platforms, but I'm not</div><div>planning to do it in this patch.</div><br class=""><blockquote type="cite" class=""><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Regards,</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">--</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Alexandre Janniaux</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Videolabs</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">On Wed, Nov 04, 2020 at 08:12:49PM +0800, Zhao Zhili wrote:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">First, fix the conflict setting/using of CMAKE_GENERATOR. Second,<br class="">call build via cmake instead of run make directly.<br class="">---<br class="">v3:<br class="">Now $(CMAKEBUILD) is defined as "cmake --build" so we don't have to rename $(CMAKE).<br class=""><br class="">v2:<br class="">remove $CMAKE_GENERATOR from soxr/rule.mak<br class="">rename CMAKE_WRAPPER CONTRIB_CMAKE_CONFIG to avoid conflict with cmake standard variable.<br class=""><br class="">contrib/bootstrap | 6 +++++-<br class="">contrib/src/aom/rules.mak | 4 ++--<br class="">contrib/src/chromaprint/rules.mak | 2 +-<br class="">contrib/src/ebml/rules.mak | 2 +-<br class="">contrib/src/fluidlite/rules.mak | 2 +-<br class="">contrib/src/glew/rules.mak | 2 +-<br class="">contrib/src/glslang/rules.mak | 2 +-<br class="">contrib/src/gme/rules.mak | 2 +-<br class="">contrib/src/libebur128/rules.mak | 2 +-<br class="">contrib/src/main.mak | 3 ++-<br class="">contrib/src/matroska/rules.mak | 2 +-<br class="">contrib/src/mpcdec/rules.mak | 2 +-<br class="">contrib/src/mysofa/rules.mak | 2 +-<br class="">contrib/src/openjpeg/rules.mak | 2 +-<br class="">contrib/src/projectM/rules.mak | 2 +-<br class="">contrib/src/soxr/rules.mak | 4 ++--<br class="">contrib/src/spatialaudio/rules.mak | 2 +-<br class="">contrib/src/srt/rules.mak | 2 +-<br class="">contrib/src/taglib/rules.mak | 2 +-<br class="">contrib/src/x265/rules.mak | 2 +-<br class="">20 files changed, 27 insertions(+), 22 deletions(-)<br class=""><br class="">diff --git a/contrib/bootstrap b/contrib/bootstrap<br class="">index 5ed5f6f25d..8cd4c68f40 100755<br class="">--- a/contrib/bootstrap<br class="">+++ b/contrib/bootstrap<br class="">@@ -256,7 +256,11 @@ test -z "$GNUV3" || add_make_enabled "GNUV3"<br class="">test -z "$AD_CLAUSES" || add_make_enabled "AD_CLAUSES"<br class="">test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"<br class="">test -z "$ENABLE_PDB" || add_make_enabled "ENABLE_PDB"<br class="">-test "`uname -o 2>/dev/null`" != "Msys" || add_make "CMAKE_GENERATOR := -G \"MSYS Makefiles\""<br class="">+<br class="">+if [ "`uname -o 2>/dev/null`" = "Msys" ]; then<br class="">+ add_make "CMAKE_GENERATOR := MSYS Makefiles"<br class="">+ add_make "export CMAKE_GENERATOR"<br class="">+fi<br class=""><br class="">#<br class=""># Checks<br class="">diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak<br class="">index ccf6491582..d49c825d63 100644<br class="">--- a/contrib/src/aom/rules.mak<br class="">+++ b/contrib/src/aom/rules.mak<br class="">@@ -89,7 +89,7 @@ endif<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>rm -rf $(PREFIX)/include/aom<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && rm -rf aom_build && mkdir -p aom_build<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) $(CMAKE) ../ $(AOM_CONF)<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) -C aom_build<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) aom_build<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>$(call pkg_static,"aom_build/aom.pc")<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $</aom_build && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $</aom_build && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/chromaprint/rules.mak b/contrib/src/chromaprint/rules.mak<br class="">index cac496d2c8..f01beaba79 100644<br class="">--- a/contrib/src/chromaprint/rules.mak<br class="">+++ b/contrib/src/chromaprint/rules.mak<br class="">@@ -22,5 +22,5 @@ DEPS_chromaprint = ffmpeg $(DEPS_ffmpeg)<br class=""><br class="">.chromaprint: chromaprint toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) $(CMAKE)<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak<br class="">index 3aecd88c38..5f3c9ab824 100644<br class="">--- a/contrib/src/ebml/rules.mak<br class="">+++ b/contrib/src/ebml/rules.mak<br class="">@@ -18,5 +18,5 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml<br class=""><br class="">.ebml: ebml toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_WIN32_IO=OFF<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/fluidlite/rules.mak b/contrib/src/fluidlite/rules.mak<br class="">index e893a46c1c..e119a97ab0 100644<br class="">--- a/contrib/src/fluidlite/rules.mak<br class="">+++ b/contrib/src/fluidlite/rules.mak<br class="">@@ -28,5 +28,5 @@ fluidlite: fluidlite-$(FLUID_HASH).tar.xz .sum-fluidlite<br class="">.fluidlite: fluidlite toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && rm -f CMakeCache.txt<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS) $(CMAKE)<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/glew/rules.mak b/contrib/src/glew/rules.mak<br class="">index 7477d149f6..5793bf13e8 100644<br class="">--- a/contrib/src/glew/rules.mak<br class="">+++ b/contrib/src/glew/rules.mak<br class="">@@ -18,5 +18,5 @@ glew: glew-$(GLEW_VERSION).tgz .sum-glew<br class=""><br class="">.glew: glew toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $</build/cmake && $(HOSTVARS_PIC) $(CMAKE) -DBUILD_SHARED_LIBS:BOOL=OFF -DGLEW_USE_STATIC_LIBS:BOOL=ON<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $</build/cmake && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $</build/cmake && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/glslang/rules.mak b/contrib/src/glslang/rules.mak<br class="">index 32c680b9f0..ee389f4fa5 100644<br class="">--- a/contrib/src/glslang/rules.mak<br class="">+++ b/contrib/src/glslang/rules.mak<br class="">@@ -25,5 +25,5 @@ glslang: glslang-$(GLSLANG_BASENAME).tar.xz .sum-glslang<br class="">.glslang: glslang toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) -DBUILD_SHARED_LIBS=OFF \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span> -DENABLE_GLSLANG_BINARIES=OFF<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/gme/rules.mak b/contrib/src/gme/rules.mak<br class="">index 60af152940..51c0bf171d 100644<br class="">--- a/contrib/src/gme/rules.mak<br class="">+++ b/contrib/src/gme/rules.mak<br class="">@@ -19,5 +19,5 @@ game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme<br class=""><br class="">.gme: game-music-emu toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) $(CMAKE) .<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/libebur128/rules.mak b/contrib/src/libebur128/rules.mak<br class="">index 7f74aabb76..75d6cd7269 100644<br class="">--- a/contrib/src/libebur128/rules.mak<br class="">+++ b/contrib/src/libebur128/rules.mak<br class="">@@ -20,6 +20,6 @@ libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz .sum-libebur128<br class=""><br class="">.libebur128: libebur128 toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_INTERNAL_QUEUE_H=TRUE<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>rm -f $(PREFIX)/lib/libebur128.so*<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/main.mak b/contrib/src/main.mak<br class="">index aa273ef89c..fb71479d68 100644<br class="">--- a/contrib/src/main.mak<br class="">+++ b/contrib/src/main.mak<br class="">@@ -392,8 +392,9 @@ AUTORECONF = autoreconf<br class="">endif<br class="">RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)<br class="">+CMAKEBUILD := cmake --build<br class="">CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_GENERATOR) \<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DCMAKE_INSTALL_PREFIX=$(PREFIX) \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DBUILD_SHARED_LIBS:BOOL=OFF<br class="">ifdef HAVE_WIN32<br class="">CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=<br class="">diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak<br class="">index c455d2f912..786f338355 100644<br class="">--- a/contrib/src/matroska/rules.mak<br class="">+++ b/contrib/src/matroska/rules.mak<br class="">@@ -23,5 +23,5 @@ matroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska<br class=""><br class="">.matroska: matroska toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) $(CMAKE)<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak<br class="">index 9284ad4e99..32ee57d5af 100644<br class="">--- a/contrib/src/mpcdec/rules.mak<br class="">+++ b/contrib/src/mpcdec/rules.mak<br class="">@@ -43,7 +43,7 @@ endif<br class=""><br class="">.mpcdec: musepack toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF .<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>mkdir -p -- "$(PREFIX)/lib"<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span># Use globbing to work around cmake's change of destination file<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && cp libmpcdec/*mpcdec_static.* "$(PREFIX)/lib/libmpcdec.a"<br class="">diff --git a/contrib/src/mysofa/rules.mak b/contrib/src/mysofa/rules.mak<br class="">index fe443988c9..84c0bb6b36 100644<br class="">--- a/contrib/src/mysofa/rules.mak<br class="">+++ b/contrib/src/mysofa/rules.mak<br class="">@@ -26,6 +26,6 @@ mysofa: libmysofa-$(MYSOFA_VERSION).tar.gz .sum-mysofa<br class="">.mysofa: mysofa toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && rm -f CMakeCache.txt<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS) $(CMAKE) -DBUILD_TESTS=OFF<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class=""><br class="">diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak<br class="">index ad51638902..e485651354 100644<br class="">--- a/contrib/src/openjpeg/rules.mak<br class="">+++ b/contrib/src/openjpeg/rules.mak<br class="">@@ -30,5 +30,5 @@ endif<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DBUILD_PKGCONFIG_FILES=ON \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DBUILD_CODEC:bool=OFF \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>.<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/projectM/rules.mak b/contrib/src/projectM/rules.mak<br class="">index ee2652b6d2..ec5d2bc3a4 100644<br class="">--- a/contrib/src/projectM/rules.mak<br class="">+++ b/contrib/src/projectM/rules.mak<br class="">@@ -43,6 +43,6 @@ DEPS_projectM = glew $(DEPS_glew)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DINCLUDE-PROJECTM-QT:BOOL=OFF \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DBUILD_PROJECTM_STATIC:BOOL=ON .<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>-cd $<; cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/soxr/rules.mak b/contrib/src/soxr/rules.mak<br class="">index 3981271743..8d3a986568 100644<br class="">--- a/contrib/src/soxr/rules.mak<br class="">+++ b/contrib/src/soxr/rules.mak<br class="">@@ -41,6 +41,6 @@ endif<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DWITH_LSR_BINDINGS=OFF \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DWITH_OPENMP=OFF \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DWITH_AVFFT=ON \<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-Wno-dev $(CMAKE_GENERATOR)<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-Wno-dev<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/spatialaudio/rules.mak b/contrib/src/spatialaudio/rules.mak<br class="">index 60a6596fc2..ce65adbd87 100644<br class="">--- a/contrib/src/spatialaudio/rules.mak<br class="">+++ b/contrib/src/spatialaudio/rules.mak<br class="">@@ -23,5 +23,5 @@ spatialaudio: spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 .sum-spatialaudio<br class="">.spatialaudio: spatialaudio toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && rm -f CMakeCache.txt<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS) $(CMAKE) -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak<br class="">index c9dbb59db8..05942a7af5 100644<br class="">--- a/contrib/src/srt/rules.mak<br class="">+++ b/contrib/src/srt/rules.mak<br class="">@@ -38,5 +38,5 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt<br class="">.srt: srt toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) CFLAGS="$(SRT_CFLAGS)" CXXFLAGS="$(SRT_CXXFLAGS)" $(CMAKE) \<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>-DENABLE_SHARED=OFF -DUSE_GNUTLS=ON -DENABLE_CXX11=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/taglib/rules.mak b/contrib/src/taglib/rules.mak<br class="">index 214b1ac1a1..b6204859e9 100644<br class="">--- a/contrib/src/taglib/rules.mak<br class="">+++ b/contrib/src/taglib/rules.mak<br class="">@@ -24,5 +24,5 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib<br class=""><br class="">.taglib: taglib toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(HOSTVARS_PIC) $(CMAKE) .<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) . --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak<br class="">index 0ed3de65d6..ad6cb7fbd3 100644<br class="">--- a/contrib/src/x265/rules.mak<br class="">+++ b/contrib/src/x265/rules.mak<br class="">@@ -37,6 +37,6 @@ endif<br class="">.x265: x265 toolchain.cmake<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>$(REQUIRE_GPL)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) -DENABLE_CLI=OFF<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(MAKE) -C source install<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>cd $< && $(CMAKEBUILD) source --target install<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>sed -e s/'[^ ]*clang_rt[^ ]*'//g -i.orig "$(PREFIX)/lib/pkgconfig/x265.pc"<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>touch $@<br class="">--<br class="">2.28.0<br class=""><br class="">_______________________________________________<br class="">vlc-devel mailing list<br class="">To unsubscribe or modify your subscription options:<br class=""><a href="https://mailman.videolan.org/listinfo/vlc-devel" class="">https://mailman.videolan.org/listinfo/vlc-devel</a><br class=""></blockquote><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">_______________________________________________</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">vlc-devel mailing list</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">To unsubscribe or modify your subscription options:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><a href="https://mailman.videolan.org/listinfo/vlc-devel" style="font-family: Helvetica; font-size: 14px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">https://mailman.videolan.org/listinfo/vlc-devel</a></div></blockquote></div><br class=""></body></html>