guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

11/13: gnu: vlc: Use monolithic Qt 5.6.


From: David Craven
Subject: 11/13: gnu: vlc: Use monolithic Qt 5.6.
Date: Sun, 21 Aug 2016 23:50:18 +0000 (UTC)

dvc pushed a commit to branch master
in repository guix.

commit c161c22a51534dd17892fd10a9ca8381532e9356
Author: David Craven <address@hidden>
Date:   Sat Aug 20 21:39:42 2016 +0200

    gnu: vlc: Use monolithic Qt 5.6.
    
    * gnu/packages/video.scm (vlc)[inputs]: Use qt 5.6.1-1. Add libxi.
---
 gnu/packages/video.scm |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index fa0c175..3c07d23 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)
@@ -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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]