From c66c7c64ebd16287b892f8a780cffcabafba3799 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 7 Sep 2026 15:06:14 -0400 Subject: Better OSD behavior, lots of build stuff Signed-off-by: Andrew Opalach --- subprojects/packagefiles/ffmpeg/meson.build | 20 ++++---- .../packagefiles/ffmpeg/version_2.8.22.diff | 57 +++++++++++++++++----- subprojects/packagefiles/ffmpeg/version_3.3.9.diff | 40 ++++++++------- .../packagefiles/ffmpeg/version_3.4.14.diff | 32 ++++++++++-- .../packagefiles/ffmpeg/version_4.2.11.diff | 35 +++++-------- .../packagefiles/ffmpeg/version_5.1.10.diff | 29 +++++++++++ subprojects/packagefiles/ffmpeg/version_5.1.7.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_5.1.8.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_6.1.3.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_6.1.4.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_6.1.6.diff | 29 +++++++++++ subprojects/packagefiles/ffmpeg/version_7.1.1.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_7.1.3.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_7.1.5.diff | 29 +++++++++++ subprojects/packagefiles/ffmpeg/version_8.0.1.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_8.0.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_8.1.1.diff | 29 ----------- subprojects/packagefiles/ffmpeg/version_8.1.2.diff | 6 +-- subprojects/packagefiles/ffmpeg/version_8.1.diff | 29 ----------- 19 files changed, 204 insertions(+), 363 deletions(-) create mode 100644 subprojects/packagefiles/ffmpeg/version_5.1.10.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_5.1.7.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_5.1.8.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_6.1.3.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_6.1.4.diff create mode 100644 subprojects/packagefiles/ffmpeg/version_6.1.6.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_7.1.1.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_7.1.3.diff create mode 100644 subprojects/packagefiles/ffmpeg/version_7.1.5.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_8.0.1.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_8.0.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_8.1.1.diff delete mode 100644 subprojects/packagefiles/ffmpeg/version_8.1.diff (limited to 'subprojects/packagefiles/ffmpeg') diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index aa881bc..f19204a 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -77,20 +77,18 @@ decoders += ',av1' 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() - decoders += ',libdav1d' - extra_options += ['--enable-libdav1d'] - deps += [libdav1d] - endif -#endif +libdav1d = dependency('dav1d', required: false) +if libdav1d.found() + decoders += ',libdav1d' + extra_options += ['--enable-libdav1d'] + deps += [libdav1d] +endif demuxers = '' muxers = '' parsers = '' if not get_option('sink-only') - demuxers += 'flac,mp3,aac,wav,matroska,mov,avi' + demuxers += ',flac,mp3,aac,wav,matroska,mov,avi' demuxers += ',pcm_s32be,pcm_s32le,pcm_s24be,pcm_s24le,pcm_s16be,pcm_s16le' #demuxers += ',pcm_f32be,pcm_f32le,pcm_s32le_planar,pcm_s16be_planar,pcm_s16le_planar' demuxers += ',eac3' @@ -99,7 +97,7 @@ if not get_option('sink-only') demuxers += ',ass,srt,webvtt' muxers += ',ass,srt,webvtt' endif - parsers += 'aac,opus,h264,hevc,av1,vp9' + parsers += ',aac,opus,h264,hevc,av1,vp9' parsers += ',dca' parsers += ',mpegaudio,mpegvideo,dvd_nav' bzlib = dependency('bzip2', required: false) @@ -128,7 +126,7 @@ extra_options += ['--disable-xlib'] bsfs = '' if not get_option('sink-only') - bsfs += 'extract_extradata,mp3_header_decompress' + bsfs += ',extract_extradata,mp3_header_decompress' endif hwaccels = '' diff --git a/subprojects/packagefiles/ffmpeg/version_2.8.22.diff b/subprojects/packagefiles/ffmpeg/version_2.8.22.diff index 8530b6d..443b12d 100644 --- a/subprojects/packagefiles/ffmpeg/version_2.8.22.diff +++ b/subprojects/packagefiles/ffmpeg/version_2.8.22.diff @@ -1,14 +1,12 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:47:10.979206957 -0400 -@@ -1,4 +1,6 @@ +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:16:24.138586490 -0400 +@@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '2.8.22', meson_version: '>=0.57.0') -+ -+error('FFmpeg version 2.x currently unsupported.') compiler = meson.get_compiler('c') -@@ -35,10 +37,6 @@ +@@ -38,10 +38,6 @@ extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')] endif @@ -17,25 +15,60 @@ -endif - extra_options += ['--enable-static', '--disable-shared'] + if is_static_shared_lib + extra_options += ['--enable-pic'] +@@ -77,12 +73,6 @@ + if get_option('subtitles').enabled() + decoders += ',ass,srt,webvtt' + endif +-libdav1d = dependency('dav1d', required: false) +-if libdav1d.found() +- decoders += ',libdav1d' +- extra_options += ['--enable-libdav1d'] +- deps += [libdav1d] +-endif + + demuxers = '' + muxers = '' +@@ -191,7 +181,7 @@ + deps += [compiler.find_library('mediandk')] + args += ['-DCAMU_HAVE_MEDIACODEC'] + else +- extra_options += ['--disable-jni', '--disable-mediacodec'] ++ extra_options += [] + endif + + if get_option('codec-hwaccels').length() == 0 +@@ -202,12 +192,6 @@ - if is_windows -@@ -229,7 +227,6 @@ + # Disable unused hwaccels. + extra_options += [ +- '--disable-amf', +- '--disable-audiotoolbox', +- '--disable-cuda-llvm', +- '--disable-cuvid', +- '--disable-ffnvcodec', +- '--disable-nvdec', + '--disable-nvenc', + '--disable-vdpau', + '--disable-videotoolbox' +@@ -261,7 +245,6 @@ + '--libdir=@PREFIX@/@LIBDIR@', '--incdir=@PREFIX@/@INCLUDEDIR@', - '--enable-pic', '--disable-all', - '--disable-autodetect', '--disable-everything', '--disable-programs', '--disable-doc', -@@ -238,7 +235,6 @@ +@@ -269,7 +252,6 @@ + '--disable-manpages', '--disable-podpages', '--disable-txtpages', - '--disable-safe-bitstream-reader', - '--disable-schannel', '--disable-network', '--disable-securetransport', '--enable-gpl', -@@ -268,14 +264,14 @@ +@@ -299,14 +281,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( diff --git a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff index bf31274..1ea98d9 100644 --- a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff +++ b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff @@ -1,12 +1,12 @@ ---- a/meson.build 2026-07-04 12:03:17.942564661 -0400 -+++ b/meson.build 2026-07-04 15:10:51.305639404 -0400 +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:19:35.891881943 -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') compiler = meson.get_compiler('c') -@@ -40,10 +40,6 @@ +@@ -38,10 +38,6 @@ extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')] endif @@ -15,24 +15,22 @@ -endif - extra_options += ['--enable-static', '--disable-shared'] - - if is_windows -@@ -76,14 +72,6 @@ + if is_static_shared_lib + extra_options += ['--enable-pic'] +@@ -77,12 +73,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() -- decoders += ',libdav1d' -- extra_options += ['--enable-libdav1d'] -- deps += [libdav1d] -- endif --#endif +-libdav1d = dependency('dav1d', required: false) +-if libdav1d.found() +- decoders += ',libdav1d' +- extra_options += ['--enable-libdav1d'] +- deps += [libdav1d] +-endif demuxers = '' muxers = '' -@@ -203,12 +191,8 @@ +@@ -202,12 +192,8 @@ # Disable unused hwaccels. extra_options += [ @@ -44,8 +42,8 @@ - '--disable-nvdec', '--disable-nvenc', '--disable-vdpau', - '--disable-audiotoolbox', -@@ -255,6 +239,15 @@ + '--disable-videotoolbox' +@@ -253,6 +239,15 @@ args += ['-DCAMU_HAVE_SOXR'] endif @@ -61,15 +59,15 @@ ext_proj = import('unstable-external_project') proj = ext_proj.add_project('configure', -@@ -264,7 +257,6 @@ +@@ -261,7 +256,6 @@ + '--libdir=@PREFIX@/@LIBDIR@', '--incdir=@PREFIX@/@INCLUDEDIR@', - '--enable-pic', '--disable-all', - '--disable-autodetect', '--disable-everything', '--disable-programs', '--disable-doc', -@@ -289,11 +281,14 @@ +@@ -286,11 +280,14 @@ '--enable-swscale', '--disable-indevs', '--disable-outdevs', @@ -84,7 +82,7 @@ avutil = proj.dependency('avutil') avformat = proj.dependency('avformat') avcodec = proj.dependency('avcodec') -@@ -302,14 +297,14 @@ +@@ -299,14 +296,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( diff --git a/subprojects/packagefiles/ffmpeg/version_3.4.14.diff b/subprojects/packagefiles/ffmpeg/version_3.4.14.diff index fa3622a..538a777 100644 --- a/subprojects/packagefiles/ffmpeg/version_3.4.14.diff +++ b/subprojects/packagefiles/ffmpeg/version_3.4.14.diff @@ -1,12 +1,38 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:58:06.264562637 -0400 +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:22:28.874228365 -0400 @@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '3.4.14', meson_version: '>=0.57.0') compiler = meson.get_compiler('c') -@@ -268,14 +268,14 @@ +@@ -77,12 +77,6 @@ + if get_option('subtitles').enabled() + decoders += ',ass,srt,webvtt' + endif +-libdav1d = dependency('dav1d', required: false) +-if libdav1d.found() +- decoders += ',libdav1d' +- extra_options += ['--enable-libdav1d'] +- deps += [libdav1d] +-endif + + demuxers = '' + muxers = '' +@@ -202,12 +196,8 @@ + + # Disable unused hwaccels. + extra_options += [ +- '--disable-amf', + '--disable-audiotoolbox', +- '--disable-cuda-llvm', + '--disable-cuvid', +- '--disable-ffnvcodec', +- '--disable-nvdec', + '--disable-nvenc', + '--disable-vdpau', + '--disable-videotoolbox' +@@ -299,14 +289,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( diff --git a/subprojects/packagefiles/ffmpeg/version_4.2.11.diff b/subprojects/packagefiles/ffmpeg/version_4.2.11.diff index cce132d..94decd2 100644 --- a/subprojects/packagefiles/ffmpeg/version_4.2.11.diff +++ b/subprojects/packagefiles/ffmpeg/version_4.2.11.diff @@ -1,32 +1,21 @@ ---- a/meson.build 2025-11-30 11:51:43.747121512 -0500 -+++ b/meson.build 2025-11-30 12:52:39.981254464 -0500 +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:32:24.949964575 -0400 @@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '4.2.11', meson_version: '>=0.57.0') compiler = meson.get_compiler('c') -@@ -68,18 +68,7 @@ - decoders += ',dca,eac3' - decoders += ',pcm_dvd,mpegvideo,mpeg2video' - #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 -- endif --else -- decoders += ',av1' --endif -+decoders += ',av1' - - demuxers = '' - parsers = '' -@@ -290,14 +279,14 @@ +@@ -77,7 +77,7 @@ + if get_option('subtitles').enabled() + decoders += ',ass,srt,webvtt' + endif +-libdav1d = dependency('dav1d', required: false) ++libdav1d = dependency('dav1d', version: '<1.0.0', required: false) + if libdav1d.found() + decoders += ',libdav1d' + extra_options += ['--enable-libdav1d'] +@@ -299,14 +299,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( diff --git a/subprojects/packagefiles/ffmpeg/version_5.1.10.diff b/subprojects/packagefiles/ffmpeg/version_5.1.10.diff new file mode 100644 index 0000000..0b9f4d6 --- /dev/null +++ b/subprojects/packagefiles/ffmpeg/version_5.1.10.diff @@ -0,0 +1,29 @@ +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:41:24.437290827 -0400 +@@ -1,4 +1,4 @@ +-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') ++project('ffmpeg', 'c', version: '5.1.10', meson_version: '>=0.57.0') + + compiler = meson.get_compiler('c') + +@@ -299,14 +299,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: '57.28.100')) + meson.override_dependency('libavformat', declare_dependency( +- dependencies: [avformat], include_directories: include, version: '')) ++ dependencies: [avformat], include_directories: include, version: '59.27.100')) + meson.override_dependency('libavcodec', declare_dependency( +- dependencies: [avcodec], include_directories: include, version: '')) ++ dependencies: [avcodec], include_directories: include, version: '59.37.100')) + meson.override_dependency('libavdevice', declare_dependency( +- dependencies: [avdevice], include_directories: include, version: '')) ++ dependencies: [avdevice], include_directories: include, version: '59.7.100')) + meson.override_dependency('libswresample', declare_dependency( +- dependencies: [swresample], include_directories: include, version: '')) ++ dependencies: [swresample], include_directories: include, version: '4.7.100')) + meson.override_dependency('libswscale', declare_dependency( +- dependencies: [swscale], include_directories: include, version: '')) ++ dependencies: [swscale], include_directories: include, version: '6.7.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_5.1.7.diff b/subprojects/packagefiles/ffmpeg/version_5.1.7.diff deleted file mode 100644 index f48d522..0000000 --- a/subprojects/packagefiles/ffmpeg/version_5.1.7.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:40:17.065798145 -0400 -@@ -1,4 +1,4 @@ --project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') -+project('ffmpeg', 'c', version: '5.1.7', 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: '57.28.100')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '59.27.100')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '59.37.100')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '59.7.100')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '4.7.100')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '6.7.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_5.1.8.diff b/subprojects/packagefiles/ffmpeg/version_5.1.8.diff deleted file mode 100644 index 784c8a1..0000000 --- a/subprojects/packagefiles/ffmpeg/version_5.1.8.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:40:17.065798145 -0400 -@@ -1,4 +1,4 @@ --project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') -+project('ffmpeg', 'c', version: '5.1.8', 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: '57.28.100')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '59.27.100')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '59.37.100')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '59.7.100')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '4.7.100')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '6.7.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_6.1.3.diff b/subprojects/packagefiles/ffmpeg/version_6.1.3.diff deleted file mode 100644 index 6193dfe..0000000 --- a/subprojects/packagefiles/ffmpeg/version_6.1.3.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:37:56.556303265 -0400 -@@ -1,4 +1,4 @@ --project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') -+project('ffmpeg', 'c', version: '6.1.3', 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: '58.29.100')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '60.16.100')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '60.31.102')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '60.3.100')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '4.12.100')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '7.5.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_6.1.4.diff b/subprojects/packagefiles/ffmpeg/version_6.1.4.diff deleted file mode 100644 index 5f54fe5..0000000 --- a/subprojects/packagefiles/ffmpeg/version_6.1.4.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:37:56.556303265 -0400 -@@ -1,4 +1,4 @@ --project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') -+project('ffmpeg', 'c', version: '6.1.4', 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: '58.29.100')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '60.16.100')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '60.31.102')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '60.3.100')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '4.12.100')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '7.5.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_6.1.6.diff b/subprojects/packagefiles/ffmpeg/version_6.1.6.diff new file mode 100644 index 0000000..524e369 --- /dev/null +++ b/subprojects/packagefiles/ffmpeg/version_6.1.6.diff @@ -0,0 +1,29 @@ +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:45:44.998194363 -0400 +@@ -1,4 +1,4 @@ +-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') ++project('ffmpeg', 'c', version: '6.1.6', meson_version: '>=0.57.0') + + compiler = meson.get_compiler('c') + +@@ -299,14 +299,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: '58.29.100')) + meson.override_dependency('libavformat', declare_dependency( +- dependencies: [avformat], include_directories: include, version: '')) ++ dependencies: [avformat], include_directories: include, version: '60.16.100')) + meson.override_dependency('libavcodec', declare_dependency( +- dependencies: [avcodec], include_directories: include, version: '')) ++ dependencies: [avcodec], include_directories: include, version: '60.31.102')) + meson.override_dependency('libavdevice', declare_dependency( +- dependencies: [avdevice], include_directories: include, version: '')) ++ dependencies: [avdevice], include_directories: include, version: '60.3.100')) + meson.override_dependency('libswresample', declare_dependency( +- dependencies: [swresample], include_directories: include, version: '')) ++ dependencies: [swresample], include_directories: include, version: '4.12.100')) + meson.override_dependency('libswscale', declare_dependency( +- dependencies: [swscale], include_directories: include, version: '')) ++ dependencies: [swscale], include_directories: include, version: '7.5.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_7.1.1.diff b/subprojects/packagefiles/ffmpeg/version_7.1.1.diff deleted file mode 100644 index 74a41fe..0000000 --- a/subprojects/packagefiles/ffmpeg/version_7.1.1.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:35:33.498781349 -0400 -@@ -1,4 +1,4 @@ --project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') -+project('ffmpeg', 'c', version: '7.1.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: '59.39.100')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '61.7.100')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '61.19.100')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '61.3.100')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '5.3.100')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '8.3.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_7.1.3.diff b/subprojects/packagefiles/ffmpeg/version_7.1.3.diff deleted file mode 100644 index 554ef02..0000000 --- a/subprojects/packagefiles/ffmpeg/version_7.1.3.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:35:33.498781349 -0400 -@@ -1,4 +1,4 @@ --project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') -+project('ffmpeg', 'c', version: '7.1.3', 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: '59.39.100')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '61.7.100')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '61.19.100')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '61.3.100')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '5.3.100')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '8.3.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_7.1.5.diff b/subprojects/packagefiles/ffmpeg/version_7.1.5.diff new file mode 100644 index 0000000..6b25cf2 --- /dev/null +++ b/subprojects/packagefiles/ffmpeg/version_7.1.5.diff @@ -0,0 +1,29 @@ +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:50:23.103988360 -0400 +@@ -1,4 +1,4 @@ +-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') ++project('ffmpeg', 'c', version: '7.1.5', meson_version: '>=0.57.0') + + compiler = meson.get_compiler('c') + +@@ -299,14 +299,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: '59.39.100')) + meson.override_dependency('libavformat', declare_dependency( +- dependencies: [avformat], include_directories: include, version: '')) ++ dependencies: [avformat], include_directories: include, version: '61.7.100')) + meson.override_dependency('libavcodec', declare_dependency( +- dependencies: [avcodec], include_directories: include, version: '')) ++ dependencies: [avcodec], include_directories: include, version: '61.19.100')) + meson.override_dependency('libavdevice', declare_dependency( +- dependencies: [avdevice], include_directories: include, version: '')) ++ dependencies: [avdevice], include_directories: include, version: '61.3.100')) + meson.override_dependency('libswresample', declare_dependency( +- dependencies: [swresample], include_directories: include, version: '')) ++ dependencies: [swresample], include_directories: include, version: '5.3.100')) + meson.override_dependency('libswscale', declare_dependency( +- dependencies: [swscale], include_directories: include, version: '')) ++ dependencies: [swscale], include_directories: include, version: '8.3.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_8.0.1.diff b/subprojects/packagefiles/ffmpeg/version_8.0.1.diff deleted file mode 100644 index b222001..0000000 --- a/subprojects/packagefiles/ffmpeg/version_8.0.1.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- 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.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: '60.8.100')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '62.3.100')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '62.11.100')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '62.1.100')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '6.1.100')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '9.1.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_8.0.diff b/subprojects/packagefiles/ffmpeg/version_8.0.diff deleted file mode 100644 index ad3b77b..0000000 --- a/subprojects/packagefiles/ffmpeg/version_8.0.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- 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.0', 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.8.100')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '62.3.100')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '62.11.100')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '62.1.100')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '6.1.100')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '9.1.100')) diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.1.diff b/subprojects/packagefiles/ffmpeg/version_8.1.1.diff deleted file mode 100644 index 8976dd2..0000000 --- a/subprojects/packagefiles/ffmpeg/version_8.1.1.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- 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.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.101')) - meson.override_dependency('libavformat', declare_dependency( -- dependencies: [avformat], include_directories: include, version: '')) -+ dependencies: [avformat], include_directories: include, version: '62.12.101')) - meson.override_dependency('libavcodec', declare_dependency( -- dependencies: [avcodec], include_directories: include, version: '')) -+ dependencies: [avcodec], include_directories: include, version: '62.28.101')) - meson.override_dependency('libavdevice', declare_dependency( -- dependencies: [avdevice], include_directories: include, version: '')) -+ dependencies: [avdevice], include_directories: include, version: '62.3.101')) - meson.override_dependency('libswresample', declare_dependency( -- dependencies: [swresample], include_directories: include, version: '')) -+ dependencies: [swresample], include_directories: include, version: '6.3.101')) - meson.override_dependency('libswscale', declare_dependency( -- dependencies: [swscale], include_directories: include, version: '')) -+ dependencies: [swscale], include_directories: include, version: '9.5.101')) diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.2.diff b/subprojects/packagefiles/ffmpeg/version_8.1.2.diff index e1b52a4..036e9a3 100644 --- a/subprojects/packagefiles/ffmpeg/version_8.1.2.diff +++ b/subprojects/packagefiles/ffmpeg/version_8.1.2.diff @@ -1,12 +1,12 @@ ---- a/meson.build 2025-08-23 18:44:34.634014892 -0400 -+++ b/meson.build 2025-08-25 15:33:36.209533531 -0400 +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:57:13.560928426 -0400 @@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '8.1.2', meson_version: '>=0.57.0') compiler = meson.get_compiler('c') -@@ -268,14 +268,14 @@ +@@ -299,14 +299,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.diff b/subprojects/packagefiles/ffmpeg/version_8.1.diff deleted file mode 100644 index 9b87011..0000000 --- a/subprojects/packagefiles/ffmpeg/version_8.1.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- 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')) -- cgit v1.2.3-101-g0448