diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2019-02-08 12:54:13 +0100 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2019-02-08 13:39:07 +0100 |
commit | adb6c4975b733a4efba44de0dd1041bd0741623c (patch) | |
tree | f71d36da5beba65e86a5fc6813049ddb2c2f18f6 /build/features.py | |
parent | f21fe32ff344794c18a6d4ff17aa247b9b568226 (diff) |
Increase required FFmpeg version from 3.1 to 4.0
Diffstat (limited to 'build/features.py')
-rw-r--r-- | build/features.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/build/features.py b/build/features.py index 0c62ecadbf..4dc53b2c46 100644 --- a/build/features.py +++ b/build/features.py @@ -860,19 +860,18 @@ class FFMPEG(Feature): 'src/encoder/encoderffmpegvorbis.cpp'] -class FFMPEG31(Feature): +class FFMPEG4(Feature): def description(self): - return "FFmpeg 3.1 support" + return "FFmpeg 4.x support" def enabled(self, build): - build.flags['ffmpeg31'] = util.get_flags(build.env, 'ffmpeg31', 0) - if int(build.flags['ffmpeg31']): + build.flags['ffmpeg4'] = util.get_flags(build.env, 'ffmpeg4', 0) + if int(build.flags['ffmpeg4']): return True return False def add_options(self, build, vars): - vars.Add('ffmpeg31', 'Set to 1 to enable FFmpeg 3.1 support \ - (supported FFmpeg >= 3.1)', 0) + vars.Add('ffmpeg4', 'Set to 1 to enable FFmpeg 4.x support', 0) def configure(self, build, conf): if not self.enabled(build): @@ -882,16 +881,16 @@ class FFMPEG31(Feature): if build.platform_is_linux or build.platform_is_osx \ or build.platform_is_bsd: # Check for libavcodec, libavformat - if not conf.CheckForPKG('libavcodec', '57.48.0'): + if not conf.CheckForPKG('libavcodec', '58'): raise Exception('Missing libavcodec or it\'s too old! It can' 'be separated from main package so check your' 'operating system packages.') - if not conf.CheckForPKG('libavformat', '53.21.0'): - raise Exception('Missing libavformat or it\'s too old!' + if not conf.CheckForPKG('libavformat', '58'): + raise Exception('Missing libavformat or it\'s too old!' 'It can be separated from main package so' 'check your operating system packages.') - if not conf.CheckForPKG('libswresample'): - raise Exception('Missing libswresample!' + if not conf.CheckForPKG('libswresample', '3.1'): + raise Exception('Missing libswresample or it\'s too old!' 'It can be separated from main package so' 'check your operating system packages.') @@ -910,15 +909,15 @@ class FFMPEG31(Feature): build.env.ParseConfig('pkg-config libavutil --silence-errors \ --cflags --libs') - build.env.Append(CPPDEFINES='__FFMPEG31__') + build.env.Append(CPPDEFINES='__FFMPEG4__') self.status = "Enabled" else: - raise Exception('Building with FFmpeg 3.1 is not supported' + raise Exception('Building with FFmpeg 4.x is not supported' 'for your platform') def sources(self, build): - return ['src/sources/soundsourceffmpeg31.cpp'] + return ['src/sources/soundsourceffmpeg4.cpp'] class Optimize(Feature): |