Date: 1 Oct 2000 00:04:43 -0000 From: "Mario Sergio Fujikawa Ferreira" <lioux@uol.com.br> To: FreeBSD-gnats-submit@freebsd.org Cc: holger@eit.uni-kl.de Subject: ports/21663: Update port: graphics/avifile to 0.48 (not fetching anyway) Message-ID: <20001001000443.9627.qmail@Fedaykin.here>
next in thread | raw e-mail | index | archive | help
>Number: 21663 >Category: ports >Synopsis: Update port: graphics/avifile to 0.48 (not fetching anyway) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 30 17:10:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Mario Sergio Fujikawa Ferreira >Release: FreeBSD 4.0-STABLE i386 >Organization: >Environment: FreeBSD Fedaykin.here 4.1-STABLE FreeBSD 4.1-STABLE #10: Sun Sep 24 15:18:36 BRT 2000 lioux@Fedaykin.here:/usr/src/sys/compile/LIOUX i386 >Description: The port is not able to fetch avifile-0.47.1.tar.gz Therefore, I updated the port to the latest available version (0.48) to fix this. + While I was there, I did some updates to the Makefile. - now uses INSTALLS_SHLIB - added appropriate RESTRICTED line - added commented RESTRICTED_FILES for use when PW releases the new code - added a pre-build clean-up - updated pre-install - and added a warning post-install message regarding the fact that this port requires a kernel with USE_LDT - also, enforced the rule: one file patched per patch file + Files added: patches/patch-ae patches/patch-af patches/patch-ag patches/patch-ah patches/patch-ai patches/patch-aj patches/patch-ak + No files were removed + No directories were added/removed >How-To-Repeat: n/a >Fix: diff -ruN /usr/ports/graphics/avifile/Makefile avifile/Makefile --- /usr/ports/graphics/avifile/Makefile Tue Sep 19 13:17:52 2000 +++ avifile/Makefile Sat Sep 30 20:37:33 2000 @@ -6,7 +6,7 @@ # PORTNAME= avifile -PORTVERSION= 0.47.1 +PORTVERSION= 0.48 CATEGORIES= graphics MASTER_SITES= http://divx.euro.ru/ DISTFILES= avifile-${PORTVERSION}${EXTRACT_SUFX} binaries.zip @@ -18,10 +18,14 @@ SDL-1.1.2:${PORTSDIR}/devel/sdl-devel BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip +RESTRICTED= The licensing of the MPEG4 codec is uncertain +#RESTRICTED_FILES= binaries.zip + ONLY_FOR_ARCHS= i386 USE_GMAKE= yes USE_XLIB= yes HAS_CONFIGURE= yes +INSTALLS_SHLIB= yes SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config MOC?= ${X11BASE}/bin/moc2 @@ -32,7 +36,15 @@ --with-qt-includes=${X11BASE}/include/qt2 \ --with-win32-path=${LOCALBASE}/lib/win32 +pre-build: + ${PERL} -pi -e "s| ||;" ${WRKSRC}/lib/videocodec/VideoDecoder.cpp + pre-install: - unzip ${DISTDIR}/binaries.zip -d ${LOCALBASE}/lib/win32 - strip ${WRKSRC}/bin/aviplay ${WRKSRC}/bin/benchmark + unzip ${DISTDIR}/binaries.zip -d ${PREFIX}/lib/win32 + ${STRIP} ${WRKSRC}/bin/aviplay + ${STRIP} ${WRKSRC}/bin/benchmark + +post-install: + @/usr/bin/fmt < ${PKGMESSAGE} + .include <bsd.port.mk> diff -ruN /usr/ports/graphics/avifile/files/md5 avifile/files/md5 --- /usr/ports/graphics/avifile/files/md5 Tue Sep 19 13:17:52 2000 +++ avifile/files/md5 Sat Sep 30 04:07:20 2000 @@ -1,2 +1,2 @@ -MD5 (avifile-0.47.1.tar.gz) = edbad85f6c72d61f3a66d99c61620f39 -MD5 (binaries.zip) = 6df7c0a266ba6e8c022160605791644b +MD5 (avifile-0.48.tar.gz) = 1ef3dc746db373f34288922901577245 +MD5 (binaries.zip) = 2b59bf068c7508ad071fa9aca58cd1e7 diff -ruN /usr/ports/graphics/avifile/patches/patch-aa avifile/patches/patch-aa --- /usr/ports/graphics/avifile/patches/patch-aa Tue Sep 19 13:17:53 2000 +++ avifile/patches/patch-aa Sat Sep 30 04:13:25 2000 @@ -1,5 +1,5 @@ ---- configure.orig Sat Sep 16 11:33:30 2000 -+++ configure Sat Sep 16 11:43:00 2000 +--- configure.orig Sat Sep 30 04:12:20 2000 ++++ configure Sat Sep 30 04:13:03 2000 @@ -2302,7 +2302,7 @@ @@ -18,25 +18,3 @@ 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@ diff -ruN /usr/ports/graphics/avifile/patches/patch-ab avifile/patches/patch-ab --- /usr/ports/graphics/avifile/patches/patch-ab Tue Sep 19 13:17:53 2000 +++ avifile/patches/patch-ab Sat Sep 30 04:14:17 2000 @@ -1,82 +1,11 @@ ---- lib/avifile/AviWrite.cpp.orig Mon Sep 11 15:40:31 2000 -+++ lib/avifile/AviWrite.cpp Wed Sep 13 20:52:55 2000 -@@ -19,7 +19,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"); +--- 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 @@ + -@@ -203,7 +207,11 @@ - } - long long AviWriteFile::FileSize() - { -+#ifdef __Linux__ - return lseek64(m_fd, 0, SEEK_CUR); -+#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; + 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@ diff -ruN /usr/ports/graphics/avifile/patches/patch-ac avifile/patches/patch-ac --- /usr/ports/graphics/avifile/patches/patch-ac Tue Sep 19 13:17:53 2000 +++ avifile/patches/patch-ac Sat Sep 30 04:15:20 2000 @@ -1,11 +1,11 @@ ---- xmps-avi-plugin/Makefile.in.orig Sat Sep 16 14:13:04 2000 -+++ xmps-avi-plugin/Makefile.in Sat Sep 16 14:20:30 2000 -@@ -1,6 +1,6 @@ --LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -lpthread @XMPS_LIBS@ -+LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -pthread @XMPS_LIBS@ +--- 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@ + --INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ -+INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ @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 - all: avi_configure.o avi_codec.o - $(CC) -shared avi_configure.o avi_codec.o $(LIBS) -o libavi.so + MOC=@MOC@ diff -ruN /usr/ports/graphics/avifile/patches/patch-ad avifile/patches/patch-ad --- /usr/ports/graphics/avifile/patches/patch-ad Tue Sep 19 13:17:53 2000 +++ avifile/patches/patch-ad Sat Sep 30 04:17:32 2000 @@ -1,235 +1,32 @@ ---- lib/loader/ext.c.orig Sat Sep 16 17:02:10 2000 -+++ lib/loader/ext.c Sat Sep 16 17:02:14 2000 -@@ -7,7 +7,7 @@ - ********************************************************/ - #include <config.h> - --#include <malloc.h> -+#include <stdlib.h> - #include <unistd.h> - #include <sys/mman.h> - #include <errno.h> ---- lib/loader/win32.c.orig Sat Sep 16 17:03:28 2000 -+++ lib/loader/win32.c Sat Sep 16 17:03:30 2000 -@@ -13,7 +13,7 @@ - #include "win32.h" - #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 ); +--- 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 @@ } - -+/********************************************************************** -+ * 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); + long long AviWriteFile::FileSize() + { ++#ifdef __Linux__ + return lseek64(m_fd, 0, SEEK_CUR); ++#else ++ return lseek(m_fd, 0, SEEK_CUR); +#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; } - /* Messages...used by FormatMessage32* (KERNEL32.something) ---- lib/videocodec/VideoDecoder.cpp.orig Sat Sep 16 17:11:41 2000 -+++ lib/videocodec/VideoDecoder.cpp Sat Sep 16 17:16:25 2000 -@@ -20,7 +20,6 @@ - #include <fcntl.h> - #include <sys/mman.h> - #include <sys/types.h> --#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" + AviWriteStream::AviWriteStream +@@ -357,4 +365,4 @@ + lseek(m_fd, hdr_pos, SEEK_SET); + write_int(hdr_size); + lseek(m_fd, 0, SEEK_END); +-} ++} diff -ruN /usr/ports/graphics/avifile/patches/patch-ae avifile/patches/patch-ae --- /usr/ports/graphics/avifile/patches/patch-ae Wed Dec 31 21:00:00 1969 +++ avifile/patches/patch-ae Sat Sep 30 04:21:39 2000 @@ -0,0 +1,21 @@ +--- 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 diff -ruN /usr/ports/graphics/avifile/patches/patch-af avifile/patches/patch-af --- /usr/ports/graphics/avifile/patches/patch-af Wed Dec 31 21:00:00 1969 +++ avifile/patches/patch-af Sat Sep 30 04:23:09 2000 @@ -0,0 +1,10 @@ +--- player/renderer.cpp.orig Sat Sep 30 04:22:03 2000 ++++ player/renderer.cpp Sat Sep 30 04:22:33 2000 +@@ -12,6 +12,7 @@ + #ifdef __FreeBSD__ + #include <machine/param.h> + #include <sys/types.h> ++#include <unistd.h> + #endif + #include <sys/ipc.h> + #include <sys/shm.h> diff -ruN /usr/ports/graphics/avifile/patches/patch-ag avifile/patches/patch-ag --- /usr/ports/graphics/avifile/patches/patch-ag Wed Dec 31 21:00:00 1969 +++ avifile/patches/patch-ag Sat Sep 30 04:28:53 2000 @@ -0,0 +1,29 @@ +--- 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; diff -ruN /usr/ports/graphics/avifile/patches/patch-ah avifile/patches/patch-ah --- /usr/ports/graphics/avifile/patches/patch-ah Wed Dec 31 21:00:00 1969 +++ avifile/patches/patch-ah Sat Sep 30 04:30:14 2000 @@ -0,0 +1,11 @@ +--- xmps-avi-plugin/Makefile.in.orig Sat Sep 30 04:29:07 2000 ++++ xmps-avi-plugin/Makefile.in Sat Sep 30 04:29:46 2000 +@@ -1,6 +1,6 @@ +-LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -lpthread @XMPS_LIBS@ ++LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -pthread @XMPS_LIBS@ @SDL_LIBS@ + +-INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ ++INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ @SDL_CFLAGS@ + + all: avi_configure.o avi_codec.o + $(CC) -shared avi_configure.o avi_codec.o $(LIBS) -o libavi.so diff -ruN /usr/ports/graphics/avifile/patches/patch-ai avifile/patches/patch-ai --- /usr/ports/graphics/avifile/patches/patch-ai Wed Dec 31 21:00:00 1969 +++ avifile/patches/patch-ai Sat Sep 30 04:36:04 2000 @@ -0,0 +1,11 @@ +--- lib/videocodec/VideoDecoder.cpp.orig Sat Sep 30 04:32:56 2000 ++++ lib/videocodec/VideoDecoder.cpp Sat Sep 30 04:35:33 2000 +@@ -21,6 +21,8 @@ + #include <sys/types.h> + #ifdef HAVE_MALLOC_H + #include <malloc.h> ++#else ++#include <stdlib.h> + #endif + #include <stdio.h> + #include <unistd.h> diff -ruN /usr/ports/graphics/avifile/patches/patch-aj avifile/patches/patch-aj --- /usr/ports/graphics/avifile/patches/patch-aj Wed Dec 31 21:00:00 1969 +++ avifile/patches/patch-aj Sat Sep 30 04:39:21 2000 @@ -0,0 +1,20 @@ +--- 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; +-} ++} diff -ruN /usr/ports/graphics/avifile/patches/patch-ak avifile/patches/patch-ak --- /usr/ports/graphics/avifile/patches/patch-ak Wed Dec 31 21:00:00 1969 +++ avifile/patches/patch-ak Sat Sep 30 04:40:27 2000 @@ -0,0 +1,14 @@ +--- 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" diff -ruN /usr/ports/graphics/avifile/pkg/MESSAGE avifile/pkg/MESSAGE --- /usr/ports/graphics/avifile/pkg/MESSAGE Wed Dec 31 21:00:00 1969 +++ avifile/pkg/MESSAGE Sat Sep 30 20:28:12 2000 @@ -0,0 +1,11 @@ + ATTENTIONATTENTION: + +This port requires a kernel built with +the directive: + +options USE_LDT + +Please, check the FreeBSD Handbook for instructions +on building a custom kernel. If you do not know +where to find it, check the FreeBSD website +http://www.freebsd.org/ diff -ruN /usr/ports/graphics/avifile/pkg/PLIST avifile/pkg/PLIST --- /usr/ports/graphics/avifile/pkg/PLIST Tue Sep 19 13:17:53 2000 +++ avifile/pkg/PLIST Sat Sep 30 19:35:51 2000 @@ -59,8 +59,7 @@ lib/win32/ir41_qc.dll lib/win32/ir50_32.dll lib/win32/ir50_qc.dll +lib/win32/m3jpeg32.dll lib/win32/mpg4c32.dll @dirrm lib/win32 lib/libaviplay.so -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001001000443.9627.qmail>