pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/audio/ncspot audio/ncspot: bring back termion backend



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2801b5c8372c
branches:  trunk
changeset: 768645:2801b5c8372c
user:      pin <pin%pkgsrc.org@localhost>
date:      Thu Oct 28 20:17:34 2021 +0000

description:
audio/ncspot: bring back termion backend

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

diffstat:

 audio/ncspot/Makefile                 |   6 ++----
 audio/ncspot/distinfo                 |   3 ++-
 audio/ncspot/options.mk               |   5 ++++-
 audio/ncspot/patches/patch-Cargo.toml |  14 ++++++++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diffs (86 lines):

diff -r 1b63bebbf22c -r 2801b5c8372c audio/ncspot/Makefile
--- a/audio/ncspot/Makefile     Thu Oct 28 20:15:38 2021 +0000
+++ b/audio/ncspot/Makefile     Thu Oct 28 20:17:34 2021 +0000
@@ -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 @@
 
 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 @@
 
 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 @@
 .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"
diff -r 1b63bebbf22c -r 2801b5c8372c audio/ncspot/distinfo
--- a/audio/ncspot/distinfo     Thu Oct 28 20:15:38 2021 +0000
+++ b/audio/ncspot/distinfo     Thu Oct 28 20:17:34 2021 +0000
@@ -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 @@
 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
diff -r 1b63bebbf22c -r 2801b5c8372c audio/ncspot/options.mk
--- a/audio/ncspot/options.mk   Thu Oct 28 20:15:38 2021 +0000
+++ b/audio/ncspot/options.mk   Thu Oct 28 20:17:34 2021 +0000
@@ -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 @@
 .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)
diff -r 1b63bebbf22c -r 2801b5c8372c audio/ncspot/patches/patch-Cargo.toml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ncspot/patches/patch-Cargo.toml     Thu Oct 28 20:17:34 2021 +0000
@@ -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"



Home | Main Index | Thread Index | Old Index