[vlc-commits] [Git][videolan/vlc][master] 3 commits: package/win32: prefer static linking with meson

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
419f64d6 by Steve Lhomme at 2024-11-03T15:31:01+00:00
package/win32: prefer static linking with meson

This is also how pkg-config is called with configure.ac for mingw32, darwin and os2.

- - - - -
d3237a4f by Steve Lhomme at 2024-11-03T15:31:01+00:00
package/win32: keep the full path of tools for meson

So a reconfigure still works even if the PATH was not set from this script.

- - - - -
0858165d by Steve Lhomme at 2024-11-03T15:31:01+00:00
meson: add the CMake name of some libraries

They can be found with CMake if necessary.

- - - - -


5 changed files:

- extras/package/win32/build.sh
- modules/codec/meson.build
- modules/demux/meson.build
- modules/meson.build
- modules/services_discovery/meson.build


Changes:

=====================================
extras/package/win32/build.sh
=====================================
@@ -435,6 +435,7 @@ else
 fi
 cd ../..
 
+MCONFIGFLAGS="$MCONFIGFLAGS --prefer-static"
 if [ "$RELEASE" != "yes" ]; then
      CONFIGFLAGS="$CONFIGFLAGS --enable-debug"
      MCONFIGFLAGS="$MCONFIGFLAGS --buildtype debugoptimized"
@@ -501,21 +502,21 @@ if [ -n "$BUILD_MESON" ]; then
 
     printf '# This file was automatically generated!\n\n' >&3
     printf '[binaries]\n' >&3
-    printf 'c = '"'"'%s'"'"'\n' "${CC}" >&3
-    printf 'cpp = '"'"'%s'"'"'\n' "${CXX:-$TRIPLET-g++}" >&3
+    printf 'c = '"'"'%s'"'"'\n' "$(command -v ${CC})" >&3
+    printf 'cpp = '"'"'%s'"'"'\n' "$(command -v ${CXX:-$TRIPLET-g++})" >&3
     if [ -n "$VLC_AR" ]; then
-        printf 'ar = '"'"'%s'"'"'\n' "${VLC_AR}" >&3
+        printf 'ar = '"'"'%s'"'"'\n' "$(command -v ${VLC_AR})" >&3
     fi
     if [ -n "$VLC_RANLIB" ]; then
-        printf 'ranlib = '"'"'%s'"'"'\n' "${VLC_RANLIB}" >&3
+        printf 'ranlib = '"'"'%s'"'"'\n' "$(command -v ${VLC_RANLIB})" >&3
     fi
-    printf 'strip = '"'"'%s'"'"'\n' "${TRIPLET}-strip" >&3
+    printf 'strip = '"'"'%s'"'"'\n' "$(command -v ${TRIPLET}-strip)" >&3
     if [ -n "$VLC_PKG_CONFIG" ]; then
-        printf 'pkg-config = '"'"'%s'"'"'\n' "${VLC_PKG_CONFIG}" >&3
+        printf 'pkg-config = '"'"'%s'"'"'\n' "$(command -v ${VLC_PKG_CONFIG})" >&3
     fi
-    printf 'windres = '"'"'%s'"'"'\n' "${TRIPLET}-windres" >&3
+    printf 'windres = '"'"'%s'"'"'\n' "$(command -v ${TRIPLET}-windres)" >&3
     if [ -n "$VLC_EXE_WRAPPER" ]; then
-        printf 'exe_wrapper = '"'"'%s'"'"'\n' "${VLC_EXE_WRAPPER}" >&3
+        printf 'exe_wrapper = '"'"'%s'"'"'\n' "$(command -v ${VLC_EXE_WRAPPER})" >&3
     fi
     printf 'cmake = '"'"'%s'"'"'\n' "$(command -v cmake)" >&3
     if [ -z "$DISABLEGUI" ]; then


=====================================
modules/codec/meson.build
=====================================
@@ -175,7 +175,7 @@ vlc_modules += {
 }
 
 # JPEG codec
-jpeg_dep = dependency('libjpeg', required: get_option('jpeg'))
+jpeg_dep = dependency('libjpeg', 'libjpeg-turbo', required: get_option('jpeg'))
 vlc_modules += {
     'name' : 'jpeg',
     'sources' : files('jpeg.c'),
@@ -413,10 +413,10 @@ vlc_modules += {
 
 ## Xiph.org codecs
 
-ogg_dep = dependency('ogg', required: get_option('ogg'))
+ogg_dep = dependency('ogg', 'Ogg', required: get_option('ogg'))
 
 # FLAC codec
-flac_dep = dependency('flac', required: get_option('flac'))
+flac_dep = dependency('flac', 'FLAC', required: get_option('flac'))
 vlc_modules += {
     'name' : 'flac',
     'sources' : files('flac.c'),
@@ -474,7 +474,7 @@ vlc_modules += {
 }
 
 # Vorbis codec
-vorbis_dep    = dependency('vorbis', version: '>= 1.1', required: get_option('vorbis'))
+vorbis_dep    = dependency('vorbis', 'Vorbis', version: '>= 1.1', required: get_option('vorbis'))
 vorbisenc_dep = dependency('vorbisenc', version: '>= 1.1', required: get_option('vorbis'))
 vlc_modules += {
     'name' : 'vorbis',


=====================================
modules/demux/meson.build
=====================================
@@ -256,8 +256,8 @@ vlc_modules += {
 }
 
 # MKV demux
-libebml_dep = dependency('libebml', required: get_option('matroska'))
-libmatroska_dep = dependency('libmatroska', required: get_option('matroska'))
+libebml_dep = dependency('libebml', 'EBML', required: get_option('matroska'))
+libmatroska_dep = dependency('libmatroska', 'Matroska', required: get_option('matroska'))
 if libebml_dep.found() and libmatroska_dep.found()
     vlc_modules += {
         'name' : 'mkv',


=====================================
modules/meson.build
=====================================
@@ -186,7 +186,7 @@ avcodec_dep  = dependency('libavcodec', version: '>= 58.54.100', required: get_o
 avutil_dep   = dependency('libavutil', version: '>= 56.31.100', required: false)
 
 # Freetype, used by text_renderer and ASS access
-freetype_dep = dependency('freetype2', required: get_option('freetype'))
+freetype_dep = dependency('freetype2', 'freetype', required: get_option('freetype'))
 
 # ZVBI, used by Linsys SDI access and VBI/Teletext decoders
 zvbi_dep = dependency('zvbi-0.2', version: '>= 0.2.28', required: false)


=====================================
modules/services_discovery/meson.build
=====================================
@@ -33,7 +33,7 @@ if mtp_dep.found()
 endif
 
 # UPnP Plugin (Intel SDK)
-upnp_dep = dependency('libupnp', required: get_option('upnp'))
+upnp_dep = dependency('libupnp', 'UPNP', required: get_option('upnp'))
 if upnp_dep.found()
 
     upnp_darwin_deps = []



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a3d47a325d884ce5af2e56c7d69be6a742c6664d...0858165dadab27a3b11260697e2858f15c4670c5

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a3d47a325d884ce5af2e56c7d69be6a742c6664d...0858165dadab27a3b11260697e2858f15c4670c5
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance