CVS commit: pkgsrc/audio/xmp

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Dec  1 13:34:43 UTC 2025

Modified Files:
        pkgsrc/audio/xmp: Makefile distinfo
        pkgsrc/audio/xmp/patches: patch-src_options.c
Added Files:
        pkgsrc/audio/xmp/patches: patch-src_Makefile.in
Removed Files:
        pkgsrc/audio/xmp/patches: patch-etc_Makefile patch-src_drivers_netbsd.c
            patch-src_sound_oss.c

Log Message:
xmp: updated to 4.2.0

4.2.0 (20230615):
        Changes by Özkan Sezer:
        - Fix OS/2 and Amiga builds. OS-specific tweaks.
        - DOS Sound Blaster output, adapted from mikmod.
        - Build system improvements.
        Changes by Emanuel Haupt:
        - Make configure detect sndio on FreeBSD
        Changes by Alice Rowan:
        - Fix mod->xxs out-of-bounds read.
        - Fix terminal output for MSYS2.
        - Fix crash-on-exit in Windows audio output.
        - Fixes to BSD audio output modules.
        Changes by Cameron Cawley:
        - Support compiling for Windows with OpenWatcom.
        - DOS Sound Blaster support using OpenWatcom.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/audio/xmp/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/audio/xmp/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/audio/xmp/patches/patch-etc_Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/xmp/patches/patch-src_Makefile.in
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/xmp/patches/patch-src_drivers_netbsd.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/xmp/patches/patch-src_options.c
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/xmp/patches/patch-src_sound_oss.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/xmp/Makefile
diff -u pkgsrc/audio/xmp/Makefile:1.69 pkgsrc/audio/xmp/Makefile:1.70
--- pkgsrc/audio/xmp/Makefile:1.69      Mon Nov 17 11:00:24 2025
+++ pkgsrc/audio/xmp/Makefile   Mon Dec  1 13:34:43 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2025/11/17 11:00:24 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2025/12/01 13:34:43 adam Exp $
 
-DISTNAME=      xmp-4.1.0
-PKGREVISION=   13
+DISTNAME=      xmp-4.2.0
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xmp/}
 
@@ -27,9 +26,9 @@ INSTALL_MAKE_FLAGS+=  INSTALL=${INSTALL:Q
 .if ${OPSYS} != "NetBSD" && \
     ${OPSYS} != "SunOS" && \
     ${OSS_TYPE} != "none"
-LIBS+=         ${LIBOSSAUDIO}
-CPPFLAGS+=     -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-CPPFLAGS+=     -DDEVOSSSOUND="\"${DEVOSSSOUND}\""
+LIBS+=                 ${LIBOSSAUDIO}
+CPPFLAGS+=             -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+CPPFLAGS+=             -DDEVOSSSOUND="\"${DEVOSSSOUND}\""
 .else
 CONFIGURE_ARGS+=       --disable-oss
 .endif

Index: pkgsrc/audio/xmp/distinfo
diff -u pkgsrc/audio/xmp/distinfo:1.21 pkgsrc/audio/xmp/distinfo:1.22
--- pkgsrc/audio/xmp/distinfo:1.21      Tue Oct 26 09:59:38 2021
+++ pkgsrc/audio/xmp/distinfo   Mon Dec  1 13:34:43 2025
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 09:59:38 nia Exp $
+$NetBSD: distinfo,v 1.22 2025/12/01 13:34:43 adam Exp $
 
-BLAKE2s (xmp-4.1.0.tar.gz) = cc5e21ff33ed968af09900f8c0de0c8fd4b60e470d0fb96b348a2b05effabc57
-SHA512 (xmp-4.1.0.tar.gz) = 9d9791b729f902afc8c728609e82c06fc6576d915b83a01957b1ca585d726f00196f9059df1d86c3e75db7b275416b3d550aea32b140daafaf20b0170ae2dc32
-Size (xmp-4.1.0.tar.gz) = 210435 bytes
-SHA1 (patch-etc_Makefile) = 5816b82a6253a627b39ff2ca262bfb5675ca97e3
-SHA1 (patch-src_drivers_netbsd.c) = ff8c97165380ea2323957135554fda53253b00d5
-SHA1 (patch-src_options.c) = f372d1336e795b77c7ce38230bf69dd363da02c2
-SHA1 (patch-src_sound_oss.c) = 251a09075ade185e33938be67776e7740473a6a5
+BLAKE2s (xmp-4.2.0.tar.gz) = aedfcea23f85825015bcbfb3aef835fce9505f33b0d3046e867e4889d173991d
+SHA512 (xmp-4.2.0.tar.gz) = dc9834f6a08b1d9c5b8b91a32c0e886fc4da769e9c3c5c8b94d21ca672293d1911d43c75c1a5a820cb95286d7da46b0bd2ae91574d357c3ce78ee2777f216d04
+Size (xmp-4.2.0.tar.gz) = 224328 bytes
+SHA1 (patch-src_Makefile.in) = 5816b82a6253a627b39ff2ca262bfb5675ca97e3
+SHA1 (patch-src_options.c) = fe293ddf0e6ab58b0dc5b2eea16c13c0c2e4b693

Index: pkgsrc/audio/xmp/patches/patch-src_options.c
diff -u pkgsrc/audio/xmp/patches/patch-src_options.c:1.1 pkgsrc/audio/xmp/patches/patch-src_options.c:1.2
--- pkgsrc/audio/xmp/patches/patch-src_options.c:1.1    Tue Dec 10 07:14:45 2013
+++ pkgsrc/audio/xmp/patches/patch-src_options.c        Mon Dec  1 13:34:43 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_options.c,v 1.1 2013/12/10 07:14:45 rxg Exp $
+$NetBSD: patch-src_options.c,v 1.2 2025/12/01 13:34:43 adam Exp $
 
---- src/options.c.orig 2013-05-19 14:18:19.000000000 +0000
+--- src/options.c.orig 2023-06-15 20:11:10.000000000 +0000
 +++ src/options.c
-@@ -317,6 +317,6 @@ void get_options(int argc, char **argv, 
+@@ -385,8 +385,8 @@ void get_options(int argc, char **argv,
        /* Set limits */
        if (options->rate < 1000)
                options->rate = 1000;   /* Min. rate 1 kHz */
@@ -10,4 +10,6 @@ $NetBSD: patch-src_options.c,v 1.1 2013/
 -              options->rate = 48000;  /* Max. rate 48 kHz */
 +      if (options->rate > 192000)
 +              options->rate = 192000; /* Max. rate 192 kHz */
- }
+ 
+       /* apply guess if no driver selected */
+       if (!options->driver_id)

Added files:

Index: pkgsrc/audio/xmp/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/audio/xmp/patches/patch-src_Makefile.in:1.1
--- /dev/null   Mon Dec  1 13:34:43 2025
+++ pkgsrc/audio/xmp/patches/patch-src_Makefile.in      Mon Dec  1 13:34:43 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2025/12/01 13:34:43 adam Exp $
+
+--- src/Makefile.in.orig       2013-05-19 14:44:09.000000000 +0000
++++ src/Makefile.in
+@@ -509,18 +509,18 @@ uninstall-man1:
+       dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-pkgsysconfDATA: $(pkgsysconf_DATA)
+       @$(NORMAL_INSTALL)
+-      @list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
++      @list='$(pkgsysconf_DATA)'; test -n "$(datarootdir)/examples/xmp" || list=; \
+       if test -n "$$list"; then \
+-        echo " $(MKDIR_P) '$(DESTDIR)$(pkgsysconfdir)'"; \
+-        $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)" || exit 1; \
++        echo " $(MKDIR_P) '$(DESTDIR)$(datarootdir)/examples/xmp/'"; \
++        $(MKDIR_P) "$(DESTDIR)$(datarootdir)/examples/xmp/" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+-        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \
+-        $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \
++        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datarootdir)/examples/xmp/'"; \
++        $(INSTALL_DATA) $$files "$(DESTDIR)$(datarootdir)/examples/xmp/" || exit $$?; \
+       done
+ 
+ uninstall-pkgsysconfDATA: