diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2026-07-10 14:04:29 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2026-07-10 14:04:29 -0400 |
| commit | 566c022572bbff8bb7ff105b9adbe74500b2c716 (patch) | |
| tree | 6cc0942bdfcdcbf3b1df52c8436d1b0ea5f88c52 /subprojects/packagefiles/ffmpeg/version_3.3.9.diff | |
| parent | c60363d4652ff60826b29a2e75f53a78df0f44cb (diff) | |
| download | camu-566c022572bbff8bb7ff105b9adbe74500b2c716.tar.gz camu-566c022572bbff8bb7ff105b9adbe74500b2c716.tar.bz2 camu-566c022572bbff8bb7ff105b9adbe74500b2c716.zip | |
Build fixes, get LTO+Os working on Windows
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.diff | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff index 7e91e5d..bf31274 100644 --- a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff +++ b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff @@ -1,5 +1,5 @@ ---- a/meson.build 2026-07-02 16:36:02.258920727 -0400 -+++ b/meson.build 2026-07-02 16:49:06.795636508 -0400 +--- a/meson.build 2026-07-04 12:03:17.942564661 -0400 ++++ b/meson.build 2026-07-04 15:10:51.305639404 -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') @@ -17,10 +17,10 @@ extra_options += ['--enable-static', '--disable-shared'] if is_windows -@@ -74,14 +70,6 @@ - decoders += ',pcm_dvd,mpegvideo,mpeg2video' - decoders += ',av1' - #decoders += ',ass,srt' +@@ -76,14 +72,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() @@ -31,8 +31,8 @@ -#endif demuxers = '' - parsers = '' -@@ -197,12 +185,8 @@ + muxers = '' +@@ -203,12 +191,8 @@ # Disable unused hwaccels. extra_options += [ @@ -45,7 +45,7 @@ '--disable-nvenc', '--disable-vdpau', '--disable-audiotoolbox', -@@ -245,6 +229,15 @@ +@@ -255,6 +239,15 @@ args += ['-DCAMU_HAVE_SOXR'] endif @@ -61,7 +61,7 @@ ext_proj = import('unstable-external_project') proj = ext_proj.add_project('configure', -@@ -254,7 +247,6 @@ +@@ -264,7 +257,6 @@ '--incdir=@PREFIX@/@INCLUDEDIR@', '--enable-pic', '--disable-all', @@ -69,7 +69,7 @@ '--disable-everything', '--disable-programs', '--disable-doc', -@@ -279,11 +271,14 @@ +@@ -289,11 +281,14 @@ '--enable-swscale', '--disable-indevs', '--disable-outdevs', @@ -84,7 +84,7 @@ avutil = proj.dependency('avutil') avformat = proj.dependency('avformat') avcodec = proj.dependency('avcodec') -@@ -292,14 +287,14 @@ +@@ -302,14 +297,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( |