BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update mjpegtools to 1.6.2 (sourceforge) no longer needing patch(?)

Browse source 
svn path=/nixpkgs/trunk/; revision=13066
This commit is contained in:
Marc Weber 2008-10-14 14:01:26 +00:00
parent 892db3bb8c
commit ef6cf67fc4
2 changed files with 2 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/video/mjpegtools/default.nix
View file

@ -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];
}

36
pkgs/tools/video/mjpegtools/fix.patch
View file

@ -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++)
{