pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/adplay adplay: Support optional alsa and sdl2 au...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5295f3d59462
branches:  trunk
changeset: 401062:5295f3d59462
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Sep 10 13:49:14 2019 +0000

description:
adplay: Support optional alsa and sdl2 audio outputs.

diffstat:

 audio/adplay/Makefile   |   9 ++++-----
 audio/adplay/options.mk |  28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r b8898fcdf98c -r 5295f3d59462 audio/adplay/Makefile
--- a/audio/adplay/Makefile     Tue Sep 10 13:33:05 2019 +0000
+++ b/audio/adplay/Makefile     Tue Sep 10 13:49:14 2019 +0000
@@ -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_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"
diff -r b8898fcdf98c -r 5295f3d59462 audio/adplay/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/adplay/options.mk   Tue Sep 10 13:49:14 2019 +0000
@@ -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



Home | Main Index | Thread Index | Old Index