Date: Wed, 20 Nov 2002 13:12:57 +0100 From: Jens Rehsack <rehsack@liwing.de> To: Ying-Chieh Liao <ijliao@FreeBSD.org> Cc: freebsd-ports@FreeBSD.org Subject: Re: ports/45219: update of audio/id3lib to 3.8.1 Message-ID: <3DDB7C49.5080601@liwing.de> References: <200211200748.gAK7m3Mt083553@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------060003030504040709070809 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Ying-Chieh Liao wrote: > Synopsis: update of audio/id3lib to 3.8.1 > > State-Changed-From-To: open->feedback > State-Changed-By: ijliao > State-Changed-When: Tue Nov 19 23:47:35 PST 2002 > State-Changed-Why: > could your plz submit again in "diff" format ? > > http://www.freebsd.org/cgi/query-pr.cgi?pr=45219 > > -- L i W W W i Jens Rehsack L W W W L i W W W W i nnn gggg LiWing IT-Services L i W W W W i n n g g LLLL i W W i n n g g Friesenstraße 2 gggg 06112 Halle g g g Tel.: +49 - 3 45 - 5 17 05 91 ggg e-Mail: <rehsack@liwing.de> Fax: +49 - 3 45 - 5 17 05 92 http://www.liwing.de/ --------------060003030504040709070809 Content-Type: text/plain; name="id3lib.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="id3lib.patch" diff -Nur id3lib.orig/Makefile id3lib/Makefile --- id3lib.orig/Makefile Sat Aug 31 04:38:29 2002 +++ id3lib/Makefile Wed Nov 20 13:12:14 2002 @@ -6,7 +6,8 @@ # PORTNAME= id3lib -PORTVERSION= 3.7.13 +PORTVERSION= 3.8.1 +PORTCOMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,9 +16,11 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \ + automake:${PORTSDIR}/devel/automake + INSTALLS_SHLIB= yes USE_LIBTOOL= yes -USE_AUTOMAKE= yes USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff -Nur id3lib.orig/distinfo id3lib/distinfo --- id3lib.orig/distinfo Sat Oct 28 09:19:06 2000 +++ id3lib/distinfo Wed Nov 20 13:12:14 2002 @@ -1 +1 @@ -MD5 (id3lib-3.7.13.tar.gz) = 19ab352ac8d522ebcabb85f2445bfced +MD5 (id3lib-3.8.1.tar.gz) = 063f230027d9d5a4223bb068db4eced3 diff -Nur id3lib.orig/distinfo.orig id3lib/distinfo.orig --- id3lib.orig/distinfo.orig Sat Oct 28 09:19:06 2000 +++ id3lib/distinfo.orig Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -MD5 (id3lib-3.7.13.tar.gz) = 19ab352ac8d522ebcabb85f2445bfced diff -Nur id3lib.orig/files/patch-Makefile.am id3lib/files/patch-Makefile.am --- id3lib.orig/files/patch-Makefile.am Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-Makefile.am Wed Nov 20 13:12:14 2002 @@ -1,14 +1,11 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-Makefile.am,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- Makefile.am.orig Fri Sep 15 02:13:51 2000 -+++ Makefile.am Sun Jul 21 15:13:19 2002 -@@ -32,7 +32,7 @@ - popt_subdir = +--- Makefile.am.orig Wed Nov 6 18:16:43 2002 ++++ Makefile.am Wed Nov 6 18:17:06 2002 +@@ -27,7 +27,7 @@ + zlib_subdir = endif --SUBDIRS = . m4 $(popt_subdir) $(zlib_subdir) doc include src examples -+SUBDIRS = . m4 doc include src examples - DIST_SUBDIRS = . m4 popt zlib doc include src examples +-SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples ++SUBDIRS = . m4 doc include id3com src examples + DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj INCLUDES = @ID3LIB_DEBUG_FLAGS@ diff -Nur id3lib.orig/files/patch-Makefile.am.orig id3lib/files/patch-Makefile.am.orig --- id3lib.orig/files/patch-Makefile.am.orig Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-Makefile.am.orig Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-Makefile.am,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- Makefile.am.orig Fri Sep 15 02:13:51 2000 -+++ Makefile.am Sun Jul 21 15:13:19 2002 -@@ -32,7 +32,7 @@ - popt_subdir = - endif - --SUBDIRS = . m4 $(popt_subdir) $(zlib_subdir) doc include src examples -+SUBDIRS = . m4 doc include src examples - DIST_SUBDIRS = . m4 popt zlib doc include src examples - - INCLUDES = @ID3LIB_DEBUG_FLAGS@ diff -Nur id3lib.orig/files/patch-aclocal.m4 id3lib/files/patch-aclocal.m4 --- id3lib.orig/files/patch-aclocal.m4 Thu Jan 1 01:00:00 1970 +++ id3lib/files/patch-aclocal.m4 Wed Nov 20 13:12:14 2002 @@ -0,0 +1,11 @@ +--- aclocal.m4.orig Wed Nov 6 18:56:20 2002 ++++ aclocal.m4 Wed Nov 6 18:56:24 2002 +@@ -86,7 +86,7 @@ + # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) + # -------------------------------------------------------------- + AC_DEFUN([AM_CONFIG_HEADER], +-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) ++[AC_FOREACH([_AM_File], [$1]) + ])# AM_CONFIG_HEADER + + # Do all the work for Automake. -*- Autoconf -*- diff -Nur id3lib.orig/files/patch-configure.in id3lib/files/patch-configure.in --- id3lib.orig/files/patch-configure.in Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-configure.in Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-configure.in,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- configure.in.orig Fri Sep 15 02:03:02 2000 -+++ configure.in Sun Jul 21 15:13:19 2002 -@@ -143,7 +143,7 @@ - ) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS --AC_CHECK_HEADER(iostream.h iomanip.h) -+AC_CHECK_HEADERS(iostream.h iomanip.h) - - dnl Check for functions. - AC_FUNC_MEMCMP diff -Nur id3lib.orig/files/patch-configure.in.orig id3lib/files/patch-configure.in.orig --- id3lib.orig/files/patch-configure.in.orig Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-configure.in.orig Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-configure.in,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- configure.in.orig Fri Sep 15 02:03:02 2000 -+++ configure.in Sun Jul 21 15:13:19 2002 -@@ -143,7 +143,7 @@ - ) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS --AC_CHECK_HEADER(iostream.h iomanip.h) -+AC_CHECK_HEADERS(iostream.h iomanip.h) - - dnl Check for functions. - AC_FUNC_MEMCMP diff -Nur id3lib.orig/files/patch-include_id3_globals_h id3lib/files/patch-include_id3_globals_h --- id3lib.orig/files/patch-include_id3_globals_h Thu Jan 1 01:00:00 1970 +++ id3lib/files/patch-include_id3_globals_h Wed Nov 20 13:12:14 2002 @@ -0,0 +1,11 @@ +--- include/id3/globals.h.orig Thu Nov 7 12:29:02 2002 ++++ include/id3/globals.h Thu Nov 7 12:29:13 2002 +@@ -34,7 +34,7 @@ + #ifndef _ID3LIB_GLOBALS_H_ + #define _ID3LIB_GLOBALS_H_ + +-#include <stdlib.h> ++#include <cstdlib> + #include "id3/sized_types.h" + + /* id3lib version. diff -Nur id3lib.orig/files/patch-include_id3_id3lib_bitset id3lib/files/patch-include_id3_id3lib_bitset --- id3lib.orig/files/patch-include_id3_id3lib_bitset Thu Jan 1 01:00:00 1970 +++ id3lib/files/patch-include_id3_id3lib_bitset Wed Nov 20 13:12:14 2002 @@ -0,0 +1,17 @@ +--- include/id3/id3lib_bitset.orig Sun Nov 3 01:23:00 2002 ++++ include/id3/id3lib_bitset Thu Nov 7 12:30:38 2002 +@@ -35,11 +35,11 @@ + // returns a reference to a bit, again without doing any range checking. + + +-#include <stddef.h> // for size_t +-#include <limits.h> // for CHAR_BIT ++#include <cstddef> // for size_t ++#include <climits> // for CHAR_BIT + #include <string> + #include <stdexcept> // for invalid_argument, out_of_range, overflow_error +-#include <iostream.h> // for istream, ostream ++#include <iostream> // for istream, ostream + + #define __BITS_PER_WORDT(__wt) (CHAR_BIT*sizeof(__wt)) + #define __BITSET_WORDS(__n,__wt) \ diff -Nur id3lib.orig/files/patch-include_id3_sized_types_h id3lib/files/patch-include_id3_sized_types_h --- id3lib.orig/files/patch-include_id3_sized_types_h Thu Jan 1 01:00:00 1970 +++ id3lib/files/patch-include_id3_sized_types_h Wed Nov 20 13:12:14 2002 @@ -0,0 +1,11 @@ +--- include/id3/sized_types.h.orig Sun Nov 3 01:23:00 2002 ++++ include/id3/sized_types.h Thu Nov 7 12:31:29 2002 +@@ -34,7 +34,7 @@ + #ifndef _SIZED_TYPES_H_ + #define _SIZED_TYPES_H_ + +-#include <limits.h> ++#include <climits> + + /* define our datatypes */ + diff -Nur id3lib.orig/files/patch-src_tag__file.cpp id3lib/files/patch-src_tag__file.cpp --- id3lib.orig/files/patch-src_tag__file.cpp Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__file.cpp Thu Jan 1 01:00:00 1970 @@ -1,72 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__file.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_file.cpp.orig Mon Sep 11 09:46:32 2000 -+++ src/tag_file.cpp Sun Jul 21 15:13:19 2002 -@@ -184,7 +184,7 @@ - } - } - -- file.write(sTag, tag_size); -+ file.write((const char*) sTag, tag_size); - - return tag_size; - } -@@ -221,7 +221,7 @@ - file.seekp(0, ios::beg); - if (buffer) - { -- file.write(buffer, tag_size); -+ file.write((const char*) buffer, tag_size); - } - } - else -@@ -282,8 +282,9 @@ - remove(sTempFile); - ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file"); - } -- -- ofstream tmpOut(fd); -+ -+ close(fd); -+ ofstream tmpOut(sTempFile); - if (!tmpOut) - { - tmpOut.close(); -@@ -292,15 +293,15 @@ - } - if (buffer) - { -- tmpOut.write(buffer, tag_size); -+ tmpOut.write((const char*) buffer, tag_size); - } - file.seekg(tag.GetPrependedBytes(), ios::beg); - uchar buffer2[BUFSIZ]; - while (file) - { -- file.read(buffer2, BUFSIZ); -+ file.read((char*) buffer2, BUFSIZ); - size_t nBytes = file.gcount(); -- tmpOut.write(buffer2, nBytes); -+ tmpOut.write((const char*) buffer2, nBytes); - } - - tmpOut.close(); -@@ -431,7 +432,7 @@ - while (!file.eof()) - { - size_t nBytesToRead = MIN(nBytesRemaining - nBytesCopied, BUFSIZ); -- file.read(aucBuffer, nBytesToRead); -+ file.read((char*) aucBuffer, nBytesToRead); - size_t nBytesRead = file.gcount(); - - if (nBytesRead != nBytesToRead) -@@ -444,7 +445,7 @@ - { - long offset = nBytesRead + this->GetPrependedBytes(); - file.seekp(-offset, ios::cur); -- file.write(aucBuffer, nBytesRead); -+ file.write((const char*) aucBuffer, nBytesRead); - file.seekg(this->GetPrependedBytes(), ios::cur); - nBytesCopied += nBytesRead; - } diff -Nur id3lib.orig/files/patch-src_tag__file.cpp.orig id3lib/files/patch-src_tag__file.cpp.orig --- id3lib.orig/files/patch-src_tag__file.cpp.orig Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__file.cpp.orig Thu Jan 1 01:00:00 1970 @@ -1,72 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__file.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_file.cpp.orig Mon Sep 11 09:46:32 2000 -+++ src/tag_file.cpp Sun Jul 21 15:13:19 2002 -@@ -184,7 +184,7 @@ - } - } - -- file.write(sTag, tag_size); -+ file.write((const char*) sTag, tag_size); - - return tag_size; - } -@@ -221,7 +221,7 @@ - file.seekp(0, ios::beg); - if (buffer) - { -- file.write(buffer, tag_size); -+ file.write((const char*) buffer, tag_size); - } - } - else -@@ -282,8 +282,9 @@ - remove(sTempFile); - ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file"); - } -- -- ofstream tmpOut(fd); -+ -+ close(fd); -+ ofstream tmpOut(sTempFile); - if (!tmpOut) - { - tmpOut.close(); -@@ -292,15 +293,15 @@ - } - if (buffer) - { -- tmpOut.write(buffer, tag_size); -+ tmpOut.write((const char*) buffer, tag_size); - } - file.seekg(tag.GetPrependedBytes(), ios::beg); - uchar buffer2[BUFSIZ]; - while (file) - { -- file.read(buffer2, BUFSIZ); -+ file.read((char*) buffer2, BUFSIZ); - size_t nBytes = file.gcount(); -- tmpOut.write(buffer2, nBytes); -+ tmpOut.write((const char*) buffer2, nBytes); - } - - tmpOut.close(); -@@ -431,7 +432,7 @@ - while (!file.eof()) - { - size_t nBytesToRead = MIN(nBytesRemaining - nBytesCopied, BUFSIZ); -- file.read(aucBuffer, nBytesToRead); -+ file.read((char*) aucBuffer, nBytesToRead); - size_t nBytesRead = file.gcount(); - - if (nBytesRead != nBytesToRead) -@@ -444,7 +445,7 @@ - { - long offset = nBytesRead + this->GetPrependedBytes(); - file.seekp(-offset, ios::cur); -- file.write(aucBuffer, nBytesRead); -+ file.write((const char*) aucBuffer, nBytesRead); - file.seekg(this->GetPrependedBytes(), ios::cur); - nBytesCopied += nBytesRead; - } diff -Nur id3lib.orig/files/patch-src_tag__parse.cpp id3lib/files/patch-src_tag__parse.cpp --- id3lib.orig/files/patch-src_tag__parse.cpp Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__parse.cpp Thu Jan 1 01:00:00 1970 @@ -1,23 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__parse.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_parse.cpp.orig Fri Sep 15 01:54:08 2000 -+++ src/tag_parse.cpp Sun Jul 21 15:13:19 2002 -@@ -178,7 +178,7 @@ - return 0; - } - uchar header[ID3_TAGHEADERSIZE]; -- file.read(header, ID3_TAGHEADERSIZE); -+ file.read((char*) header, ID3_TAGHEADERSIZE); - if (file.gcount() != ID3_TAGHEADERSIZE) - { - return 0; -@@ -188,7 +188,7 @@ - if (tagSize > 0) - { - uchar* bin = new uchar[tagSize]; -- file.read(bin, tagSize - ID3_TagHeader::SIZE); -+ file.read((char*) bin, tagSize - ID3_TagHeader::SIZE); - if (tagSize != (size_t)file.gcount()) - { - // log this... diff -Nur id3lib.orig/files/patch-src_tag__parse.cpp.orig id3lib/files/patch-src_tag__parse.cpp.orig --- id3lib.orig/files/patch-src_tag__parse.cpp.orig Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__parse.cpp.orig Thu Jan 1 01:00:00 1970 @@ -1,23 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__parse.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_parse.cpp.orig Fri Sep 15 01:54:08 2000 -+++ src/tag_parse.cpp Sun Jul 21 15:13:19 2002 -@@ -178,7 +178,7 @@ - return 0; - } - uchar header[ID3_TAGHEADERSIZE]; -- file.read(header, ID3_TAGHEADERSIZE); -+ file.read((char*) header, ID3_TAGHEADERSIZE); - if (file.gcount() != ID3_TAGHEADERSIZE) - { - return 0; -@@ -188,7 +188,7 @@ - if (tagSize > 0) - { - uchar* bin = new uchar[tagSize]; -- file.read(bin, tagSize - ID3_TagHeader::SIZE); -+ file.read((char*) bin, tagSize - ID3_TagHeader::SIZE); - if (tagSize != (size_t)file.gcount()) - { - // log this... diff -Nur id3lib.orig/files/patch-src_tag__parse__lyrics3.cpp id3lib/files/patch-src_tag__parse__lyrics3.cpp --- id3lib.orig/files/patch-src_tag__parse__lyrics3.cpp Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__parse__lyrics3.cpp Thu Jan 1 01:00:00 1970 @@ -1,23 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__parse__lyrics3.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_parse_lyrics3.cpp.orig Mon Sep 11 08:34:06 2000 -+++ src/tag_parse_lyrics3.cpp Sun Jul 21 15:13:19 2002 -@@ -200,7 +200,7 @@ - // reserve enough space for lyrics3 + id3v1 tag - const size_t max_lyr_size = 11 + 5100 + 9 + 128; - -- size_t lyr_buffer_size = MIN(max_lyr_size, file.tellg()); -+ size_t lyr_buffer_size = MIN(max_lyr_size, (size_t) file.tellg()); - - file.seekg(- static_cast<long>(lyr_buffer_size), ios::cur); - if (!file) -@@ -274,7 +274,7 @@ - - // Using binary minus rather than unary minus to avoid compiler warning - -- file.seekg(- MIN(file.tellg(), -+ file.seekg(- MIN((size_t) file.tellg(), - (static_cast<long>(lyr_size) + 6 + 9 + 3)), ios::cur); - if (!file) - { diff -Nur id3lib.orig/files/patch-src_tag__parse__lyrics3.cpp.orig id3lib/files/patch-src_tag__parse__lyrics3.cpp.orig --- id3lib.orig/files/patch-src_tag__parse__lyrics3.cpp.orig Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__parse__lyrics3.cpp.orig Thu Jan 1 01:00:00 1970 @@ -1,23 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__parse__lyrics3.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_parse_lyrics3.cpp.orig Mon Sep 11 08:34:06 2000 -+++ src/tag_parse_lyrics3.cpp Sun Jul 21 15:13:19 2002 -@@ -200,7 +200,7 @@ - // reserve enough space for lyrics3 + id3v1 tag - const size_t max_lyr_size = 11 + 5100 + 9 + 128; - -- size_t lyr_buffer_size = MIN(max_lyr_size, file.tellg()); -+ size_t lyr_buffer_size = MIN(max_lyr_size, (size_t) file.tellg()); - - file.seekg(- static_cast<long>(lyr_buffer_size), ios::cur); - if (!file) -@@ -274,7 +274,7 @@ - - // Using binary minus rather than unary minus to avoid compiler warning - -- file.seekg(- MIN(file.tellg(), -+ file.seekg(- MIN((size_t) file.tellg(), - (static_cast<long>(lyr_size) + 6 + 9 + 3)), ios::cur); - if (!file) - { diff -Nur id3lib.orig/files/patch-src_tag__parse__musicmatch.cpp id3lib/files/patch-src_tag__parse__musicmatch.cpp --- id3lib.orig/files/patch-src_tag__parse__musicmatch.cpp Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__parse__musicmatch.cpp Thu Jan 1 01:00:00 1970 @@ -1,53 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__parse__musicmatch.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_parse_musicmatch.cpp.orig Mon Sep 11 09:46:32 2000 -+++ src/tag_parse_musicmatch.cpp Sun Jul 21 15:13:19 2002 -@@ -221,7 +221,7 @@ - return 0; - } - -- file.seekg(tag_end - tag_size); -+ file.seekg((size_t) tag_end - tag_size); - tag_beg = file.tellg(); - - // Now calculate the actual offsets -@@ -229,17 +229,17 @@ - offsets[0] = tag_beg; - for (size_t i = 0; i < 4; ++i) - { -- offsets[i+1] = offsets[i] + section_sizes[i]; -+ offsets[i+1] = offsets[i] + (streampos) section_sizes[i]; - } - - // now check for a tag header and adjust the tag_beg pointer appropriately - if (tag_beg >= 256) - { -- file.seekg(tag_beg - 256); -+ file.seekg((size_t) tag_beg - 256); - file.read(sig, 8); - if (memcmp(sig, "18273645", 8) == 0) - { -- file.seekg(tag_beg - 256); -+ file.seekg((size_t) tag_beg - 256); - tag_beg = file.tellg(); - file.ignore(256); - } -@@ -267,7 +267,7 @@ - { - // no image binary. don't do anything. - } -- else if (offsets[0] + 4 + nImgSize > static_cast<size_t>(offsets[2])) -+ else if ((size_t) offsets[0] + 4 + nImgSize > static_cast<size_t>(offsets[2])) - { - // Ack! The image size given extends beyond the next offset! This is - // not good... log? -@@ -275,7 +275,7 @@ - else - { - uchar* img_data = new uchar[nImgSize]; -- file.read(img_data, nImgSize); -+ file.read((char*) img_data, nImgSize); - ID3_Frame* frame = new ID3_Frame(ID3FID_PICTURE); - if (frame) - { diff -Nur id3lib.orig/files/patch-src_tag__parse__musicmatch.cpp.orig id3lib/files/patch-src_tag__parse__musicmatch.cpp.orig --- id3lib.orig/files/patch-src_tag__parse__musicmatch.cpp.orig Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__parse__musicmatch.cpp.orig Thu Jan 1 01:00:00 1970 @@ -1,53 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__parse__musicmatch.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_parse_musicmatch.cpp.orig Mon Sep 11 09:46:32 2000 -+++ src/tag_parse_musicmatch.cpp Sun Jul 21 15:13:19 2002 -@@ -221,7 +221,7 @@ - return 0; - } - -- file.seekg(tag_end - tag_size); -+ file.seekg((size_t) tag_end - tag_size); - tag_beg = file.tellg(); - - // Now calculate the actual offsets -@@ -229,17 +229,17 @@ - offsets[0] = tag_beg; - for (size_t i = 0; i < 4; ++i) - { -- offsets[i+1] = offsets[i] + section_sizes[i]; -+ offsets[i+1] = offsets[i] + (streampos) section_sizes[i]; - } - - // now check for a tag header and adjust the tag_beg pointer appropriately - if (tag_beg >= 256) - { -- file.seekg(tag_beg - 256); -+ file.seekg((size_t) tag_beg - 256); - file.read(sig, 8); - if (memcmp(sig, "18273645", 8) == 0) - { -- file.seekg(tag_beg - 256); -+ file.seekg((size_t) tag_beg - 256); - tag_beg = file.tellg(); - file.ignore(256); - } -@@ -267,7 +267,7 @@ - { - // no image binary. don't do anything. - } -- else if (offsets[0] + 4 + nImgSize > static_cast<size_t>(offsets[2])) -+ else if ((size_t) offsets[0] + 4 + nImgSize > static_cast<size_t>(offsets[2])) - { - // Ack! The image size given extends beyond the next offset! This is - // not good... log? -@@ -275,7 +275,7 @@ - else - { - uchar* img_data = new uchar[nImgSize]; -- file.read(img_data, nImgSize); -+ file.read((char*) img_data, nImgSize); - ID3_Frame* frame = new ID3_Frame(ID3FID_PICTURE); - if (frame) - { diff -Nur id3lib.orig/files/patch-src_tag__parse__v1.cpp id3lib/files/patch-src_tag__parse__v1.cpp --- id3lib.orig/files/patch-src_tag__parse__v1.cpp Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__parse__v1.cpp Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__parse__v1.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_parse_v1.cpp.orig Mon Sep 11 08:34:06 2000 -+++ src/tag_parse_v1.cpp Sun Jul 21 15:13:19 2002 -@@ -67,7 +67,7 @@ - { - const size_t data_size = ID3_V1_LEN - ID3_V1_LEN_ID; - uchar tag_bytes[data_size]; -- file.read(tag_bytes, data_size); -+ file.read((char*) tag_bytes, data_size); - if (file.gcount() != data_size) - { - return num_bytes; diff -Nur id3lib.orig/files/patch-src_tag__parse__v1.cpp.orig id3lib/files/patch-src_tag__parse__v1.cpp.orig --- id3lib.orig/files/patch-src_tag__parse__v1.cpp.orig Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_tag__parse__v1.cpp.orig Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_tag__parse__v1.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/tag_parse_v1.cpp.orig Mon Sep 11 08:34:06 2000 -+++ src/tag_parse_v1.cpp Sun Jul 21 15:13:19 2002 -@@ -67,7 +67,7 @@ - { - const size_t data_size = ID3_V1_LEN - ID3_V1_LEN_ID; - uchar tag_bytes[data_size]; -- file.read(tag_bytes, data_size); -+ file.read((char*) tag_bytes, data_size); - if (file.gcount() != data_size) - { - return num_bytes; diff -Nur id3lib.orig/files/patch-src_utils.cpp id3lib/files/patch-src_utils.cpp --- id3lib.orig/files/patch-src_utils.cpp Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_utils.cpp Thu Jan 1 01:00:00 1970 @@ -1,41 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_utils.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/utils.cpp.orig Mon Sep 11 09:46:32 2000 -+++ src/utils.cpp Sun Jul 21 15:13:19 2002 -@@ -231,7 +231,7 @@ - - bool exists(const char *name) - { -- ifstream file(name, ios::nocreate); -+ ifstream file(name/*, ios::nocreate*/); - return file.is_open() != 0; - } - -@@ -256,7 +256,7 @@ - size_t size = 0; - if (file.is_open()) - { -- streamoff curpos = file.tellp(); -+ streampos curpos = file.tellp(); - file.seekp(0, ios::end); - size = file.tellp(); - file.seekp(curpos); -@@ -275,7 +275,7 @@ - { - file.close(); - } -- file.open(name, ios::in | ios::out | ios::binary | ios::nocreate); -+ file.open(name, ios::in | ios::out | ios::binary /*| ios::nocreate*/); - if (!file) - { - return ID3E_ReadOnly; -@@ -290,7 +290,7 @@ - { - file.close(); - } -- file.open(name, ios::in | ios::binary | ios::nocreate); -+ file.open(name, ios::in | ios::binary /*| ios::nocreate*/); - if (!file) - { - return ID3E_NoFile; diff -Nur id3lib.orig/files/patch-src_utils.cpp.orig id3lib/files/patch-src_utils.cpp.orig --- id3lib.orig/files/patch-src_utils.cpp.orig Sun Jul 21 22:11:00 2002 +++ id3lib/files/patch-src_utils.cpp.orig Thu Jan 1 01:00:00 1970 @@ -1,41 +0,0 @@ - -$FreeBSD: ports/audio/id3lib/files/patch-src_utils.cpp,v 1.1 2002/07/21 20:11:00 naddy Exp $ - ---- src/utils.cpp.orig Mon Sep 11 09:46:32 2000 -+++ src/utils.cpp Sun Jul 21 15:13:19 2002 -@@ -231,7 +231,7 @@ - - bool exists(const char *name) - { -- ifstream file(name, ios::nocreate); -+ ifstream file(name/*, ios::nocreate*/); - return file.is_open() != 0; - } - -@@ -256,7 +256,7 @@ - size_t size = 0; - if (file.is_open()) - { -- streamoff curpos = file.tellp(); -+ streampos curpos = file.tellp(); - file.seekp(0, ios::end); - size = file.tellp(); - file.seekp(curpos); -@@ -275,7 +275,7 @@ - { - file.close(); - } -- file.open(name, ios::in | ios::out | ios::binary | ios::nocreate); -+ file.open(name, ios::in | ios::out | ios::binary /*| ios::nocreate*/); - if (!file) - { - return ID3E_ReadOnly; -@@ -290,7 +290,7 @@ - { - file.close(); - } -- file.open(name, ios::in | ios::binary | ios::nocreate); -+ file.open(name, ios::in | ios::binary /*| ios::nocreate*/); - if (!file) - { - return ID3E_NoFile; diff -Nur id3lib.orig/pkg-plist id3lib/pkg-plist --- id3lib.orig/pkg-plist Fri Mar 16 16:07:47 2001 +++ id3lib/pkg-plist Wed Nov 20 13:12:14 2002 @@ -1,21 +1,25 @@ -bin/id3convert -bin/id3cp bin/id3info +bin/id3convert bin/id3tag -include/id3.h -include/id3/error.h +bin/id3cp include/id3/field.h -include/id3/flags.h -include/id3/frame.h +include/id3/id3lib_frame.h include/id3/globals.h -include/id3/header.h -include/id3/header_frame.h -include/id3/header_tag.h include/id3/misc_support.h +include/id3/reader.h +include/id3/readers.h include/id3/sized_types.h -include/id3/spec.h include/id3/tag.h -lib/libid3-3.7.so.13 -lib/libid3.a +include/id3/writer.h +include/id3/writers.h +include/id3/utils.h +include/id3/id3lib_streams.h +include/id3/id3lib_strings.h +include/id3.h +lib/libid3-3.8.so.1 +lib/libid3-3.8.so lib/libid3.so +lib/libid3.la +lib/libid3.a @dirrm include/id3 +@dirrm include diff -Nur id3lib.orig/pkg-plist.orig id3lib/pkg-plist.orig --- id3lib.orig/pkg-plist.orig Fri Mar 16 16:07:47 2001 +++ id3lib/pkg-plist.orig Thu Jan 1 01:00:00 1970 @@ -1,21 +0,0 @@ -bin/id3convert -bin/id3cp -bin/id3info -bin/id3tag -include/id3.h -include/id3/error.h -include/id3/field.h -include/id3/flags.h -include/id3/frame.h -include/id3/globals.h -include/id3/header.h -include/id3/header_frame.h -include/id3/header_tag.h -include/id3/misc_support.h -include/id3/sized_types.h -include/id3/spec.h -include/id3/tag.h -lib/libid3-3.7.so.13 -lib/libid3.a -lib/libid3.so -@dirrm include/id3 --------------060003030504040709070809-- 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?3DDB7C49.5080601>