summaryrefslogtreecommitdiff
path: root/subprojects/packagefiles/ffmpeg/version_2.8.22.diff
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2026-09-07 15:06:14 -0400
committerAndrew Opalach <andrew@akon.city> 2026-09-07 15:06:14 -0400
commitc66c7c64ebd16287b892f8a780cffcabafba3799 (patch)
treeb2195902ef055147878b591cf1171be7e6133c97 /subprojects/packagefiles/ffmpeg/version_2.8.22.diff
parent1758ae9e860bd3b65b661e3c804288c3599f4fd4 (diff)
downloadcamu-c66c7c64ebd16287b892f8a780cffcabafba3799.tar.gz
camu-c66c7c64ebd16287b892f8a780cffcabafba3799.tar.bz2
camu-c66c7c64ebd16287b892f8a780cffcabafba3799.zip
Better OSD behavior, lots of build stuff
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects/packagefiles/ffmpeg/version_2.8.22.diff')
-rw-r--r--subprojects/packagefiles/ffmpeg/version_2.8.22.diff57
1 files changed, 45 insertions, 12 deletions
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(