* Doh! Evacuate sources.

svn path=/nixpkgs/branches/0.7-release/; revision=2396

NEWS

@@ -1,15 +1,4 @@
-Nix Packages 0.8 (April 11, 2005)
-
-* This release is mostly to remain synchronised with the changed
-  hashing scheme in Nix 0.8.
-
-* Notable updates:
-
-  - Adobe Reader 7.0
-  - Various security updates (zlib 1.2.2, etc.)
-
-
-Nix Packages 0.7 (March 14, 2005)
+Nix Packages 0.7
 
 * The bootstrap process for the standard build environment on Linux
   (stdenv-linux) has been improved.  It is no longer dependent in its

VERSION

@@ -1 +1 @@
-0.8
+0.7

maintainers/docs/classification.txt

@@ -53,9 +53,6 @@ ELSE IF it's a TOOL (or set of):
   ELSE IF it's a COMPRESSION program:
     ./tools/compression
     (e.g., gzip, bzip2)
-  ELSE IF it's a SECURITY program:
-    ./tools/security
-    (e.g., nmap, gnupg)
   ELSE
     ./tools/misc
 

maintainers/scripts/evacuate-urls.sh

@@ -6,7 +6,7 @@ find . -name "*.nix" | while read fn; do
 
         if oldURL=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
 
-            if ! echo "$oldURL" | grep -q -E ".cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe"; then
+            if ! echo "$oldURL" | grep -q -E ".cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer"; then
                 base=$(basename $oldURL)
                 newURL="http://catamaran.labs.cs.uu.nl/dist/tarballs/$base"
                 newPath="/mnt/scratchy/eelco/public_html/tarballs/$base"

pkgs/applications/graphics/gqview/default.nix

@@ -6,11 +6,11 @@ assert pkgconfig != null && gtk != null && libpng != null;
 # !!! assert libpng == gtk.libpng;
 
 stdenv.mkDerivation {
-  name = "gqview-2.0.0";
+  name = "gqview-1.4.5";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-2.0.0.tar.gz;
-    md5 = "421c9a79827e91e394bdfc924071d66f";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-1.4.5.tar.gz;
+    md5 = "b196935767c2d3dc61243d9ed0801c2e";
   };
 
   buildInputs = [pkgconfig gtk libpng];

pkgs/applications/misc/acrobat-reader/builder.sh

@@ -6,23 +6,16 @@ tar xvfz $src
 mkdir $out
 
 echo "unpacking reader..."
-tar xvf AdobeReader/COMMON.TAR -C $out
-tar xvf AdobeReader/ILINXR.TAR -C $out
-
-# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
-rm $out/Reader/intellinux/plug_ins/PPKLite.api
+tar xvf ./COMMON.TAR -C $out
+tar xvf ./LINUXRDR.TAR -C $out
 
 glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
 
 patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread
 
-fullPath=
-for i in $libPath; do
-    fullPath=$fullPath${fullPath:+:}$i/lib
-done
-
-echo "#! $SHELL" > $out/bin/acroread.tmp
-echo "LD_LIBRARY_PATH=$fullPath\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH" >> $out/bin/acroread.tmp
-cat $out/bin/acroread >> $out/bin/acroread.tmp
-chmod 755 $out/bin/acroread.tmp
-mv $out/bin/acroread.tmp $out/bin/acroread
+sed "s^REPLACE_ME^$out/Reader^" $out/bin/acroread.sh > $out/bin/acroread.sh.tmp
+echo "#! /bin/sh" > $out/bin/acroread.sh
+echo "LD_LIBRARY_PATH=$libXt/lib:$libXp/lib:$libXext/lib:$libX11/lib" >> $out/bin/acroread.sh
+cat $out/bin/acroread.sh.tmp >> $out/bin/acroread.sh
+chmod 755 $out/bin/acroread.sh
+mv $out/bin/acroread.sh $out/bin/acroread

pkgs/applications/misc/acrobat-reader/default.nix

@@ -1,12 +1,12 @@
-{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib}:
+{stdenv, fetchurl, patchelf, libXt, libXp, libXext, libX11}:
 
 stdenv.mkDerivation {
-  name = "acrobat-reader-7.0";
+  name = "acrobat-reader-5.0.9";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr70_linux_enu.tar.gz;
-    md5 = "f847ce21e5d871837f2dc1d2f1baf9a9";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-509.tar.gz;
+    md5 = "53b7ca0fc83ab81214ba82050ce89c64";
   };
-  
-  libPath = [libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib];
+  buildInputs = [patchelf];
+  inherit libXt libXp libXext libX11;
 }

pkgs/applications/networking/browsers/firefox/default.nix

@@ -3,12 +3,12 @@
 # !!! assert libIDL.glib == gtk.glib;
 
 (stdenv.mkDerivation {
-  name = "firefox-1.0.2";
+  name = "firefox-1.0.1";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0.2-source.tar.bz2;
-    md5 = "fd1a0dec3e763e93eb45c0c34b399712";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0.1-source.tar.bz2;
+    md5 = "ebaea974fea9460ab7050fff76b41cb1";
   };
 
   buildInputs = [pkgconfig gtk perl zip libIDL libXi];

pkgs/applications/version-management/subversion-1.1.x/default.nix

@@ -19,12 +19,12 @@ assert javahlBindings -> j2sdk != null;
 assert compressionSupport -> zlib != null;
 
 stdenv.mkDerivation {
-  name = "subversion-1.1.4";
+  name = "subversion-1.1.3";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.4.tar.bz2;
-    md5 = "6e557ae65b6b8d7577cc7704ede85a23";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.3.tar.bz2;
+    md5 = "a09c2b2fa1a09566c024547954a48478";
   };
 
   # This is a hopefully temporary fix for the problem that

pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "docbook-xsl-1.68.1";
+  name = "docbook-xsl-1.65.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xsl-1.68.1.tar.bz2;
-    md5 = "f4985efbc0f3411af8106928f8752fc5";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xsl-1.65.1.tar.gz;
+    md5 = "2f7d446de5523ec34a19ccbe8caf387f";
   };
 }

pkgs/development/interpreters/octave/default.nix

@@ -1,14 +1,14 @@
-{stdenv, fetchurl, g77, readline, ncurses, perl, flex}:
+{stdenv, fetchurl, g77, readline, ncurses, perl}:
 
-assert readline != null && ncurses != null && flex != null;
+assert readline != null && ncurses != null;
 assert g77.langF77;
 
 stdenv.mkDerivation {
-  name = "octave-2.9.0";
+  name = "octave-2.1.64";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/octave-2.9.0.tar.bz2;
-    md5 = "687a09033bc68f09810e947010bc8f29";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/octave-2.1.64.tar.bz2;
+    md5 = "01ec8b13bd850123b190129be93adc1f";
   };
-  buildInputs = [g77 readline ncurses perl flex];
+  buildInputs = [g77 readline ncurses perl];
   configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";
 }

pkgs/development/libraries/gtk-libs-2.6/glib/default.nix

@@ -3,10 +3,10 @@
 assert pkgconfig != null && gettext != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "glib-2.6.4";
+  name = "glib-2.6.3";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.6.4.tar.bz2;
-    md5 = "af7eeb8aae764ff763418471ed6eb93d";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.6.3.tar.bz2;
+    md5 = "8f69ad5387197114b356efc64ce88d77";
   };
   buildInputs = [pkgconfig gettext perl];
 }

pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix

@@ -10,10 +10,10 @@ assert x11.buildClientLibs;
 #assert x11 == pango.x11;
 
 stdenv.mkDerivation {
-  name = "gtk+-2.6.6";
+  name = "gtk+-2.6.4";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.6.6.tar.bz2;
-    md5 = "6bf5a71a7ea6a02821fd0c9edab25904";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.6.4.tar.bz2;
+    md5 = "4749fce7b082b784a71a076aa586dc25";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
   propagatedBuildInputs = [x11 glib atk pango];

pkgs/development/libraries/java/jjtraveler/default.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchurl, j2sdk}:
 
 stdenv.mkDerivation {
-  name = "jjtraveler-0.4.3";
+  name = "jjtraveler-0.4.3.tar.gz";
   src = fetchurl {
     url = http://catamaran.labs.cs.uu.nl/dist/tarballs/JJTraveler-0.4.3.tar.gz;
     md5 = "35bf801ee61f042513ae88247fe1bf1d";

pkgs/development/libraries/libtiff/default.nix

@@ -3,11 +3,11 @@
 assert zlib != null && libjpeg != null;
 
 stdenv.mkDerivation {
-  name = "libtiff-3.7.2";
+  name = "libtiff-3.7.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-3.7.2.tar.gz;
-    md5 = "9d7123bd0dbde2a3853fb758346adb78";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-3.7.1.tar.gz;
+    md5 = "37d222df12eb23691614cd40b7b1f215";
   };
   propagatedBuildInputs = [zlib libjpeg];
   inherit zlib libjpeg;

pkgs/development/libraries/openssl/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl, perl}: stdenv.mkDerivation {
-  name = "openssl-0.9.7f";
+  name = "openssl-0.9.7d";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/openssl-0.9.7f.tar.gz;
-    md5 = "b2d37d7eb8a5a5040d834105d5ae1a50";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/openssl-0.9.7d.tar.gz;
+    md5 = "1b49e90fc8a75c3a507c0a624529aca5";
   };
   inherit perl;
 }

pkgs/development/libraries/zlib/darwin.patch

@@ -0,0 +1,22 @@
+diff -rc zlib-1.2.1/configure zlib-patched/configure
+*** zlib-1.2.1/configure	2003-11-17 04:50:39.000000000 +0100
+--- zlib-patched/configure	2004-08-05 19:18:59.000000000 +0200
+***************
+*** 89,97 ****
+               SHAREDLIB=libz$shared_ext
+               SHAREDLIBV=libz.$VER$shared_ext
+               SHAREDLIBM=libz.$VER1$shared_ext
+!              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name /usr/lib/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"}
+!              libdir='/usr/lib'
+!              includedir='/usr/include';;
+    *)             LDSHARED=${LDSHARED-"$cc -shared"};;
+    esac
+  else
+--- 89,95 ----
+               SHAREDLIB=libz$shared_ext
+               SHAREDLIBV=libz.$VER$shared_ext
+               SHAREDLIBM=libz.$VER1$shared_ext
+!              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name \${libdir}/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"};;
+    *)             LDSHARED=${LDSHARED-"$cc -shared"};;
+    esac
+  else

pkgs/development/libraries/zlib/default.nix

@@ -1,10 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "zlib-1.2.2";
+  name = "zlib-1.2.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zlib-1.2.2.tar.gz;
-    md5 = "68bd51aaa6558c3bc3fd4890e53413de";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zlib-1.2.1.tar.gz;
+    md5 = "ef1cb003448b4a53517b8f25adb12452";
   };
   configureFlags = "--shared";
+  patches = [./darwin.patch];
 }

pkgs/development/perl-modules/BerkeleyDB/default.nix

@@ -7,5 +7,6 @@ import ../generic perl {
     md5 = "6e9882f4e4bac48b24079d082af30e6c";
   };
   perlPreHook = ./hook.sh;
-  inherit db4;
+  buildInputs = [db4];
+#  inherit db4;
 }

pkgs/development/tools/misc/valgrind/default.nix

@@ -3,13 +3,23 @@
 # Note: I added the Perl dependency for Valgrind 2.1.1.  It's needed
 # to generate some files.  Maybe in stable releases we won't need
 # Perl.
-# Update: 2.4.0 still needs it.
+# Update: 2.2.0 still needs it.
 
 stdenv.mkDerivation {
-  name = "valgrind-2.4.0";
+  name = "valgrind-2.2.0";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.4.0.tar.bz2;
-    md5 = "1d0bd81d368789946d32d18a468ea0cf";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.2.0.tar.bz2;
+    md5 = "30dc51f6fc94751b90b04af9c2e2c656";
   };
   buildInputs = [perl];
+
+  # Hack to get Valgrind to compile with Linux 2.6.10 headers.  The
+  # file `include/asm/processor.h' indirectly needs
+  # CONFIG_X86_L1_CACHE_SHIFT (for the alignment of some type that
+  # probably isn't relevant here anyway).
+  # !!! maybe this should be done in linux-headers?
+  NIX_CFLAGS_COMPILE = "-DCONFIG_X86_L1_CACHE_SHIFT=7";
+
+  # Another kernel header problem.
+  patches = [./pgoff_t.patch];
 }

pkgs/development/tools/misc/valgrind/pgoff_t.patch

@@ -0,0 +1,34 @@
+diff -rc valgrind-orig/coregrind/vg_unsafe.h valgrind-2.2.0/coregrind/vg_unsafe.h
+*** valgrind-orig/coregrind/vg_unsafe.h	2004-08-29 23:02:28.000000000 +0200
+--- valgrind-2.2.0/coregrind/vg_unsafe.h	2005-02-23 21:39:25.000000000 +0100
+***************
+*** 31,36 ****
+--- 31,40 ----
+  */
+  
+  
++ #ifndef pgoff_t
++ #define pgoff_t unsigned long
++ #endif
++ 
+  /* These includes are only used for making sense of the args for
+     system calls. */
+  #include "vg_unistd.h"    /* for system call numbers */
+***************
+*** 47,53 ****
+  #include <sys/socket.h>   /* for struct msghdr */
+  #include <linux/sockios.h>/* for SIOCOUTQ */
+  #include <sys/un.h>       /* for sockaddr_un */
+! #include <net/if.h>       /* for struct ifreq et al */
+  #include <net/if_arp.h>   /* for struct arpreq */
+  #include <net/route.h>    /* for struct rtentry */
+  #ifdef HAVE_LINUX_COMPILER_H
+--- 51,58 ----
+  #include <sys/socket.h>   /* for struct msghdr */
+  #include <linux/sockios.h>/* for SIOCOUTQ */
+  #include <sys/un.h>       /* for sockaddr_un */
+! /* hack - should be fixed in CVS */
+! //#include <net/if.h>       /* for struct ifreq et al */
+  #include <net/if_arp.h>   /* for struct arpreq */
+  #include <net/route.h>    /* for struct rtentry */
+  #ifdef HAVE_LINUX_COMPILER_H

pkgs/servers/http/apache-httpd/default.nix

@@ -7,12 +7,12 @@ assert db4Support -> db4 != null;
 assert expat != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "apache-httpd-2.0.53";
+  name = "apache-httpd-2.0.52";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.53.tar.bz2;
-    md5 = "94f3a793fb1665365724943206cce23f";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/httpd-2.0.52.tar.bz2;
+    md5 = "0e1b47c53921a1fc8fb006effdb3bf1c";
   };
 
   inherit sslSupport db4Support;

pkgs/system/all-packages-generic.nix

@@ -90,7 +90,7 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  unzip = import ../tools/archivers/unzip {
+  unzip = (import ../tools/archivers/unzip) {
     inherit fetchurl stdenv;
   };
 
@@ -182,11 +182,7 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  mjpegtools = (import ../tools/video/mjpegtools) {
-    inherit fetchurl stdenv libjpeg;
-    inherit (xlibs) libX11;
-  };
- 
+  
   ### SHELLS
 
   bash = (import ../shells/bash) {
@@ -217,7 +213,7 @@ rec {
     inherit fetchurl stdenv perl autoconf;
   };
 
-  automake19x = (import ../development/tools/misc/automake/automake-1.9.x.nix) {
+  automake194 = (import ../development/tools/misc/automake/automake-1.9.4.nix) {
     inherit fetchurl stdenv perl autoconf;
   };
 
@@ -266,7 +262,7 @@ rec {
   };
 
   octave = (import ../development/interpreters/octave) {
-    inherit fetchurl stdenv readline ncurses g77 perl flex;
+    inherit fetchurl stdenv readline ncurses g77 perl;
   };
 
   gnumake = (import ../development/tools/build-managers/gnumake) {
@@ -503,7 +499,7 @@ rec {
   apacheAntBlackdown14 = (import ../development/tools/build-managers/apache-ant) {
     inherit fetchurl stdenv;
     j2sdk = blackdown;
-    name = "ant-blackdown-1.4.2";
+     name = "ant-blackdown-1.4.2";
   };
 
   apacheAnt15 = (import ../development/tools/build-managers/apache-ant) {
@@ -1175,10 +1171,8 @@ rec {
   };
 
   acroread = (import ../applications/misc/acrobat-reader) {
-    inherit fetchurl stdenv zlib;
+    inherit fetchurl stdenv patchelf;
     inherit (xlibs) libXt libXp libXext libX11;
-    inherit (gtkLibs) glib pango atk gtk;
-    libstdcpp5 = gcc33.gcc;
   };
 
   eclipse = (import ../applications/editors/eclipse) {

pkgs/system/populate-cache.nix

@@ -25,7 +25,7 @@ let {
     binutils
     gnum4
     autoconf
-    automake19x
+    automake194
     libtool
     pkgconfig
     valgrind
@@ -92,23 +92,13 @@ let {
   ;};
 
   powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
-    unzip
     aterm
     subversion
-    bisonnew
-#    flexnew
-    libxml2
-    libxslt
-    docbook_xml_dtd_42
-    docbook_xml_dtd_43
-    docbook_xml_ebnf_dtd
-    docbook_xml_xslt
-    nxml
   ;};
 
 
   body = [
     i686LinuxPkgs
-    powerpcDarwinPkgs
+#    powerpcDarwinPkgs
   ];
 }

pkgs/system/stdenvs.nix

@@ -58,7 +58,7 @@
   # (essentially it's just the native environment).
   stdenvDarwin = (import ../stdenv/darwin) {
     stdenv = stdenvInitial;
-    genericStdenv = import ../stdenv/generic;
+    genericStdenv = import ../stdenv/generic-branch;
     inherit gccWrapper;
   };
 

pkgs/tools/archivers/unzip/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "unzip-5.52";
+  name = "unzip-5.50";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/unzip552.tar.gz;
-    md5 = "9d23919999d6eac9217d1f41472034a9";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/unzip550.tar.gz;
+    md5 = "798592d62e37f92571184236947122ed";
   };
 }

pkgs/tools/security/gnupg/builder.sh

@@ -1,3 +0,0 @@
-. $stdenv/setup
-
-genericBuild

pkgs/tools/security/gnupg/default.nix

@@ -1,10 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "gnupg-1.4.0";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnupg_1.4.0.orig.tar.gz;
-    md5 = "74e407a8dcb09866555f79ae797555da";
-  };
-}

pkgs/tools/video/mjpegtools/default.nix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl, libjpeg, libX11}:
-
-stdenv.mkDerivation {
-  name = "mjpegtools-1.6.2";
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mjpegtools-1.6.2.tar.gz;
-    md5 = "01c0120b0182de67f182ef99ad855daa" ;
-  };
-  buildInputs = [libjpeg libX11];
-  patches = [./fix.patch];
-}

pkgs/tools/video/mjpegtools/fix.patch

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