Smaller stuff that went uncommitted

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

2 files changed, 43 insertions, 12 deletions

diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index f813c8f..36bae60 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -6,6 +6,7 @@ cpu = target_machine.cpu_family()
 is_64bit = (cpu == 'x86_64' or cpu == 'aarch64')
 is_debug = get_option('debug')
 is_minsize = get_option('optimization') == 's'
+is_lto = get_option('b_lto')
 is_linux = host_machine.system() == 'linux'
 is_windows = host_machine.system() == 'windows'
 is_msvc = compiler.get_id() == 'msvc' or compiler.get_id() == 'clang-cl'
@@ -25,11 +26,15 @@ if is_minsize
   extra_options += ['--enable-small']
 endif
 
+if is_lto
+  extra_options += ['--enable-lto']
+endif
+
 extra_options += ['--arch=' + cpu]
 extra_options += ['--cc=' + compiler.cmd_array()[0]]
 if meson.is_cross_build()
   if is_msvc
-    extra_options += ['--ld=' + compiler.get_linker_id()]
+    extra_options += ['--ld=' + meson.get_external_property('ld')]
   endif
   extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')]
   extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
@@ -67,19 +72,16 @@ decoders += ',pcm_s32be,pcm_s32le,pcm_s24be,pcm_s24le,pcm_s16be,pcm_s16le'
 #decoders += ',pcm_f32be,pcm_f32le,pcm_s32le_planar,pcm_s16be_planar,pcm_s16le_planar'
 decoders += ',dca,eac3'
 decoders += ',pcm_dvd,mpegvideo,mpeg2video'
+decoders += ',av1'
 #decoders += ',ass,srt'
-if get_option('codec-hwaccels').length() == 0
-  if not is_msvc
-    libdav1d = dependency('dav1d', required: false)
-    if libdav1d.found()
-      decoders += ',libdav1d'
-      extra_options += ['--enable-libdav1d']
-      deps += [libdav1d]
-    endif
+#if get_option('codec-hwaccels').length() == 0
+  libdav1d = dependency('dav1d', required: false)
+  if libdav1d.found()
+    decoders += ',libdav1d'
+    extra_options += ['--enable-libdav1d']
+    deps += [libdav1d]
   endif
-else
-  decoders += ',av1'
-endif
+#endif
 
 demuxers = ''
 parsers = ''
diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.diff b/subprojects/packagefiles/ffmpeg/version_8.1.diff
new file mode 100644
index 0000000..9b87011
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg/version_8.1.diff
@@ -0,0 +1,29 @@
+--- a/meson.build	2025-08-23 18:44:34.634014892 -0400
++++ b/meson.build	2025-08-25 15:33:36.209533531 -0400
+@@ -1,4 +1,4 @@
+-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0')
++project('ffmpeg', 'c', version: '8.1', meson_version: '>=0.57.0')
+ 
+ compiler = meson.get_compiler('c')
+ 
+@@ -268,14 +268,14 @@
+ swscale = proj.dependency('swscale')
+ include = include_directories('.', 'build/')
+ meson.override_dependency('libavutil', declare_dependency(
+-  dependencies: [avutil, deps], compile_args: args, include_directories: include, version: ''))
++  dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '60.26.100'))
+ meson.override_dependency('libavformat', declare_dependency(
+-  dependencies: [avformat], include_directories: include, version: ''))
++  dependencies: [avformat], include_directories: include, version: '62.12.100'))
+ meson.override_dependency('libavcodec', declare_dependency(
+-  dependencies: [avcodec], include_directories: include, version: ''))
++  dependencies: [avcodec], include_directories: include, version: '62.28.100'))
+ meson.override_dependency('libavdevice', declare_dependency(
+-  dependencies: [avdevice], include_directories: include, version: ''))
++  dependencies: [avdevice], include_directories: include, version: '62.3.100'))
+ meson.override_dependency('libswresample', declare_dependency(
+-  dependencies: [swresample], include_directories: include, version: ''))
++  dependencies: [swresample], include_directories: include, version: '6.3.100'))
+ meson.override_dependency('libswscale', declare_dependency(
+-  dependencies: [swscale], include_directories: include, version: ''))
++  dependencies: [swscale], include_directories: include, version: '9.5.100'))