diff options
| author | Leo Famulari <leo@famulari.name> | 2016-06-12 22:02:04 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-06-12 22:09:26 -0400 |
| commit | ee86e7e14859533045e1f7727ae731ba6ba72daf (patch) | |
| tree | a5f51a9c4859a3242b46876797b98e77a5a7506e /gnu/packages/video.scm | |
| parent | 8af5cac527eee03005f3809578a0d8258a878f95 (diff) | |
| parent | fe585be9aa8f5158a7dfb6477d19ece3d643dec3 (diff) | |
| download | guix-patches-ee86e7e14859533045e1f7727ae731ba6ba72daf.tar guix-patches-ee86e7e14859533045e1f7727ae731ba6ba72daf.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4782ec4692..ecdf4c35e6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -559,15 +559,15 @@ audio/video codec library.") (define-public vlc (package (name "vlc") - (version "2.2.1") + (version "2.2.4") (source (origin (method url-fetch) (uri (string-append - "http://download.videolan.org/pub/videolan/vlc/" + "https://download.videolan.org/pub/videolan/vlc/" version "/vlc-" version ".tar.xz")) (sha256 (base32 - "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal")) + "1gjkrwlg8ab3skzl67cxb9qzg4187ifckd1z9kpy11q058fyjchn")) (modules '((guix build utils))) (snippet ;; There are two occurrences where __DATE__ and __TIME__ are @@ -609,7 +609,8 @@ audio/video codec library.") ("perl" ,perl) ("pulseaudio" ,pulseaudio) ("python" ,python-wrapper) - ("qt" ,qt) + ("qtbase" ,qtbase) + ;("qtx11extras" ,qtx11extras) ("sdl" ,sdl) ("sdl-image" ,sdl-image) ("speex" ,speex) @@ -623,6 +624,13 @@ audio/video codec library.") #:phases (modify-phases %standard-phases + (add-before 'configure 'remove-visual-tests + ;; Some of the tests require using the display to test out VLC, + ;; which fails in our sandboxed build system + (lambda _ + (substitute* "test/run_vlc.sh" + (("./vlc --ignore-config") "echo")) + #t)) (add-after 'install 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) ;; The 'install-exec-hook' rule in the top-level Makefile.am @@ -831,7 +839,8 @@ projects while introducing many more.") name "-" version ".tar.bz2")) (sha256 (base32 - "15v7qw0ydyxn08ksb6lxn1l51pxgpwgshdwd3275yrr5hs86fv9h")))) + "15v7qw0ydyxn08ksb6lxn1l51pxgpwgshdwd3275yrr5hs86fv9h")) + (patches (search-patches "libvpx-CVE-2016-2818.patch")))) (build-system gnu-build-system) (arguments `(#:phases |