diff options
author | Andreas Enge <andreas@enge.fr> | 2013-12-13 11:32:25 +0100 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2013-12-13 11:32:25 +0100 |
commit | 31f9322e6fdecc6addcf8a67e0200bf1f457a7d7 (patch) | |
tree | e8a1d9e142030a3b03dbccb007b88de1eccf9154 /gnu/packages/video.scm | |
parent | a31f4d35571376a0842aa3d044c4da12e17d3dbc (diff) | |
download | gnu-guix-31f9322e6fdecc6addcf8a67e0200bf1f457a7d7.tar gnu-guix-31f9322e6fdecc6addcf8a67e0200bf1f457a7d7.tar.gz |
gnu: ffmpeg: Check via "make fate".
* gnu/packages/patches/ffmpeg-check.patch: Drop patch.
* gnu-system.am (dist_patch_DATA): Unregister patch.
* gnu/packages/video.scm (ffmpeg): Drop patch and use "fate" as test target
as recommended at http://trac.ffmpeg.org/ticket/3177#comment:11 .
* gnu/packages/video.scm
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r-- | gnu/packages/video.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 563ff3cb77..199f7c2c74 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -21,7 +21,6 @@ #: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) @@ -42,9 +41,7 @@ version ".tar.bz2")) (sha256 (base32 - "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy")) - ;; from upstream, drop with next release - (patches (list (search-patch "ffmpeg-check.patch"))))) + "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy")))) (build-system gnu-build-system) (inputs `(("bc" ,bc) @@ -60,7 +57,8 @@ ("yasm" ,yasm) ("zlib", zlib))) (arguments - `(#:phases + `(#:test-target "fate" + #:phases (alist-replace 'configure ;; configure does not work followed by "SHELL=..." and |