initial import of libmpeg3, an MPEG decoding library

7 files changed, 189 insertions, 0 deletions

diff --git a/devel/libmpeg3/patches/patch-aa b/devel/libmpeg3/patches/patch-aa
new file mode 100644
index 00000000000..19760373573
--- /dev/null
+++ b/devel/libmpeg3/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+
+--- Makefile.orig	Sun May 20 05:05:26 2001
++++ Makefile	Tue Jul 31 17:34:17 2001
+@@ -2,7 +2,7 @@
+ 
+ CFLAGS += 
+ 
+-OBJDIR = $(shell uname --machine)
++OBJDIR = work
+ 
+ $(shell sh -c 'if ! test -d $(OBJDIR)\; then \
+ 	mkdir $(OBJDIR)\; \
+@@ -69,7 +69,7 @@
+ 
+ OUTPUT = $(OBJDIR)/libmpeg3.a
+ UTILS = $(OBJDIR)/dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
+-LIBS = -lm -lpthread
++LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm -lpthread
+ 
+ all: $(OUTPUT) util
+ 
diff --git a/devel/libmpeg3/patches/patch-ab b/devel/libmpeg3/patches/patch-ab
new file mode 100644
index 00000000000..57d2cd00123
--- /dev/null
+++ b/devel/libmpeg3/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+
+--- mpeg3css.c.orig	Tue Jul 31 17:16:17 2001
++++ mpeg3css.c	Tue Jul 31 17:16:44 2001
+@@ -45,7 +45,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include <linux/cdrom.h>
++#include <sys/dvdio.h>
+ 
+ #ifndef FIBMAP
+ #define FIBMAP	   _IO(0x00,1)	/* bmap access */
diff --git a/devel/libmpeg3/patches/patch-ac b/devel/libmpeg3/patches/patch-ac
new file mode 100644
index 00000000000..c974b0eb7bf
--- /dev/null
+++ b/devel/libmpeg3/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+
+--- mpeg3ifo.c.orig	Tue Jul 31 17:18:25 2001
++++ mpeg3ifo.c	Tue Jul 31 17:18:56 2001
+@@ -1,9 +1,13 @@
+-#include <byteswap.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
++
++#include <sys/endian.h>
++#include <machine/bswap.h>
++#define bswap_16(x) bswap16(x)
++#define bswap_32(x) bswap32(x)
+ 
+ #include "ifo.h"
+ #include "mpeg3private.h"
diff --git a/devel/libmpeg3/patches/patch-ad b/devel/libmpeg3/patches/patch-ad
new file mode 100644
index 00000000000..72226b4455e
--- /dev/null
+++ b/devel/libmpeg3/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+
+--- ifo.h.orig	Tue Jul 31 17:19:54 2001
++++ ifo.h	Tue Jul 31 17:20:47 2001
+@@ -193,7 +193,7 @@
+ 	u_char *data[10];
+ 	
+ 	int fd;		// file descriptor
+-	__off64_t pos;	// offset of ifo file on device 
++	off_t pos;	// offset of ifo file on device 
+ } ifo_t;
+ 
+ 
+@@ -221,7 +221,7 @@
+  * Prototypes
+  */
+ 
+-ifo_t *ifoOpen (int fd, __off64_t pos);
++ifo_t *ifoOpen (int fd, off_t pos);
+ int ifoClose (ifo_t *ifo);
+ 
+ u_int ifoGetVOBStart	(ifo_t *ifo);
diff --git a/devel/libmpeg3/patches/patch-ae b/devel/libmpeg3/patches/patch-ae
new file mode 100644
index 00000000000..f751ba39838
--- /dev/null
+++ b/devel/libmpeg3/patches/patch-ae
@@ -0,0 +1,46 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+
+--- mpeg3io.c.orig	Sun May 20 05:05:26 2001
++++ mpeg3io.c	Tue Jul 31 17:57:27 2001
+@@ -1,8 +1,8 @@
+ #include "mpeg3private.h"
+ #include "mpeg3protos.h"
+ 
+-#include <mntent.h>
+-#include <sys/stat.h>
++#include <sys/param.h>
++#include <sys/mount.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+@@ -88,27 +88,15 @@
+ 
+ int mpeg3io_device(char *path, char *device)
+ {
+-	struct stat file_st, device_st;
+-    struct mntent *mnt;
+-	FILE *fp;
++	struct statfs file_st;
+ 
+-	if(stat(path, &file_st) < 0)
++	if(statfs(path, &file_st) < 0)
+ 	{
+ 		perror("mpeg3io_device");
+ 		return 1;
+ 	}
+ 
+-	fp = setmntent(MOUNTED, "r");
+-    while(fp && (mnt = getmntent(fp)))
+-	{
+-		if(stat(mnt->mnt_fsname, &device_st) < 0) continue;
+-		if(device_st.st_rdev == file_st.st_dev)
+-		{
+-			strncpy(device, mnt->mnt_fsname, MPEG3_STRLEN);
+-			break;
+-		}
+-	}
+-	endmntent(fp);
++	strncpy(device, file_st.f_mntfromname, MPEG3_STRLEN);
+ 
+ 	return 0;
+ }
diff --git a/devel/libmpeg3/patches/patch-af b/devel/libmpeg3/patches/patch-af
new file mode 100644
index 00000000000..1a776f7900e
--- /dev/null
+++ b/devel/libmpeg3/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+
+--- video/reconstruct.c.orig	Tue Jul 31 17:23:42 2001
++++ video/reconstruct.c	Tue Jul 31 17:24:52 2001
+@@ -572,7 +572,7 @@
+ 	}
+ }
+ 
+-static inline void recv(unsigned char *s, unsigned char *d, int lx, int lx2, int h)
++static inline void xxrecv(unsigned char *s, unsigned char *d, int lx, int lx2, int h)
+ {
+ 	unsigned char *dp,*sp,*sp2;
+ 	int j;
+@@ -971,7 +971,7 @@
+ 			case 0x0:	recc(s, d, lx2, h);       break;
+ 			case 0x7:   recva(s, d, lx, lx2, h);  break;
+ 			case 0x6:   recvac(s, d, lx, lx2, h); break;
+-			case 0x5:	recv(s, d, lx, lx2, h);   break;
++			case 0x5:	xxrecv(s, d, lx, lx2, h);   break;
+ 			case 0x4:	recvc(s, d, lx, lx2, h);  break;
+ 			case 0x9:	rech(s, d, lx2, h);       break;
+ 			case 0x8:   rechc(s, d, lx2, h);      break;
diff --git a/devel/libmpeg3/patches/patch-ag b/devel/libmpeg3/patches/patch-ag
new file mode 100644
index 00000000000..8653083e5db
--- /dev/null
+++ b/devel/libmpeg3/patches/patch-ag
@@ -0,0 +1,45 @@
+$NetBSD: patch-ag,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+
+--- video/mmxtest.c.orig	Tue Jul 31 19:37:07 2001
++++ video/mmxtest.c	Tue Jul 31 19:41:16 2001
+@@ -5,39 +5,9 @@
+ 
+ int mpeg3_mmx_test()
+ {
+-	int result = 0;
+-	FILE *proc;
+-	char string[MPEG3_STRLEN];
+-
+ 
+ #ifdef HAVE_MMX
+-	if(!(proc = fopen(MPEG3_PROC_CPUINFO, "r")))
+-	{
+-		fprintf(stderr, "mpeg3_mmx_test: failed to open /proc/cpuinfo\n");
+-		return 0;
+-	}
+-	
+-	while(!feof(proc))
+-	{
+-		fgets(string, MPEG3_STRLEN, proc);
+-/* Got the flags line */
+-		if(!strncasecmp(string, "flags", 5))
+-		{
+-			char *needle;
+-			needle = strstr(string, "mmx");
+-			if(!needle)
+-            {
+-            	fclose(proc);
+-            	return 0;
+-            }
+-			if(!strncasecmp(needle, "mmx", 3))
+-            {
+-            	fclose(proc);
+-            	return 1;
+-            }
+-		}
+-	}
+-   	fclose(proc);
++	return (1);
+ #endif
+ 
+ 	return 0;