Major build improvments (Windows sink)

- This commit won't run correctly because the signedness change is not handled by bimu server yet.

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 10 insertions, 9 deletions

diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 2faa65e..c4ab72d 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -1,4 +1,4 @@
-project('ffmpeg', 'c', version: '6.1', meson_version: '>=0.57.0')
+project('ffmpeg', 'c', version: '6.1.1', meson_version: '>=0.57.0')
 
 compiler = meson.get_compiler('c')
 
@@ -16,6 +16,8 @@ if not is_debug
 endif
 
 extra_options += ['--cc=' + compiler.cmd_array()[0]]
+extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
+extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')]
 
 if is_windows
   if is_64bit
@@ -40,13 +42,11 @@ demuxers = 'flac,mp3,aac,wav,image2,mjpeg,image2pipe,image_jpeg_pipe,matroska,mo
 parsers = 'mjpeg,jpeg2000'
 #parsers += ',mpegaudio,mpegvideo,dvd_nav'
 
-if not is_windows or is_mingw
-  #extra_options += ['--enable-zlib', '--enable-libsoxr']
-  extra_options += ['--enable-zlib']
-  decoders += ',png'
-  demuxers += ',image_png_pipe'
-  parsers += ',png'
-endif
+#extra_options += ['--enable-zlib', '--enable-libsoxr']
+extra_options += ['--enable-zlib']
+decoders += ',png'
+demuxers += ',image_png_pipe'
+parsers += ',png'
 
 bsfs = 'extract_extradata,mp3_header_decompress'
 
@@ -81,6 +81,7 @@ proj = ext_proj.add_project('configure',
     '--disable-alsa',
     '--disable-xlib',
     '--disable-vulkan',
+    '--enable-nonfree',
     '--enable-runtime-cpudetect',
     '--enable-asm',
     '--enable-inline-asm',
@@ -105,5 +106,5 @@ avcodec = proj.dependency('avcodec')
 swresample = proj.dependency('swresample')
 swscale = proj.dependency('swscale')
 
-libdir = meson.project_build_root() + '/dist/usr/locallib'
 inc = include_directories('.')
+libdir = meson.project_build_root() + '/dist/usr/locallib'