From 0e6300acae29ac5c9bbcfb63b779056dc5a66297 Mon Sep 17 00:00:00 2001 From: Martin Holzer Date: Fri, 5 Sep 2003 16:05:14 +0000 Subject: Fixing bug with gcc 2.95. Closes #27987 --- media-video/avifile/ChangeLog | 6 +++++- media-video/avifile/Manifest | 9 +++++---- media-video/avifile/avifile-0.7.38.20030710.ebuild | 3 ++- media-video/avifile/files/flvenc-patch | 20 ++++++++++++++++++++ 4 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 media-video/avifile/files/flvenc-patch (limited to 'media-video') diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog index 6b3569b50872..07b4f2c404d1 100644 --- a/media-video/avifile/ChangeLog +++ b/media-video/avifile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/avifile # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.54 2003/08/17 14:40:03 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.55 2003/09/05 16:05:07 mholzer Exp $ + + 06 Sep 2003; Martin Holzer + avifile-0.7.38.20030710.ebuild: + Fixing bug with gcc 2.95. Closes #27987 *avifile-0.7.38.20030710 (17 Aug 2003) diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest index 26d2ce4dd4e1..069ae5eee344 100644 --- a/media-video/avifile/Manifest +++ b/media-video/avifile/Manifest @@ -1,8 +1,9 @@ -MD5 9c295c74000abcf7ff403b46eece9193 ChangeLog 9994 -MD5 bad3a8230974fae1f52a66af1b5319f7 avifile-0.7.38.20030710.ebuild 4182 +MD5 5e194e77c03bfafda4a1d122dcb4294b ChangeLog 10121 MD5 7272f32f06100ca91ce93d4cbdbf664c avifile-0.7.32.20030219.ebuild 4084 MD5 fcc6fd107817ac0f3fd29d48db36fddb avifile-0.7.37.20030522-r2.ebuild 4499 -MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71 -MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73 +MD5 d7d57ea69fa9500ef5811a39d616e8fa avifile-0.7.38.20030710.ebuild 4215 +MD5 af963fb11fc5116245dfd661f23d724a files/flvenc-patch 539 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943 +MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73 MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73 +MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71 diff --git a/media-video/avifile/avifile-0.7.38.20030710.ebuild b/media-video/avifile/avifile-0.7.38.20030710.ebuild index ee0ba87c8262..993fd53126e0 100644 --- a/media-video/avifile/avifile-0.7.38.20030710.ebuild +++ b/media-video/avifile/avifile-0.7.38.20030710.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710.ebuild,v 1.1 2003/08/17 14:40:03 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710.ebuild,v 1.2 2003/09/05 16:05:07 mholzer Exp $ MAJ_PV=${PV:0:3} MIN_PV=${PV:0:6} @@ -42,6 +42,7 @@ src_unpack() { } src_compile() { + epatch ${FILESDIR}/flvenc-patch local myconf="--enable-oss" local kdepre="" diff --git a/media-video/avifile/files/flvenc-patch b/media-video/avifile/files/flvenc-patch new file mode 100644 index 000000000000..a634abdeb344 --- /dev/null +++ b/media-video/avifile/files/flvenc-patch @@ -0,0 +1,20 @@ +--- flvenc.c.org 2003-09-06 17:56:37.000000000 +0000 ++++ ffmpeg/libavformat/flvenc.c 2003-09-06 17:51:55.000000000 +0000 +@@ -224,13 +224,15 @@ + + static int flv_write_trailer(AVFormatContext *s) + { ++ int64_t file_size ; ++ int flags = 0; + ByteIOContext *pb = &s->pb; + FLVContext *flv = s->priv_data; + + 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); -- cgit v1.2.3-65-gdbad