move mpeg-lib to multimedia/

22 files changed, 368 insertions, 1 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index d4d1f22074c..773716c1739 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/06/26 18:10:20 grant Exp $
+# $NetBSD: Makefile,v 1.55 2004/06/26 18:27:23 grant Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -53,6 +53,7 @@ SUBDIR+=	moz-flash
 SUBDIR+=	moz-mplayer
 SUBDIR+=	mpeg_encode
 SUBDIR+=	mpeg_play
+SUBDIR+=	mpeg-lib
 SUBDIR+=	mplayer
 SUBDIR+=	mplayer-share
 SUBDIR+=	mplex
diff --git a/multimedia/mpeg-lib/DESCR b/multimedia/mpeg-lib/DESCR
new file mode 100644
index 00000000000..7c6d4e25b07
--- /dev/null
+++ b/multimedia/mpeg-lib/DESCR
@@ -0,0 +1,10 @@
+The MPEG Library is a collection of C routines to decode MPEG movies
+and dither them in a variety of colour schemes.  Most of the code in
+the library comes directly from the Berkely MPEG player, an
+X11-specific implementation that works fine, but suffers from minimal
+documentation and a lack of modularity.  A front end to the Berkeley
+decoding engine was developed by Greg Ward at the Montreal
+Neurological Institute in May/June 1994 to facilitate the development
+of an MPEG player specifically for Silicon Graphics workstations; the
+decoding engine together with the MNI front end constitute the MPEG
+Library.
diff --git a/multimedia/mpeg-lib/Makefile b/multimedia/mpeg-lib/Makefile
new file mode 100644
index 00000000000..3d8139f5028
--- /dev/null
+++ b/multimedia/mpeg-lib/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2004/06/26 18:27:23 grant Exp $
+#
+
+DISTNAME=	mpeg_lib-1.3.1
+PKGNAME=	mpeg-1.3.1
+CATEGORIES=	multimedia
+MASTER_SITES=	ftp://ftp.mni.mcgill.ca/pub/mpeg/ \
+		ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/libs/ \
+		ftp://ftp.gimp.org/pub/gimp/libs/
+
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://starship.python.net/~gward/mpeglib/
+COMMENT=	Library for decoding MPEG movies
+
+USE_BUILDLINK3=	YES
+USE_LIBTOOL=	YES
+GNU_CONFIGURE=	YES
+
+ALL_TARGET=	libmpeg_lib.la
+
+CONFIGURE_ENV+=	OPTIMIZE="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"	\
+		EXTRA_CPPFLAGS="${CPPFLAGS}"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mpeg-lib/PLIST b/multimedia/mpeg-lib/PLIST
new file mode 100644
index 00000000000..bfbc9fe1095
--- /dev/null
+++ b/multimedia/mpeg-lib/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2004/06/26 18:27:23 grant Exp $
+include/mpeg.h
+lib/libmpeg_lib.a
+lib/libmpeg_lib.la
+lib/libmpeg_lib.so
+lib/libmpeg_lib.so.1
+lib/libmpeg_lib.so.1.3
diff --git a/multimedia/mpeg-lib/buildlink3.mk b/multimedia/mpeg-lib/buildlink3.mk
new file mode 100644
index 00000000000..90f921e304f
--- /dev/null
+++ b/multimedia/mpeg-lib/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+MPEG_BUILDLINK3_MK:=	${MPEG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	mpeg
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmpeg}
+BUILDLINK_PACKAGES+=	mpeg
+
+.if !empty(MPEG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.mpeg+=	mpeg>=1.3.1
+BUILDLINK_PKGSRCDIR.mpeg?=	../../multimedia/mpeg-lib
+.endif	# MPEG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/mpeg-lib/distinfo b/multimedia/mpeg-lib/distinfo
new file mode 100644
index 00000000000..19aab741628
--- /dev/null
+++ b/multimedia/mpeg-lib/distinfo
@@ -0,0 +1,20 @@
+$NetBSD: distinfo,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+SHA1 (mpeg_lib-1.3.1.tar.gz) = 0ea4f8b31e4f316d99c2034d76619988f75147dc
+Size (mpeg_lib-1.3.1.tar.gz) = 152092 bytes
+SHA1 (patch-aa) = 6f43a8a94c8efa3f241891fe479a1b93406d2266
+SHA1 (patch-ab) = a97c3c8b411975ee51ef25cd6a0a66aa967ac064
+SHA1 (patch-ac) = 20b8e16bcbcd183441855a9277b9042d2ec7bcf0
+SHA1 (patch-ad) = 822fcd6a1908b4b0c31b9a565929bbd0f37f31af
+SHA1 (patch-ae) = 79ff90b04dc9e9b1a55bb5800263f29d193d0abe
+SHA1 (patch-af) = b4cbba0e6e08ee5b9e72f7ff8ede0fc3f615aab0
+SHA1 (patch-ag) = fbc47b594a0c7184d46a72f748109b3114e94234
+SHA1 (patch-ah) = 9c9460a86c6384955016c42e58b0f4e66743650e
+SHA1 (patch-ai) = 9573d9b58fa55ead4d51ede01f4f3fe24121408a
+SHA1 (patch-aj) = 5fbff44803b11344fde25f94f3466f4af3e40633
+SHA1 (patch-ak) = e6dd6f3e902ee774d06aa93cfa6ac5ead9df7aa9
+SHA1 (patch-al) = f63df4035b3f33ac778e7bde1e478434826c34ba
+SHA1 (patch-am) = b2f7afdd74c28bd6345f1ac291577103bf8196f3
+SHA1 (patch-an) = 3b23f238fcdc1321d17d19be74c7e670b249c5fc
+SHA1 (patch-ao) = 84caaa6c7b9cb5eb7f7455323767aa6753e92ff7
+SHA1 (patch-ap) = 2d7536517bcf3e9ed52fdc09ab5a5f721aab6c5d
diff --git a/multimedia/mpeg-lib/patches/patch-aa b/multimedia/mpeg-lib/patches/patch-aa
new file mode 100644
index 00000000000..7992e3aa633
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- wrapper.c.orig	Sun Aug  8 20:22:14 1999
++++ wrapper.c	Mon Sep 15 22:50:34 2003
+@@ -44,7 +44,6 @@
+ ---------------------------------------------------------------------------- */
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include <stdio.h>
+ #include <errno.h>
+@@ -55,6 +54,9 @@
+ #include "globals.h"
+ #include "my_dmalloc.h"
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #define BUF_LENGTH 80000
+ 
+ 
+@@ -341,7 +343,7 @@
+ @CREATED    : 94/6/17, Greg Ward.
+ @MODIFIED   : 95/3/18, GW: added MPEG_CMAP_INDEX option.
+ ---------------------------------------------------------------------------- */
+-void SetMPEGOption (MPEGOptionEnum Option, int Value)
++void SetMPEGOption (MPEGOptionEnum Option, long Value)
+ {
+    switch (Option)
+    {
diff --git a/multimedia/mpeg-lib/patches/patch-ab b/multimedia/mpeg-lib/patches/patch-ab
new file mode 100644
index 00000000000..ae5a7d9a21a
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- globals.c.orig	Sat Jul 31 20:17:20 1999
++++ globals.c
+@@ -63,6 +63,7 @@
+ #include "globals.h"
+ #include "my_dmalloc.h"
+ 
++#include <string.h>
+ 
+ /* Universal global variables -- those needed by the decoding engine: */
+ 
diff --git a/multimedia/mpeg-lib/patches/patch-ac b/multimedia/mpeg-lib/patches/patch-ac
new file mode 100644
index 00000000000..fea118f46f5
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- 24bit.c.orig	Fri Jul 23 23:59:25 1999
++++ 24bit.c	Mon Sep 15 22:49:14 2003
+@@ -30,7 +30,8 @@
+ #include "dither.h"
+ #include "proto.h"
+ #include <time.h>
+-#include <malloc.h>
++#include <stdlib.h>
++
+ #include "my_dmalloc.h"
+ 
+ /*
diff --git a/multimedia/mpeg-lib/patches/patch-ad b/multimedia/mpeg-lib/patches/patch-ad
new file mode 100644
index 00000000000..a07403c7329
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- gdith.c.orig	Sat Jul 24 00:04:42 1999
++++ gdith.c	Mon Sep 15 22:49:55 2003
+@@ -21,8 +21,8 @@
+ 
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
++#include <stdlib.h>
+ #include "mpeg.h"
+ #include "dither.h"
+ #include "video.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ae b/multimedia/mpeg-lib/patches/patch-ae
new file mode 100644
index 00000000000..423c0f5669e
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- fs2.c.orig	Fri Jul 23 23:40:17 1999
++++ fs2.c	Mon Sep 15 22:49:38 2003
+@@ -19,10 +19,10 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
+ #include "dither.h"
++#include <stdlib.h>
+ #include "fs2.h"
+ #include "proto.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-af b/multimedia/mpeg-lib/patches/patch-af
new file mode 100644
index 00000000000..b062d62eb9b
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- fs2fast.c.orig	Fri Jul 23 23:59:24 1999
++++ fs2fast.c	Mon Sep 15 22:49:44 2003
+@@ -19,9 +19,9 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
++#include <stdlib.h>
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ag b/multimedia/mpeg-lib/patches/patch-ag
new file mode 100644
index 00000000000..eeb84b078bd
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- fs4.c.orig	Fri Jul 23 23:59:24 1999
++++ fs4.c	Mon Sep 15 22:49:49 2003
+@@ -21,10 +21,10 @@
+ /* This file contains C code to do YCrCb -> colormap space. */
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include "fs4.h"
+ #include "video.h"
++#include <stdlib.h>
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ah b/multimedia/mpeg-lib/patches/patch-ah
new file mode 100644
index 00000000000..ccd292e7b8a
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- hybrid.c.orig	Fri Jul 23 23:50:51 1999
++++ hybrid.c	Mon Sep 15 22:50:01 2003
+@@ -21,9 +21,9 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
++#include <stdlib.h>
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ai b/multimedia/mpeg-lib/patches/patch-ai
new file mode 100644
index 00000000000..ce12be8142d
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- hybriderr.c.orig	Sat Jul 31 20:05:24 1999
++++ hybriderr.c	Mon Sep 15 22:50:05 2003
+@@ -24,8 +24,8 @@
+ 
+ #include <config.h>
+ #include <memory.h>
+-#include <malloc.h>
+ #include "video.h"
++#include <stdlib.h>
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-aj b/multimedia/mpeg-lib/patches/patch-aj
new file mode 100644
index 00000000000..43d2203dfd4
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- 2x2.c.orig	Sat Jul 24 00:06:22 1999
++++ 2x2.c	Mon Sep 15 22:49:32 2003
+@@ -21,8 +21,8 @@
+ 
+ #include <config.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include "video.h"
++#include <stdlib.h>
+ #include "dither.h"
+ #include "proto.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ak b/multimedia/mpeg-lib/patches/patch-ak
new file mode 100644
index 00000000000..6f66cb53ca7
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- mono.c.orig	Fri Jul 23 23:59:22 1999
++++ mono.c	Mon Sep 15 22:50:16 2003
+@@ -24,9 +24,9 @@
+  */
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
++#include <stdlib.h>
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-al b/multimedia/mpeg-lib/patches/patch-al
new file mode 100644
index 00000000000..3b7536ca9bd
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- ordered.c.orig	Fri Jul 23 23:53:40 1999
++++ ordered.c	Mon Sep 15 22:50:21 2003
+@@ -21,9 +21,9 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
++#include <stdlib.h>
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-am b/multimedia/mpeg-lib/patches/patch-am
new file mode 100644
index 00000000000..d6b1259e0c5
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- ordered2.c.orig	Fri Jul 23 23:54:01 1999
++++ ordered2.c	Mon Sep 15 22:50:25 2003
+@@ -21,9 +21,9 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
++#include <stdlib.h>
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-an b/multimedia/mpeg-lib/patches/patch-an
new file mode 100644
index 00000000000..8ebfa240891
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-an
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- mb_ordered.c.orig	Fri Jul 23 23:53:08 1999
++++ mb_ordered.c	Mon Sep 15 22:50:11 2003
+@@ -21,9 +21,9 @@
+ /* This file contains C code to implement an ordered dither. */
+ 
+ #include <config.h>
+-#include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
++#include <stdlib.h>
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ao b/multimedia/mpeg-lib/patches/patch-ao
new file mode 100644
index 00000000000..4d21db9560f
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- mpeg.h.orig	Sat Jul 24 00:32:06 1999
++++ mpeg.h
+@@ -109,7 +109,7 @@
+ Boolean OpenMPEG PROTO((FILE *MPEGfile, ImageDesc *ImgInfo));
+ void    CloseMPEG PROTO((void));
+ Boolean RewindMPEG PROTO((FILE *MPEGfile, ImageDesc *Image));
+-void    SetMPEGOption PROTO((MPEGOptionEnum Option, int value));
++void    SetMPEGOption PROTO((MPEGOptionEnum Option, long value));
+ Boolean GetMPEGFrame PROTO((char *Frame));
+ 
+ #ifdef __cplusplus
diff --git a/multimedia/mpeg-lib/patches/patch-ap b/multimedia/mpeg-lib/patches/patch-ap
new file mode 100644
index 00000000000..90c429c44c0
--- /dev/null
+++ b/multimedia/mpeg-lib/patches/patch-ap
@@ -0,0 +1,53 @@
+$NetBSD: patch-ap,v 1.1 2004/06/26 18:27:23 grant Exp $
+
+--- Makefile.in.orig	Thu Nov 26 17:03:29 1998
++++ Makefile.in	Mon Aug  6 16:54:52 2001
+@@ -11,7 +11,7 @@
+ EXTRA_CFLAGS  = @EXTRA_CFLAGS@
+ INCLUDE_DIRS  = -I. @INCLUDE_DIRS@
+ DEFINES       = @DEFINES@
+-CFLAGS        = $(OPTIMIZE) $(EXTRA_CFLAGS)
++CFLAGS        += $(OPTIMIZE) $(EXTRA_CFLAGS)
+ CPPFLAGS      = $(INCLUDE_DIRS) $(DEFINES)
+ 
+ # Installation directories (and install program)
+@@ -41,14 +41,14 @@
+ 
+ # Other files of interest
+ 
+-LIBRARY       = libmpeg.a
++LIBRARY       = libmpeg_lib.la
+ SHLIB         = libmpeg.so
+ HEADER        = mpeg.h
+ EXTRAS        = @extras@
+ 
+ # Implicit targets
+ .c.o:
+-		$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
++		${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
+ 
+ 
+ # Library/cleanup targets: 
+@@ -60,16 +60,18 @@
+ shlib:          $(SHLIB)
+ 
+ $(LIBRARY):	$(LIBOBJ)
+-		$(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ)
+-		$(RANLIB) $(LIBRARY)
++		${LIBTOOL} --mode=link $(CC) -o $(LIBRARY) $(LIBOBJ:.o=.lo)		\
++			-rpath ${PREFIX}/lib -version-info 1:3
++
+ 
+ $(SHLIB):	$(LIBOBJ)
+ 		$(CC) -shared -o $(SHLIB) $(LIBOBJ)
+ 
+ install:	$(LIBRARY)
+-		$(INSTALL) -d $(INSTALL_INCLUDE) $(INSTALL_LIBRARY)
++		$(INSTALL) -d $(INSTALL_INCLUDE)
++		$(INSTALL) -d $(INSTALL_LIBRARY)
+ 		$(INSTALL) -m 0644 $(HEADER) $(INSTALL_INCLUDE)/$(HEADER)
+-		$(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
++		${LIBTOOL} --mode=install $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
+ 		@if test -f $(SHLIB) ; then echo "warning: $(SHLIB) *not* installed (installing shared libraries is too system-specific)" ; fi
+ 
+ clean: