Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715018491300000"
MIME-Version: 1.0
Date: Mon, 6 May 2024 18:01:31 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240506180131.9C64DFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715018491300000
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Mon May  6 18:01:31 UTC 2024

Modified Files:
	pkgsrc/audio: Makefile
	pkgsrc/audio/SDL2_mixer: buildlink3.mk
Added Files:
	pkgsrc/audio/SDL2_mixer-legacy: DESCR Makefile PLIST buildlink3.mk
	    distinfo

Log Message:
import a legacy version of SDL2_mixer to go with the legacy SDL2.


To generate a diff of this commit:
cvs rdiff -u -r1.700 -r1.701 pkgsrc/audio/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/SDL2_mixer/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/SDL2_mixer-legacy/DESCR \
    pkgsrc/audio/SDL2_mixer-legacy/Makefile \
    pkgsrc/audio/SDL2_mixer-legacy/PLIST \
    pkgsrc/audio/SDL2_mixer-legacy/buildlink3.mk \
    pkgsrc/audio/SDL2_mixer-legacy/distinfo

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


--_----------=_1715018491300000
Content-Disposition: inline
Content-Length: 4938
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/Makefile
diff -u pkgsrc/audio/Makefile:1.700 pkgsrc/audio/Makefile:1.701
--- pkgsrc/audio/Makefile:1.700	Fri Apr 26 15:01:03 2024
+++ pkgsrc/audio/Makefile	Mon May  6 18:01:30 2024
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.700 2024/04/26 15:01:03 wiz Exp $
+# $NetBSD: Makefile,v 1.701 2024/05/06 18:01:30 nia Exp $
 #
 
 COMMENT=	Audio tools, players, and libraries
 
 SUBDIR+=	SDL2_mixer
+SUBDIR+=	SDL2_mixer-legacy
 SUBDIR+=	SDL2_sound
 SUBDIR+=	SDL_mixer
 SUBDIR+=	SDL_sound

Index: pkgsrc/audio/SDL2_mixer/buildlink3.mk
diff -u pkgsrc/audio/SDL2_mixer/buildlink3.mk:1.15 pkgsrc/audio/SDL2_mixer/buildlink3.mk:1.16
--- pkgsrc/audio/SDL2_mixer/buildlink3.mk:1.15	Sat Apr  6 08:04:46 2024
+++ pkgsrc/audio/SDL2_mixer/buildlink3.mk	Mon May  6 18:01:31 2024
@@ -1,12 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.15 2024/04/06 08:04:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2024/05/06 18:01:31 nia Exp $
 
 BUILDLINK_TREE+=	SDL2_mixer
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${MACHINE_PLATFORM:MDarwin-*-powerpc*}
+# This defines SDL2_MIXER_BUILDLINK3_MK.
+.  include "../../audio/SDL2_mixer-legacy/buildlink3.mk"
+.endif
+
 .if !defined(SDL2_MIXER_BUILDLINK3_MK)
 SDL2_MIXER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL2_mixer+=	SDL2_mixer>=2.0.0
-BUILDLINK_ABI_DEPENDS.SDL2_mixer+=	SDL2_mixer>=2.0.4nb15
 BUILDLINK_PKGSRCDIR.SDL2_mixer?=	../../audio/SDL2_mixer
 
 .include "../../devel/SDL2/buildlink3.mk"

Added files:

Index: pkgsrc/audio/SDL2_mixer-legacy/DESCR
diff -u /dev/null pkgsrc/audio/SDL2_mixer-legacy/DESCR:1.1
--- /dev/null	Mon May  6 18:01:31 2024
+++ pkgsrc/audio/SDL2_mixer-legacy/DESCR	Mon May  6 18:01:31 2024
@@ -0,0 +1,8 @@
+SDL_mixer is a sample multi-channel audio mixer library. It supports any number
+of simultaneously playing channels of 16 bit stereo audio, plus a single channel
+of music, mixed by the popular FLAC, MikMod MOD, Timidity MIDI, Ogg Vorbis, and
+SMPEG MP3 libraries.
+
+As of SDL_mixer 1.2.7, FLAC, MikMod, Ogg Vorbis and MP3 loading libraries are
+dynamically loaded, so if you don't need to load those formats, you don't need
+to include those shared libraries.
Index: pkgsrc/audio/SDL2_mixer-legacy/Makefile
diff -u /dev/null pkgsrc/audio/SDL2_mixer-legacy/Makefile:1.1
--- /dev/null	Mon May  6 18:01:31 2024
+++ pkgsrc/audio/SDL2_mixer-legacy/Makefile	Mon May  6 18:01:31 2024
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2024/05/06 18:01:31 nia Exp $
+
+DISTNAME=	SDL2_mixer-2.0.1
+CATEGORIES=	audio devel
+MASTER_SITES=	https://www.libsdl.org/projects/SDL_mixer/release/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://www.libsdl.org/projects/SDL_mixer/
+COMMENT=	Sample multi-channel audio mixer library
+LICENSE=	zlib
+
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
+PKGCONFIG_OVERRIDE+=	SDL2_mixer.pc.in
+
+CONFIGURE_ARGS.Darwin+=	--disable-music-midi-native
+
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libmodplug/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
+.include "../../audio/opusfile/buildlink3.mk"
+.include "../../multimedia/smpeg2/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/SDL2_mixer-legacy/PLIST
diff -u /dev/null pkgsrc/audio/SDL2_mixer-legacy/PLIST:1.1
--- /dev/null	Mon May  6 18:01:31 2024
+++ pkgsrc/audio/SDL2_mixer-legacy/PLIST	Mon May  6 18:01:31 2024
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2024/05/06 18:01:31 nia Exp $
+include/SDL2/SDL_mixer.h
+lib/libSDL2_mixer.la
+lib/pkgconfig/SDL2_mixer.pc
Index: pkgsrc/audio/SDL2_mixer-legacy/buildlink3.mk
diff -u /dev/null pkgsrc/audio/SDL2_mixer-legacy/buildlink3.mk:1.1
--- /dev/null	Mon May  6 18:01:31 2024
+++ pkgsrc/audio/SDL2_mixer-legacy/buildlink3.mk	Mon May  6 18:01:31 2024
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2024/05/06 18:01:31 nia Exp $
+
+BUILDLINK_TREE+=	SDL2_mixer
+
+.if !defined(SDL2_MIXER_BUILDLINK3_MK)
+SDL2_MIXER_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.SDL2_mixer+=	SDL2_mixer>=2.0.0
+BUILDLINK_ABI_DEPENDS.SDL2_mixer+=	SDL2_mixer>=2.0.0
+BUILDLINK_PKGSRCDIR.SDL2_mixer?=	../../audio/SDL2_mixer-legacy
+
+.include "../../devel/SDL2/buildlink3.mk"
+.endif	# SDL2_MIXER_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-SDL2_mixer
Index: pkgsrc/audio/SDL2_mixer-legacy/distinfo
diff -u /dev/null pkgsrc/audio/SDL2_mixer-legacy/distinfo:1.1
--- /dev/null	Mon May  6 18:01:31 2024
+++ pkgsrc/audio/SDL2_mixer-legacy/distinfo	Mon May  6 18:01:31 2024
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2024/05/06 18:01:31 nia Exp $
+
+BLAKE2s (SDL2_mixer-2.0.1.tar.gz) = c9646bd8c02df4529fd26f90e3154806da67500240438301ad591519a70da9c7
+SHA512 (SDL2_mixer-2.0.1.tar.gz) = bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d
+Size (SDL2_mixer-2.0.1.tar.gz) = 10213891 bytes


--_----------=_1715018491300000--