CVS commit: pkgsrc/audio/ices-mp3

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Mon Aug 18 05:26:28 UTC 2025

Modified Files:
        pkgsrc/audio/ices-mp3: Makefile distinfo
        pkgsrc/audio/ices-mp3/patches: patch-src_in_flac.c
Added Files:
        pkgsrc/audio/ices-mp3/patches: patch-src_in_vorbis.c

Log Message:
audio/ices-mp3: Improve Vorbis tag handling

Thanks to Dan Engholm


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/audio/ices-mp3/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/ices-mp3/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ices-mp3/patches/patch-src_in_flac.c
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/ices-mp3/patches/patch-src_in_vorbis.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/ices-mp3/Makefile
diff -u pkgsrc/audio/ices-mp3/Makefile:1.63 pkgsrc/audio/ices-mp3/Makefile:1.64
--- pkgsrc/audio/ices-mp3/Makefile:1.63 Fri Jul  4 08:44:45 2025
+++ pkgsrc/audio/ices-mp3/Makefile      Mon Aug 18 05:26:28 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.63 2025/07/04 08:44:45 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2025/08/18 05:26:28 kim Exp $
 #
 
 DISTNAME=              ices-${ICES_VERSION}
 PKGNAME=               ices-mp3-${ICES_VERSION}
-PKGREVISION=           43
+PKGREVISION=           44
 ICES_VERSION=          0.4
 CATEGORIES=            audio
 MASTER_SITES=          https://downloads.xiph.org/releases/ices/
@@ -13,7 +13,7 @@ HOMEPAGE=             http://www.icecast.org/ices.p
 COMMENT=               Source client for a streaming server
 LICENSE=               gnu-gpl-v2
 
-USE_TOOLS+=            automake pkg-config
+USE_TOOLS+=            automake autoreconf pkg-config
 TOOLS_BROKEN+=         perl
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes

Index: pkgsrc/audio/ices-mp3/distinfo
diff -u pkgsrc/audio/ices-mp3/distinfo:1.9 pkgsrc/audio/ices-mp3/distinfo:1.10
--- pkgsrc/audio/ices-mp3/distinfo:1.9  Tue Dec  3 10:11:34 2024
+++ pkgsrc/audio/ices-mp3/distinfo      Mon Aug 18 05:26:28 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2024/12/03 10:11:34 wiz Exp $
+$NetBSD: distinfo,v 1.10 2025/08/18 05:26:28 kim Exp $
 
 BLAKE2s (ices-0.4.tar.gz) = 4d107b7de5591d0e92dd48cc44f64aa7dcfff2714c8b115578ebc4f93c952d93
 SHA512 (ices-0.4.tar.gz) = a66c811c4156b92efb615c6024477ae979cdca69701b44853bbd1e6c2696d0ddc618f9ee16b0c7c83591ee50b365210c17732c170dca5266d7cebe2bcd5767d3
 Size (ices-0.4.tar.gz) = 372837 bytes
 SHA1 (patch-configure.ac) = 305da92f83100f36c9f57c1741cc63a0fef10d12
-SHA1 (patch-src_in_flac.c) = d7aa28c15b55d424e67fa6052570b8ea7f6007fe
+SHA1 (patch-src_in_flac.c) = 7d1ab0e978a1b9a6fb98d32ea6396dfd954351e8
+SHA1 (patch-src_in_vorbis.c) = c3c9e281e156f6b812894e32317185f8c74f069e

Index: pkgsrc/audio/ices-mp3/patches/patch-src_in_flac.c
diff -u pkgsrc/audio/ices-mp3/patches/patch-src_in_flac.c:1.1 pkgsrc/audio/ices-mp3/patches/patch-src_in_flac.c:1.2
--- pkgsrc/audio/ices-mp3/patches/patch-src_in_flac.c:1.1       Tue Dec  3 09:57:13 2024
+++ pkgsrc/audio/ices-mp3/patches/patch-src_in_flac.c   Mon Aug 18 05:26:28 2025
@@ -1,7 +1,10 @@
-$NetBSD: patch-src_in_flac.c,v 1.1 2024/12/03 09:57:13 kim Exp $
+$NetBSD: patch-src_in_flac.c,v 1.2 2025/08/18 05:26:28 kim Exp $
 
 Adapt to latest libFLAC API.
 
+Compare against title= and artist= to avoid accidentally matching
+titlesort and artistsort.
+
 --- src/in_flac.c.orig 2004-07-31 17:52:24.000000000 +0000
 +++ src/in_flac.c
 @@ -76,18 +76,10 @@ ices_flac_open (input_stream_t* self, ch

Added files:

Index: pkgsrc/audio/ices-mp3/patches/patch-src_in_vorbis.c
diff -u /dev/null pkgsrc/audio/ices-mp3/patches/patch-src_in_vorbis.c:1.1
--- /dev/null   Mon Aug 18 05:26:28 2025
+++ pkgsrc/audio/ices-mp3/patches/patch-src_in_vorbis.c Mon Aug 18 05:26:28 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_in_vorbis.c,v 1.1 2025/08/18 05:26:28 kim Exp $
+
+Compare against title= and artist= to avoid accidentally matching
+titlesort and artistsort.
+
+--- src/in_vorbis.c.orig       2025-08-18 01:08:49.075203334 +0000
++++ src/in_vorbis.c
+@@ -234,9 +234,9 @@ in_vorbis_set_metadata (ices_vorbis_in_t
+   for (i = 0; i < comment->comments; i++) {
+     key = comment->user_comments[i];
+     ices_log_debug ("Vorbis comment found: %s", key);
+-    if (! strncasecmp ("artist", key, 6))
++    if (! strncasecmp ("artist=", key, 7))
+       artist = key+7;
+-    else if (! strncasecmp ("title", key, 5))
++    else if (! strncasecmp ("title=", key, 6))
+       title = key+6;
+   }
+