diff options
| -rw-r--r-- | media-video/avifile/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/avifile/Manifest | 15 | ||||
| -rw-r--r-- | media-video/avifile/avifile-0.7.38.20030710.ebuild | 3 | ||||
| -rw-r--r-- | media-video/avifile/files/avifile-gcc34.patch | 172 |
4 files changed, 187 insertions, 9 deletions
diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog index 45041b4ab300..aee318b7ff37 100644 --- a/media-video/avifile/ChangeLog +++ b/media-video/avifile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/avifile # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.66 2004/04/27 20:50:58 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.67 2004/04/28 18:16:15 lv Exp $ + + 28 Apr 2004; Travis Tilley <lv@gentoo.org> +files/avifile-gcc34.patch, + avifile-0.7.38.20030710.ebuild: + patched to compile using gcc 3.4 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.38.20030710.ebuild: diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest index 3e60171773db..63cad6581657 100644 --- a/media-video/avifile/Manifest +++ b/media-video/avifile/Manifest @@ -1,13 +1,14 @@ -MD5 ca49775b9c0881a1c67e0c5868e75ea6 ChangeLog 11743 -MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272 +MD5 dede0053fa0c8a2198bd96f157c6a5da avifile-0.7.38.20030710.ebuild 4439 MD5 6e1f918f777434d9c6bf98885408e179 avifile-0.7.32.20030219.ebuild 4064 -MD5 d392a5f94ed3b02aa606b6f907396929 avifile-0.7.38.20030710.ebuild 4405 +MD5 c205675235ae830c8bb767003a1bb2f3 ChangeLog 11880 +MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272 MD5 72cd96a06c09134a534ab4e6cd7a7636 avifile-0.7.37.20030522-r2.ebuild 4433 -MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558 +MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943 +MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73 MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73 -MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038 -MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466 -MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73 +MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558 MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998 +MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71 +MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795 diff --git a/media-video/avifile/avifile-0.7.38.20030710.ebuild b/media-video/avifile/avifile-0.7.38.20030710.ebuild index 71d38ca14cb5..e5aea19b7a79 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-2004 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.14 2004/04/27 20:50:58 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710.ebuild,v 1.15 2004/04/28 18:16:15 lv Exp $ inherit eutils @@ -48,6 +48,7 @@ src_unpack() { epatch ${FILESDIR}/${P}-2.6.patch use amd64 && epatch ${FILESDIR}/${P}-amd64.patch use sparc && epatch ${FILESDIR}/${P}-sparc.patch + epatch ${FILESDIR}/avifile-gcc34.patch } src_compile() { diff --git a/media-video/avifile/files/avifile-gcc34.patch b/media-video/avifile/files/avifile-gcc34.patch new file mode 100644 index 000000000000..349676b33ee4 --- /dev/null +++ b/media-video/avifile/files/avifile-gcc34.patch @@ -0,0 +1,172 @@ +diff -urd avifile-0.7-0.7.38.old/include/aviplay.h avifile-0.7-0.7.38/include/aviplay.h +--- avifile-0.7-0.7.38.old/include/aviplay.h 2003-05-24 18:51:30.000000000 -0400 ++++ avifile-0.7-0.7.38/include/aviplay.h 2004-04-28 14:08:02.520535288 -0400 +@@ -12,8 +12,8 @@ + #include "image.h" + #include "avm_args.h" + +-typedef void (*KILLHANDLER)(int, void* p = 0); +-typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p = 0); ++typedef void (*KILLHANDLER)(int, void* p); ++typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p); + + AVM_BEGIN_NAMESPACE; + +diff -urd avifile-0.7-0.7.38.old/include/avm_map.h avifile-0.7-0.7.38/include/avm_map.h +--- avifile-0.7-0.7.38.old/include/avm_map.h 2003-03-26 20:01:22.000000000 -0500 ++++ avifile-0.7-0.7.38/include/avm_map.h 2004-04-28 14:08:29.592419736 -0400 +@@ -198,7 +198,8 @@ + { + // cast to the needed type - used to prevent internal compiler error + // for old egcc +- avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n; ++ //avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n; ++ _Tnode* node = (_Tnode*) n; + + if(node->entry) + { +diff -urd avifile-0.7-0.7.38.old/include/avm_stl.h avifile-0.7-0.7.38/include/avm_stl.h +--- avifile-0.7-0.7.38.old/include/avm_stl.h 2003-06-08 11:57:05.000000000 -0400 ++++ avifile-0.7-0.7.38/include/avm_stl.h 2004-04-28 14:08:24.074258624 -0400 +@@ -74,6 +74,10 @@ + m_Type = new Type[m_uiCapacity]; + } + ~qring() { delete[] m_Type; } ++ qring<Type>(const qring<Type>& t) : m_Type(0) ++ { ++ operator=(t); ++ } + qring<Type>& operator=(const qring<Type>& t) + { + if (this != &t) +@@ -149,7 +153,6 @@ + + // disabled for now + qring<Type>() {} +- qring<Type>(const qring<Type>& t) {} + + uint_t bpos() const { return (m_uiPos > 0) ? m_uiPos - 1 : m_uiCapacity - 1; } + uint_t fpos() const { return (m_uiSize > m_uiPos) ? m_uiPos + m_uiCapacity - m_uiSize: m_uiPos - m_uiSize; } +@@ -167,9 +170,21 @@ + static const uint_t invalid=(uint_t)(~0); + typedef Type* iterator; + typedef const Type* const_iterator; +- vector<Type>(int prealloc = 0); ++ vector<Type>() ++ :m_Type(0), m_uiCapacity(0), m_uiSize(0) ++ { ++ } ++ ++ vector<Type>(int prealloc) ++ :m_Type(0), m_uiCapacity(prealloc), m_uiSize(prealloc) ++ { ++ if (m_uiCapacity > 0 ) ++ m_Type = new Type[m_uiCapacity]; ++ //printf("vector %p (%d)\n", this, m_uiSize); ++ } ++ + // we will not count references - we have to program with this in mind! +- vector<Type>(const vector<Type>& t) :m_Type(0), m_uiCapacity(0), m_uiSize(0) ++ vector<Type>(const vector<Type>& t) :m_Type(0) + { + operator=(t); + } +@@ -272,15 +287,6 @@ + }; + + template <class Type> +-vector<Type>::vector<Type>(int prealloc) +- :m_Type(0), m_uiCapacity(prealloc), m_uiSize(prealloc) +-{ +- if (m_uiCapacity > 0 ) +- m_Type = new Type[m_uiCapacity]; +- //printf("vector %p (%d)\n", this, m_uiSize); +-} +- +-template <class Type> + void vector<Type>::remove(const Type& t) + { + int d = 0; +diff -urd avifile-0.7-0.7.38.old/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp +--- avifile-0.7-0.7.38.old/lib/aviread/AsfNetworkInputStream.cpp 2003-05-27 11:26:31.000000000 -0400 ++++ avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp 2004-04-28 14:08:13.148919528 -0400 +@@ -793,22 +793,24 @@ + return -1; + } + +-int AsfNetworkInputStream::write(const void* buffer, uint_t size) ++int AsfNetworkInputStream::write(const void* b, uint_t size) + { ++ const char* buffer = (const char*) b; + int wsize = size; + while (wsize > 0) + { + int i = ::write(m_iSocket, buffer, wsize); + if (i <= 0) + return i; +- (const char*)buffer += i; ++ buffer += i; + wsize -= i; + } + return size; + } + +-int AsfNetworkInputStream::dwrite(const void* buffer, uint_t size) ++int AsfNetworkInputStream::dwrite(const void* b, uint_t size) + { ++ const char* buffer = (const char*) b; + if (m_lfd < 0) + { + if (m_lfd == -12345) +@@ -843,7 +845,7 @@ + int i = ::write(m_lfd, buffer, size); + if (i < 0) + return i; +- (const char*)buffer += i; ++ buffer += i; + size -= i; + } + fsync(m_lfd); +Only in avifile-0.7-0.7.38/lib/aviread: AsfNetworkInputStream.cpp.orig +diff -urd avifile-0.7-0.7.38.old/lib/common/image.cpp avifile-0.7-0.7.38/lib/common/image.cpp +--- avifile-0.7-0.7.38.old/lib/common/image.cpp 2003-05-24 19:00:58.000000000 -0400 ++++ avifile-0.7-0.7.38/lib/common/image.cpp 2004-04-28 14:09:07.337681584 -0400 +@@ -954,7 +954,7 @@ + fillMembers(); + if (!copy) + { +- (const uint8_t*) m_pPlane[0] = data; ++ m_pPlane[0] = (uint8_t*) data; + } + else + { +diff -urd avifile-0.7-0.7.38.old/plugins/libvorbis/libvorbis.cpp avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp +--- avifile-0.7-0.7.38.old/plugins/libvorbis/libvorbis.cpp 2003-05-20 10:33:13.000000000 -0400 ++++ avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp 2004-04-28 14:08:38.700035168 -0400 +@@ -96,7 +96,7 @@ + op.packet = NULL; + op.b_o_s = 1; /* beginning of stream for first packet */ + op.bytes = hdrsizes[0]; +- (const void*) op.packet = vorbishdr; ++ op.packet = (unsigned char*) vorbishdr; + vorbishdr += op.bytes; + if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0) + { +@@ -106,7 +106,7 @@ + + op.b_o_s = 0; + op.bytes = hdrsizes[1]; +- (const void*) op.packet = vorbishdr; ++ op.packet = (unsigned char*) vorbishdr; + vorbishdr += op.bytes; + if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0) + { +@@ -115,7 +115,7 @@ + } + + op.bytes = hdrsizes[2]; +- (const void*) op.packet = vorbishdr; ++ op.packet = (unsigned char*) vorbishdr; + vorbishdr += op.bytes; + if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0) + { |