pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/audio/librespot librespot: Allow audio backends to coe...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9cf3303fcebe
branches:  trunk
changeset: 442752:9cf3303fcebe
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Nov 29 22:46:02 2020 +0000

description:
librespot: Allow audio backends to coexist. Fix linking.

diffstat:

 audio/librespot/options.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 5cb5e71c4994 -r 9cf3303fcebe audio/librespot/options.mk
--- a/audio/librespot/options.mk        Sun Nov 29 22:39:10 2020 +0000
+++ b/audio/librespot/options.mk        Sun Nov 29 22:46:02 2020 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2020/11/29 19:37:14 nia Exp $
+# $NetBSD: options.mk,v 1.3 2020/11/29 22:46:02 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.librespot
-PKG_OPTIONS_OPTIONAL_GROUPS=   backend
-PKG_OPTIONS_GROUP.backend=     alsa gstreamer jack portaudio pulseaudio rodio sdl
-
-PKG_SUGGESTED_OPTIONS= portaudio
+PKG_SUPPORTED_OPTIONS=         alsa gstreamer jack portaudio pulseaudio rodio sdl
+PKG_SUGGESTED_OPTIONS=         portaudio
 
 .include "../../mk/bsd.options.mk"
 
@@ -22,6 +20,7 @@
 
 .if !empty(PKG_OPTIONS:Mjack)
 CARGO_FEATURES+=       jackaudio-backend
+RUSTFLAGS+=            -C link-arg=-L${BUILDLINK_PREFIX.jack}/lib
 RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.jack}/lib
 .include "../../audio/jack/buildlink3.mk"
 .endif
@@ -44,6 +43,7 @@
 
 .if !empty(PKG_OPTIONS:Msdl)
 CARGO_FEATURES+=       sdl-backend
+RUSTFLAGS+=            -C link-arg=-L${BUILDLINK_PREFIX.SDL2}/lib
 RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.SDL2}/lib
 .include "../../devel/SDL2/buildlink3.mk"
 .endif



Home | Main Index | Thread Index | Old Index