diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2015-07-25 15:20:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-28 18:21:01 +0000 |
| commit | a965497c55903e4cebde0c0c50e1fb50d9f5ba63 (patch) | |
| tree | 98fc88f39e2703307ea2b453cc201c050216e97c | |
| parent | 8ba83af2855a39669c43e078203dc2eb1b92b05f (diff) | |
Add configurable option for using system FFMPEG
Add qmake command line option to use system FFMPEG and report result
and option in the configure summary. Also checks libraries FFMPEG and
chromium both uses are available on the system since linking will
otherwise fail. Does not check if the version of the libav libraries are
correct, but leaves that to whomever enables the option.
Change-Id: I39c9c47eba19a6e40872a2e9b24a9010cdea1011
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/core/config/desktop_linux.pri | 1 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 1 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 15 |
3 files changed, 17 insertions, 0 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 50649c277..cb4efa607 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -32,5 +32,6 @@ config_system_speex: GYP_CONFIG += use_system_speex=1 config_system_vpx: GYP_CONFIG += use_system_libvpx=1 contains(WEBENGINE_CONFIG, use_system_icu): GYP_CONFIG += use_system_icu=1 +contains(WEBENGINE_CONFIG, use_system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1 !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 28c9094e7..0133dc6b0 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -64,3 +64,4 @@ config_system_speex: GYP_CONFIG += use_system_speex=1 config_system_vpx: GYP_CONFIG += use_system_libvpx=1 contains(WEBENGINE_CONFIG, use_system_icu): GYP_CONFIG += use_system_icu=1 +contains(WEBENGINE_CONFIG, use_system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1 diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 9fb18770b..17bdc8ba1 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -67,6 +67,21 @@ defineTest(finalizeConfigure) { } else { log("ICU............................... Using internal copy (Default, force system ICU with WEBENGINE_CONFIG += use_system_icu)$${EOL}") } + contains(WEBENGINE_CONFIG, use_system_ffmpeg) { + packagesExist("libavcodec libavformat libavutil") { + packagesExist("libwebp, libwebpdemux, opus, \'vpx >= 1.4\'"){ + log("FFMPEG............................ Using system version$${EOL}") + } else { + log("FFMPEG............................ Conflicting FFMPEG dependencies$${EOL}") + skipBuild("Unmet dependencies: opus, vpx, libwebp, libwebpdemux") + } + } else { + log("FFMPEG............................ System FFMPEG not found$${EOL}") + skipBuild("Unmet dependencies: libavcodec, libavformat, libavutil") + } + } else { + log("FFMPEG............................ Using internal copy (Default, force system FFMPEG with WEBENGINE_CONFIG += use_system_ffmpeg)$${EOL}") + } } contains(WEBENGINE_CONFIG, use_proprietary_codecs) { log("Proprietary codecs (H264, MP3).... Enabled$${EOL}") |