CVS commit: pkgsrc/audio/librespot

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Nov 29 22:46:02 UTC 2020

Modified Files:
        pkgsrc/audio/librespot: options.mk

Log Message:
librespot: Allow audio backends to coexist. Fix linking.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/librespot/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/librespot/options.mk
diff -u pkgsrc/audio/librespot/options.mk:1.2 pkgsrc/audio/librespot/options.mk:1.3
--- pkgsrc/audio/librespot/options.mk:1.2       Sun Nov 29 19:37:14 2020
+++ pkgsrc/audio/librespot/options.mk   Sun Nov 29 22:46:02 2020
@@ -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 @@ RUSTFLAGS+=           -C link-arg=${COMPILER_RPAT
 
 .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 @@ CARGO_FEATURES+=      rodio-backend
 
 .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