CVS commit: pkgsrc/audio/adplay

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Sep 10 13:49:14 UTC 2019

Modified Files:
        pkgsrc/audio/adplay: Makefile
Added Files:
        pkgsrc/audio/adplay: options.mk

Log Message:
adplay: Support optional alsa and sdl2 audio outputs.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/adplay/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/adplay/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/adplay/Makefile
diff -u pkgsrc/audio/adplay/Makefile:1.1 pkgsrc/audio/adplay/Makefile:1.2
--- pkgsrc/audio/adplay/Makefile:1.1    Tue Sep 10 12:34:55 2019
+++ pkgsrc/audio/adplay/Makefile        Tue Sep 10 13:49:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/09/10 12:34:55 fcambus Exp $
+# $NetBSD: Makefile,v 1.2 2019/09/10 13:49:14 nia Exp $
 
 DISTNAME=      adplay-1.8
 CATEGORIES=    audio
@@ -28,15 +28,14 @@ USE_LANGUAGES=      c c++
 USE_TOOLS+=    pkg-config
 
 CONFIGURE_ARGS+=       --disable-output-ao \
-                       --disable-output-esound \
-                       --disable-output-alsa \
-                       --disable-output-sdl
+                       --disable-output-esound
 
 .if ${OSS_TYPE} != "none"
-LDFLAGS+=              -lossaudio
+LDFLAGS+=              ${LIBOSSAUDIO}
 .else
 CONFIGURE_ARGS+=       --disable-output-oss
 .endif
 
+.include "options.mk"
 .include "../../audio/adplug/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/audio/adplay/options.mk
diff -u /dev/null pkgsrc/audio/adplay/options.mk:1.1
--- /dev/null   Tue Sep 10 13:49:14 2019
+++ pkgsrc/audio/adplay/options.mk      Tue Sep 10 13:49:14 2019
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2019/09/10 13:49:14 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.adplay
+PKG_SUPPORTED_OPTIONS=         alsa sdl2
+PKG_SUGGESTED_OPTIONS.Linux=   alsa
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OPSYS} != "Linux" && ${OSS_TYPE} == "none"
+PKG_SUGGESTED_OPTIONS+=                sdl2
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+.include "../../audio/alsa-lib/buildlink3.mk"
+BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+.else
+CONFIGURE_ARGS+=       --disable-output-alsa
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl2)
+CONFIGURE_ARGS+=       --with-sdl=sdl2
+.include "../../devel/SDL2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-output-sdl
+.endif