summary refs log tree commit diff
path: root/gnu/packages/video.scm
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2013-12-05 21:42:37 +0100
committerAndreas Enge <andreas@enge.fr>2013-12-05 21:43:41 +0100
commite7de5ac0d56dfc895d5a60d59f6307d6b966346a (patch)
treedccbad58d40cbec6570dbda5b9441da0b24a8c9b /gnu/packages/video.scm
parent49d294e5c8eefdbf166fbc82ee535dd1a5de4571 (diff)
downloadguix-e7de5ac0d56dfc895d5a60d59f6307d6b966346a.tar.gz
gnu: ffmpeg: Enable tests.
* gnu/packages/video.scm (ffmpeg): Add upstream patch and re-enable tests.
* gnu/packages/patches/ffmpeg-check.patch: New file.
* gnu-system.am (dist_patch_DATA): Register patch.
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r--gnu/packages/video.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 054b875fd8..563ff3cb77 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -21,6 +21,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages fontutils)
@@ -41,7 +42,9 @@
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy"))))
+               "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy"))
+             ;; from upstream, drop with next release
+             (patches (list (search-patch "ffmpeg-check.patch")))))
     (build-system gnu-build-system)
     (inputs
      `(("bc" ,bc)
@@ -57,8 +60,7 @@
        ("yasm" ,yasm)
        ("zlib", zlib)))
     (arguments
-     `(#:tests? #f ; see https://trac.ffmpeg.org/ticket/3177
-       #:phases
+     `(#:phases
          (alist-replace
           'configure
           ;; configure does not work followed by "SHELL=..." and