CVS commit: pkgsrc/audio/libxspf

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Dec 16 22:46:05 UTC 2025

Modified Files:
        pkgsrc/audio/libxspf: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/audio/libxspf/patches: patch-src_XspfReader.cpp

Log Message:
libxspf: remove broken uriparser version check

Fix pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/libxspf/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/libxspf/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/libxspf/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/libxspf/patches/patch-src_XspfReader.cpp

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

Modified files:

Index: pkgsrc/audio/libxspf/Makefile
diff -u pkgsrc/audio/libxspf/Makefile:1.8 pkgsrc/audio/libxspf/Makefile:1.9
--- pkgsrc/audio/libxspf/Makefile:1.8   Mon Nov 17 11:00:19 2025
+++ pkgsrc/audio/libxspf/Makefile       Tue Dec 16 22:46:05 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2025/11/17 11:00:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2025/12/16 22:46:05 wiz Exp $
 
 DISTNAME=      libxspf-1.2.1
 PKGREVISION=   1
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=      --with-expat=${BUILDLIN
 CONFIGURE_ARGS+=       --disable-test
 #TEST_TARGET=          check
 
-BUILDLINK_ABI_DEPENDS.expat+=          expat>=2.0.0nb1
+BUILDLINK_API_DEPENDS.expat+=          expat>=2.0.0nb1
 BUILDLINK_API_DEPENDS.uriparser+=      uriparser>=0.7.5
 
 .include "../../textproc/expat/buildlink3.mk"

Index: pkgsrc/audio/libxspf/buildlink3.mk
diff -u pkgsrc/audio/libxspf/buildlink3.mk:1.2 pkgsrc/audio/libxspf/buildlink3.mk:1.3
--- pkgsrc/audio/libxspf/buildlink3.mk:1.2      Sun Jan  7 13:03:55 2018
+++ pkgsrc/audio/libxspf/buildlink3.mk  Tue Dec 16 22:46:05 2025
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:55 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/12/16 22:46:05 wiz Exp $
 
-BUILDLINK_TREE+=       libspiff
+BUILDLINK_TREE+=       libxspf
 
-.if !defined(LIBSPIFF_BUILDLINK3_MK)
-LIBSPIFF_BUILDLINK3_MK:=
+.if !defined(LIBXSPF_BUILDLINK3_MK)
+LIBXSPF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libspiff+=       libxspf>=1.2.0
-BUILDLINK_PKGSRCDIR.libspiff?=         ../../audio/libxspf
+BUILDLINK_API_DEPENDS.libxspf+=        libxspf>=1.2.0
+BUILDLINK_PKGSRCDIR.libxspf?=  ../../audio/libxspf
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/uriparser/buildlink3.mk"
-.endif # LIBSPIFF_BUILDLINK3_MK
+.endif # LIBXSPF_BUILDLINK3_MK
 
-BUILDLINK_TREE+=       -libspiff
+BUILDLINK_TREE+=       -libxspf

Index: pkgsrc/audio/libxspf/distinfo
diff -u pkgsrc/audio/libxspf/distinfo:1.5 pkgsrc/audio/libxspf/distinfo:1.6
--- pkgsrc/audio/libxspf/distinfo:1.5   Sat Nov 13 10:49:00 2021
+++ pkgsrc/audio/libxspf/distinfo       Tue Dec 16 22:46:05 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/11/13 10:49:00 nia Exp $
+$NetBSD: distinfo,v 1.6 2025/12/16 22:46:05 wiz Exp $
 
 BLAKE2s (libxspf-1.2.1.tar.bz2) = 4d260cfe05dc693d0eb58f9ed7b8e7081072d1780f4aa81b005ef28eb5a475df
 SHA512 (libxspf-1.2.1.tar.bz2) = e2ac7c56fe71536c198caffac654056c48c619ca0b8bd97905d564ec7aebb60e74b3cdc94b3a2ae3ca6f195fd56034e0483503dc091f1f4d5808d72d086d2613
 Size (libxspf-1.2.1.tar.bz2) = 479581 bytes
 SHA1 (patch-aa) = 16f441fd7662395244feae0bebf03497c1bba0ed
+SHA1 (patch-src_XspfReader.cpp) = ff2c1c34c03a297af0148547a70aff31a8dcdcdf

Added files:

Index: pkgsrc/audio/libxspf/patches/patch-src_XspfReader.cpp
diff -u /dev/null pkgsrc/audio/libxspf/patches/patch-src_XspfReader.cpp:1.1
--- /dev/null   Tue Dec 16 22:46:05 2025
+++ pkgsrc/audio/libxspf/patches/patch-src_XspfReader.cpp       Tue Dec 16 22:46:05 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_XspfReader.cpp,v 1.1 2025/12/16 22:46:05 wiz Exp $
+
+Remove broken uriparser version check.
+
+--- src/XspfReader.cpp.orig    2025-12-16 22:44:25.338208693 +0000
++++ src/XspfReader.cpp
+@@ -61,10 +61,6 @@
+ #include <cstring> // size_t
+ #include <cstddef> // int
+ 
+-#if (URI_VER_MINOR < 7) || ((URI_VER_MINOR == 7) && (URI_VER_RELEASE < 2))
+-# error uriparser 0.7.2 or later is required
+-#endif
+-
+ 
+ namespace {
+