Move mpeg_encode from the graphics to the multimedia category.

This is version 1.5bnb1.

5 files changed, 105 insertions, 0 deletions

diff --git a/multimedia/mpeg_encode/patches/patch-aa b/multimedia/mpeg_encode/patches/patch-aa
new file mode 100644
index 00000000000..2fb3f989b20
--- /dev/null
+++ b/multimedia/mpeg_encode/patches/patch-aa
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
+
+--- Makefile.orig	Thu Aug 17 00:16:56 1995
++++ Makefile
+@@ -36,9 +36,9 @@
+ ##############
+ # JPEG STUFF #
+ ##############
+-JPEG_LIB = jpeg/libjpeg.a
+-JPEG_DIR = -Ijpeg
+-JPEG_LIB_DIR = -Ljpeg
++JPEG_LIB = -ljpeg
++JPEG_DIR = 
++JPEG_LIB_DIR = 
+ MP_JPEG_OBJS = jpeg.o
+ MP_JPEG_SRCS = jpeg.c
+ 
+@@ -57,7 +57,7 @@
+ #################
+ # INCLUDE FILES # 
+ #################
+-INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
++INCLUDEDIR = -Iheaders $(JPEG_DIR)
+ 
+ ############################################################################
+ # LIBRARIES # specify library directories; need jpg lib and maybe pbm	   #
+@@ -203,7 +203,7 @@
+ ############
+ 
+ mpeg_encode: $(MP_ALL_OBJS) $(JPEG_LIB)
+-	$(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
++	$(PURIFY) $(CC) $(LDFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+ 	strip mpeg_encode
+ 
+ profile: $(MP_ALL_OBJS)
diff --git a/multimedia/mpeg_encode/patches/patch-ab b/multimedia/mpeg_encode/patches/patch-ab
new file mode 100644
index 00000000000..52806afd68e
--- /dev/null
+++ b/multimedia/mpeg_encode/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
+
+--- jpeg.c.orig	Sat Aug  5 01:35:07 1995
++++ jpeg.c
+@@ -77,7 +77,7 @@
+ 
+ /* make it happier.... */
+ #undef DCTSIZE2
+-#include "jpeg/jpeglib.h"
++#include "jpeglib.h"	/* Use system header! */
+ 
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
diff --git a/multimedia/mpeg_encode/patches/patch-ac b/multimedia/mpeg_encode/patches/patch-ac
new file mode 100644
index 00000000000..87286cc1460
--- /dev/null
+++ b/multimedia/mpeg_encode/patches/patch-ac
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
+
+--- libpnmrw.c.orig	Thu Aug 17 00:24:26 1995
++++ libpnmrw.c
+@@ -28,6 +28,9 @@
+ #endif
+ 
+ #include <stdio.h>
++#ifdef __NetBSD__
++#  include <errno.h>
++#endif
+ #include "libpnmrw.h"
+ 
+ /* if don't have string.h, try strings.h */
+@@ -126,8 +129,10 @@
+   pm_perror( reason )
+ char* reason;
+ {
++#ifndef __NetBSD__
+   extern char* sys_errlist[];
+   extern int errno;
++#endif
+   char* e;
+ 
+   e = sys_errlist[errno];
diff --git a/multimedia/mpeg_encode/patches/patch-ad b/multimedia/mpeg_encode/patches/patch-ad
new file mode 100644
index 00000000000..a2cd5e696a5
--- /dev/null
+++ b/multimedia/mpeg_encode/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
+
+--- docs/mpeg_encode.1.orig	Thu Mar 30 00:15:09 1995
++++ docs/mpeg_encode.1
+@@ -368,6 +368,8 @@
+ This is version 1.5 it contins new features and bug fixes from version 1.3.
+ .SH BUGS
+ No known bugs, but if you find any, report them to mpeg-bugs@plateau.cs.berkeley.edu.
++If you experience problems in the jpeg code, it is advisable to use another
++input format. This problem is documented in NetBSD PR pkg/14043.
+ .HP
+ .SH AUTHORS
+ .HP
diff --git a/multimedia/mpeg_encode/patches/patch-ae b/multimedia/mpeg_encode/patches/patch-ae
new file mode 100644
index 00000000000..d304801cdc7
--- /dev/null
+++ b/multimedia/mpeg_encode/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
+
+--- convert/jmovie2jpeg.c.orig	1995-01-20 00:29:24.000000000 +0000
++++ convert/jmovie2jpeg.c
+@@ -283,12 +283,12 @@ static char inbuffer[300000] = {    
+     if (fread (&(image_offset),sizeof(int),1,inFile) != 1)
+     {
+ 	perror("Error in reading image offset");
+-	exit();
++	exit(1);
+     }
+     if (fread (&(audio_tracks),sizeof(int),1,inFile) != 1)
+     {
+ 	perror("Error in reading audio tracks");
+-	exit();
++	exit(1);
+     }
+     if (audio_tracks != 1) 
+       {