diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 22:50:07 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 22:50:07 +0100 |
| commit | 3cb61ca85a634db2dcc2badaf3492440bf621d92 (patch) | |
| tree | 72561a5f7056aa29cec7d50fb8b960b32b44a585 /gnu/packages/video.scm | |
| parent | a60370727a77d1658307698276239c153d8279e8 (diff) | |
| parent | f92854fea150f0d47c4984f87bf21bd5f8051820 (diff) | |
| download | guix-3cb61ca85a634db2dcc2badaf3492440bf621d92.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 22dc17b15e..16ab160d0b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -755,14 +755,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.1") + (version "4.1.2") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp")))) + "0yrl6nij4b1pk1c4nbi80857dsd760gziiss2ls19awq8zj0lpxr")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -1132,13 +1132,11 @@ videoformats depend on the configuration flags of ffmpeg.") (substitute* "modules/text_renderer/freetype/text_layout.c" (("# define FRIBIDI_NO_DEPRECATED 1") "")) - ;; Fix build against Qt 5.11. - (substitute* "modules/gui/qt/actions_manager.cpp" - (("#include <vlc_keys.h>") "#include <vlc_keys.h> -#include <QAction>")) - (substitute* "modules/gui/qt/components/simple_preferences.cpp" - (("#include <QFont>") "#include <QFont> -#include <QButtonGroup>")) + ;; Fix build with libssh2 > 1.8.0: + ;; <https://trac.videolan.org/vlc/ticket/22060> + ;; <https://git.videolan.org/?p=vlc.git;a=commit;h=11449b5cd8b415768e010d9b7c1d6ba3cea21f82> + (substitute* "modules/access/sftp.c" + (("010801") "010900")) #t))) (add-after 'strip 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) |