make this build with gcc3.3: include <assert.h> if you use it, avoid invalid

C++ syntax and turn of -Werror for one subdir...

7 files changed, 70 insertions, 2 deletions

diff --git a/graphics/mjpegtools/Makefile b/graphics/mjpegtools/Makefile
index a0f842e5474..12f21e8dbef 100644
--- a/graphics/mjpegtools/Makefile
+++ b/graphics/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/26 21:41:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/02 05:22:57 mrg Exp $
 
 DISTNAME=	mjpegtools-1.6.1
 PKGREVISION=	2
@@ -19,6 +19,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-large-file
 CONFIGURE_ARGS+=	--with-lame-includes=${BUILDLINK_PREFIX.lame}
 # XXX fix me
 CONFIGURE_ARGS+=	--without-avifile
diff --git a/graphics/mjpegtools/distinfo b/graphics/mjpegtools/distinfo
index 91d8aa5908f..ee437b1ee23 100644
--- a/graphics/mjpegtools/distinfo
+++ b/graphics/mjpegtools/distinfo
@@ -1,4 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/23 07:08:29 mrg Exp $
+$NetBSD: distinfo,v 1.2 2003/08/02 05:22:57 mrg Exp $
 
 SHA1 (mjpegtools-1.6.1.tar.gz) = af3705a1ef92c9ccd3e2d6db6c6b50e33f18b838
 Size (mjpegtools-1.6.1.tar.gz) = 976241 bytes
+SHA1 (patch-aa) = 71d5c53e4fcbabb110153b57bdba49621551f0a7
+SHA1 (patch-ab) = 3bbb6d45e3999db47c4dc853c2d2ad609a0fdda3
+SHA1 (patch-ac) = f900d8efe93d0e6c873533804495d3213427ddbb
+SHA1 (patch-ad) = 6c6c53bacb76185019c72b72ce65977f5c1ec49e
+SHA1 (patch-ae) = 077a87101a5c0fd7ddd8ba037d4769e30ff379b6
diff --git a/graphics/mjpegtools/patches/patch-aa b/graphics/mjpegtools/patches/patch-aa
new file mode 100644
index 00000000000..973b295c74f
--- /dev/null
+++ b/graphics/mjpegtools/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2003/08/02 05:22:58 mrg Exp $
+
+--- mplex/multplex.cc.orig	2002-04-30 00:36:00.000000000 +1000
++++ mplex/multplex.cc	2003-06-28 23:53:58.000000000 +1000
+@@ -3,6 +3,7 @@
+ #include <math.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <assert.h>
+ 
+ #include <mjpeg_types.h>
+ #include <mjpeg_logging.h>
diff --git a/graphics/mjpegtools/patches/patch-ab b/graphics/mjpegtools/patches/patch-ab
new file mode 100644
index 00000000000..d9c0d048b70
--- /dev/null
+++ b/graphics/mjpegtools/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2003/08/02 05:22:59 mrg Exp $
+
+--- mplex/systems.cc.orig	2002-04-30 00:36:01.000000000 +1000
++++ mplex/systems.cc	2003-06-28 23:54:51.000000000 +1000
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <assert.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include "systems.hh"
diff --git a/graphics/mjpegtools/patches/patch-ac b/graphics/mjpegtools/patches/patch-ac
new file mode 100644
index 00000000000..126a9bd7a1b
--- /dev/null
+++ b/graphics/mjpegtools/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/08/02 05:22:59 mrg Exp $
+
+--- mplex/vector.cc.orig	2003-06-29 00:05:01.000000000 +1000
++++ mplex/vector.cc	2003-06-29 00:05:07.000000000 +1000
+@@ -9,7 +9,7 @@
+ AUStream::AUStream() : 
+ 	cur_rd( 0 ), cur_wr(0), totalctr(0), size(0), buf(0)
+ {
+-	buf = new (Aunit*)[AUStream::BUF_SIZE];
++	buf = new Aunit *[AUStream::BUF_SIZE];
+ }
+ 
+ 
diff --git a/graphics/mjpegtools/patches/patch-ad b/graphics/mjpegtools/patches/patch-ad
new file mode 100644
index 00000000000..ddf02464df9
--- /dev/null
+++ b/graphics/mjpegtools/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2003/08/02 05:23:00 mrg Exp $
+
+--- mplex/stillsstream.cc.orig	2002-04-18 14:32:02.000000000 +1000
++++ mplex/stillsstream.cc	2003-06-29 00:05:37.000000000 +1000
+@@ -22,6 +22,7 @@
+ 
+ 
+ #include <format_codes.h>
++#include <assert.h>
+ 
+ #include "stillsstream.hh"
+ #include "interact.hh"
diff --git a/graphics/mjpegtools/patches/patch-ae b/graphics/mjpegtools/patches/patch-ae
new file mode 100644
index 00000000000..865127a05f9
--- /dev/null
+++ b/graphics/mjpegtools/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/08/02 05:23:00 mrg Exp $
+
+--- yuvdenoise/Makefile.in.orig	2002-12-09 23:58:03.000000000 +1100
++++ yuvdenoise/Makefile.in	2003-06-29 00:27:52.000000000 +1000
+@@ -134,7 +134,7 @@
+ EXTRA_DIST = .cvsignore
+ MAINTAINERCLEANFILES = Makefile.in
+ INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
+-AM_CFLAGS = -funroll-all-loops -finline-functions -ffast-math -frerun-cse-after-loop -frerun-loop-opt -fexpensive-optimizations -fmove-all-movables -Werror
++AM_CFLAGS = -funroll-all-loops -finline-functions -ffast-math -frerun-cse-after-loop -frerun-loop-opt -fexpensive-optimizations -fmove-all-movables
+ 
+ bin_PROGRAMS = yuvdenoise
+ yuvdenoise_SOURCES = main.c deinterlace.c deinterlace.h denoise.c denoise.h motion.c motion.h global.h