01/01: gnu: ffmpeg: Enable gnutls support.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit c8dab7f4752133110b5aa2a9de375d812f1b9247
Author: Andy Patterson <address@hidden>
Date:   Thu Oct 29 18:59:18 2015 -0400

    gnu: ffmpeg: Enable gnutls support.
    
    * gnu/package/video.scm (ffmpeg)[inputs]: Add gnutls.
      [arguments]: Enable it.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/packages/video.scm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 554a2ea..eb9a503 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -384,6 +384,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and 
VC-1/VMW3).")
     (inputs
      `(("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
+       ("gnutls" ,gnutls)
        ("opus" ,opus)
        ("ladspa" ,ladspa)
        ("lame" ,lame)
@@ -467,7 +468,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and 
VC-1/VMW3).")
          "--enable-gpl" ; enable optional gpl licensed parts
          "--enable-shared"
          "--enable-fontconfig"
-         ;; "--enable-gnutls" ; causes test failures
+         "--enable-gnutls"
          "--enable-ladspa"
          "--enable-libass"
          "--enable-libbluray"