Attachment #37335 for bug #59475

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




#

PORTNAME=	avifile
PORTVERSION=	0.7.38
PORTEPOCH=	2
CATEGORIES=	multimedia
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-0.7-${PORTVERSION}
EXTRACT_SUFX=	.tgz

MAINTAINER=	holger@e-gitt.net
COMMENT=	AVI player/converter with numerous codecs, including MPEG-4(DivX ;-))

USE_LIBTOOL=	yes
GNU_CONFIGURE=	yes
INSTALLS_SHLIB=	yes

WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:C/^(.{3}).*/\1/}-${PORTVERSION:C/^(.{6}).+$/\1/}

LIBTOOLFILES=	acinclude.m4
CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \

Line 1 Link Here

(-)avifile/distinfo (-1 / +1 lines)
1	MD5 (avifile-0.7.34-20030319.tgz) = 5b3a831ed3d12a5d12d23b8d9673b88d	1	MD5 (avifile-0.7-0.7.38.tar.gz) = db90c4bc0a8a8182b1ec084feca86bbb




--- ffmpeg/libavformat/flvenc.c.orig	Wed Nov 19 10:06:53 2003
+++ ffmpeg/libavformat/flvenc.c	Wed Nov 19 10:08:10 2003
@@ -226,11 +226,12 @@
 {
     ByteIOContext *pb = &s->pb;
     FLVContext *flv = s->priv_data;
-
+    int64_t file_size;
+    int flags = 0;
+    
     Dump(flv,pb,1);
 
-    int64_t file_size = url_ftell(pb);
-    int flags = 0;
+    file_size = url_ftell(pb);
     flags |= flv->hasAudio ? 4 : 0;
     flags |= flv->hasVideo ? 1 : 0;
     url_fseek(pb, 4, SEEK_SET);




--- lib/common/String.cpp.orig	Wed Nov 19 10:51:12 2003
+++ lib/common/String.cpp	Wed Nov 19 10:52:01 2003
@@ -3,6 +3,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 AVM_BEGIN_NAMESPACE;
 
@@ -170,7 +171,7 @@
 #else
     // a bit poor hack but should be sufficient
     // eventually write full implementation
-    s = malloc(1000);
+    s = (char *)malloc(1000);
     r = vsnprintf(str, 999, fmt, ap);
 #endif
     if (s)

Return to bug 59475

Lines 6-18 Link Here

(-)avifile/Makefile (-5 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= avifile	8	PORTNAME= avifile
9	PORTVERSION= 0.7.34.20030319	9	PORTVERSION= 0.7.38
10	PORTEPOCH= 2	10	PORTEPOCH= 2
11	CATEGORIES= multimedia	11	CATEGORIES= multimedia
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/}	14	DISTNAME= ${PORTNAME}-0.7-${PORTVERSION}
15	EXTRACT_SUFX= .tgz
16		15
17	MAINTAINER= holger@e-gitt.net	16	MAINTAINER= holger@e-gitt.net
18	COMMENT= AVI player/converter with numerous codecs, including MPEG-4(DivX ;-))	17	COMMENT= AVI player/converter with numerous codecs, including MPEG-4(DivX ;-))
Lines 26-33 Link Here
26	USE_LIBTOOL= yes	25	USE_LIBTOOL= yes
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
28	INSTALLS_SHLIB= yes	27	INSTALLS_SHLIB= yes
29
30	WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:C/^(.{3}).*/\1/}-${PORTVERSION:C/^(.{6}).+$/\1/}
31		28
32	LIBTOOLFILES= acinclude.m4	29	LIBTOOLFILES= acinclude.m4
33	CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \	30	CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \

Line 0 Link Here

(-)avifile/files/patch-ffmpeg::libavformat::flvenc.c (+18 lines)
	1	--- ffmpeg/libavformat/flvenc.c.orig Wed Nov 19 10:06:53 2003
	2	+++ ffmpeg/libavformat/flvenc.c Wed Nov 19 10:08:10 2003
	3	@@ -226,11 +226,12 @@
	4	{
	5	ByteIOContext *pb = &s->pb;
	6	FLVContext *flv = s->priv_data;
	7	-
	8	+ int64_t file_size;
	9	+ int flags = 0;
	10	+
	11	Dump(flv,pb,1);
	12
	13	- int64_t file_size = url_ftell(pb);
	14	- int flags = 0;
	15	+ file_size = url_ftell(pb);
	16	flags \|= flv->hasAudio ? 4 : 0;
	17	flags \|= flv->hasVideo ? 1 : 0;
	18	url_fseek(pb, 4, SEEK_SET);

Line 0 Link Here

(-)avifile/files/patch-lib::common::String.cpp (+19 lines)
	1	--- lib/common/String.cpp.orig Wed Nov 19 10:51:12 2003
	2	+++ lib/common/String.cpp Wed Nov 19 10:52:01 2003
	3	@@ -3,6 +3,7 @@
	4	#include <ctype.h>
	5	#include <stdio.h>
	6	#include <stdarg.h>
	7	+#include <stdlib.h>
	8
	9	AVM_BEGIN_NAMESPACE;
	10
	11	@@ -170,7 +171,7 @@
	12	#else
	13	// a bit poor hack but should be sufficient
	14	// eventually write full implementation
	15	- s = malloc(1000);
	16	+ s = (char *)malloc(1000);
	17	r = vsnprintf(str, 999, fmt, ap);
	18	#endif
	19	if (s)