Build fixes, get LTO+Os working on Windows

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

4 files changed, 38 insertions, 14 deletions

diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 7481dea..ed3617c 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -73,7 +73,9 @@ decoders += ',pcm_s32be,pcm_s32le,pcm_s24be,pcm_s24le,pcm_s16be,pcm_s16le'
 decoders += ',dca,eac3'
 decoders += ',pcm_dvd,mpegvideo,mpeg2video'
 decoders += ',av1'
-#decoders += ',ass,srt'
+if get_option('subtitles').enabled()
+  decoders += ',ass,srt,webvtt'
+endif
 #if get_option('codec-hwaccels').length() == 0
   libdav1d = dependency('dav1d', required: false)
   if libdav1d.found()
@@ -84,6 +86,7 @@ decoders += ',av1'
 #endif
 
 demuxers = ''
+muxers = ''
 parsers = ''
 if not get_option('sink-only')
   demuxers += 'flac,mp3,aac,wav,matroska,mov,avi'
@@ -91,7 +94,10 @@ if not get_option('sink-only')
   #demuxers += ',pcm_f32be,pcm_f32le,pcm_s32le_planar,pcm_s16be_planar,pcm_s16le_planar'
   demuxers += ',eac3'
   demuxers += ',mpegts,mpegtsraw,mpegps,mpegvideo'
-  #demuxers += ',ass,srt'
+  if get_option('subtitles').enabled()
+    demuxers += ',ass,srt,webvtt'
+    muxers += ',ass,srt,webvtt'
+  endif
   parsers += 'aac,opus,h264,hevc,av1,vp9'
   parsers += ',dca'
   parsers += ',mpegaudio,mpegvideo,dvd_nav'
@@ -222,6 +228,10 @@ if demuxers != ''
   extra_options += ['--enable-demuxer=' + demuxers]
 endif
 
+if muxers != ''
+  extra_options += ['--enable-muxer=' + muxers]
+endif
+
 if parsers != ''
   extra_options += ['--enable-parser=' + parsers]
 endif
diff --git a/subprojects/packagefiles/ffmpeg/meson_options.txt b/subprojects/packagefiles/ffmpeg/meson_options.txt
index c06b276..d58d8fd 100644
--- a/subprojects/packagefiles/ffmpeg/meson_options.txt
+++ b/subprojects/packagefiles/ffmpeg/meson_options.txt
@@ -1,5 +1,6 @@
 # Copy-paste from top-level project.
 option('codec-hwaccels', type: 'array', choices: ['vulkan', 'vaapi', 'mediacodec', 'd3d11va', 'dxva2'], value: [], yield: true)
 option('renderer-api', type: 'combo', choices: ['vulkan', 'dx11', 'gl', 'gl-rpi'], value: 'vulkan', yield: true)
+option('subtitles', type: 'feature', value: 'enabled', yield: true)
 option('win32-compat', type: 'boolean', value: false, yield: true)
 option('sink-only', type: 'boolean', value: false, yield: true)
diff --git a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
index 7e91e5d..bf31274 100644
--- a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
+++ b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
@@ -1,5 +1,5 @@
---- a/meson.build	2026-07-02 16:36:02.258920727 -0400
-+++ b/meson.build	2026-07-02 16:49:06.795636508 -0400
+--- a/meson.build	2026-07-04 12:03:17.942564661 -0400
++++ b/meson.build	2026-07-04 15:10:51.305639404 -0400
 @@ -1,4 +1,4 @@
 -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0')
 +project('ffmpeg', 'c', version: '3.3.9', meson_version: '>=0.57.0')
@@ -17,10 +17,10 @@
  extra_options += ['--enable-static', '--disable-shared']
  
  if is_windows
-@@ -74,14 +70,6 @@
- decoders += ',pcm_dvd,mpegvideo,mpeg2video'
- decoders += ',av1'
- #decoders += ',ass,srt'
+@@ -76,14 +72,6 @@
+ if get_option('subtitles').enabled()
+   decoders += ',ass,srt,webvtt'
+ endif
 -#if get_option('codec-hwaccels').length() == 0
 -  libdav1d = dependency('dav1d', required: false)
 -  if libdav1d.found()
@@ -31,8 +31,8 @@
 -#endif
  
  demuxers = ''
- parsers = ''
-@@ -197,12 +185,8 @@
+ muxers = ''
+@@ -203,12 +191,8 @@
  
  # Disable unused hwaccels.
  extra_options += [
@@ -45,7 +45,7 @@
    '--disable-nvenc',
    '--disable-vdpau',
    '--disable-audiotoolbox',
-@@ -245,6 +229,15 @@
+@@ -255,6 +239,15 @@
    args += ['-DCAMU_HAVE_SOXR']
  endif
  
@@ -61,7 +61,7 @@
  ext_proj = import('unstable-external_project')
  
  proj = ext_proj.add_project('configure',
-@@ -254,7 +247,6 @@
+@@ -264,7 +257,6 @@
      '--incdir=@PREFIX@/@INCLUDEDIR@',
      '--enable-pic',
      '--disable-all',
@@ -69,7 +69,7 @@
      '--disable-everything',
      '--disable-programs',
      '--disable-doc',
-@@ -279,11 +271,14 @@
+@@ -289,11 +281,14 @@
      '--enable-swscale',
      '--disable-indevs',
      '--disable-outdevs',
@@ -84,7 +84,7 @@
  avutil = proj.dependency('avutil')
  avformat = proj.dependency('avformat')
  avcodec = proj.dependency('avcodec')
-@@ -292,14 +287,14 @@
+@@ -302,14 +297,14 @@
  swscale = proj.dependency('swscale')
  include = include_directories('.', 'build/')
  meson.override_dependency('libavutil', declare_dependency(
diff --git a/subprojects/packagefiles/shaderc/spirv_tools_build_version.diff b/subprojects/packagefiles/shaderc/spirv_tools_build_version.diff
index de50787..ebd5cdc 100644
--- a/subprojects/packagefiles/shaderc/spirv_tools_build_version.diff
+++ b/subprojects/packagefiles/shaderc/spirv_tools_build_version.diff
@@ -19,3 +19,16 @@ index 8e918de0..5dbc0dd1 100644
  endfunction()
  
  # Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and
+diff --git a/source/opt/CMakeLists.txt b/source/opt/CMakeLists.txt
+index a0ca5b84..a6dd3f68 100644
+--- a/source/opt/CMakeLists.txt
++++ b/source/opt/CMakeLists.txt
+@@ -283,6 +283,8 @@ target_include_directories(SPIRV-Tools-opt
+ target_link_libraries(SPIRV-Tools-opt
+   PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY})
+ 
++add_dependencies(SPIRV-Tools-opt core_tables)
++
+ set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "SPIRV-Tools libraries")
+ spvtools_check_symbol_exports(SPIRV-Tools-opt)
+