Date: Wed, 20 Nov 2002 13:12:44 +0100 From: Jens Rehsack <rehsack@liwing.de> To: Ying-Chieh Liao <ijliao@FreeBSD.org> Cc: freebsd-ports@FreeBSD.org Subject: Re: ports/45220: update for audio/id3v2 to 0.1.7 Message-ID: <3DDB7C3C.3080401@liwing.de> References: <200211200748.gAK7mRVu083604@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------070606030607000708050800 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Ying-Chieh Liao wrote: > Synopsis: update for audio/id3v2 to 0.1.7 > > State-Changed-From-To: open->feedback > State-Changed-By: ijliao > State-Changed-When: Tue Nov 19 23:48:08 PST 2002 > State-Changed-Why: > could you plz submit again in "diff" format ? > > http://www.freebsd.org/cgi/query-pr.cgi?pr=45220 > > -- 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/ --------------070606030607000708050800 Content-Type: text/plain; name="id3v2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="id3v2.patch" diff -Nur id3v2.orig/Makefile id3v2/Makefile --- id3v2.orig/Makefile Sat Oct 20 16:55:04 2001 +++ id3v2/Makefile Mon Nov 11 18:30:08 2002 @@ -6,7 +6,7 @@ # PORTNAME= id3v2 -PORTVERSION= 0.1.2 +PORTVERSION= 0.1.7 CATEGORIES= audio MASTER_SITES= http://download.sourceforge.net/id3v2/ diff -Nur id3v2.orig/distinfo id3v2/distinfo --- id3v2.orig/distinfo Sat Oct 20 16:55:04 2001 +++ id3v2/distinfo Mon Nov 11 18:31:11 2002 @@ -1 +1 @@ -MD5 (id3v2-0.1.2.tar.gz) = 6bc856e78da102c2f012db63d516806e +MD5 (id3v2-0.1.7.tar.gz) = 825cf4baf60e2951b7826b947a8f52fa diff -Nur id3v2.orig/files/patch-Makefile id3v2/files/patch-Makefile --- id3v2.orig/files/patch-Makefile Thu Jan 1 01:00:00 1970 +++ id3v2/files/patch-Makefile Mon Nov 11 18:55:24 2002 @@ -0,0 +1,20 @@ +--- Makefile.orig Tue Apr 16 03:35:31 2002 ++++ Makefile Mon Nov 11 18:52:50 2002 +@@ -1,10 +1,14 @@ + all: id3v2 + +-id3v2: Makefile convert.cpp list.cpp id3v2.cpp convert.cpp +- g++ -lz -lid3 -g -o id3v2 id3v2.cpp list.cpp convert.cpp ++CXXFLAGS+= -I${PREFIX}/include/ ++LDFLAGS+= -L${PREFIX}/lib/ ++ ++id3v2: convert.o list.o id3v2.o ++ c++ ${LDFLAGS} -lz -lid3 -lgnugetopt -g -o $@ id3v2.o list.o convert.o + + install: all +- cp id3v2 /usr/local/bin/ ++ install -c -s id3v2 ${PREFIX}/bin/id3v2 ++ nroff -man id3v2.1 > ${PREFIX}/man/man1/id3v2.1 + + clean: + rm -f id3v2 core diff -Nur id3v2.orig/files/patch-aa id3v2/files/patch-aa --- id3v2.orig/files/patch-aa Sat Oct 20 16:55:06 2001 +++ id3v2/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,18 +0,0 @@ ---- Makefile.orig Thu Apr 6 17:23:27 2000 -+++ Makefile Wed Oct 10 16:59:49 2001 -@@ -1,7 +1,12 @@ -+PREFIX = /usr/local -+CXXFLAGS += -I${PREFIX}/include -+LDFLAGS += -L${PREFIX}/lib -+ - all: id3v2 - --id3v2: Makefile convert.cpp list.cpp id3v2.cpp convert.cpp -- g++ -lid3 -g -o id3v2 id3v2.cpp list.cpp convert.cpp -+id3v2: convert.o list.o id3v2.o -+ g++ ${LDFLAGS} -lid3 -lz -lgnugetopt -o $@ convert.o list.o id3v2.o - - install: all -- cp id3v2 /usr/local/bin/ -+ install -c -s id3v2 ${PREFIX}/bin/id3v2 -+ nroff -man id3v2.1 > ${PREFIX}/man/man1/id3v2.1 diff -Nur id3v2.orig/files/patch-ab id3v2/files/patch-ab --- id3v2.orig/files/patch-ab Sat Oct 20 16:55:06 2001 +++ id3v2/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,74 +0,0 @@ ---- convert.cpp~ Fri Apr 7 14:11:22 2000 -+++ convert.cpp Wed Oct 10 15:50:16 2001 -@@ -14,22 +14,22 @@ - cout << argv[nIndex] << "\"..."; - - myTag.Clear(); -- myTag.Link(argv[nIndex]); -+ myTag.Link(argv[nIndex], ID3TT_ALL); - - luint nTags; - switch(whichTags) - { - case 1: -- nTags = myTag.Strip(V1_TAG); -+ nTags = myTag.Strip(ID3TT_ID3V1); - cout << "id3v1 "; - break; - case 2: -- nTags = myTag.Strip(V2_TAG); -+ nTags = myTag.Strip(ID3TT_ID3V2); - cout << "id3v2 "; - break; - case 0: - default: -- nTags = myTag.Strip(BOTH_ID3_TAGS); -+ nTags = myTag.Strip(ID3TT_ID3); - cout << "id3v1 and v2 "; - } - -@@ -61,11 +61,11 @@ - cout << argv[nIndex] << "..."; - - myTag.Clear(); -- myTag.Link(argv[nIndex]); -+ myTag.Link(argv[nIndex], ID3TT_ALL); - - luint nTags; - -- nTags = myTag.Update(V2_TAG); -+ nTags = myTag.Update(ID3TT_ID3V2); - cout << " converted "; - cout << endl; - } ---- id3v2.cpp~ Sat Apr 22 13:46:44 2000 -+++ id3v2.cpp Wed Oct 10 15:52:09 2001 -@@ -291,7 +291,7 @@ - // cout << "Tagging " << argv[nIndex] << ": "; - - // fix me - not checking to see if we can link to it -- myTag.Link(argv[nIndex], false, false); -+ myTag.Link(argv[nIndex], ID3TT_ID3V2); - - // loop thru the frames we need to add/modify - for(ii = 0; ii < frameCounter; ii++) -@@ -557,7 +557,7 @@ - } - } // steping thru frames - -- luint nTags = myTag.Update(V2_TAG); -+ luint nTags = myTag.Update(ID3TT_ID3V2); - - } - catch(ID3_Error err) ---- list.cpp~ Sat Apr 22 13:47:43 2000 -+++ list.cpp Wed Oct 10 15:52:37 2001 -@@ -353,7 +353,7 @@ - - if(!PrintID3v1Tag(argv[nIndex])) - tags = true; -- myTag.Link(argv[nIndex], false, false); -+ myTag.Link(argv[nIndex], ID3TT_ID3V2); - if(!PrintInformation(argv[nIndex],myTag)) - tags = true; - if(!tags) diff -Nur id3v2.orig/files/patch-ac id3v2/files/patch-ac --- id3v2.orig/files/patch-ac Sat Oct 20 16:55:06 2001 +++ id3v2/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,77 +0,0 @@ ---- /dev/null Wed Oct 10 15:39:32 2001 -+++ id3v2.1 Mon Dec 11 00:53:03 2000 -@@ -0,0 +1,74 @@ -+.TH ID3V2 1 "May 2000" "" "User Command" -+.SH NAME -+id3v2 \- Adds/Modifies/Removes/Views id3v2 tags, converts/lists id3v1 tags -+.SH SYNOPSIS -+.B id3v2 -+.RB [ -+.I OPTION -+.RB ] -+... -+.RB [ -+.I FILE -+.RB ] -+... -+.br -+.SH OPTIONS -+.TP -+.B \-h, \-\-help -+Display help and exit -+.TP -+.B \-f, \-\-list\-frames -+Display all possible frames for id3v2 -+.TP -+.B \-L, \-\-list\-genres -+Lists all id3v1 genres -+.TP -+.B \-v, \-\-version -+Display version information and exit -+.TP -+.B \-l, \-\-list -+Lists the tag(s) on the file(s) -+.TP -+.B \-R, \-\-list-rfc822 -+Lists using an rfc822\-style format for output -+.TP -+.B \-d, \-\-delete\-v2 -+Deletes id3v2 tags -+.TP -+.B \-s, \-\-delete\-v1 -+Deletes id3v1 tags -+.TP -+.B \-D, \-\-delete\-all -+ Deletes both id3v1 and id3v2 tags -+.TP -+.B \-C, \-\-convert -+ Converts id3v1 tag to id3v2 -+.TP -+.B \-a, \-\-artist ARTIST -+Set the artist information -+.TP -+.B \-A, \-\-album ALBUM -+Set the album title information -+.TP -+.B \-t, \-\-song SONG -+Set the song title information -+.TP -+.B \-c, \-\-comment DESCRIPTION:COMMENT -+Set the comment information -+.TP -+.B \-g, \-\-genre num -+Set the genre number -+.TP -+.B \-y, \-\-year num -+Set the year -+.TP -+.B \-T, \-\-track num/num -+Set the track number/(optional) total tracks -+ -+.SH SEE ALSO -+id3tag(1), id3info(1), id3convert(1) -+.SH AUTHOR -+.B id3v2 -+is by myers <icepick@users.sourceforge.net> with major portions used from id3lib -+examples. Manual page written for Debian GNU/Linux by Robert Woodcock -+<rcw@debian.org>. diff -Nur id3v2.orig/files/patch-convert_cpp id3v2/files/patch-convert_cpp --- id3v2.orig/files/patch-convert_cpp Thu Jan 1 01:00:00 1970 +++ id3v2/files/patch-convert_cpp Mon Nov 11 18:55:48 2002 @@ -0,0 +1,13 @@ +--- convert.cpp.orig Mon Nov 11 18:53:12 2002 ++++ convert.cpp Mon Nov 11 18:54:36 2002 +@@ -1,6 +1,8 @@ +-#include <iostream.h> ++#include <iostream> + #include <id3/tag.h> +-#include <stdlib.h> ++#include <cstdlib> ++ ++using namespace std; + + void DeleteTag(int argc, char *argv[], int optind, int whichTags) + { diff -Nur id3v2.orig/files/patch-id3v2_1 id3v2/files/patch-id3v2_1 --- id3v2.orig/files/patch-id3v2_1 Thu Jan 1 01:00:00 1970 +++ id3v2/files/patch-id3v2_1 Mon Nov 11 18:36:24 2002 @@ -0,0 +1,77 @@ +--- /dev/null Wed Oct 10 15:39:32 2001 ++++ id3v2.1 Mon Dec 11 00:53:03 2000 +@@ -0,0 +1,74 @@ ++.TH ID3V2 1 "May 2000" "" "User Command" ++.SH NAME ++id3v2 \- Adds/Modifies/Removes/Views id3v2 tags, converts/lists id3v1 tags ++.SH SYNOPSIS ++.B id3v2 ++.RB [ ++.I OPTION ++.RB ] ++... ++.RB [ ++.I FILE ++.RB ] ++... ++.br ++.SH OPTIONS ++.TP ++.B \-h, \-\-help ++Display help and exit ++.TP ++.B \-f, \-\-list\-frames ++Display all possible frames for id3v2 ++.TP ++.B \-L, \-\-list\-genres ++Lists all id3v1 genres ++.TP ++.B \-v, \-\-version ++Display version information and exit ++.TP ++.B \-l, \-\-list ++Lists the tag(s) on the file(s) ++.TP ++.B \-R, \-\-list-rfc822 ++Lists using an rfc822\-style format for output ++.TP ++.B \-d, \-\-delete\-v2 ++Deletes id3v2 tags ++.TP ++.B \-s, \-\-delete\-v1 ++Deletes id3v1 tags ++.TP ++.B \-D, \-\-delete\-all ++ Deletes both id3v1 and id3v2 tags ++.TP ++.B \-C, \-\-convert ++ Converts id3v1 tag to id3v2 ++.TP ++.B \-a, \-\-artist ARTIST ++Set the artist information ++.TP ++.B \-A, \-\-album ALBUM ++Set the album title information ++.TP ++.B \-t, \-\-song SONG ++Set the song title information ++.TP ++.B \-c, \-\-comment DESCRIPTION:COMMENT ++Set the comment information ++.TP ++.B \-g, \-\-genre num ++Set the genre number ++.TP ++.B \-y, \-\-year num ++Set the year ++.TP ++.B \-T, \-\-track num/num ++Set the track number/(optional) total tracks ++ ++.SH SEE ALSO ++id3tag(1), id3info(1), id3convert(1) ++.SH AUTHOR ++.B id3v2 ++is by myers <icepick@users.sourceforge.net> with major portions used from id3lib ++examples. Manual page written for Debian GNU/Linux by Robert Woodcock ++<rcw@debian.org>. diff -Nur id3v2.orig/files/patch-id3v2_cpp id3v2/files/patch-id3v2_cpp --- id3v2.orig/files/patch-id3v2_cpp Thu Jan 1 01:00:00 1970 +++ id3v2/files/patch-id3v2_cpp Mon Nov 11 18:56:16 2002 @@ -0,0 +1,29 @@ +--- id3v2.cpp.orig Mon Nov 11 18:47:38 2002 ++++ id3v2.cpp Mon Nov 11 18:53:32 2002 +@@ -2,20 +2,21 @@ + #include <config.h> + #endif + +-#include <stdio.h> +-#include <iostream.h> +-#include <string.h> ++#include <cstdio> ++#include <iostream> ++#include <cstring> + #include <id3/tag.h> + #include <getopt.h> +-#include <stdlib.h> ++#include <cstdlib> + #include <id3/misc_support.h> + + #include <sys/types.h> + #include <sys/stat.h> +-#include <unistd.h> + + #define VERSION_NUMBER "$Revision: 1.7 $" + #define MAXNOFRAMES 1000 ++ ++using namespace std; + + /* Write both tags by default */ + flags_t UpdFlags = ID3TT_ALL; diff -Nur id3v2.orig/files/patch-list_cpp id3v2/files/patch-list_cpp --- id3v2.orig/files/patch-list_cpp Thu Jan 1 01:00:00 1970 +++ id3v2/files/patch-list_cpp Mon Nov 11 18:56:01 2002 @@ -0,0 +1,24 @@ +--- list.cpp.orig Mon Nov 11 18:53:23 2002 ++++ list.cpp Mon Nov 11 18:54:14 2002 +@@ -17,15 +17,17 @@ + #include <config.h> + #endif + +-#include <iostream.h> +-#include <string.h> ++#include <iostream> ++#include <cstring> + #include <id3/tag.h> + #include <getopt.h> +-#include <stdlib.h> +-#include <stdio.h> ++#include <cstdlib> ++#include <cstdio> + #include <id3/misc_support.h> + #include "frametable.h" + #include "genre.h" ++ ++using namespace std; + + char *GetDescription(const ID3_FrameID eFrameID) + { --------------070606030607000708050800-- 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?3DDB7C3C.3080401>