summaryrefslogtreecommitdiff
path: root/subprojects/packagefiles/ffmpeg/version_3.3.9.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_3.3.9.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_3.3.9.diff')
-rw-r--r--subprojects/packagefiles/ffmpeg/version_3.3.9.diff40
1 files changed, 19 insertions, 21 deletions
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(