diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-09-02 11:18:37 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-09-02 11:18:58 +0200 |
| commit | 1e7e5cf5b4395cb2ff0207ca4749d11b95a6d4d5 (patch) | |
| tree | 6991011b742523ef17de011eb6ae4cad941c8eca /media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch | |
| parent | dev-libs/beignet: a few additional build-time tweaks (diff) | |
| download | gentoo-1e7e5cf5b4395cb2ff0207ca4749d11b95a6d4d5.tar.gz gentoo-1e7e5cf5b4395cb2ff0207ca4749d11b95a6d4d5.tar.bz2 gentoo-1e7e5cf5b4395cb2ff0207ca4749d11b95a6d4d5.zip | |
media-video/vlc: add patches to build with ffmpeg3, bug #574788
Package-Manager: portage-2.3.0
Diffstat (limited to 'media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch')
| -rw-r--r-- | media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch new file mode 100644 index 000000000000..218af58281fa --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch @@ -0,0 +1,45 @@ +commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752 +Author: Rafaël Carré <funman@videolan.org> +Date: Fri Feb 26 00:36:26 2016 +0000 + + Relax requirements for FFmpeg hwaccel + + It doesn't error out anymore since 5edd1f62ca1 + +Index: vlc-2.2.4/configure.ac +=================================================================== +--- vlc-2.2.4.orig/configure.ac ++++ vlc-2.2.4/configure.ac +@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a " + case "${avfork}" in + ffmpeg) + PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ +- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.]) ++ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [ ++ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.]) ++ ]) + ]) + ;; + esac +@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"], + case "${avfork}" in + ffmpeg) + PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ +- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) ++ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [ ++ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.]) ++ ]) + ]) + ;; + esac +@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a " + libav) av_vdpau_ver="55.26.0" ;; + ffmpeg) av_vdpau_ver="55.42.100" + PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ +- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) ++ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [ ++ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.]) ++ ]) + ]) + ;; + esac |