Update deps, small changes and cleanup

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

3 files changed, 34 insertions, 7 deletions

diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index ed3617c..aa881bc 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -12,6 +12,7 @@ is_windows = host_machine.system() == 'windows'
 is_msvc = compiler.get_id() == 'msvc' or compiler.get_id() == 'clang-cl'
 is_mingw = is_windows and not is_msvc
 is_android = host_machine.system() == 'android'
+is_static_shared_lib = is_android
 
 args = ['-DFFMPEG_VERSION="' + meson.project_version() + '"']
 deps = []
@@ -33,9 +34,6 @@ endif
 extra_options += ['--arch=' + cpu]
 extra_options += ['--cc=' + compiler.cmd_array()[0]]
 if meson.is_cross_build()
-  if is_msvc
-    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')]
 endif
@@ -45,6 +43,9 @@ if cpu == 'x86_64' or cpu == 'x86'
 endif
 
 extra_options += ['--enable-static', '--disable-shared']
+if is_static_shared_lib
+  extra_options += ['--enable-pic']
+endif
 
 if is_windows
   if get_option('win32-compat')
@@ -211,7 +212,6 @@ extra_options += [
   '--disable-nvdec',
   '--disable-nvenc',
   '--disable-vdpau',
-  '--disable-audiotoolbox',
   '--disable-videotoolbox'
 ]
 
@@ -262,7 +262,6 @@ proj = ext_proj.add_project('configure',
     '--prefix=@PREFIX@',
     '--libdir=@PREFIX@/@LIBDIR@',
     '--incdir=@PREFIX@/@INCLUDEDIR@',
-    '--enable-pic',
     '--disable-all',
     '--disable-autodetect',
     '--disable-everything',
diff --git a/subprojects/packagefiles/ffmpeg/meson_options.txt b/subprojects/packagefiles/ffmpeg/meson_options.txt
index d58d8fd..7854d28 100644
--- a/subprojects/packagefiles/ffmpeg/meson_options.txt
+++ b/subprojects/packagefiles/ffmpeg/meson_options.txt
@@ -1,6 +1,5 @@
 # Copy-paste from top-level project.
+option('sink-only', type: 'boolean', value: false, yield: true)
 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_9.0.1.diff b/subprojects/packagefiles/ffmpeg/version_9.0.1.diff
new file mode 100644
index 0000000..8c10f1c
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg/version_9.0.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: '9.0.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: '61.1.100'))
+ meson.override_dependency('libavformat', declare_dependency(
+-  dependencies: [avformat], include_directories: include, version: ''))
++  dependencies: [avformat], include_directories: include, version: '63.1.100'))
+ meson.override_dependency('libavcodec', declare_dependency(
+-  dependencies: [avcodec], include_directories: include, version: ''))
++  dependencies: [avcodec], include_directories: include, version: '63.1.100'))
+ meson.override_dependency('libavdevice', declare_dependency(
+-  dependencies: [avdevice], include_directories: include, version: ''))
++  dependencies: [avdevice], include_directories: include, version: '63.1.100'))
+ meson.override_dependency('libswresample', declare_dependency(
+-  dependencies: [swresample], include_directories: include, version: ''))
++  dependencies: [swresample], include_directories: include, version: '7.1.100'))
+ meson.override_dependency('libswscale', declare_dependency(
+-  dependencies: [swscale], include_directories: include, version: ''))
++  dependencies: [swscale], include_directories: include, version: '10.1.100'))