CVS commit: pkgsrc/audio/ncspot

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Thu Oct 28 20:17:34 UTC 2021

Modified Files:
        pkgsrc/audio/ncspot: Makefile distinfo options.mk
Added Files:
        pkgsrc/audio/ncspot/patches: patch-Cargo.toml

Log Message:
audio/ncspot: bring back termion backend

Apply Void Linux patch and bring back termion backend with the
option to build without ncursesw.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/ncspot/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/audio/ncspot/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/ncspot/options.mk
cvs rdiff -u -r0 -r1.6 pkgsrc/audio/ncspot/patches/patch-Cargo.toml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/ncspot/Makefile
diff -u pkgsrc/audio/ncspot/Makefile:1.28 pkgsrc/audio/ncspot/Makefile:1.29
--- pkgsrc/audio/ncspot/Makefile:1.28   Sat Oct 16 11:47:27 2021
+++ pkgsrc/audio/ncspot/Makefile        Thu Oct 28 20:17:34 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/10/16 11:47:27 pin Exp $
+# $NetBSD: Makefile,v 1.29 2021/10/28 20:17:34 pin Exp $
 
 DISTNAME=      ncspot-0.9.0
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=hrkfdn/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -14,7 +15,6 @@ LICENSE=      2-clause-bsd
 
 USE_LANGUAGES+=                        c c++
 USE_TOOLS+=                    pkg-config
-USE_NCURSES=                   yes     # NCURSES_MOUSE_VERSION
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 PYTHON_FOR_BUILD_ONLY=         tool
 
@@ -22,7 +22,6 @@ 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.ncursesw}/lib
 
 CARGO_NO_DEFAULT_FEATURES=     YES
 
@@ -34,5 +33,4 @@ do-install:
 .include "../../lang/python/tool.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/ncspot/distinfo
diff -u pkgsrc/audio/ncspot/distinfo:1.21 pkgsrc/audio/ncspot/distinfo:1.22
--- pkgsrc/audio/ncspot/distinfo:1.21   Tue Oct 26 09:59:18 2021
+++ pkgsrc/audio/ncspot/distinfo        Thu Oct 28 20:17:34 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 09:59:18 nia Exp $
+$NetBSD: distinfo,v 1.22 2021/10/28 20:17:34 pin Exp $
 
 BLAKE2s (addr2line-0.16.0.crate) = 24e229c429a7ffc5c9010ec4c102ab2fc3f9982cfa9897b42709fd96b8f83dc7
 SHA512 (addr2line-0.16.0.crate) = 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c
@@ -1224,3 +1224,4 @@ Size (zvariant-2.9.0.crate) = 63979 byte
 BLAKE2s (zvariant_derive-2.9.0.crate) = c65e9edc00035f9f8a91a2dc4c7d5bd16208e713194cbca235acaea1e07aac3f
 SHA512 (zvariant_derive-2.9.0.crate) = 278e51c208f32b0261396072ecc67ca0aee91ec3821756a51300422b9b16426a85a186f4ca3c86b6d1864e526b331e6a67a2e19a1c82bebe780ae755f2c64e2e
 Size (zvariant_derive-2.9.0.crate) = 8734 bytes
+SHA1 (patch-Cargo.toml) = 390e742bca11cf5afc9ead8ab310e74b84939037

Index: pkgsrc/audio/ncspot/options.mk
diff -u pkgsrc/audio/ncspot/options.mk:1.3 pkgsrc/audio/ncspot/options.mk:1.4
--- pkgsrc/audio/ncspot/options.mk:1.3  Sat Oct 16 11:47:27 2021
+++ pkgsrc/audio/ncspot/options.mk      Thu Oct 28 20:17:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2021/10/16 11:47:27 pin Exp $
+# $NetBSD: options.mk,v 1.4 2021/10/28 20:17:34 pin Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ncspot
 PKG_OPTIONS_OPTIONAL_GROUPS=   backend ui
@@ -33,7 +33,10 @@ CARGO_FEATURES+=     rodio_backend
 .endif
 
 .if !empty(PKG_OPTIONS:Mncursesw)
+USE_NCURSES=           yes #NCURSES_MOUSE_VERSION
 CARGO_FEATURES+=       cursive/pancurses-backend
+RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
+.include "../../devel/ncursesw/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mtermion)

Added files:

Index: pkgsrc/audio/ncspot/patches/patch-Cargo.toml
diff -u /dev/null pkgsrc/audio/ncspot/patches/patch-Cargo.toml:1.6
--- /dev/null   Thu Oct 28 20:17:34 2021
+++ pkgsrc/audio/ncspot/patches/patch-Cargo.toml        Thu Oct 28 20:17:34 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-Cargo.toml,v 1.6 2021/10/28 20:17:34 pin Exp $
+
+Don't force ncurses backend
+
+--- Cargo.toml.orig    2021-10-15 15:43:00.000000000 +0000
++++ Cargo.toml
+@@ -47,7 +47,6 @@ strum_macros = "0.22.0"
+ regex = "1"
+ ioctl-rs = { version = "0.2", optional = true }
+ serde_cbor = "0.11.2"
+-pancurses = { version = "0.17.0", features = ["win32"] }
+ 
+ [dependencies.cursive]
+ version = "0.16.3"