[vlc-commits] package/win32: build.sh: force building the local meson

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jan 28 09:58:00 2020 +0100| [3f53addfdc706d34c242c3421d61e9a103c83588] | committer: Steve Lhomme

package/win32: build.sh: force building the local meson

Versions above 0.51.1 don't add the -lpthread properly in libplacebo.pc.

(cherry picked from commit ed2886d85e70334be8677d00f5417afefd7119f8)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=3f53addfdc706d34c242c3421d61e9a103c83588
---

 extras/package/win32/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 43929165c0..8d70328371 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -111,9 +111,11 @@ mkdir -p extras/tools
 cd extras/tools
 
 export PATH="$PWD/build/bin":"$PATH"
+# Force meson 0.51.1 as newer versions don't add -lpthread properly in libplacebo.pc
+FORCED_TOOLS="meson"
 # Force libtool build when compiling with clang
 if [ "$COMPILING_WITH_CLANG" -gt 0 ] && [ ! -d "libtool" ]; then
-    FORCED_TOOLS="libtool"
+    FORCED_TOOLS="$FORCED_TOOLS libtool"
 fi
 # bootstrap only if needed in interactive mode
 if [ "$INTERACTIVE" != "yes" ] || [ ! -f ./Makefile ]; then