Thu Feb 19 00:20:47 2015 UTC ()
Update to 1.64.6 using audio/streamripper-current and patch from PR 49677
provided by Petar Bogdanovic.

New for 1.64.6
------------------------------------
Mon Mar 30 21:10:13 EDT 2009
* Fix bug which creates corrupted id3v2 tags
* Remove trailing periods for stream name

New for 1.64.5
------------------------------------
Sun Mar  8 12:08:15 EDT 2009
* Change default values for
  - localhost from "localhost" to "127.0.0.1"
  - splitpoint padding from 300 ms to 0 ms
  - metadata and relay codeset (if UTF-8) to ISO-8859-1
  - id3 codeset to UTF-16
  - "keep files in incomplete" from false to true
* Fix parse rules to properly tag artists with "-" in their name (#540543)
* Fix bitrate & metadata reporting in console (#1957248)
* Fix integer overflow on bytes read (#1261305)
* Option for stopping based on megabytes ripped now uses MiB instead of MB
* Support splitting based on empty StreamTitle= strings 2648664

New for 1.64.4
------------------------------------
Mon Feb 16 21:27:29 EST 2009
* Fix problem where corrupt ogg files are being created
* Robustify metadata parsing for Limecast servers
* Fix buffer overflow bug with substitution rules (#2492422)
* Fix file creation bug when "/" is in stream name (#2533980)
* Disable creating cue file for ogg streams
* Fix problem skipping extra track on ogg streams


(wiz)
diff -r1.8 -r1.9 pkgsrc/audio/streamripper/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/audio/streamripper/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/audio/streamripper/options.mk
diff -r1.4 -r1.5 pkgsrc/audio/streamripper/distinfo
diff -r1.1 -r0 pkgsrc/audio/streamripper/patches/patch-aa
diff -r1.2 -r0 pkgsrc/audio/streamripper/patches/patch-ab
diff -r0 -r1.1 pkgsrc/audio/streamripper/patches/patch-ac
diff -r0 -r1.1 pkgsrc/audio/streamripper/patches/patch-ad
diff -r0 -r1.1 pkgsrc/audio/streamripper/patches/patch-lib_ripstream.c
cvs diff -r1.8 -r1.9 pkgsrc/audio/streamripper/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/streamripper/Makefile 2012/10/02 23:48:10 1.8
+++ pkgsrc/audio/streamripper/Makefile 2015/02/19 00:20:47 1.9
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.8 2012/10/02 23:48:10 asau Exp $ 1# $NetBSD: Makefile,v 1.9 2015/02/19 00:20:47 wiz Exp $
2# 
3 2
4DISTNAME= streamripper-1.61.27 3DISTNAME= streamripper-1.64.6
5PKGREVISION= 2 
6CATEGORIES= audio 4CATEGORIES= audio
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=streamripper/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=streamripper/}
8 6
9MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://streamripper.sourceforge.net/ 8HOMEPAGE= http://streamripper.sourceforge.net/
11COMMENT= Splits SHOUTcast stream into tracks 9COMMENT= Splits SHOUTcast stream into tracks
12 10
13GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
 12CONFIGURE_ARGS+= --without-included-libmad
 13USE_TOOLS+= pkg-config
14 14
15PTHREAD_OPTS+= require 15PTHREAD_OPTS+= require
16 16
17.include "options.mk" 17.include "options.mk"
18 18
19.include "../../audio/libmad/buildlink3.mk" 19.include "../../audio/libmad/buildlink3.mk"
20.include "../../converters/libiconv/buildlink3.mk" 20.include "../../converters/libiconv/buildlink3.mk"
 21.include "../../devel/glib2/buildlink3.mk"
21.include "../../mk/pthread.buildlink3.mk" 22.include "../../mk/pthread.buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/streamripper/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/streamripper/PLIST 2005/10/20 19:55:49 1.1.1.1
+++ pkgsrc/audio/streamripper/PLIST 2015/02/19 00:20:47 1.2
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/20 19:55:49 xtraeme Exp $ 1@comment $NetBSD: PLIST,v 1.2 2015/02/19 00:20:47 wiz Exp $
2bin/streamripper 2bin/streamripper
3man/man1/streamripper.1 3man/man1/streamripper.1
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/streamripper/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/streamripper/options.mk 2005/10/20 19:55:49 1.1.1.1
+++ pkgsrc/audio/streamripper/options.mk 2015/02/19 00:20:47 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1.1.1 2005/10/20 19:55:49 xtraeme Exp $ 1# $NetBSD: options.mk,v 1.2 2015/02/19 00:20:47 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.streamripper 3PKG_OPTIONS_VAR= PKG_OPTIONS.streamripper
4PKG_SUPPORTED_OPTIONS= ogg 4PKG_SUPPORTED_OPTIONS= ogg
5PKG_SUGGESTED_OPTIONS= ogg 5PKG_SUGGESTED_OPTIONS= ogg
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mogg) 9.if !empty(PKG_OPTIONS:Mogg)
10. include "../../audio/libvorbis/buildlink3.mk" 10. include "../../audio/libvorbis/buildlink3.mk"
11CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis} 11CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis}
12.else 12.else
13CONFIGURE_ARGS+= --disable-ogg 13CONFIGURE_ARGS+= --disable-ogg
14.endif 14.endif
cvs diff -r1.4 -r1.5 pkgsrc/audio/streamripper/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/streamripper/distinfo 2009/01/07 18:45:54 1.4
+++ pkgsrc/audio/streamripper/distinfo 2015/02/19 00:20:47 1.5
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.4 2009/01/07 18:45:54 drochner Exp $ 1$NetBSD: distinfo,v 1.5 2015/02/19 00:20:47 wiz Exp $
2 2
3SHA1 (streamripper-1.61.27.tar.gz) = bdbf0e301c3c783e1f13c2977508afd5076328ad 3SHA1 (streamripper-1.64.6.tar.gz) = bc8a8d3ad045e0772ca691d2063c39efcc0dca45
4RMD160 (streamripper-1.61.27.tar.gz) = 14b55b91e3b995515d6978383f9fc618fe92bbcb 4RMD160 (streamripper-1.64.6.tar.gz) = 3c010038f7be6959ada637b933feff2616915dba
5Size (streamripper-1.61.27.tar.gz) = 1227559 bytes 5Size (streamripper-1.64.6.tar.gz) = 900205 bytes
6SHA1 (patch-aa) = 1150430aa345f78c58d7a207433947a4241ecf29 6SHA1 (patch-ac) = b22e18723d4888d78f0e5e01e0db40f010b15f96
7SHA1 (patch-ab) = dbcdf5e2c03f4c2b2b63f23026347d15bb452c5c 7SHA1 (patch-ad) = 583dbf02c8adf75eccdfea8c0e8aa181e89256de
 8SHA1 (patch-lib_ripstream.c) = 4cc71c5d58cec36711d9c90a327dea9f466cec2a
File Deleted: pkgsrc/audio/streamripper/patches/Attic/patch-aa
File Deleted: pkgsrc/audio/streamripper/patches/Attic/patch-ab
File Added: pkgsrc/audio/streamripper/patches/patch-ac
$NetBSD: patch-ac,v 1.1 2015/02/19 00:20:47 wiz Exp $

--- lib/argv.c.orig	2007-08-14 17:33:03.000000000 +0200
+++ lib/argv.c
@@ -33,7 +33,7 @@ void freeargv (char **vector);
 
 /*  Routines imported from standard C runtime libraries. */
 
-#ifdef ANSI_PROTOTYPES
+#if 1
 
 #include <stddef.h>
 #include <string.h>
File Added: pkgsrc/audio/streamripper/patches/patch-ad
$NetBSD: patch-ad,v 1.1 2015/02/19 00:20:47 wiz Exp $

--- ./lib/mchar.c.orig	2008-12-11 05:48:39.000000000 +0100
+++ ./lib/mchar.c
@@ -48,7 +48,7 @@
     #define vsnprintf _vsnprintf
 //    #define vswprintf _vsnwprintf
 #else
-    #define ICONV_WCHAR "WCHAR_T"
+    #define ICONV_WCHAR "ucs-4"
     /* This prototype is missing in some systems */
 //    int vswprintf (wchar_t * ws, size_t n, const wchar_t * format, va_list arg);
 #endif
File Added: pkgsrc/audio/streamripper/patches/patch-lib_ripstream.c
$NetBSD: patch-lib_ripstream.c,v 1.1 2015/02/19 00:20:47 wiz Exp $

--- lib/ripstream.c.orig	2008-12-27 15:32:07.000000000 +0100
+++ lib/ripstream.c	2012-01-11 21:38:08.772278869 +0100
@@ -731,7 +731,7 @@ write_id3v2_frame(RIP_MANAGER_INFO* rmi,
     char bigbuf[HEADER_SIZE] = "";
     ID3V2frame id3v2frame;
 #ifndef WIN32
-    __uint32_t framesize = 0;
+    uint32_t framesize = 0;
 #else
     unsigned long int framesize = 0;
 #endif