diff options
| author | tnn <tnn@pkgsrc.org> | 2020-10-20 22:54:40 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-10-20 22:54:40 +0000 |
| commit | b14a2aa265d5b232d3da0c4584eea94f3e473120 (patch) | |
| tree | 2dbd30b533e388b3b2a4f9ea6c6a0d7934920e1c /audio | |
| parent | cbb5c734d87d7ef47a0d23e32ca7151a60fedf72 (diff) | |
| download | pkgsrc-b14a2aa265d5b232d3da0c4584eea94f3e473120.tar.gz | |
ncspot: turn xcb off by default. Terminal apps should not need X11.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/ncspot/Makefile | 8 | ||||
| -rw-r--r-- | audio/ncspot/options.mk | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/audio/ncspot/Makefile b/audio/ncspot/Makefile index 48c4ea5f4dd..2afe2a981a1 100644 --- a/audio/ncspot/Makefile +++ b/audio/ncspot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2020/10/20 19:03:07 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2020/10/20 22:54:40 tnn Exp $ DISTNAME= ncspot-0.2.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=hrkfdn/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -425,12 +425,9 @@ INSTALLATION_DIRS= bin MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q} RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib -RUSTFLAGS+= -C link-arg=-L${BUILDLINK_PREFIX.libxcb}/lib MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q} CARGO_NO_DEFAULT_FEATURES= YES -CARGO_FEATURES+= share_clipboard .include "options.mk" @@ -440,5 +437,4 @@ do-install: .include "../../lang/python/tool.mk" .include "../../lang/rust/cargo.mk" .include "../../security/openssl/buildlink3.mk" -.include "../../x11/libxcb/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/ncspot/options.mk b/audio/ncspot/options.mk index 44cd1c879bd..4331b2dfa1c 100644 --- a/audio/ncspot/options.mk +++ b/audio/ncspot/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2020/10/20 18:40:31 tnn Exp $ +# $NetBSD: options.mk,v 1.2 2020/10/20 22:54:40 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ncspot PKG_OPTIONS_OPTIONAL_GROUPS= backend ui PKG_OPTIONS_GROUP.backend= alsa portaudio pulseaudio rodio PKG_OPTIONS_GROUP.ui= ncursesw termion -PKG_SUPPORTED_OPTIONS= dbus +PKG_SUPPORTED_OPTIONS= dbus xcb PKG_SUGGESTED_OPTIONS= portaudio ncursesw .include "../../mk/bsd.options.mk" @@ -45,9 +45,14 @@ CARGO_FEATURES+= cursive/termion-backend .if !empty(PKG_OPTIONS:Mdbus) CARGO_FEATURES+= mpris -CARGO_FEATURES+= notif +CARGO_FEATURES+= notify RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.dbus}/lib . include "../../sysutils/dbus/buildlink3.mk" -.else +.endif +.if !empty(PKG_OPTIONS:Mxcb) +CARGO_FEATURES+= share_clipboard +RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib +RUSTFLAGS+= -C link-arg=-L${BUILDLINK_PREFIX.libxcb}/lib +.include "../../x11/libxcb/buildlink3.mk" .endif |