summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2003-12-19 18:25:57 +0000
committeragc <agc@pkgsrc.org>2003-12-19 18:25:57 +0000
commit593f4169e86459960663f698d447857761687899 (patch)
tree1268866ab955a53db03dcb1c5becb5e065079b9c /graphics
parente1cea6386d7383b098de3b8403bfe49063b17960 (diff)
downloadpkgsrc-593f4169e86459960663f698d447857761687899.tar.gz
Make this build with gcc3 (use <assert.h> explicitly, rather than relying
on implicit inclusion). We might as well use pkgsrc's libtool.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/mplex/Makefile3
-rw-r--r--graphics/mplex/distinfo5
-rw-r--r--graphics/mplex/patches/patch-aa12
-rw-r--r--graphics/mplex/patches/patch-ab12
-rw-r--r--graphics/mplex/patches/patch-ac12
5 files changed, 42 insertions, 2 deletions
diff --git a/graphics/mplex/Makefile b/graphics/mplex/Makefile
index 67290f009c1..bec32048781 100644
--- a/graphics/mplex/Makefile
+++ b/graphics/mplex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/13 20:14:27 ben Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/19 18:25:57 agc Exp $
DISTNAME= mjpegtools-1.6.0
PKGNAME= mplex-1.6.0
@@ -15,6 +15,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_GCC_SHLIB= yes
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
do-build:
cd ${WRKSRC}/utils && ${GMAKE}
diff --git a/graphics/mplex/distinfo b/graphics/mplex/distinfo
index e6cdff1cf83..730d7f5f11d 100644
--- a/graphics/mplex/distinfo
+++ b/graphics/mplex/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/11/23 22:03:19 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/12/19 18:25:57 agc Exp $
SHA1 (mjpegtools-1.6.0.tar.gz) = 07637802c94cff2363ca53529ba5e14d0786d6d6
Size (mjpegtools-1.6.0.tar.gz) = 928991 bytes
+SHA1 (patch-aa) = 136c2e6068beec6676e328e213ddb9164d9e9489
+SHA1 (patch-ab) = e8207b661a8204b23ecc36e0b60844bfba4e1494
+SHA1 (patch-ac) = 47b2d73ae5d8d697cacc00fa7c5b05b39c2ff789
diff --git a/graphics/mplex/patches/patch-aa b/graphics/mplex/patches/patch-aa
new file mode 100644
index 00000000000..35f17926c32
--- /dev/null
+++ b/graphics/mplex/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2003/12/19 18:25:57 agc Exp $
+
+--- mplex/multplex.cc 2003/12/19 18:16:29 1.1
++++ mplex/multplex.cc 2003/12/19 18:17:25
+@@ -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/mplex/patches/patch-ab b/graphics/mplex/patches/patch-ab
new file mode 100644
index 00000000000..6f0003d4d3e
--- /dev/null
+++ b/graphics/mplex/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2003/12/19 18:25:57 agc Exp $
+
+--- mplex/systems.cc 2003/12/19 18:19:54 1.1
++++ mplex/systems.cc 2003/12/19 18:20:07
+@@ -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/mplex/patches/patch-ac b/graphics/mplex/patches/patch-ac
new file mode 100644
index 00000000000..fe41d80e530
--- /dev/null
+++ b/graphics/mplex/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2003/12/19 18:25:57 agc Exp $
+
+--- mplex/stillsstream.cc 2003/12/19 18:20:51 1.1
++++ mplex/stillsstream.cc 2003/12/19 18:21:08
+@@ -22,6 +22,7 @@
+
+
+ #include <format_codes.h>
++#include <assert.h>
+
+ #include "stillsstream.hh"
+ #include "interact.hh"