diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
| commit | b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60 (patch) | |
| tree | 707c6a5e18474b410e39fa6892521c9f47518ccc /gnu/packages/video.scm | |
| parent | 97127431ee9133626fea62449706d729d80b73f6 (diff) | |
| parent | 5b63a8568b39c019970569773bace18fab17a157 (diff) | |
| download | guix-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 921aff4e25..b85ece0aac 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages elf) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -399,14 +400,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 "3.1.2") + (version "3.1.3") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0qdxp6r6x47jzi6nmbsv3dhvm073c8n5hpnlmj5gwihgkyva5ljq")))) + "08l8290gipm632dhrqndnphdpkc5ncqc1j3hxdx46r1a3q3mqmzq")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -626,6 +627,7 @@ audio/video codec library.") ("libvorbis" ,libvorbis) ("libtheora" ,libtheora) ("libxext" ,libxext) + ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxml2" ,libxml2) ("libxpm" ,libxpm) @@ -635,7 +637,8 @@ audio/video codec library.") ("perl" ,perl) ("pulseaudio" ,pulseaudio) ("python" ,python-wrapper) - ("qtbase" ,qtbase) + ("qt" ,qt) ; FIXME: reenable modular qt after update - requires building + ;("qtbase" ,qtbase) with -std=gnu++11. ;("qtx11extras" ,qtx11extras) ("sdl" ,sdl) ("sdl-image" ,sdl-image) @@ -1141,8 +1144,9 @@ for use with HTML5 video.") ("perl" ,perl) ("pulseaudio" ,pulseaudio) ("python" ,python-wrapper) - ("qtbase" ,qtbase) - ("qttools" ,qttools) + ("qt" ,qt) ; FIXME: reenable modular qt after update - requires building + ;("qtbase" ,qtbase) with -std=gnu++11. + ;("qttools" ,qttools) ("sdl" ,sdl) ("sqlite" ,sqlite) ("yasm" ,yasm) @@ -1396,7 +1400,8 @@ tools, XML authoring components, and an extensible plug-in based API.") '(#:configure-flags (list (string-append "--with-udevdir=" (assoc-ref %outputs "out") - "/lib/udev")))) + "/lib/udev") + "CXXFLAGS=-std=gnu++11"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs |