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

Bump PKGREVISION because this changes default options (on Linux only)
This commit is contained in:
nia 2020-01-20 21:26:52 +00:00
parent b438a1c8c0
commit 53b93b4fce
3 changed files with 20 additions and 16 deletions

View file

@ -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/}

View file

@ -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?= ../../audio/libmikmod
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

View file

@ -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