[vlc-commits] [Git][videolan/vlc][master] package/win32: no longer force meson build

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
3696b231 by Marvin Scholz at 2021-08-11T14:12:48+00:00
package/win32: no longer force meson build

The related meson issue was fixed in meson 0.54.0 and extras/tools now
requires meson 0.54.2 or higehr, else it builds it anyway. So there is
no need to force it anymore here.

Fix in meson upstream in 49ae886620c5d140efbbe177ff0565ba100309f2

- - - - -


1 changed file:

- extras/package/win32/build.sh


Changes:

=====================================
extras/package/win32/build.sh
=====================================
@@ -142,8 +142,8 @@ cd extras/tools
 export VLC_TOOLS="$PWD/build"
 
 export PATH="$PWD/build/bin":"$PATH"
-# Force patched meson as newer versions don't add -lpthread properly in libplacebo.pc
-FORCED_TOOLS="meson"
+
+FORCED_TOOLS=""
 # Force libtool build when compiling with clang
 if [ "$COMPILING_WITH_CLANG" -gt 0 ] && [ ! -d "libtool" ]; then
     FORCED_TOOLS="$FORCED_TOOLS libtool"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3696b231cb9c6a17147fd5e5c3259a35cdf75cc1

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3696b231cb9c6a17147fd5e5c3259a35cdf75cc1
You're receiving this email because of your account on code.videolan.org.