From 674385e7bdd7edf43985cb286df9e1e5cef3b721 Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 31 Aug 2007 10:32:49 +0000 Subject: update to 0.8.5a changes: - Added handling of 'free form' bitrate frames, the lack of which was causing segfaults on AMD 64-bit sytems - Tweaked code to eliminate various gcc warnings and errors - Improved detection of invalid MP3 frames - Updated gmp3info for GTK 2 - Miscellaneous documentation updates and corrections - Fixed possible buffer overflow condition in gmp3info approved by tron --- audio/gmp3info/Makefile | 7 +++-- audio/gmp3info/distinfo | 12 ++++----- audio/gmp3info/patches/patch-aa | 22 +++++++++------- audio/gmp3info/patches/patch-ab | 23 ---------------- audio/gmp3info/patches/patch-ac | 58 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 43 deletions(-) delete mode 100644 audio/gmp3info/patches/patch-ab create mode 100644 audio/gmp3info/patches/patch-ac diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile index ec666f87121..a00a63a2655 100644 --- a/audio/gmp3info/Makefile +++ b/audio/gmp3info/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:08 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2007/08/31 10:32:49 drochner Exp $ -DISTNAME= mp3info-0.8.4 +DISTNAME= mp3info-0.8.5a PKGNAME= g${DISTNAME} -PKGREVISION= 4 CATEGORIES= audio MASTER_SITES= ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/ \ ${MASTER_SITE_SUNSITE:=apps/sound/mp3-utils/mp3info/} @@ -18,6 +17,6 @@ CONFLICTS= mp3info-[0-9]* INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-* .include "../../devel/ncurses/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gmp3info/distinfo b/audio/gmp3info/distinfo index 93815448d41..b6f0072c4dc 100644 --- a/audio/gmp3info/distinfo +++ b/audio/gmp3info/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2005/02/23 20:39:46 agc Exp $ +$NetBSD: distinfo,v 1.8 2007/08/31 10:32:49 drochner Exp $ -SHA1 (mp3info-0.8.4.tgz) = a291aa1c3c216f838f85c1148adbb69f7bf31d80 -RMD160 (mp3info-0.8.4.tgz) = 265db8a8c32956b485c4af8aa42f2f29d4bb0825 -Size (mp3info-0.8.4.tgz) = 38773 bytes -SHA1 (patch-aa) = 8d371ae15a05bd3d4f52ad0b850b9e739fcb0b54 -SHA1 (patch-ab) = 7b96582d8b0681383afacb89c3ca968b3d6b24c4 +SHA1 (mp3info-0.8.5a.tgz) = 54df29eb6c2e581899affc12be698b0a71d91ca6 +RMD160 (mp3info-0.8.5a.tgz) = 898b566d9ba2f352949d061d991d92f2c8996ec3 +Size (mp3info-0.8.5a.tgz) = 127482 bytes +SHA1 (patch-aa) = d5fd1dc7e912ba07d7f717aad118a160f5defe30 +SHA1 (patch-ac) = 8cc78ef7b1d0b85b5d42536b45e481bfd50d26d9 diff --git a/audio/gmp3info/patches/patch-aa b/audio/gmp3info/patches/patch-aa index bdb78044d55..3404798d0f1 100644 --- a/audio/gmp3info/patches/patch-aa +++ b/audio/gmp3info/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2002/09/21 00:44:10 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2007/08/31 10:32:49 drochner Exp $ ---- Makefile.orig Fri Aug 18 17:42:22 2000 +--- Makefile.orig 2006-11-10 01:14:11.000000000 +0100 +++ Makefile @@ -28,9 +28,8 @@ # bindir = where binaries get installed (default = /usr/local/bin) @@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.3 2002/09/21 00:44:10 jlam Exp $ # No changes necessary below this line -@@ -43,9 +42,9 @@ +@@ -43,9 +42,9 @@ RM = /bin/rm INSTALL = /usr/bin/install -c STRIP = strip @@ -27,18 +27,20 @@ $NetBSD: patch-aa,v 1.3 2002/09/21 00:44:10 jlam Exp $ all: mp3info gmp3info doc -@@ -69,11 +68,9 @@ +@@ -69,13 +68,11 @@ distclean: clean $(RM) -f mp3info.txt - install: mp3info gmp3info + install-mp3info: mp3info - $(STRIP) mp3info - $(INSTALL) mp3info $(bindir)/mp3info -- $(STRIP) gmp3info -- $(INSTALL) gmp3info $(bindir)/gmp3info - $(INSTALL) mp3info.1 $(mandir)/mp3info.1 + $(BSD_INSTALL_PROGRAM) mp3info $(bindir)/mp3info -+ $(BSD_INSTALL_PROGRAM) gmp3info $(bindir)/gmp3info + $(BSD_INSTALL_DATA) mp3info.1 $(mandir)/mp3info.1 - uninstall: - rm -f $(bindir)/mp3info + install-gmp3info: gmp3info +- $(STRIP) gmp3info +- $(INSTALL) gmp3info $(bindir)/gmp3info ++ $(BSD_INSTALL_PROGRAM) gmp3info $(bindir)/gmp3info + + install: install-mp3info install-gmp3info + diff --git a/audio/gmp3info/patches/patch-ab b/audio/gmp3info/patches/patch-ab deleted file mode 100644 index 390051b37e4..00000000000 --- a/audio/gmp3info/patches/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2003/09/21 20:39:27 tron Exp $ - ---- gmp3info.c.orig 2001-07-16 11:17:16.000000000 +0200 -+++ gmp3info.c 2003-09-21 22:36:40.000000000 +0200 -@@ -484,12 +484,12 @@ - } - - void about_mp3info(void) { -- quick_popup(VERSION,"MP3Info -- An ID3 Tag Editor\n\n -- Original author: Ricardo Cerqueira -- Current maintainer: Cedric Tefft -- GTK Version: Ricardo Cerqueira \n\n -- Ricardo Cerqueira, Cedric Tefft 1999-2001\n\n"); -+ quick_popup(VERSION,"MP3Info\n" -+ "An ID3 Tag Editor\n\n\n" -+ "Original author: Ricardo Cerqueira \n" -+ "Current maintainer: Cedric Tefft \n" -+ "GTK Version: Ricardo Cerqueira \n\n\n" -+ "Ricardo Cerqueira, Cedric Tefft 1999-2001\n\n\n"); - } - - /* rmcc has left the building */ diff --git a/audio/gmp3info/patches/patch-ac b/audio/gmp3info/patches/patch-ac new file mode 100644 index 00000000000..2641693b9be --- /dev/null +++ b/audio/gmp3info/patches/patch-ac @@ -0,0 +1,58 @@ +$NetBSD: patch-ac,v 1.1 2007/08/31 10:32:50 drochner Exp $ + +--- gmp3info.c.orig 2006-11-10 01:11:43.000000000 +0100 ++++ gmp3info.c +@@ -103,7 +103,7 @@ int main(int argc, char *argv[] ) { + id3win=gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(id3win),"MP3info - An ID3 tag editor"); + gtk_window_set_policy (GTK_WINDOW(id3win), FALSE,FALSE,FALSE); +- gtk_widget_set_usize(id3win,450,360); ++ /*gtk_widget_set_usize(id3win,450,360);*/ + gtk_container_border_width(GTK_CONTAINER(id3win),5); + gtk_signal_connect(GTK_OBJECT(id3win), "delete_event", (GtkSignalFunc) gtk_exit, NULL); + id3win_frame_global=gtk_vbox_new(FALSE,5); +@@ -171,7 +171,7 @@ int main(int argc, char *argv[] ) { + gtk_box_pack_start(GTK_BOX(id3win_frame_albyear),id3win_frame_album,TRUE,TRUE,0); + + id3win_frame_year=gtk_frame_new("Year"); +- gtk_widget_set_usize(id3win_frame_year,2,0); ++ /*gtk_widget_set_usize(id3win_frame_year,2,0);*/ + gtk_container_border_width(GTK_CONTAINER(id3win_frame_year),5); + id3win_text_year=gtk_entry_new_with_max_length(4); + gtk_container_add(GTK_CONTAINER(id3win_frame_year),id3win_text_year); +@@ -186,7 +186,7 @@ int main(int argc, char *argv[] ) { + gtk_box_pack_start(GTK_BOX(id3win_frame_comtrack),id3win_frame_comment,TRUE,TRUE,0); + + id3win_frame_track=gtk_frame_new("Track"); +- gtk_widget_set_usize(id3win_frame_track,2,0); ++ /*gtk_widget_set_usize(id3win_frame_track,2,0);*/ + gtk_container_border_width(GTK_CONTAINER(id3win_frame_track),5); + id3win_text_track=gtk_entry_new_with_max_length(3); + gtk_container_add(GTK_CONTAINER(id3win_frame_track),id3win_text_track); +@@ -220,7 +220,7 @@ int main(int argc, char *argv[] ) { + gtk_signal_connect (GTK_OBJECT (id3win_cancel_button), "clicked", GTK_SIGNAL_FUNC (gtk_exit), NULL); + } + +- gtk_widget_set_usize(id3win_frame_buttons,30,20); ++ /*gtk_widget_set_usize(id3win_frame_buttons,30,20);*/ + gtk_box_pack_start(GTK_BOX(id3win_frame_global),id3win_frame_buttons,TRUE,TRUE,0); + + gtk_container_add(GTK_CONTAINER(id3win),id3win_frame_global); +@@ -305,7 +305,7 @@ void create_techinfo_win(void) { + + + infowin_main = gtk_window_new(GTK_WINDOW_TOPLEVEL); +- gtk_widget_set_usize(infowin_main, 230, 300); ++ /*gtk_widget_set_usize(infowin_main, 230, 300);*/ + gtk_container_border_width(GTK_CONTAINER(infowin_main), 15); + gtk_window_set_title(GTK_WINDOW(infowin_main), "MP3 Technical Info"); + gtk_window_set_policy(GTK_WINDOW(infowin_main), FALSE, FALSE, FALSE); +@@ -363,7 +363,7 @@ void create_techinfo_win(void) { + } + + infowin_button_frame=gtk_hbox_new(TRUE,30); +- gtk_widget_set_usize(infowin_button_frame,30,20); ++ /*gtk_widget_set_usize(infowin_button_frame,30,20);*/ + gtk_box_pack_start(GTK_BOX(infowin_main_frame),infowin_button_frame,TRUE,TRUE,0); + + -- cgit v1.2.3