ports/59475: Update: multimedia/avifile

[Holger Lamm]

>Number:         59475
>Category:       ports
>Synopsis:       Update: multimedia/avifile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 19 07:20:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Holger Lamm
>Release:        FreeBSD 4.9-RC i386
>Organization:
>Environment:
System: FreeBSD hl.homeunix.net 4.9-RC FreeBSD 4.9-RC #0: Sat Oct 25 21:15:57 CEST 2003 root at neo:/halde/world/usr/src/sys/NEO i386


	
>Description:

Version bumped to 0.7.38
Fixes PR 59138, 53026

Files added with this patch:
- files/patch-ffmpeg::libavformat::flvenc.c
- files/patch-lib::common::String.cpp

>How-To-Repeat:

>Fix:

diff -Nur avifile.orig/Makefile avifile/Makefile
--- avifile.orig/Makefile	Wed Nov 19 15:21:02 2003
+++ avifile/Makefile	Wed Nov 19 09:46:14 2003
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.7.34.20030319
+PORTVERSION=	0.7.38
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}-0.7-${PORTVERSION}
 
 MAINTAINER=	holger at e-gitt.net
 COMMENT=	AVI player/converter with numerous codecs, including MPEG-4(DivX ;-))
@@ -26,8 +25,6 @@
 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}" \
diff -Nur avifile.orig/distinfo avifile/distinfo
--- avifile.orig/distinfo	Wed Nov 19 15:21:02 2003
+++ avifile/distinfo	Wed Nov 12 21:40:51 2003
@@ -1 +1 @@
-MD5 (avifile-0.7.34-20030319.tgz) = 5b3a831ed3d12a5d12d23b8d9673b88d
+MD5 (avifile-0.7-0.7.38.tar.gz) = db90c4bc0a8a8182b1ec084feca86bbb
diff -Nur avifile.orig/files/patch-ffmpeg::libavformat::flvenc.c avifile/files/patch-ffmpeg::libavformat::flvenc.c
--- avifile.orig/files/patch-ffmpeg::libavformat::flvenc.c	Thu Jan  1 01:00:00 1970
+++ avifile/files/patch-ffmpeg::libavformat::flvenc.c	Wed Nov 19 10:09:08 2003
@@ -0,0 +1,18 @@
+--- 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);
diff -Nur avifile.orig/files/patch-lib::common::String.cpp avifile/files/patch-lib::common::String.cpp
--- avifile.orig/files/patch-lib::common::String.cpp	Thu Jan  1 01:00:00 1970
+++ avifile/files/patch-lib::common::String.cpp	Wed Nov 19 10:52:53 2003
@@ -0,0 +1,19 @@
+--- 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)

>Release-Note:
>Audit-Trail:
>Unformatted: