diff options
| author | wm4 <wm4@nowhere> | 2015-03-03 11:51:22 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-03 11:56:44 +0100 |
| commit | 5808f1c408be958e90a302f42610fc59dfa0c373 (patch) | |
| tree | 3f059ce2235a100b7294a697b20dd167aced4353 /old-configure | |
| parent | 7031335886606714d8c2209984bc837530b2ba2d (diff) | |
| download | mpv-5808f1c408be958e90a302f42610fc59dfa0c373.tar.bz2 mpv-5808f1c408be958e90a302f42610fc59dfa0c373.tar.xz | |
build: bump required FFmpeg/Libav libraries
The af_lavrresample commit made compilation fail on Libav 10, so I think
it's time to require somewhat more recent dependencies.
Libav 11 is the latest release, and FFmpeg 2.4 seems to correspond to
Libav 11. So use these.
Also adjust the configure failure message. Instead of (accidentally)
printing the pkg-config versions twice, print the release version
numbers too. This is helpful, because the release version numbers are
completely different from the pkg-config ones.
I will probably remove some compatibility hacks in the following commits
too.
Diffstat (limited to 'old-configure')
| -rwxr-xr-x | old-configure | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/old-configure b/old-configure index e7fae165b2..f8f67110ac 100755 --- a/old-configure +++ b/old-configure @@ -747,15 +747,15 @@ check_pkg_config "libbs2b audio filter support" $_libbs2b LIBBS2B 'libbs2b' check_pkg_config "LCMS2 support" $_lcms2 LCMS2 'lcms2 >= 2.6' check_pkg_config "FFmpeg/Libav" $_ffmpeg FFMPEG \ - "libavutil >= 52.48.101 libavcodec >= 55.34.1 libavformat >= 55.12.0 libswscale >= 2.1.2" + "libavutil >= 54.02.0 libavcodec >= 56.1.0 libavformat >= 56.01.0 libswscale >= 2.1.3" test $(defretval) = no && die "Unable to find development files for some of the required Libav libraries above. Aborting." -check_pkg_config "Libswresample" $_libswresample LIBSWRESAMPLE 'libswresample >= 0.17.104' +check_pkg_config "Libswresample" $_libswresample LIBSWRESAMPLE 'libswresample >= 1.1.100' _libswresample=$(defretval) _libavresample=auto test $_libswresample = yes && _libavresample=no -check_pkg_config "Libavresample" $_libavresample LIBAVRESAMPLE 'libavresample >= 1.1.0' +check_pkg_config "Libavresample" $_libavresample LIBAVRESAMPLE 'libavresample >= 2.1.0' _libavresample=$(defretval) if test "$_libswresample" = no && test "$_libavresample" = no ; then @@ -831,9 +831,9 @@ api_statement_check \ libavcodec/vdpau.h \ 'AVVDPAUContext *x = av_vdpau_alloc_context()' -check_pkg_config "libavfilter" $_libavfilter LIBAVFILTER 'libavfilter >= 3.90.100' +check_pkg_config "libavfilter" $_libavfilter LIBAVFILTER 'libavfilter >= 5.0.0' -check_pkg_config "libavdevice" $_libavdevice LIBAVDEVICE 'libavdevice >= 54.0.0' +check_pkg_config "libavdevice" $_libavdevice LIBAVDEVICE 'libavdevice >= 55.0.0' check_trivial "TV interface" $_tv TV |