diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2008-10-14 14:01:26 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2008-10-14 14:01:26 +0000 |
| commit | ef6cf67fc4f078e1360e4266e242b08b80ecf1c2 (patch) | |
| tree | 0adcacab24c614a1ee3aace5a9bdd8d73aff1901 /pkgs/tools/video | |
| parent | 892db3bb8c23305b66e24e2b600b03ae197aa0c3 (diff) | |
update mjpegtools to 1.6.2 (sourceforge) no longer needing patch(?)
svn path=/nixpkgs/trunk/; revision=13066
Diffstat (limited to 'pkgs/tools/video')
| -rw-r--r-- | pkgs/tools/video/mjpegtools/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/video/mjpegtools/fix.patch | 36 |
2 files changed, 2 insertions, 39 deletions
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 3ac57124a7ded..79d8b43e10931 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -3,9 +3,8 @@ stdenv.mkDerivation { name = "mjpegtools-1.6.2"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/mjpegtools-1.6.2.tar.gz; - md5 = "01c0120b0182de67f182ef99ad855daa" ; + url = mirror://sourceforge/mjpeg/mjpegtools-1.9.0rc3.tar.gz; + sha256 = "1xvgqzdb2rw6j4ss65k4hrzrbsl74p7k5l4qgf5dbfcw522kw7lb"; }; buildInputs = [libjpeg libX11]; - patches = [./fix.patch]; } diff --git a/pkgs/tools/video/mjpegtools/fix.patch b/pkgs/tools/video/mjpegtools/fix.patch deleted file mode 100644 index 2103fda54b4a4..0000000000000 --- a/pkgs/tools/video/mjpegtools/fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** /tmp/mjpegtools-1.6.2/lavtools/lavpipe.c Mon Sep 23 19:46:43 2002 ---- mjpegtools-1.6.2/lavtools/lavpipe.c Thu Mar 17 10:24:10 2005 -*************** -*** 582,587 **** ---- 582,588 ---- - mjpeg_info( "closing input %d (source %d)", i, current_index); - decommission_pipe_source(source); - KEEP_SOURCE: -+ ; - } - } - } -*** /tmp/mjpegtools-1.6.2/mpeg2enc/picture.cc Sat Oct 25 17:36:32 2003 ---- mjpegtools-1.6.2/mpeg2enc/picture.cc Fri Mar 18 07:55:36 2005 -*************** -*** 83,91 **** - } - - -! curref = new (uint8_t *)[5]; -! curorg = new (uint8_t *)[5]; -! pred = new (uint8_t *)[5]; - - for( i = 0 ; i<3; i++) - { ---- 83,91 ---- - } - - -! curref = new uint8_t *[5]; -! curorg = new uint8_t *[5]; -! pred = new uint8_t *[5]; - - for( i = 0 ; i<3; i++) - { - |