Initial import of avifile-0.53.5

An MPEG-4 (aka DivX) player built around the Windows binaries,
but does not need Wine.
There is also a xmps plugin you can build (manually).

NOTE: aviplay (player originally included in the package) does not work
and thus the package does not build it. I'll send mail about tiny,
but working player to netbsd-users@netbsd.org soon.

16 files changed, 294 insertions, 0 deletions

diff --git a/graphics/avifile/patches/patch-aa b/graphics/avifile/patches/patch-aa
new file mode 100644
index 00000000000..015258d49c0
--- /dev/null
+++ b/graphics/avifile/patches/patch-aa
@@ -0,0 +1,44 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/aviplay/audio.cpp.orig	Fri Dec 15 07:53:05 2000
++++ lib/aviplay/audio.cpp
+@@ -28,7 +28,11 @@
+ #include <pthread.h>
+ 
+ 
+-#include <sys/soundcard.h>
++#ifdef __NetBSD__
++#include <soundcard.h>
++#else
++ #include <sys/soundcard.h>
++#endif
+ 
+ #include "aviplay_impl.h"
+ #include "audio.h"
+@@ -112,7 +116,7 @@
+ int audio_queue::write(int fd)//writes some data
+ {
+     int startpos, size, tmp;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+     const int AUDIO_BUFFER_SIZE=2048;
+ #else
+     const int AUDIO_BUFFER_SIZE=8192;
+@@ -372,7 +376,7 @@
+ 	audio_fd=-1;
+ 	try
+ 	{
+-    	    audio_fd=open("/dev/dsp",O_RDWR|O_NDELAY);
++    	    audio_fd=open("/dev/audio",O_RDWR|O_NDELAY);
+ 	    if(audio_fd<=0)
+   		throw FATAL("Can't open audio device");
+ 	    if(audio_fd>0)
+@@ -388,7 +392,7 @@
+ 	catch(FatalError&)
+ 	{
+ 	    if(audio_fd>0)::close(audio_fd);
+-	    audio_fd=open("/dev/dsp", O_RDWR);
++	    audio_fd=open("/dev/audio", O_RDWR);
+ 	}
+         if(audio_fd<=0)
+      	    throw FATAL("Can't open audio device");
diff --git a/graphics/avifile/patches/patch-ab b/graphics/avifile/patches/patch-ab
new file mode 100644
index 00000000000..f9dc9bd9c13
--- /dev/null
+++ b/graphics/avifile/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/avifile/File64.h.orig	Sun Nov 26 18:43:55 2000
++++ lib/avifile/File64.h
+@@ -3,7 +3,7 @@
+ 
+ typedef long long 
__int64;
+ //typedef int HANDLE;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #define lseek64 lseek
+ //#else
+ //extern "C" __int64 lseek64(int fd, __int64 offset, int);
diff --git a/graphics/avifile/patches/patch-ac b/graphics/avifile/patches/patch-ac
new file mode 100644
index 00000000000..bac1bc5cfd9
--- /dev/null
+++ b/graphics/avifile/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/avifile/AVIReadHandler2.cpp.orig	Wed Jan 10 19:01:12 2001
++++ lib/avifile/AVIReadHandler2.cpp
+@@ -27,6 +27,10 @@
+ typedef long long
 __int64;
+ //#define STREAMING_DEBUG
+ 
++#if defined(__NetBSD__)
++#define lseek64 lseek
++#endif
++
+ // HACK!!!!
+ 
+ extern pthread_mutex_t g_diskcs;
diff --git a/graphics/avifile/patches/patch-ad b/graphics/avifile/patches/patch-ad
new file mode 100644
index 00000000000..7f4ea92d0f6
--- /dev/null
+++ b/graphics/avifile/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/avifile/FastReadStream.cpp.orig	Sun Nov 26 18:43:55 2000
++++ lib/avifile/FastReadStream.cpp
+@@ -6,7 +6,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/types.h>
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <features.h>
+ #endif
+ #include <unistd.h>
+@@ -16,7 +16,7 @@
+ #include <stdlib.h>
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #define lseek64 lseek
+ #else
+ extern "C" __int64 lseek64(int fd, __int64 offset, int);
diff --git a/graphics/avifile/patches/patch-ae b/graphics/avifile/patches/patch-ae
new file mode 100644
index 00000000000..445e4c90012
--- /dev/null
+++ b/graphics/avifile/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/avifile/Cache.cpp.orig	Tue Oct 10 20:31:37 2000
++++ lib/avifile/Cache.cpp
+@@ -3,6 +3,10 @@
+ #include <except.h>
+ #define BUFFERING 100
+ 
++#ifdef __NetBSD__
++#define lseek64 lseek
++#endif
++
+ class mem_counter
+ {
+ int size;
diff --git a/graphics/avifile/patches/patch-af b/graphics/avifile/patches/patch-af
new file mode 100644
index 00000000000..30510cd4ccc
--- /dev/null
+++ b/graphics/avifile/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/avifile/AviWrite.cpp.orig	Fri Dec  1 12:13:53 2000
++++ lib/avifile/AviWrite.cpp
+@@ -12,7 +12,7 @@
+ 
+ #include "AviWrite.h"
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #define lseek64 lseek
+ #define O_LARGEFILE 0
+ #endif
diff --git a/graphics/avifile/patches/patch-ag b/graphics/avifile/patches/patch-ag
new file mode 100644
index 00000000000..7889be9696f
--- /dev/null
+++ b/graphics/avifile/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- player/Makefile.in.orig	Thu Feb  8 04:19:59 2001
++++ player/Makefile.in
+@@ -207,7 +207,7 @@
+ 
+ MOC = @MOC@
+ UIC = @UIC@
+-LDFLAGS = @LIBS@ @X_LDFLAGS@ -lX11 -lXext @QT_LDFLAGS@  @QT_NAME@ @SDL_LIBS@
++LDFLAGS = @LIBS@ @X_LDFLAGS@ -lX11 -lXext @QT_LDFLAGS@  @QT_NAME@ @SDL_LIBS@ -li386
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../include/config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/graphics/avifile/patches/patch-ai b/graphics/avifile/patches/patch-ai
new file mode 100644
index 00000000000..5bb22d944a7
--- /dev/null
+++ b/graphics/avifile/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/aviplay/Makefile.in.orig	Wed Jan 10 19:02:43 2001
++++ lib/aviplay/Makefile.in
+@@ -210,7 +210,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
+ CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -li386
+ libaviplay_la_LDFLAGS = 
+ libaviplay_la_LIBADD = 
+ libaviplay_la_OBJECTS =  audio.lo aviplay.lo aviutil.lo
diff --git a/graphics/avifile/patches/patch-aj b/graphics/avifile/patches/patch-aj
new file mode 100644
index 00000000000..94ad7c3075b
--- /dev/null
+++ b/graphics/avifile/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/Makefile.in.orig	Wed Jan 10 19:02:33 2001
++++ lib/Makefile.in
+@@ -202,7 +202,7 @@
+ libaviplay_la_LIBADD = loader/libloader.la videocodec/libvideocodec.la avifile/libavi_io.la aviplay/libaviplay.la audiodecoder/libaudiodec.la audioencoder/libaudioenc.la audiodecoder/mpeg/libmpeg.la audioencoder/lame3.70/libmp3lame.la videocodec/DirectShow/libds_videocodec.la
+ 
+ 
+-LDFLAGS = @SDL_LIBS@ @AC3_LIBS@ @AC3_LDADD@
++LDFLAGS = @SDL_LIBS@ @AC3_LIBS@ @AC3_LDADD@ -li386
+ 
+ LIBS = @SDL_LIBS@ @AVILIBDEPLIB@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/avifile/patches/patch-ak b/graphics/avifile/patches/patch-ak
new file mode 100644
index 00000000000..8367fa23f31
--- /dev/null
+++ b/graphics/avifile/patches/patch-ak
@@ -0,0 +1,31 @@
+$NetBSD: patch-ak,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/videocodec/Module.cpp.orig	Sun Dec 17 01:07:43 2000
++++ lib/videocodec/Module.cpp
+@@ -4,7 +4,7 @@
+ #include <registry.h>
+ #include <except.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/time.h>
+ #endif
+ #define __MODULE__ "Win32 loader"
+@@ -138,7 +138,7 @@
+     int result;
+     DRVR* module=(DRVR*)handle;
+     char qw[200];    
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ 	/*   XXX
+ 	 *	disable Thread Context Switch in Windows Dll Calls.
+ 	 *	Because Thread Switched Win32 Dll Calls <-> another threads
+@@ -155,7 +155,7 @@
+     REST_ALL;
+     __asm__ __volatile__ ("fsave (%0)\n\t": :"r"(&qw));    
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+     setitimer(ITIMER_PROF,&itoval,NULL);
+ #endif
+     return result;
diff --git a/graphics/avifile/patches/patch-al b/graphics/avifile/patches/patch-al
new file mode 100644
index 00000000000..487a8f73ff2
--- /dev/null
+++ b/graphics/avifile/patches/patch-al
@@ -0,0 +1,39 @@
+$NetBSD: patch-al,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/loader/driver.c.orig	Mon Dec 18 02:07:13 2000
++++ lib/loader/driver.c
+@@ -13,7 +13,7 @@
+ #include <wine/vfw.h>
+ #include <registry.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/time.h>
+ #endif
+ 
+@@ -38,7 +38,7 @@
+ {
+     DRVR* module=(DRVR*)hDriver;
+     int result;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+     struct itimerval itoval;
+     struct itimerval itval;
+ #endif
+@@ -48,14 +48,14 @@
+     if(module==0)return -1;
+     if(module->hDriverModule==0)return -1;
+     if(module->DriverProc==0)return -1;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+     memset(&itval,0,sizeof(struct itimerval));
+     setitimer(ITIMER_PROF ,&itval,&itoval);
+ #endif
+     STORE_ALL;
+     result=module->DriverProc(module->dwDriverID,1,message,lParam1,lParam2);
+     REST_ALL;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+     setitimer(ITIMER_PROF,&itoval,NULL);
+ #endif
+ #ifdef DETAILED_OUT    
diff --git a/graphics/avifile/patches/patch-am b/graphics/avifile/patches/patch-am
new file mode 100644
index 00000000000..c77ae2af968
--- /dev/null
+++ b/graphics/avifile/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/loader/win32.c.orig	Wed Jan 31 21:23:25 2001
++++ lib/loader/win32.c
+@@ -696,7 +696,7 @@
+ 	cachedsi.wProcessorLevel		= 5; /* pentium */
+ 	cachedsi.wProcessorRevision		= 0x0101;
+ 	
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+         cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
+         cachedsi.wProcessorLevel= 5;
+ 	PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
diff --git a/graphics/avifile/patches/patch-an b/graphics/avifile/patches/patch-an
new file mode 100644
index 00000000000..2080d33f656
--- /dev/null
+++ b/graphics/avifile/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- player/main.cpp.orig	Thu Dec 14 03:37:50 2000
++++ player/main.cpp
+@@ -16,6 +16,9 @@
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
+ #endif
++#ifdef __NetBSD__
++#include <machine/ieeefp.h>
++#endif
+ #include "mywidget.h"
+ #include <default.h>
+ #include <version.h>
diff --git a/graphics/avifile/patches/patch-ao b/graphics/avifile/patches/patch-ao
new file mode 100644
index 00000000000..7e5b610908b
--- /dev/null
+++ b/graphics/avifile/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- player/renderer.cpp.orig	Wed Feb  7 18:21:11 2001
++++ player/renderer.cpp
+@@ -9,7 +9,7 @@
+ 
+ #include <unistd.h>
+ #define QT_CLEAN_NAMESPACE
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <machine/param.h>
+ #include <sys/types.h>
+ #endif
diff --git a/graphics/avifile/patches/patch-ap b/graphics/avifile/patches/patch-ap
new file mode 100644
index 00000000000..40407858c99
--- /dev/null
+++ b/graphics/avifile/patches/patch-ap
@@ -0,0 +1,11 @@
+$NetBSD: patch-ap,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/loader/Makefile.am.orig	Fri Jan 26 17:06:42 2001
++++ lib/loader/Makefile.am
+@@ -7,6 +7,3 @@
+ -D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer -fno-inline
+ 
+ LIBS=
+-
+-stubs.lo: stubs.s
+-	$(CC) -c ./stubs.s -o stubs.lo
diff --git a/graphics/avifile/patches/patch-aq b/graphics/avifile/patches/patch-aq
new file mode 100644
index 00000000000..cda92623159
--- /dev/null
+++ b/graphics/avifile/patches/patch-aq
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+
+--- lib/videocodec/Makefile.am.orig	Wed Jan 10 19:00:05 2001
++++ lib/videocodec/Makefile.am
+@@ -4,7 +4,5 @@
+     ldt_keeper.cpp image.cpp
+ libvideocodec_la_LIBADD=codeckeeper.lo
+ CXXFLAGS=-I../../include
+-codeckeeper.lo: codeckeeper.cpp
+-	$(CXX) $(CXXFLAGS) $(DEFINES) -O0 -fPIC -c codeckeeper.cpp -o codeckeeper.lo
+ 
+ LIBS=