Merge commit 'e2d72f8ca174960005ae15ed1de68c375aa511cd' into joyent/r…

…elease/trunk
TritonDataCenter · Dec 29, 2021 · a839ac5 · a839ac5
2 parents f97f220 + e2d72f8
commit a839ac5
Show file tree

Hide file tree

Showing 554 changed files with 15,365 additions and 3,668 deletions.
diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2021/12/13 12:40:56 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2021/12/23 20:33:18 nia Exp $
 
 BUILDLINK_TREE+= fluidsynth
 
@@ -9,6 +9,30 @@ BUILDLINK_API_DEPENDS.fluidsynth+= fluidsynth>=1.0.5
 BUILDLINK_ABI_DEPENDS.fluidsynth+= fluidsynth>=2.2.4nb1
 BUILDLINK_PKGSRCDIR.fluidsynth?= ../../audio/fluidsynth
 
+pkgbase := fluidsynth
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.fluidsynth:Malsa}
+. include "../../audio/alsa-lib/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.fluidsynth:Mdbus}
+. include "../../sysutils/dbus/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.fluidsynth:Mjack}
+. include "../../audio/jack/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.fluidsynth:Mladspa}
+. include "../../audio/ladspa/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.fluidsynth:Mportaudio}
+. include "../../audio/portaudio/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.fluidsynth:Mpulseaudio}
+. include "../../audio/pulseaudio/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.fluidsynth:Msdl2}
+. include "../../devel/SDL2/buildlink3.mk"
+.endif
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"

diff --git a/audio/termusic/Makefile b/audio/termusic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2021/12/19 15:55:25 pin Exp $
+$NetBSD: Makefile,v 1.26 2021/12/29 05:50:56 pin Exp $
 
-DISTNAME= termusic-0.6.3
+DISTNAME= termusic-0.6.4
 CATEGORIES= audio
 MASTER_SITES= ${MASTER_SITE_GITHUB:=tramhao/}
 GITHUB_TAG= v${PKGVERSION_NOREV}

diff --git a/audio/termusic/cargo-depends.mk b/audio/termusic/cargo-depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cargo-depends.mk,v 1.19 2021/12/19 15:55:25 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.20 2021/12/29 05:50:56 pin Exp $
 
 CARGO_CRATE_DEPENDS+= adler-1.0.2
 CARGO_CRATE_DEPENDS+= adler32-1.2.0
@@ -18,14 +18,16 @@ CARGO_CRATE_DEPENDS+= cfg-expr-0.8.1
 CARGO_CRATE_DEPENDS+= cfg-if-1.0.0
 CARGO_CRATE_DEPENDS+= chunked_transfer-1.4.0
 CARGO_CRATE_DEPENDS+= color_quant-1.1.0
-CARGO_CRATE_DEPENDS+= console-0.14.1
+CARGO_CRATE_DEPENDS+= console-0.15.0
 CARGO_CRATE_DEPENDS+= crc32fast-1.3.0
 CARGO_CRATE_DEPENDS+= crossbeam-channel-0.5.1
 CARGO_CRATE_DEPENDS+= crossbeam-deque-0.8.1
 CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.9.5
 CARGO_CRATE_DEPENDS+= crossbeam-utils-0.8.5
 CARGO_CRATE_DEPENDS+= crossterm-0.20.0
+CARGO_CRATE_DEPENDS+= crossterm-0.22.1
 CARGO_CRATE_DEPENDS+= crossterm_winapi-0.8.0
+CARGO_CRATE_DEPENDS+= crossterm_winapi-0.9.0
 CARGO_CRATE_DEPENDS+= ctor-0.1.21
 CARGO_CRATE_DEPENDS+= dbus-0.9.5
 CARGO_CRATE_DEPENDS+= dbus-crossroads-0.5.0
@@ -37,11 +39,11 @@ CARGO_CRATE_DEPENDS+= either-1.6.1
 CARGO_CRATE_DEPENDS+= encode_unicode-0.3.6
 CARGO_CRATE_DEPENDS+= flate2-1.0.22
 CARGO_CRATE_DEPENDS+= form_urlencoded-1.0.1
-CARGO_CRATE_DEPENDS+= futures-channel-0.3.17
-CARGO_CRATE_DEPENDS+= futures-core-0.3.17
-CARGO_CRATE_DEPENDS+= futures-executor-0.3.17
-CARGO_CRATE_DEPENDS+= futures-task-0.3.17
-CARGO_CRATE_DEPENDS+= futures-util-0.3.17
+CARGO_CRATE_DEPENDS+= futures-channel-0.3.19
+CARGO_CRATE_DEPENDS+= futures-core-0.3.19
+CARGO_CRATE_DEPENDS+= futures-executor-0.3.19
+CARGO_CRATE_DEPENDS+= futures-task-0.3.19
+CARGO_CRATE_DEPENDS+= futures-util-0.3.19
 CARGO_CRATE_DEPENDS+= getrandom-0.2.3
 CARGO_CRATE_DEPENDS+= gif-0.11.3
 CARGO_CRATE_DEPENDS+= glib-0.14.8
@@ -79,6 +81,7 @@ CARGO_CRATE_DEPENDS+= libc-0.2.112
 CARGO_CRATE_DEPENDS+= libdbus-sys-0.2.2
 CARGO_CRATE_DEPENDS+= linked-hash-map-0.5.4
 CARGO_CRATE_DEPENDS+= lock_api-0.4.5
+CARGO_CRATE_DEPENDS+= lofty-0.3.0
 CARGO_CRATE_DEPENDS+= log-0.4.14
 CARGO_CRATE_DEPENDS+= matches-0.1.9
 CARGO_CRATE_DEPENDS+= md5-0.7.0
@@ -99,8 +102,9 @@ CARGO_CRATE_DEPENDS+= num-iter-0.1.42
 CARGO_CRATE_DEPENDS+= num-rational-0.3.2
 CARGO_CRATE_DEPENDS+= num-rational-0.4.0
 CARGO_CRATE_DEPENDS+= num-traits-0.2.14
-CARGO_CRATE_DEPENDS+= num_cpus-1.13.0
+CARGO_CRATE_DEPENDS+= num_cpus-1.13.1
 CARGO_CRATE_DEPENDS+= ogg-0.8.0
+CARGO_CRATE_DEPENDS+= ogg_pager-0.1.7
 CARGO_CRATE_DEPENDS+= once_cell-1.9.0
 CARGO_CRATE_DEPENDS+= orange-trees-0.1.0
 CARGO_CRATE_DEPENDS+= output_vt100-0.1.2
@@ -143,7 +147,7 @@ CARGO_CRATE_DEPENDS+= serde-1.0.132
 CARGO_CRATE_DEPENDS+= serde_derive-1.0.132
 CARGO_CRATE_DEPENDS+= serde_json-1.0.73
 CARGO_CRATE_DEPENDS+= shellexpand-2.1.0
-CARGO_CRATE_DEPENDS+= signal-hook-0.3.12
+CARGO_CRATE_DEPENDS+= signal-hook-0.3.13
 CARGO_CRATE_DEPENDS+= signal-hook-mio-0.2.1
 CARGO_CRATE_DEPENDS+= signal-hook-registry-1.4.0
 CARGO_CRATE_DEPENDS+= slab-0.4.5
@@ -152,7 +156,7 @@ CARGO_CRATE_DEPENDS+= smawk-0.3.1
 CARGO_CRATE_DEPENDS+= spin-0.5.2
 CARGO_CRATE_DEPENDS+= strum-0.21.0
 CARGO_CRATE_DEPENDS+= strum_macros-0.21.1
-CARGO_CRATE_DEPENDS+= syn-1.0.82
+CARGO_CRATE_DEPENDS+= syn-1.0.83
 CARGO_CRATE_DEPENDS+= system-deps-3.2.0
 CARGO_CRATE_DEPENDS+= tempfile-3.2.0
 CARGO_CRATE_DEPENDS+= termcolor-1.1.2
@@ -180,7 +184,7 @@ CARGO_CRATE_DEPENDS+= ureq-2.3.1
 CARGO_CRATE_DEPENDS+= url-2.2.2
 CARGO_CRATE_DEPENDS+= version-compare-0.0.11
 CARGO_CRATE_DEPENDS+= version_check-0.9.3
-CARGO_CRATE_DEPENDS+= viuer-0.5.2
+CARGO_CRATE_DEPENDS+= viuer-0.5.3
 CARGO_CRATE_DEPENDS+= walkdir-2.3.2
 CARGO_CRATE_DEPENDS+= wasi-0.10.2+wasi-snapshot-preview1
 CARGO_CRATE_DEPENDS+= wasm-bindgen-0.2.78