Attachment #10887 for bug #21663

View | Details | Raw Unified | Return to bug 21663
Collapse All | Expand All

Lines 6-12 Link Here

(-)avifile/Makefile (-3 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= avifile	8	PORTNAME= avifile
9	PORTVERSION= 0.47.1	9	PORTVERSION= 0.48
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://divx.euro.ru/	11	MASTER_SITES= http://divx.euro.ru/
12	DISTFILES= avifile-${PORTVERSION}${EXTRACT_SUFX} binaries.zip	12	DISTFILES= avifile-${PORTVERSION}${EXTRACT_SUFX} binaries.zip
Lines 18-27 Link Here
18	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel	18	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel
19	BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip	19	BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
20		20
		21	RESTRICTED= The licensing of the MPEG4 codec is uncertain
		22	#RESTRICTED_FILES= binaries.zip
		23
21	ONLY_FOR_ARCHS= i386	24	ONLY_FOR_ARCHS= i386
22	USE_GMAKE= yes	25	USE_GMAKE= yes
23	USE_XLIB= yes	26	USE_XLIB= yes
24	HAS_CONFIGURE= yes	27	HAS_CONFIGURE= yes
		28	INSTALLS_SHLIB= yes
25		29
26	SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config	30	SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
27	MOC?= ${X11BASE}/bin/moc2	31	MOC?= ${X11BASE}/bin/moc2
Lines 32-38 Link Here
32	--with-qt-includes=${X11BASE}/include/qt2 \	36	--with-qt-includes=${X11BASE}/include/qt2 \
33	--with-win32-path=${LOCALBASE}/lib/win32	37	--with-win32-path=${LOCALBASE}/lib/win32
34		38
		39	pre-build:
		40	${PERL} -pi -e "s\| \|\|;" ${WRKSRC}/lib/videocodec/VideoDecoder.cpp
		41
35	pre-install:	42	pre-install:
36	unzip ${DISTDIR}/binaries.zip -d ${LOCALBASE}/lib/win32	43	unzip ${DISTDIR}/binaries.zip -d ${PREFIX}/lib/win32
37	strip ${WRKSRC}/bin/aviplay ${WRKSRC}/bin/benchmark	44	${STRIP} ${WRKSRC}/bin/aviplay
		45	${STRIP} ${WRKSRC}/bin/benchmark
		46
		47	post-install:
		48	@/usr/bin/fmt < ${PKGMESSAGE}
		49
38	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)avifile/files/md5 (-2 / +2 lines)
1	MD5 (avifile-0.47.1.tar.gz) = edbad85f6c72d61f3a66d99c61620f39	1	MD5 (avifile-0.48.tar.gz) = 1ef3dc746db373f34288922901577245
2	MD5 (binaries.zip) = 6df7c0a266ba6e8c022160605791644b	2	MD5 (binaries.zip) = 2b59bf068c7508ad071fa9aca58cd1e7




--- configure.orig	Sat Sep 30 04:12:20 2000
+++ configure	Sat Sep 30 04:13:03 2000
@@ -2302,7 +2302,7 @@
 
 

 
 
 ac_ext=C
--- player/Makefile.in.orig	Sat Sep 16 11:33:26 2000
+++ player/Makefile.in	Sat Sep 16 11:43:46 2000
@@ -7,7 +7,7 @@
     
 
 MOC=@MOC@
-LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
+LIBS=@LIBS@ -lX11 -lXext -lqt2 -laviplay @DGA_LDADD@ @SDL_LIBS@
 LIB_DIRS=-L../lib @QT_LDFLAGS@ -L/usr/X11R6/lib -L/usr/local/lib
 CDOPT=@CD_OPT@
 LDOPT=@LD_OPT@
--- samples/benchmark/Makefile.in.orig	Sat Sep 16 11:33:29 2000
+++ samples/benchmark/Makefile.in	Sat Sep 16 11:43:27 2000
@@ -5,7 +5,7 @@
 CFLAGS=-I../../include -I/usr/X11R6/include @QT_INCLUDES@ @SDL_CFLAGS@
     
 
-LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
+LIBS=@LIBS@ -lX11 -lXext -lqt2 -laviplay @DGA_LDADD@ @SDL_LIBS@
 LIB_DIRS=@QT_LDFLAGS@ -L/usr/X11R6/lib -L../../lib
 
 MOC=@MOC@




--- player/Makefile.in.orig	Sat Sep 30 04:13:40 2000
+++ player/Makefile.in	Sat Sep 30 04:13:49 2000
@@ -7,7 +7,7 @@
     
     {
         m_status=0;
+#ifdef O_LARGEFILE
	m_fd=open(name, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, mask);
+#else
+ 	m_fd=open(name, O_WRONLY | O_CREAT | O_TRUNC, mask);
+#endif
         if(m_fd==-1)
 	    throw FATAL("Can't open file for writing");
 
 MOC=@MOC@
-LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
+LIBS=@LIBS@ -lX11 -lXext -lqt2 -laviplay @DGA_LDADD@ @SDL_LIBS@
 LIB_DIRS=-L../lib @QT_LDFLAGS@ -L/usr/X11R6/lib -L/usr/local/lib
 CDOPT=@CD_OPT@
 LDOPT=@LD_OPT@
+#else
+    return lseek(m_fd, 0, SEEK_CUR);
+#endif
 }
 
 AviWriteStream::AviWriteStream
--- lib/videocodec/Module.h.orig	Sat Sep  9 14:24:49 2000
+++ lib/videocodec/Module.h	Wed Sep 13 20:20:25 2000
@@ -4,6 +4,10 @@
 #include <videoencoder.h>
 #include <list>
 #include <string>
+#ifdef __FreeBSD__
+#include <sys/time.h>
+#endif
+
 using namespace std;
 
 class VideoCodecControl;
--- player/renderer.cpp.orig	Mon Sep 11 08:38:07 2000
+++ player/renderer.cpp	Fri Sep 15 20:22:55 2000
@@ -11,6 +11,7 @@
 #ifdef __FreeBSD__
 #include <machine/param.h>
 #include <sys/types.h>
+#include <unistd.h>
 #endif
 #include <sys/ipc.h>
 #include <sys/shm.h>                               
--- lib/aviplay/aviutil.cpp.orig	Sat Sep 16 13:49:08 2000
+++ lib/aviplay/aviutil.cpp	Sat Sep 16 13:54:06 2000
@@ -28,16 +28,18 @@
 }
 CPU_Freq::CPU_Freq()
 {
-	FILE *f = fopen ("/proc/cpuinfo", "r");
 	char line[200];
 	char model[200]="unknown";
 	char flags[500]="";
 	char	*s,*value;
 	
+#ifdef __FreeBSD__
+	freq=old_freq();
+	cerr<<freq/1000.<<" MHz processor detected"<<endl;
+#else
+	FILE *f = fopen ("/proc/cpuinfo", "r");
+
 	freq=-1;
-//	    freq=old_freq();
-//	    cerr<<freq/1000.<<" MHz processor detected"<<endl;
-//	    return;
 	if (!f)
 	{
 	    printf("Can't open /proc/cpuinfo for reading\n");
@@ -86,6 +88,7 @@
 	}
 #endif
 	fclose(f);
+#endif
 }
 
 CPU_Freq freq;




--- samples/benchmark/Makefile.in.orig	Sat Sep 30 04:14:35 2000
+++ samples/benchmark/Makefile.in	Sat Sep 30 04:14:41 2000
@@ -5,7 +5,7 @@
 CFLAGS=-I../../include -I/usr/X11R6/include @QT_INCLUDES@ @SDL_CFLAGS@
     
 
-LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
+LIBS=@LIBS@ -lX11 -lXext -lqt2 -laviplay @DGA_LDADD@ @SDL_LIBS@
 LIB_DIRS=@QT_LDFLAGS@ -L/usr/X11R6/lib -L../../lib
 
 MOC=@MOC@
 	 $(CC) -shared avi_configure.o avi_codec.o $(LIBS) -o libavi.so




--- lib/avifile/AviWrite.cpp.orig	Sat Sep 30 04:15:50 2000
+++ lib/avifile/AviWrite.cpp	Sat Sep 30 04:16:53 2000
@@ -24,7 +24,11 @@
     try
     {
         m_status=0;
+#ifdef O_LARGEFILE
 	m_fd=open(name, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, mask);
+#else
+	m_fd=open(name, O_WRONLY | O_CREAT | O_TRUNC, mask);
+#endif
         if(m_fd==-1)
 	    throw FATAL("Can't open file for writing");
 	const int junk_size=0x800;
@@ -158,7 +162,11 @@
 #include <stdio.h>
 #include <pthread.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/time.h>
--- lib/loader/driver.c.orig	Sat Sep 16 17:04:30 2000
+++ lib/loader/driver.c	Sat Sep 16 17:04:32 2000
@@ -1,6 +1,6 @@
 #include <config.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <wine/driver.h>
 #include <wine/pe_image.h>
 #include <wine/winreg.h>
--- lib/loader/resource.c.orig	Sat Sep 16 17:07:41 2000
+++ lib/loader/resource.c	Sat Sep 16 17:08:00 2000
@@ -253,6 +253,56 @@
     return RES_SizeofResource( hModule, hRsrc );
 }
 long long AviWriteFile::FileSize()
 {
+#ifdef __Linux__
     return lseek64(m_fd, 0, SEEK_CUR);
+#else
+    return lseek(m_fd, 0, SEEK_CUR);
+{
+    HGLOBAL hmem;
+    HRSRC hrsrc;
+    WCHAR *p;
+    int string_num;
+    int i;
+
+    if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
+	resource_id = (UINT)(-((INT)resource_id));
+    TRACE("instance = %04x, id = %04x, buffer = %08x, "
+          "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
+
+    /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out 
+     * 20 - 31. */
+    hrsrc = FindResourceW( instance, (LPCWSTR)(((resource_id>>4)&0xffff)+1),
+                             RT_STRINGW );
+    if (!hrsrc) return 0;
+    hmem = LoadResource( instance, hrsrc );
+    if (!hmem) return 0;
+    
+    p = LockResource(hmem);
+    string_num = resource_id & 0x000f;
+    for (i = 0; i < string_num; i++)
+	p += *p + 1;
+    
+    TRACE("strlen = %d\n", (int)*p );
+    
+    if (buffer == NULL) return *p;
+    i = min(buflen - 1, *p);
+    if (i > 0) {
+	memcpy(buffer, p + 1, i * sizeof (WCHAR));
+	buffer[i] = (WCHAR) 0;
+    } else {
+	if (buflen > 1) {
+	    buffer[0] = (WCHAR) 0;
+	    return 0;
+	}
+#if 0
+	WARN("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
+#endif
+    }
+
+    TRACE("String loaded !\n");
+    return i;
+}
 
 
 /**********************************************************************
@@ -303,57 +353,6 @@
     HeapFree( GetProcessHeap(), 0, wbuf );
 
     return retval;
-}
-
-/**********************************************************************
- *	LoadStringW		(USER32.376)
- */
-INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
-                            LPWSTR buffer, INT buflen )
-{
-    HGLOBAL hmem;
-    HRSRC hrsrc;
-    WCHAR *p;
-    int string_num;
-    int i;
-
-    if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
-	resource_id = (UINT)(-((INT)resource_id));
-    TRACE("instance = %04x, id = %04x, buffer = %08x, "
-          "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
-
-    /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out 
-     * 20 - 31. */
-    hrsrc = FindResourceW( instance, (LPCWSTR)(((resource_id>>4)&0xffff)+1),
-                             RT_STRINGW );
-    if (!hrsrc) return 0;
-    hmem = LoadResource( instance, hrsrc );
-    if (!hmem) return 0;
-    
-    p = LockResource(hmem);
-    string_num = resource_id & 0x000f;
-    for (i = 0; i < string_num; i++)
-	p += *p + 1;
-    
-    TRACE("strlen = %d\n", (int)*p );
-    
-    if (buffer == NULL) return *p;
-    i = min(buflen - 1, *p);
-    if (i > 0) {
-	memcpy(buffer, p + 1, i * sizeof (WCHAR));
-	buffer[i] = (WCHAR) 0;
-    } else {
-	if (buflen > 1) {
-	    buffer[0] = (WCHAR) 0;
-	    return 0;
-	}
-#if 0
-	WARN("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
-#endif
-    }
-
-    TRACE("String loaded !\n");
-    return i;
 }
 
 AviWriteStream::AviWriteStream
@@ -357,4 +365,4 @@
     lseek(m_fd, hdr_pos, SEEK_SET);
     write_int(hdr_size);
     lseek(m_fd, 0, SEEK_END);    
-}
+}
-#include <malloc.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <strstream>
--- lib/avifile/Cache.h.orig	Sat Sep 16 17:22:11 2000
+++ lib/avifile/Cache.h	Sat Sep 16 17:22:14 2000
@@ -2,7 +2,7 @@
 #include <default.h>
 #define _LARGEFILE64_SOURCE
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <pthread.h>
--- lib/avifile/FastReadStream.cpp.orig	Sat Sep 16 17:23:45 2000
+++ lib/avifile/FastReadStream.cpp	Sat Sep 16 17:23:47 2000
@@ -8,7 +8,7 @@
 #include <features.h>
 #endif
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #ifdef __FreeBSD__
 #define lseek64 lseek
--- lib/avifile/AviRead.h.orig	Sat Sep 16 17:25:10 2000
+++ lib/avifile/AviRead.h	Sat Sep 16 17:25:13 2000
@@ -10,7 +10,7 @@
 #include <avifmt.h>
 #include <default.h>
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <pthread.h>
--- lib/avifile/AviWrite.h.orig	Sat Sep 16 17:26:35 2000
+++ lib/avifile/AviWrite.h	Sat Sep 16 17:26:37 2000
@@ -11,7 +11,7 @@
 #include <avifmt.h>
 #include <default.h>
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <pthread.h>
--- samples/benchmark/main.cpp.orig	Sat Sep 16 17:28:22 2000
+++ samples/benchmark/main.cpp	Sat Sep 16 17:28:24 2000
@@ -9,7 +9,6 @@
 #include <config.h>
 
 #include <stdio.h>
-#include <malloc.h>
 #include <signal.h>
 #include <iostream.h>
 #include <unistd.h>
--- samples/benchmark/renderer.cpp.orig	Sat Sep 16 17:29:28 2000
+++ samples/benchmark/renderer.cpp	Sat Sep 16 17:29:29 2000
@@ -14,7 +14,7 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>                               
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <pthread.h>
 #include "renderer.h"
 #include "RegAccess.h"
--- player/renderer.cpp.orig	Sat Sep 16 22:31:56 2000
+++ player/renderer.cpp	Sat Sep 16 22:32:02 2000
@@ -16,7 +16,7 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>                               
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <pthread.h>
 #include "renderer.h"
 #include "RegAccess.h"




--- lib/videocodec/Module.h.orig	Sat Sep 30 04:17:54 2000
+++ lib/videocodec/Module.h	Sat Sep 30 04:21:07 2000
@@ -4,6 +4,12 @@
 #include <videoencoder.h>
 #include <list>
 #include <string>
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+#if (defined(BSD) && (BSD >= 199103))
+#include <sys/time.h>
+#endif
 using namespace std;
 
 class VideoCodecControl;
@@ -79,4 +85,4 @@
 };
 extern VideoCodecControl control;
 
-#endif
+#endif

Line 0 Link Here

(-)avifile/patches/patch-af (+10 lines)
	1	--- player/renderer.cpp.orig Sat Sep 30 04:22:03 2000
	2	+++ player/renderer.cpp Sat Sep 30 04:22:33 2000
	3	@@ -12,6 +12,7 @@
	4	#ifdef __FreeBSD__
	5	#include <machine/param.h>
	6	#include <sys/types.h>
	7	+#include <unistd.h>
	8	#endif
	9	#include <sys/ipc.h>
	10	#include <sys/shm.h>




--- lib/aviplay/aviutil.cpp.orig	Sat Sep 30 04:23:22 2000
+++ lib/aviplay/aviutil.cpp	Sat Sep 30 04:27:57 2000
@@ -29,11 +29,17 @@
 }
 CPU_Freq::CPU_Freq()
 {
-	FILE *f = fopen ("/proc/cpuinfo", "r");
+	FILE *f;
 	char line[200];
 	char model[200]="unknown";
 	char flags[500]="";
 	char	*s,*value;
+
+#ifdef __FreeBSD
+	freq=old_freq();
+	cerr<<freq/1000.<<" Mhz procesor detected"<<endl;
+#else
+	f = fopen ("/proc/cpuinfo", "r");
 	
 	freq=-1;
 //	    freq=old_freq();
@@ -87,6 +93,7 @@
 	}
 #endif
 	fclose(f);
+#endif
 }
 
 CPU_Freq freq;

Line 0 Link Here

(-)avifile/patches/patch-ah (+11 lines)
	1	--- xmps-avi-plugin/Makefile.in.orig Sat Sep 30 04:29:07 2000
	2	+++ xmps-avi-plugin/Makefile.in Sat Sep 30 04:29:46 2000
	3	@@ -1,6 +1,6 @@
	4	-LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -lpthread @XMPS_LIBS@
	5	+LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -pthread @XMPS_LIBS@ @SDL_LIBS@
	6
	7	-INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@
	8	+INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ @SDL_CFLAGS@
	9
	10	all: avi_configure.o avi_codec.o
	11	$(CC) -shared avi_configure.o avi_codec.o $(LIBS) -o libavi.so

Line 0 Link Here

(-)avifile/patches/patch-ai (+11 lines)
	1	--- lib/videocodec/VideoDecoder.cpp.orig Sat Sep 30 04:32:56 2000
	2	+++ lib/videocodec/VideoDecoder.cpp Sat Sep 30 04:35:33 2000
	3	@@ -21,6 +21,8 @@
	4	#include <sys/types.h>
	5	#ifdef HAVE_MALLOC_H
	6	#include <malloc.h>
	7	+#else
	8	+#include <stdlib.h>
	9	#endif
	10	#include <stdio.h>
	11	#include <unistd.h>




--- samples/benchmark/main.cpp.orig	Sat Sep 30 04:37:53 2000
+++ samples/benchmark/main.cpp	Sat Sep 30 04:38:22 2000
@@ -9,7 +9,11 @@
 #include <config.h>
 
 #include <stdio.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
 #include <signal.h>
 #include <iostream.h>
 #include <unistd.h>
@@ -161,4 +165,4 @@
     if(file)delete file;
     if(m)delete m;	
     return 0;
-}
+}




--- samples/benchmark/renderer.cpp.orig	Sat Sep 30 04:39:43 2000
+++ samples/benchmark/renderer.cpp	Sat Sep 30 04:39:51 2000
@@ -14,7 +14,11 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>                               
 
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
 #include <pthread.h>
 #include "renderer.h"
 #include "RegAccess.h"

Line 0 Link Here

(-)avifile/pkg/MESSAGE (+11 lines)
	1	ATTENTIONATTENTION:
	2
	3	This port requires a kernel built with
	4	the directive:
	5
	6	options USE_LDT
	7
	8	Please, check the FreeBSD Handbook for instructions
	9	on building a custom kernel. If you do not know
	10	where to find it, check the FreeBSD website
	11	http://www.freebsd.org/

Lines 59-66 Link Here

(-)avifile/pkg/PLIST (-2 / +1 lines)
59	lib/win32/ir41_qc.dll	59	lib/win32/ir41_qc.dll
60	lib/win32/ir50_32.dll	60	lib/win32/ir50_32.dll
61	lib/win32/ir50_qc.dll	61	lib/win32/ir50_qc.dll
		62	lib/win32/m3jpeg32.dll
62	lib/win32/mpg4c32.dll	63	lib/win32/mpg4c32.dll
63	@dirrm lib/win32	64	@dirrm lib/win32
64	lib/libaviplay.so	65	lib/libaviplay.so
65	@exec /sbin/ldconfig -m %D/lib
66	@unexec /sbin/ldconfig -R

Return to bug 21663

Lines 1-5 Link Here

(-)avifile/patches/patch-aa (-24 / +2 lines)
1	--- configure.orig Sat Sep 16 11:33:30 2000	1	--- configure.orig Sat Sep 30 04:12:20 2000
2	+++ configure Sat Sep 16 11:43:00 2000	2	+++ configure Sat Sep 30 04:13:03 2000
3	@@ -2302,7 +2302,7 @@	3	@@ -2302,7 +2302,7 @@
4		4
5		5
Lines 18-42 Link Here
18		18
19		19
20	ac_ext=C	20	ac_ext=C
21	--- player/Makefile.in.orig Sat Sep 16 11:33:26 2000
22	+++ player/Makefile.in Sat Sep 16 11:43:46 2000
23	@@ -7,7 +7,7 @@
24
25
26	MOC=@MOC@
27	-LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
28	+LIBS=@LIBS@ -lX11 -lXext -lqt2 -laviplay @DGA_LDADD@ @SDL_LIBS@
29	LIB_DIRS=-L../lib @QT_LDFLAGS@ -L/usr/X11R6/lib -L/usr/local/lib
30	CDOPT=@CD_OPT@
31	LDOPT=@LD_OPT@
32	--- samples/benchmark/Makefile.in.orig Sat Sep 16 11:33:29 2000
33	+++ samples/benchmark/Makefile.in Sat Sep 16 11:43:27 2000
34	@@ -5,7 +5,7 @@
35	CFLAGS=-I../../include -I/usr/X11R6/include @QT_INCLUDES@ @SDL_CFLAGS@
36
37
38	-LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
39	+LIBS=@LIBS@ -lX11 -lXext -lqt2 -laviplay @DGA_LDADD@ @SDL_LIBS@
40	LIB_DIRS=@QT_LDFLAGS@ -L/usr/X11R6/lib -L../../lib
41
42	MOC=@MOC@

Lines 1-82 Link Here

(-)avifile/patches/patch-ab (-81 / +10 lines)
1	--- lib/avifile/AviWrite.cpp.orig Mon Sep 11 15:40:31 2000	1	--- player/Makefile.in.orig Sat Sep 30 04:13:40 2000
2	+++ lib/avifile/AviWrite.cpp Wed Sep 13 20:52:55 2000	2	+++ player/Makefile.in Sat Sep 30 04:13:49 2000
3	@@ -19,7 +19,11 @@	3	@@ -7,7 +7,7 @@
4	try	4
5	{
6	m_status=0;
7	+#ifdef O_LARGEFILE
8	m_fd=open(name, O_WRONLY \| O_CREAT \| O_TRUNC \| O_LARGEFILE, mask);
9	+#else
10	+ m_fd=open(name, O_WRONLY \| O_CREAT \| O_TRUNC, mask);
11	+#endif
12	if(m_fd==-1)
13	throw FATAL("Can't open file for writing");
14		5
15	@@ -203,7 +207,11 @@	6	MOC=@MOC@
16	}	7	-LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
17	long long AviWriteFile::FileSize()	8	+LIBS=@LIBS@ -lX11 -lXext -lqt2 -laviplay @DGA_LDADD@ @SDL_LIBS@
18	{	9	LIB_DIRS=-L../lib @QT_LDFLAGS@ -L/usr/X11R6/lib -L/usr/local/lib
19	+#ifdef __Linux__	10	CDOPT=@CD_OPT@
20	return lseek64(m_fd, 0, SEEK_CUR);	11	LDOPT=@LD_OPT@
21	+#else
22	+ return lseek(m_fd, 0, SEEK_CUR);
23	+#endif
24	}
25
26	AviWriteStream::AviWriteStream
27	--- lib/videocodec/Module.h.orig Sat Sep 9 14:24:49 2000
28	+++ lib/videocodec/Module.h Wed Sep 13 20:20:25 2000
29	@@ -4,6 +4,10 @@
30	#include <videoencoder.h>
31	#include <list>
32	#include <string>
33	+#ifdef __FreeBSD__
34	+#include <sys/time.h>
35	+#endif
36	+
37	using namespace std;
38
39	class VideoCodecControl;
40	--- player/renderer.cpp.orig Mon Sep 11 08:38:07 2000
41	+++ player/renderer.cpp Fri Sep 15 20:22:55 2000
42	@@ -11,6 +11,7 @@
43	#ifdef __FreeBSD__
44	#include <machine/param.h>
45	#include <sys/types.h>
46	+#include <unistd.h>
47	#endif
48	#include <sys/ipc.h>
49	#include <sys/shm.h>
50	--- lib/aviplay/aviutil.cpp.orig Sat Sep 16 13:49:08 2000
51	+++ lib/aviplay/aviutil.cpp Sat Sep 16 13:54:06 2000
52	@@ -28,16 +28,18 @@
53	}
54	CPU_Freq::CPU_Freq()
55	{
56	- FILE *f = fopen ("/proc/cpuinfo", "r");
57	char line[200];
58	char model[200]="unknown";
59	char flags[500]="";
60	char s,value;
61
62	+#ifdef __FreeBSD__
63	+ freq=old_freq();
64	+ cerr<<freq/1000.<<" MHz processor detected"<<endl;
65	+#else
66	+ FILE *f = fopen ("/proc/cpuinfo", "r");
67	+
68	freq=-1;
69	-// freq=old_freq();
70	-// cerr<<freq/1000.<<" MHz processor detected"<<endl;
71	-// return;
72	if (!f)
73	{
74	printf("Can't open /proc/cpuinfo for reading\n");
75	@@ -86,6 +88,7 @@
76	}
77	#endif
78	fclose(f);
79	+#endif
80	}
81
82	CPU_Freq freq;

Lines 1-11 Link Here

(-)avifile/patches/patch-ac (-9 / +9 lines)
1	--- xmps-avi-plugin/Makefile.in.orig Sat Sep 16 14:13:04 2000	1	--- samples/benchmark/Makefile.in.orig Sat Sep 30 04:14:35 2000
2	+++ xmps-avi-plugin/Makefile.in Sat Sep 16 14:20:30 2000	2	+++ samples/benchmark/Makefile.in Sat Sep 30 04:14:41 2000
3	@@ -1,6 +1,6 @@	3	@@ -5,7 +5,7 @@
4	-LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -lpthread @XMPS_LIBS@	4	CFLAGS=-I../../include -I/usr/X11R6/include @QT_INCLUDES@ @SDL_CFLAGS@
5	+LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -pthread @XMPS_LIBS@	5
6		6
7	-INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@	7	-LIBS=@LIBS@ -lX11 -lXext -lqt -laviplay @DGA_LDADD@ @SDL_LIBS@
8	+INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ @SDL_CFLAGS@	8	+LIBS=@LIBS@ -lX11 -lXext -lqt2 -laviplay @DGA_LDADD@ @SDL_LIBS@
		9	LIB_DIRS=@QT_LDFLAGS@ -L/usr/X11R6/lib -L../../lib
9		10
10	all: avi_configure.o avi_codec.o	11	MOC=@MOC@
11	$(CC) -shared avi_configure.o avi_codec.o $(LIBS) -o libavi.so

Lines 1-235 Link Here

(-)avifile/patches/patch-ad (-231 / +28 lines)
1	--- lib/loader/ext.c.orig Sat Sep 16 17:02:10 2000	1	--- lib/avifile/AviWrite.cpp.orig Sat Sep 30 04:15:50 2000
2	+++ lib/loader/ext.c Sat Sep 16 17:02:14 2000	2	+++ lib/avifile/AviWrite.cpp Sat Sep 30 04:16:53 2000
3	@@ -7,7 +7,7 @@	3	@@ -24,7 +24,11 @@
4	********************************************************/	4	try
5	#include <config.h>	5	{
6		6	m_status=0;
7	-#include <malloc.h>	7	+#ifdef O_LARGEFILE
8	+#include <stdlib.h>	8	m_fd=open(name, O_WRONLY \| O_CREAT \| O_TRUNC \| O_LARGEFILE, mask);
9	#include <unistd.h>	9	+#else
10	#include <sys/mman.h>	10	+ m_fd=open(name, O_WRONLY \| O_CREAT \| O_TRUNC, mask);
11	#include <errno.h>	11	+#endif
12	--- lib/loader/win32.c.orig Sat Sep 16 17:03:28 2000	12	if(m_fd==-1)
13	+++ lib/loader/win32.c Sat Sep 16 17:03:30 2000	13	throw FATAL("Can't open file for writing");
14	@@ -13,7 +13,7 @@	14	const int junk_size=0x800;
15	#include "win32.h"	15	@@ -158,7 +162,11 @@
16	#include <stdio.h>
17	#include <pthread.h>
18	-#include <malloc.h>
19	+#include <stdlib.h>
20	#include <time.h>
21	#include <sys/types.h>
22	#include <sys/time.h>
23	--- lib/loader/driver.c.orig Sat Sep 16 17:04:30 2000
24	+++ lib/loader/driver.c Sat Sep 16 17:04:32 2000
25	@@ -1,6 +1,6 @@
26	#include <config.h>
27	#include <stdio.h>
28	-#include <malloc.h>
29	+#include <stdlib.h>
30	#include <wine/driver.h>
31	#include <wine/pe_image.h>
32	#include <wine/winreg.h>
33	--- lib/loader/resource.c.orig Sat Sep 16 17:07:41 2000
34	+++ lib/loader/resource.c Sat Sep 16 17:08:00 2000
35	@@ -253,6 +253,56 @@
36	return RES_SizeofResource( hModule, hRsrc );
37	}	16	}
38		17	long long AviWriteFile::FileSize()
39	+/**********************************************************************	18	{
40	+ * LoadStringW (USER32.376)	19	+#ifdef __Linux__
41	+ */	20	return lseek64(m_fd, 0, SEEK_CUR);
42	+INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,	21	+#else
43	+ LPWSTR buffer, INT buflen )	22	+ return lseek(m_fd, 0, SEEK_CUR);
44	+{
45	+ HGLOBAL hmem;
46	+ HRSRC hrsrc;
47	+ WCHAR *p;
48	+ int string_num;
49	+ int i;
50	+
51	+ if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
52	+ resource_id = (UINT)(-((INT)resource_id));
53	+ TRACE("instance = %04x, id = %04x, buffer = %08x, "
54	+ "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
55	+
56	+ /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out
57	+ * 20 - 31. */
58	+ hrsrc = FindResourceW( instance, (LPCWSTR)(((resource_id>>4)&0xffff)+1),
59	+ RT_STRINGW );
60	+ if (!hrsrc) return 0;
61	+ hmem = LoadResource( instance, hrsrc );
62	+ if (!hmem) return 0;
63	+
64	+ p = LockResource(hmem);
65	+ string_num = resource_id & 0x000f;
66	+ for (i = 0; i < string_num; i++)
67	+ p += *p + 1;
68	+
69	+ TRACE("strlen = %d\n", (int)*p );
70	+
71	+ if (buffer == NULL) return *p;
72	+ i = min(buflen - 1, *p);
73	+ if (i > 0) {
74	+ memcpy(buffer, p + 1, i * sizeof (WCHAR));
75	+ buffer[i] = (WCHAR) 0;
76	+ } else {
77	+ if (buflen > 1) {
78	+ buffer[0] = (WCHAR) 0;
79	+ return 0;
80	+ }
81	+#if 0
82	+ WARN("Dont know why caller give buflen=%d p=%d trying to obtain string '%s'\n", buflen, p, p + 1);
83	+#endif	23	+#endif
84	+ }
85	+
86	+ TRACE("String loaded !\n");
87	+ return i;
88	+}
89
90
91	/**********************************************************************
92	@@ -303,57 +353,6 @@
93	HeapFree( GetProcessHeap(), 0, wbuf );
94
95	return retval;
96	-}
97	-
98	-/**********************************************************************
99	- * LoadStringW (USER32.376)
100	- */
101	-INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
102	- LPWSTR buffer, INT buflen )
103	-{
104	- HGLOBAL hmem;
105	- HRSRC hrsrc;
106	- WCHAR *p;
107	- int string_num;
108	- int i;
109	-
110	- if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
111	- resource_id = (UINT)(-((INT)resource_id));
112	- TRACE("instance = %04x, id = %04x, buffer = %08x, "
113	- "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
114	-
115	- /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out
116	- * 20 - 31. */
117	- hrsrc = FindResourceW( instance, (LPCWSTR)(((resource_id>>4)&0xffff)+1),
118	- RT_STRINGW );
119	- if (!hrsrc) return 0;
120	- hmem = LoadResource( instance, hrsrc );
121	- if (!hmem) return 0;
122	-
123	- p = LockResource(hmem);
124	- string_num = resource_id & 0x000f;
125	- for (i = 0; i < string_num; i++)
126	- p += *p + 1;
127	-
128	- TRACE("strlen = %d\n", (int)*p );
129	-
130	- if (buffer == NULL) return *p;
131	- i = min(buflen - 1, *p);
132	- if (i > 0) {
133	- memcpy(buffer, p + 1, i * sizeof (WCHAR));
134	- buffer[i] = (WCHAR) 0;
135	- } else {
136	- if (buflen > 1) {
137	- buffer[0] = (WCHAR) 0;
138	- return 0;
139	- }
140	-#if 0
141	- WARN("Dont know why caller give buflen=%d p=%d trying to obtain string '%s'\n", buflen, p, p + 1);
142	-#endif
143	- }
144	-
145	- TRACE("String loaded !\n");
146	- return i;
147	}	24	}
148		25
149	/* Messages...used by FormatMessage32* (KERNEL32.something)	26	AviWriteStream::AviWriteStream
150	--- lib/videocodec/VideoDecoder.cpp.orig Sat Sep 16 17:11:41 2000	27	@@ -357,4 +365,4 @@
151	+++ lib/videocodec/VideoDecoder.cpp Sat Sep 16 17:16:25 2000	28	lseek(m_fd, hdr_pos, SEEK_SET);
152	@@ -20,7 +20,6 @@	29	write_int(hdr_size);
153	#include <fcntl.h>	30	lseek(m_fd, 0, SEEK_END);
154	#include <sys/mman.h>	31	-}
155	#include <sys/types.h>	32	+}
156	-#include <malloc.h>
157	#include <stdio.h>
158	#include <unistd.h>
159	#include <strstream>
160	--- lib/avifile/Cache.h.orig Sat Sep 16 17:22:11 2000
161	+++ lib/avifile/Cache.h Sat Sep 16 17:22:14 2000
162	@@ -2,7 +2,7 @@
163	#include <default.h>
164	#define _LARGEFILE64_SOURCE
165	#include <unistd.h>
166	-#include <malloc.h>
167	+#include <stdlib.h>
168	#include <string.h>
169	#include <stdio.h>
170	#include <pthread.h>
171	--- lib/avifile/FastReadStream.cpp.orig Sat Sep 16 17:23:45 2000
172	+++ lib/avifile/FastReadStream.cpp Sat Sep 16 17:23:47 2000
173	@@ -8,7 +8,7 @@
174	#include <features.h>
175	#endif
176	#include <unistd.h>
177	-#include <malloc.h>
178	+#include <stdlib.h>
179
180	#ifdef __FreeBSD__
181	#define lseek64 lseek
182	--- lib/avifile/AviRead.h.orig Sat Sep 16 17:25:10 2000
183	+++ lib/avifile/AviRead.h Sat Sep 16 17:25:13 2000
184	@@ -10,7 +10,7 @@
185	#include <avifmt.h>
186	#include <default.h>
187	#include <unistd.h>
188	-#include <malloc.h>
189	+#include <stdlib.h>
190	#include <string.h>
191	#include <stdio.h>
192	#include <pthread.h>
193	--- lib/avifile/AviWrite.h.orig Sat Sep 16 17:26:35 2000
194	+++ lib/avifile/AviWrite.h Sat Sep 16 17:26:37 2000
195	@@ -11,7 +11,7 @@
196	#include <avifmt.h>
197	#include <default.h>
198	#include <unistd.h>
199	-#include <malloc.h>
200	+#include <stdlib.h>
201	#include <string.h>
202	#include <stdio.h>
203	#include <pthread.h>
204	--- samples/benchmark/main.cpp.orig Sat Sep 16 17:28:22 2000
205	+++ samples/benchmark/main.cpp Sat Sep 16 17:28:24 2000
206	@@ -9,7 +9,6 @@
207	#include <config.h>
208
209	#include <stdio.h>
210	-#include <malloc.h>
211	#include <signal.h>
212	#include <iostream.h>
213	#include <unistd.h>
214	--- samples/benchmark/renderer.cpp.orig Sat Sep 16 17:29:28 2000
215	+++ samples/benchmark/renderer.cpp Sat Sep 16 17:29:29 2000
216	@@ -14,7 +14,7 @@
217	#include <sys/ipc.h>
218	#include <sys/shm.h>
219
220	-#include <malloc.h>
221	+#include <stdlib.h>
222	#include <pthread.h>
223	#include "renderer.h"
224	#include "RegAccess.h"
225	--- player/renderer.cpp.orig Sat Sep 16 22:31:56 2000
226	+++ player/renderer.cpp Sat Sep 16 22:32:02 2000
227	@@ -16,7 +16,7 @@
228	#include <sys/ipc.h>
229	#include <sys/shm.h>
230
231	-#include <malloc.h>
232	+#include <stdlib.h>
233	#include <pthread.h>
234	#include "renderer.h"
235	#include "RegAccess.h"

Line 0 Link Here

(-)avifile/patches/patch-ae (+21 lines)
	1	--- lib/videocodec/Module.h.orig Sat Sep 30 04:17:54 2000
	2	+++ lib/videocodec/Module.h Sat Sep 30 04:21:07 2000
	3	@@ -4,6 +4,12 @@
	4	#include <videoencoder.h>
	5	#include <list>
	6	#include <string>
	7	+#if (defined(__unix__) \|\| defined(unix)) && !defined(USG)
	8	+#include <sys/param.h>
	9	+#endif
	10	+#if (defined(BSD) && (BSD >= 199103))
	11	+#include <sys/time.h>
	12	+#endif
	13	using namespace std;
	14
	15	class VideoCodecControl;
	16	@@ -79,4 +85,4 @@
	17	};
	18	extern VideoCodecControl control;
	19
	20	-#endif
	21	+#endif

Line 0 Link Here

(-)avifile/patches/patch-ag (+29 lines)
	1	--- lib/aviplay/aviutil.cpp.orig Sat Sep 30 04:23:22 2000
	2	+++ lib/aviplay/aviutil.cpp Sat Sep 30 04:27:57 2000
	3	@@ -29,11 +29,17 @@
	4	}
	5	CPU_Freq::CPU_Freq()
	6	{
	7	- FILE *f = fopen ("/proc/cpuinfo", "r");
	8	+ FILE *f;
	9	char line[200];
	10	char model[200]="unknown";
	11	char flags[500]="";
	12	char s,value;
	13	+
	14	+#ifdef __FreeBSD
	15	+ freq=old_freq();
	16	+ cerr<<freq/1000.<<" Mhz procesor detected"<<endl;
	17	+#else
	18	+ f = fopen ("/proc/cpuinfo", "r");
	19
	20	freq=-1;
	21	// freq=old_freq();
	22	@@ -87,6 +93,7 @@
	23	}
	24	#endif
	25	fclose(f);
	26	+#endif
	27	}
	28
	29	CPU_Freq freq;

Line 0 Link Here

(-)avifile/patches/patch-aj (+20 lines)
	1	--- samples/benchmark/main.cpp.orig Sat Sep 30 04:37:53 2000
	2	+++ samples/benchmark/main.cpp Sat Sep 30 04:38:22 2000
	3	@@ -9,7 +9,11 @@
	4	#include <config.h>
	5
	6	#include <stdio.h>
	7	+#ifdef HAVE_MALLOC_H
	8	#include <malloc.h>
	9	+#else
	10	+#include <stdlib.h>
	11	+#endif
	12	#include <signal.h>
	13	#include <iostream.h>
	14	#include <unistd.h>
	15	@@ -161,4 +165,4 @@
	16	if(file)delete file;
	17	if(m)delete m;
	18	return 0;
	19	-}
	20	+}

Line 0 Link Here

(-)avifile/patches/patch-ak (+14 lines)
	1	--- samples/benchmark/renderer.cpp.orig Sat Sep 30 04:39:43 2000
	2	+++ samples/benchmark/renderer.cpp Sat Sep 30 04:39:51 2000
	3	@@ -14,7 +14,11 @@
	4	#include <sys/ipc.h>
	5	#include <sys/shm.h>
	6
	7	+#ifdef HAVE_MALLOC_H
	8	#include <malloc.h>
	9	+#else
	10	+#include <stdlib.h>
	11	+#endif
	12	#include <pthread.h>
	13	#include "renderer.h"
	14	#include "RegAccess.h"