CVS commit: pkgsrc/audio/libmikmod

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jan 20 21:26:52 UTC 2020

Modified Files:
        pkgsrc/audio/libmikmod: Makefile buildlink3.mk options.mk

Log Message:
libmikmod: Remove esound support; add alsa and pulse support instead.

Bump PKGREVISION because this changes default options (on Linux only)


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/audio/libmikmod/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/libmikmod/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/libmikmod/options.mk

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

Modified files:

Index: pkgsrc/audio/libmikmod/Makefile
diff -u pkgsrc/audio/libmikmod/Makefile:1.63 pkgsrc/audio/libmikmod/Makefile:1.64
--- pkgsrc/audio/libmikmod/Makefile:1.63        Sat Jan 18 23:30:00 2020
+++ pkgsrc/audio/libmikmod/Makefile     Mon Jan 20 21:26:52 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2020/01/18 23:30:00 rillig Exp $
+# $NetBSD: Makefile,v 1.64 2020/01/20 21:26:52 nia Exp $
 
 DISTNAME=      libmikmod-3.3.11.1
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mikmod/}
 

Index: pkgsrc/audio/libmikmod/buildlink3.mk
diff -u pkgsrc/audio/libmikmod/buildlink3.mk:1.20 pkgsrc/audio/libmikmod/buildlink3.mk:1.21
--- pkgsrc/audio/libmikmod/buildlink3.mk:1.20   Sat Nov 12 07:34:01 2016
+++ pkgsrc/audio/libmikmod/buildlink3.mk        Mon Jan 20 21:26:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2016/11/12 07:34:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2020/01/20 21:26:52 nia Exp $
 
 BUILDLINK_TREE+=       libmikmod
 
@@ -11,13 +11,6 @@ BUILDLINK_PKGSRCDIR.libmikmod?=              ../../a
 
 pkgbase := libmikmod
 .include "../../mk/pkg-build-options.mk"
-
-# On some platforms, libmikmod dynamically loads esound,
-# so there is no library dependency
-.if !empty(PKG_BUILD_OPTIONS.libmikmod:Mesound) && \
-  empty(OPSYS:MNetBSD) && empty(OPSYS:MLinux)
-.  include "../../audio/esound/buildlink3.mk"
-.endif
 .endif # LIBMIKMOD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libmikmod

Index: pkgsrc/audio/libmikmod/options.mk
diff -u pkgsrc/audio/libmikmod/options.mk:1.2 pkgsrc/audio/libmikmod/options.mk:1.3
--- pkgsrc/audio/libmikmod/options.mk:1.2       Thu Mar  9 21:04:40 2006
+++ pkgsrc/audio/libmikmod/options.mk   Mon Jan 20 21:26:52 2020
@@ -1,16 +1,26 @@
-# $NetBSD: options.mk,v 1.2 2006/03/09 21:04:40 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2020/01/20 21:26:52 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libmikmod
-PKG_SUPPORTED_OPTIONS= esound oss
+PKG_SUPPORTED_OPTIONS= pulseaudio
+
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=        alsa
+PKG_SUGGESTED_OPTIONS+=        alsa
+.endif
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+=       --enable-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=       --disable-esd
+CONFIGURE_ARGS+=       --disable-alsa
 .endif
 
-.if !empty(PKG_OPTIONS:Moss)
-.  include "../../mk/oss.buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIGURE_ARGS+=       --enable-pulseaudio
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-pulseaudio
 .endif