diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
| commit | 6901878894e9c6405fa811c512a32f448e8b9fa2 (patch) | |
| tree | 5b04c4234f4022533692c36a83047ec9801aada9 /gnu/packages/video.scm | |
| parent | baf766a7ff9db45c707b4539176f2143fbd90efd (diff) | |
| parent | 58c6a93d9d60660d8425d8c52d4b73a42d4a5b55 (diff) | |
| download | patches-6901878894e9c6405fa811c512a32f448e8b9fa2.tar patches-6901878894e9c6405fa811c512a32f448e8b9fa2.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a5a684c67e..ece66a3745 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -683,14 +683,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "4.1") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3")))) + "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -992,7 +992,7 @@ videoformats depend on the configuration flags of ffmpeg.") ("libva" ,libva) ("libvdpau" ,libvdpau) ("libvorbis" ,libvorbis) - ("libvpx" ,libvpx) + ("libvpx" ,libvpx-1.7) ("libtheora" ,libtheora) ("libx264" ,libx264) ("libxext" ,libxext) @@ -2877,7 +2877,17 @@ programmers to access a standard API to open and decompress media files.") (add-before 'configure 'fix-ldflags (lambda _ (setenv "LDFLAGS" "-pthread") - #t))))) + #t)) + (add-after 'unpack 'fix-boost-headers + (lambda _ + (substitute* + '("src/subtitles_provider_libass.cpp" + "src/colour_button.cpp" + "src/video_provider_dummy.cpp" + "./src/video_frame.cpp") + (("#include <boost/gil/gil_all.hpp>") + "#include <boost/gil.hpp>")) + #t))))) (inputs `(("boost" ,boost) ("desktop-file-utils" ,desktop-file-utils) |