Update spotifyd to 0.2.24
They've done a lot of cleaning up upstream and are no longer pulling in
stuff via commit hashes so we can remove all the _REV, DISTFILES, SITES
and post-extract stuff for librespot, tremor, etc.
- Back to having an odd SITES work-around for a CARGO_CRATE_DEPENDS:
wasi-0.9.0 due to the version name.
- Need [Rust 1.40][1] for this owing to [whoami-0.7.0][2] and use of
`#[non_exhaustive]` per [this issue][3]
- Back to having a patch for nix [per this commit][4] just
because of the version being used (this is ultimately fixed upstream)
- Most other patches can be (and have been) removed though
[1]: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1400-2019-12-19
[2]: 03b0b552f3/changelog.md (070---2019-12-21)
[3]: https://github.com/rust-lang/rust/issues/44109
[4]: https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commit;h=0a23b3b322a6313f27284baa499924921beeca73
This commit is contained in:
atomicules
parent
fe49567894
commit
8a278d23c2
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD$
|
||||
|
||||
DISTNAME= spotifyd-v0.2.20
|
||||
DISTNAME= spotifyd-v0.2.24
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=Spotifyd/}
|
||||
|
|
@ -16,26 +16,6 @@ USE_LANGUAGES= c # rust, but needs a toolchain to link
|
|||
|
||||
DISTFILES= ${DEFAULT_DISTFILES}
|
||||
|
||||
LIBRESPOT_REV= 551daadc44a39336e1c643d1e300d38cdd8426d5
|
||||
DISTFILES+= librespot-${LIBRESPOT_REV}.tar.gz
|
||||
SITES.librespot-${LIBRESPOT_REV}.tar.gz= -https://github.com/librespot-org/librespot/archive/${LIBRESPOT_REV}.tar.gz
|
||||
|
||||
RUST_TREMOR_REV= 5958cc302e78f535dad90e9665da981ddff4000a
|
||||
DISTFILES+= rust-tremor-${RUST_TREMOR_REV}.tar.gz
|
||||
SITES.rust-tremor-${RUST_TREMOR_REV}.tar.gz= -https://github.com/plietar/rust-tremor/archive/${RUST_TREMOR_REV}.tar.gz
|
||||
|
||||
RUST_MDNS_REV= 66a74033da6c9f1a06e7b0a29f4544fd189d6479
|
||||
DISTFILES+= rust-mdns-${RUST_MDNS_REV}.tar.gz
|
||||
SITES.rust-mdns-${RUST_MDNS_REV}.tar.gz= -https://github.com/plietar/rust-mdns/archive/${RUST_MDNS_REV}.tar.gz
|
||||
|
||||
DNS_PARSER_REV= 1d3e5a5591bc72eb061c23bd426c4a25f2f73791
|
||||
DISTFILES+= dns-parser-${DNS_PARSER_REV}.tar.gz
|
||||
SITES.dns-parser-${DNS_PARSER_REV}.tar.gz= -https://github.com/plietar/dns-parser/archive/${DNS_PARSER_REV}.tar.gz
|
||||
|
||||
STRUCTOPT_REV= 0c888e962d842f2c90c6c290d3a2a40947b37005
|
||||
DISTFILES+= structopt-${STRUCTOPT_REV}.tar.gz
|
||||
SITES.structopt-${STRUCTOPT_REV}.tar.gz= -https://github.com/TeXitoi/structopt/archive/${STRUCTOPT_REV}.tar.gz
|
||||
|
||||
# generate using make show-cargo-depends
|
||||
CARGO_CRATE_DEPENDS+= adler32-1.0.4
|
||||
CARGO_CRATE_DEPENDS+= advapi32-sys-0.2.0
|
||||
|
|
@ -50,11 +30,10 @@ CARGO_CRATE_DEPENDS+= alsa-0.3.0
|
|||
CARGO_CRATE_DEPENDS+= alsa-sys-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= ansi_term-0.11.0
|
||||
CARGO_CRATE_DEPENDS+= approx-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= arc-swap-0.4.3
|
||||
CARGO_CRATE_DEPENDS+= arrayref-0.3.5
|
||||
CARGO_CRATE_DEPENDS+= arrayvec-0.4.12
|
||||
CARGO_CRATE_DEPENDS+= atty-0.2.13
|
||||
CARGO_CRATE_DEPENDS+= arc-swap-0.4.4
|
||||
CARGO_CRATE_DEPENDS+= atty-0.2.14
|
||||
CARGO_CRATE_DEPENDS+= autocfg-0.1.7
|
||||
CARGO_CRATE_DEPENDS+= autocfg-1.0.0
|
||||
CARGO_CRATE_DEPENDS+= backtrace-0.3.40
|
||||
CARGO_CRATE_DEPENDS+= backtrace-sys-0.1.32
|
||||
CARGO_CRATE_DEPENDS+= base64-0.10.1
|
||||
|
|
@ -65,28 +44,24 @@ CARGO_CRATE_DEPENDS+= bit-vec-0.5.1
|
|||
CARGO_CRATE_DEPENDS+= bitflags-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= bitflags-0.9.1
|
||||
CARGO_CRATE_DEPENDS+= bitflags-1.2.1
|
||||
CARGO_CRATE_DEPENDS+= blake2b_simd-0.5.8
|
||||
CARGO_CRATE_DEPENDS+= block-buffer-0.7.3
|
||||
CARGO_CRATE_DEPENDS+= block-cipher-trait-0.6.2
|
||||
CARGO_CRATE_DEPENDS+= block-modes-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= block-padding-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= block-padding-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= boxfnonce-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= byte-tools-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= bytecount-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= byteorder-0.5.3
|
||||
CARGO_CRATE_DEPENDS+= byteorder-1.3.2
|
||||
CARGO_CRATE_DEPENDS+= bytes-0.4.12
|
||||
CARGO_CRATE_DEPENDS+= c2-chacha-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= c_linked_list-1.1.1
|
||||
CARGO_CRATE_DEPENDS+= cargo_metadata-0.6.4
|
||||
CARGO_CRATE_DEPENDS+= cc-1.0.46
|
||||
CARGO_CRATE_DEPENDS+= cexpr-0.3.5
|
||||
CARGO_CRATE_DEPENDS+= cc-1.0.50
|
||||
CARGO_CRATE_DEPENDS+= cexpr-0.3.6
|
||||
CARGO_CRATE_DEPENDS+= cfg-if-0.1.10
|
||||
CARGO_CRATE_DEPENDS+= chrono-0.4.9
|
||||
CARGO_CRATE_DEPENDS+= chrono-0.4.10
|
||||
CARGO_CRATE_DEPENDS+= clang-sys-0.28.1
|
||||
CARGO_CRATE_DEPENDS+= clap-2.33.0
|
||||
CARGO_CRATE_DEPENDS+= cloudabi-0.0.3
|
||||
CARGO_CRATE_DEPENDS+= constant_time_eq-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= cookie-0.12.0
|
||||
CARGO_CRATE_DEPENDS+= cookie_store-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= core-foundation-0.6.4
|
||||
|
|
@ -96,10 +71,11 @@ CARGO_CRATE_DEPENDS+= coreaudio-rs-0.9.1
|
|||
CARGO_CRATE_DEPENDS+= coreaudio-sys-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= cpal-0.8.2
|
||||
CARGO_CRATE_DEPENDS+= crc32fast-1.2.0
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-deque-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.7.2
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-deque-0.7.2
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.8.0
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-queue-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.6.6
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= crypto-mac-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= ctr-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= daemonize-0.4.1
|
||||
|
|
@ -112,21 +88,19 @@ CARGO_CRATE_DEPENDS+= dbus-tokio-0.2.1
|
|||
CARGO_CRATE_DEPENDS+= derive_builder-0.7.2
|
||||
CARGO_CRATE_DEPENDS+= derive_builder_core-0.5.0
|
||||
CARGO_CRATE_DEPENDS+= digest-0.8.1
|
||||
CARGO_CRATE_DEPENDS+= dirs-2.0.2
|
||||
CARGO_CRATE_DEPENDS+= dirs-sys-0.3.4
|
||||
CARGO_CRATE_DEPENDS+= dotenv-0.13.0
|
||||
CARGO_CRATE_DEPENDS+= dtoa-0.4.4
|
||||
CARGO_CRATE_DEPENDS+= either-1.5.3
|
||||
CARGO_CRATE_DEPENDS+= encoding_rs-0.8.20
|
||||
CARGO_CRATE_DEPENDS+= encoding_rs-0.8.22
|
||||
CARGO_CRATE_DEPENDS+= env_logger-0.6.2
|
||||
CARGO_CRATE_DEPENDS+= env_logger-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= error-chain-0.11.0
|
||||
CARGO_CRATE_DEPENDS+= error-chain-0.12.1
|
||||
CARGO_CRATE_DEPENDS+= extprim-1.7.0
|
||||
CARGO_CRATE_DEPENDS+= failure-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= failure_derive-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= fake-simd-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= flate2-1.0.12
|
||||
CARGO_CRATE_DEPENDS+= fern-0.5.9
|
||||
CARGO_CRATE_DEPENDS+= flate2-1.0.13
|
||||
CARGO_CRATE_DEPENDS+= fnv-1.0.6
|
||||
CARGO_CRATE_DEPENDS+= foreign-types-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= foreign-types-shared-0.1.1
|
||||
|
|
@ -137,21 +111,19 @@ CARGO_CRATE_DEPENDS+= futures-0.1.29
|
|||
CARGO_CRATE_DEPENDS+= futures-cpupool-0.1.8
|
||||
CARGO_CRATE_DEPENDS+= gcc-0.3.55
|
||||
CARGO_CRATE_DEPENDS+= generic-array-0.12.3
|
||||
CARGO_CRATE_DEPENDS+= get_if_addrs-0.5.3
|
||||
CARGO_CRATE_DEPENDS+= get_if_addrs-sys-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= gethostname-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= gethostname-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= getopts-0.2.21
|
||||
CARGO_CRATE_DEPENDS+= getrandom-0.1.13
|
||||
CARGO_CRATE_DEPENDS+= getrandom-0.1.14
|
||||
CARGO_CRATE_DEPENDS+= glob-0.2.11
|
||||
CARGO_CRATE_DEPENDS+= glob-0.3.0
|
||||
CARGO_CRATE_DEPENDS+= h2-0.1.26
|
||||
CARGO_CRATE_DEPENDS+= heck-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= hermit-abi-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= hermit-abi-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= hex-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= hex-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= hkdf-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= hmac-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= http-0.1.19
|
||||
CARGO_CRATE_DEPENDS+= http-0.1.21
|
||||
CARGO_CRATE_DEPENDS+= http-body-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= httparse-1.3.4
|
||||
CARGO_CRATE_DEPENDS+= humantime-1.3.0
|
||||
|
|
@ -164,30 +136,40 @@ CARGO_CRATE_DEPENDS+= idna-0.1.5
|
|||
CARGO_CRATE_DEPENDS+= idna-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= indexmap-1.3.0
|
||||
CARGO_CRATE_DEPENDS+= iovec-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= itertools-0.8.1
|
||||
CARGO_CRATE_DEPENDS+= itertools-0.8.2
|
||||
CARGO_CRATE_DEPENDS+= itoa-0.4.4
|
||||
CARGO_CRATE_DEPENDS+= kernel32-sys-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= keyring-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= language-tags-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= lazy_static-1.4.0
|
||||
CARGO_CRATE_DEPENDS+= lewton-0.9.4
|
||||
CARGO_CRATE_DEPENDS+= libc-0.2.65
|
||||
CARGO_CRATE_DEPENDS+= libc-0.2.66
|
||||
CARGO_CRATE_DEPENDS+= libdbus-sys-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= libloading-0.5.2
|
||||
CARGO_CRATE_DEPENDS+= libm-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= libmdns-0.2.4
|
||||
CARGO_CRATE_DEPENDS+= libpulse-sys-0.0.0
|
||||
CARGO_CRATE_DEPENDS+= librespot-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= librespot-audio-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= librespot-connect-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= librespot-core-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= librespot-metadata-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= librespot-playback-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= librespot-protocol-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= librespot-tremor-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= linear-map-1.2.0
|
||||
CARGO_CRATE_DEPENDS+= lock_api-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= lock_api-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= log-0.3.9
|
||||
CARGO_CRATE_DEPENDS+= log-0.4.8
|
||||
CARGO_CRATE_DEPENDS+= matches-0.1.8
|
||||
CARGO_CRATE_DEPENDS+= matrixmultiply-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= memchr-2.2.1
|
||||
CARGO_CRATE_DEPENDS+= memoffset-0.5.2
|
||||
CARGO_CRATE_DEPENDS+= mime-0.3.14
|
||||
CARGO_CRATE_DEPENDS+= maybe-uninit-2.0.0
|
||||
CARGO_CRATE_DEPENDS+= memchr-2.3.0
|
||||
CARGO_CRATE_DEPENDS+= memoffset-0.5.3
|
||||
CARGO_CRATE_DEPENDS+= mime-0.3.16
|
||||
CARGO_CRATE_DEPENDS+= mime_guess-2.0.1
|
||||
CARGO_CRATE_DEPENDS+= miniz_oxide-0.3.5
|
||||
CARGO_CRATE_DEPENDS+= mio-0.6.19
|
||||
CARGO_CRATE_DEPENDS+= mio-0.6.21
|
||||
CARGO_CRATE_DEPENDS+= mio-named-pipes-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= mio-uds-0.6.7
|
||||
CARGO_CRATE_DEPENDS+= miow-0.2.1
|
||||
|
|
@ -196,25 +178,24 @@ CARGO_CRATE_DEPENDS+= multimap-0.4.0
|
|||
CARGO_CRATE_DEPENDS+= nalgebra-0.18.1
|
||||
CARGO_CRATE_DEPENDS+= native-tls-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= net2-0.2.33
|
||||
CARGO_CRATE_DEPENDS+= nix-0.11.1
|
||||
CARGO_CRATE_DEPENDS+= nix-0.10.0
|
||||
CARGO_CRATE_DEPENDS+= nix-0.14.1
|
||||
CARGO_CRATE_DEPENDS+= nix-0.9.0
|
||||
CARGO_CRATE_DEPENDS+= nodrop-0.1.14
|
||||
CARGO_CRATE_DEPENDS+= nom-4.2.3
|
||||
CARGO_CRATE_DEPENDS+= num-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= num-bigint-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= num-complex-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= num-integer-0.1.41
|
||||
CARGO_CRATE_DEPENDS+= num-iter-0.1.39
|
||||
CARGO_CRATE_DEPENDS+= num-rational-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= num-traits-0.2.8
|
||||
CARGO_CRATE_DEPENDS+= num_cpus-1.11.0
|
||||
CARGO_CRATE_DEPENDS+= num-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= num-bigint-0.2.5
|
||||
CARGO_CRATE_DEPENDS+= num-complex-0.2.4
|
||||
CARGO_CRATE_DEPENDS+= num-integer-0.1.42
|
||||
CARGO_CRATE_DEPENDS+= num-iter-0.1.40
|
||||
CARGO_CRATE_DEPENDS+= num-rational-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= num-traits-0.2.11
|
||||
CARGO_CRATE_DEPENDS+= num_cpus-1.11.1
|
||||
CARGO_CRATE_DEPENDS+= ogg-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= ogg-sys-0.0.9
|
||||
CARGO_CRATE_DEPENDS+= opaque-debug-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= openssl-0.10.25
|
||||
CARGO_CRATE_DEPENDS+= openssl-0.10.26
|
||||
CARGO_CRATE_DEPENDS+= openssl-probe-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.52
|
||||
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.53
|
||||
CARGO_CRATE_DEPENDS+= parking_lot-0.9.0
|
||||
CARGO_CRATE_DEPENDS+= parking_lot_core-0.6.2
|
||||
CARGO_CRATE_DEPENDS+= pbkdf2-0.3.0
|
||||
|
|
@ -225,22 +206,23 @@ CARGO_CRATE_DEPENDS+= pkg-config-0.3.17
|
|||
CARGO_CRATE_DEPENDS+= portaudio-rs-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= portaudio-sys-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= ppv-lite86-0.2.6
|
||||
CARGO_CRATE_DEPENDS+= proc-macro-error-0.2.6
|
||||
CARGO_CRATE_DEPENDS+= proc-macro-error-0.4.4
|
||||
CARGO_CRATE_DEPENDS+= proc-macro-error-attr-0.4.3
|
||||
CARGO_CRATE_DEPENDS+= proc-macro2-0.4.30
|
||||
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.6
|
||||
CARGO_CRATE_DEPENDS+= protobuf-2.8.1
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-2.8.1
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-pure-2.8.1
|
||||
CARGO_CRATE_DEPENDS+= publicsuffix-1.5.3
|
||||
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.7
|
||||
CARGO_CRATE_DEPENDS+= protobuf-2.10.0
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-2.10.0
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-pure-2.10.0
|
||||
CARGO_CRATE_DEPENDS+= publicsuffix-1.5.4
|
||||
CARGO_CRATE_DEPENDS+= pulldown-cmark-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= quick-error-1.2.2
|
||||
CARGO_CRATE_DEPENDS+= quick-error-1.2.3
|
||||
CARGO_CRATE_DEPENDS+= quote-0.6.13
|
||||
CARGO_CRATE_DEPENDS+= quote-1.0.2
|
||||
CARGO_CRATE_DEPENDS+= rand-0.3.23
|
||||
CARGO_CRATE_DEPENDS+= rand-0.4.6
|
||||
CARGO_CRATE_DEPENDS+= rand-0.5.6
|
||||
CARGO_CRATE_DEPENDS+= rand-0.6.5
|
||||
CARGO_CRATE_DEPENDS+= rand-0.7.2
|
||||
CARGO_CRATE_DEPENDS+= rand-0.7.3
|
||||
CARGO_CRATE_DEPENDS+= rand_chacha-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= rand_chacha-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= rand_core-0.3.1
|
||||
|
|
@ -257,9 +239,8 @@ CARGO_CRATE_DEPENDS+= random-0.12.2
|
|||
CARGO_CRATE_DEPENDS+= rawpointer-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= rdrand-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= redox_syscall-0.1.56
|
||||
CARGO_CRATE_DEPENDS+= redox_users-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= regex-1.3.1
|
||||
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.12
|
||||
CARGO_CRATE_DEPENDS+= regex-1.3.3
|
||||
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.13
|
||||
CARGO_CRATE_DEPENDS+= relay-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= remove_dir_all-0.5.2
|
||||
CARGO_CRATE_DEPENDS+= reqwest-0.9.17
|
||||
|
|
@ -267,39 +248,39 @@ CARGO_CRATE_DEPENDS+= result-1.0.0
|
|||
CARGO_CRATE_DEPENDS+= rodio-0.9.0
|
||||
CARGO_CRATE_DEPENDS+= rpassword-3.0.2
|
||||
CARGO_CRATE_DEPENDS+= rspotify-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= rust-argon2-0.5.1
|
||||
CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.16
|
||||
CARGO_CRATE_DEPENDS+= rustc-hash-1.0.1
|
||||
CARGO_CRATE_DEPENDS+= rustc-serialize-0.3.24
|
||||
CARGO_CRATE_DEPENDS+= rustc_version-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= rustversion-1.0.1
|
||||
CARGO_CRATE_DEPENDS+= ryu-1.0.2
|
||||
CARGO_CRATE_DEPENDS+= safemem-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= same-file-1.0.5
|
||||
CARGO_CRATE_DEPENDS+= same-file-1.0.6
|
||||
CARGO_CRATE_DEPENDS+= schannel-0.1.16
|
||||
CARGO_CRATE_DEPENDS+= scoped-tls-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= scopeguard-1.0.0
|
||||
CARGO_CRATE_DEPENDS+= secret-service-1.0.0
|
||||
CARGO_CRATE_DEPENDS+= security-framework-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= security-framework-sys-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= security-framework-0.3.4
|
||||
CARGO_CRATE_DEPENDS+= security-framework-sys-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= semver-0.9.0
|
||||
CARGO_CRATE_DEPENDS+= semver-parser-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= serde-1.0.102
|
||||
CARGO_CRATE_DEPENDS+= serde_derive-1.0.102
|
||||
CARGO_CRATE_DEPENDS+= serde-1.0.104
|
||||
CARGO_CRATE_DEPENDS+= serde_derive-1.0.104
|
||||
CARGO_CRATE_DEPENDS+= serde_ini-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= serde_json-1.0.41
|
||||
CARGO_CRATE_DEPENDS+= serde_json-1.0.44
|
||||
CARGO_CRATE_DEPENDS+= serde_urlencoded-0.5.5
|
||||
CARGO_CRATE_DEPENDS+= sha-1-0.8.1
|
||||
CARGO_CRATE_DEPENDS+= sha2-0.8.0
|
||||
CARGO_CRATE_DEPENDS+= sha-1-0.8.2
|
||||
CARGO_CRATE_DEPENDS+= sha2-0.8.1
|
||||
CARGO_CRATE_DEPENDS+= shannon-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= shlex-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= signal-hook-0.1.11
|
||||
CARGO_CRATE_DEPENDS+= signal-hook-registry-1.1.1
|
||||
CARGO_CRATE_DEPENDS+= simplelog-0.7.4
|
||||
CARGO_CRATE_DEPENDS+= signal-hook-0.1.12
|
||||
CARGO_CRATE_DEPENDS+= signal-hook-registry-1.2.0
|
||||
CARGO_CRATE_DEPENDS+= skeptic-0.13.4
|
||||
CARGO_CRATE_DEPENDS+= slab-0.3.0
|
||||
CARGO_CRATE_DEPENDS+= slab-0.4.2
|
||||
CARGO_CRATE_DEPENDS+= smallvec-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= smallvec-0.6.12
|
||||
CARGO_CRATE_DEPENDS+= smallvec-0.6.13
|
||||
CARGO_CRATE_DEPENDS+= smallvec-1.1.0
|
||||
CARGO_CRATE_DEPENDS+= socket2-0.2.4
|
||||
CARGO_CRATE_DEPENDS+= socket2-0.3.11
|
||||
CARGO_CRATE_DEPENDS+= stdweb-0.1.3
|
||||
|
|
@ -307,72 +288,76 @@ CARGO_CRATE_DEPENDS+= stream-cipher-0.3.2
|
|||
CARGO_CRATE_DEPENDS+= string-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= strsim-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= strsim-0.8.0
|
||||
CARGO_CRATE_DEPENDS+= structopt-0.3.8
|
||||
CARGO_CRATE_DEPENDS+= structopt-derive-0.4.1
|
||||
CARGO_CRATE_DEPENDS+= subtle-1.0.0
|
||||
CARGO_CRATE_DEPENDS+= syn-0.15.44
|
||||
CARGO_CRATE_DEPENDS+= syn-1.0.7
|
||||
CARGO_CRATE_DEPENDS+= synstructure-0.12.1
|
||||
CARGO_CRATE_DEPENDS+= syn-1.0.13
|
||||
CARGO_CRATE_DEPENDS+= syn-mid-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= synstructure-0.12.3
|
||||
CARGO_CRATE_DEPENDS+= syslog-4.0.1
|
||||
CARGO_CRATE_DEPENDS+= take-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= tempdir-0.3.7
|
||||
CARGO_CRATE_DEPENDS+= tempfile-3.1.0
|
||||
CARGO_CRATE_DEPENDS+= term-0.6.1
|
||||
CARGO_CRATE_DEPENDS+= termcolor-1.0.5
|
||||
CARGO_CRATE_DEPENDS+= termcolor-1.1.0
|
||||
CARGO_CRATE_DEPENDS+= textwrap-0.11.0
|
||||
CARGO_CRATE_DEPENDS+= thread_local-0.3.6
|
||||
CARGO_CRATE_DEPENDS+= thread_local-1.0.1
|
||||
CARGO_CRATE_DEPENDS+= time-0.1.42
|
||||
CARGO_CRATE_DEPENDS+= tokio-0.1.22
|
||||
CARGO_CRATE_DEPENDS+= tokio-buf-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= tokio-codec-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= tokio-core-0.1.17
|
||||
CARGO_CRATE_DEPENDS+= tokio-current-thread-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= tokio-executor-0.1.8
|
||||
CARGO_CRATE_DEPENDS+= tokio-executor-0.1.9
|
||||
CARGO_CRATE_DEPENDS+= tokio-fs-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= tokio-io-0.1.12
|
||||
CARGO_CRATE_DEPENDS+= tokio-process-0.2.4
|
||||
CARGO_CRATE_DEPENDS+= tokio-proto-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= tokio-reactor-0.1.10
|
||||
CARGO_CRATE_DEPENDS+= tokio-reactor-0.1.11
|
||||
CARGO_CRATE_DEPENDS+= tokio-service-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= tokio-signal-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= tokio-signal-0.2.7
|
||||
CARGO_CRATE_DEPENDS+= tokio-sync-0.1.7
|
||||
CARGO_CRATE_DEPENDS+= tokio-tcp-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= tokio-threadpool-0.1.16
|
||||
CARGO_CRATE_DEPENDS+= tokio-timer-0.2.11
|
||||
CARGO_CRATE_DEPENDS+= tokio-threadpool-0.1.17
|
||||
CARGO_CRATE_DEPENDS+= tokio-timer-0.2.12
|
||||
CARGO_CRATE_DEPENDS+= tokio-udp-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= tokio-uds-0.2.5
|
||||
CARGO_CRATE_DEPENDS+= try-lock-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= try-lock-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= try_from-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= typenum-1.11.2
|
||||
CARGO_CRATE_DEPENDS+= unicase-2.5.1
|
||||
CARGO_CRATE_DEPENDS+= unicase-2.6.0
|
||||
CARGO_CRATE_DEPENDS+= unicode-bidi-0.3.4
|
||||
CARGO_CRATE_DEPENDS+= unicode-normalization-0.1.8
|
||||
CARGO_CRATE_DEPENDS+= unicode-segmentation-1.5.0
|
||||
CARGO_CRATE_DEPENDS+= unicode-width-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= unicode-normalization-0.1.11
|
||||
CARGO_CRATE_DEPENDS+= unicode-segmentation-1.6.0
|
||||
CARGO_CRATE_DEPENDS+= unicode-width-0.1.7
|
||||
CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= unicode-xid-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= url-1.7.2
|
||||
CARGO_CRATE_DEPENDS+= url-2.1.0
|
||||
CARGO_CRATE_DEPENDS+= url-2.1.1
|
||||
CARGO_CRATE_DEPENDS+= uuid-0.7.4
|
||||
CARGO_CRATE_DEPENDS+= vcpkg-0.2.7
|
||||
CARGO_CRATE_DEPENDS+= vcpkg-0.2.8
|
||||
CARGO_CRATE_DEPENDS+= vec_map-0.8.1
|
||||
CARGO_CRATE_DEPENDS+= vergen-3.0.4
|
||||
CARGO_CRATE_DEPENDS+= version_check-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= version_check-0.9.1
|
||||
CARGO_CRATE_DEPENDS+= void-1.0.2
|
||||
CARGO_CRATE_DEPENDS+= walkdir-2.2.9
|
||||
CARGO_CRATE_DEPENDS+= walkdir-2.3.0
|
||||
CARGO_CRATE_DEPENDS+= want-0.0.4
|
||||
CARGO_CRATE_DEPENDS+= want-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= wasi-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= wasi-0.9.0+wasi-snapshot-preview1
|
||||
# work around weird version pattern not supported by cargo.mk
|
||||
SITES.wasi-0.9.0+wasi-snapshot-preview1.crate+= -https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download
|
||||
CARGO_CRATE_DEPENDS+= webbrowser-0.5.2
|
||||
CARGO_CRATE_DEPENDS+= whoami-0.5.3
|
||||
CARGO_CRATE_DEPENDS+= whoami-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= widestring-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= winapi-0.2.8
|
||||
CARGO_CRATE_DEPENDS+= winapi-0.3.8
|
||||
CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= winapi-util-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= winapi-util-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= wincolor-1.0.2
|
||||
CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= xdg-2.2.0
|
||||
|
||||
|
|
@ -384,13 +369,6 @@ MAKE_ENV+= RUSTFLAGS="-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pulse
|
|||
# TODO investigate why this is needed
|
||||
CHECK_WRKREF_SKIP+= bin/spotifyd
|
||||
|
||||
post-extract:
|
||||
mv ${WRKDIR}/librespot-${LIBRESPOT_REV} ${WRKDIR}/librespot
|
||||
mv ${WRKDIR}/rust-tremor-${RUST_TREMOR_REV} ${WRKDIR}/rust-tremor
|
||||
mv ${WRKDIR}/rust-mdns-${RUST_MDNS_REV} ${WRKDIR}/rust-mdns
|
||||
mv ${WRKDIR}/dns-parser-${DNS_PARSER_REV} ${WRKDIR}/dns-parser
|
||||
mv ${WRKDIR}/structopt-${STRUCTOPT_REV} ${WRKDIR}/structopt
|
||||
|
||||
# NOTE: To update this package I think you need to do:
|
||||
# 1. remove `--frozen --locked` below
|
||||
# 2. `make extract`
|
||||
|
|
@ -407,7 +385,7 @@ post-extract:
|
|||
#
|
||||
# Although... also need to update the cargo crate depends list above and those patches...
|
||||
do-build:
|
||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --no-default-features --features pulseaudio_backend --release --frozen --locked -j${_MAKE_JOBS_N}
|
||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --no-default-features --features pulseaudio_backend --release --frozen --locked
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/target/release/spotifyd ${DESTDIR}${PREFIX}/bin
|
||||
|
|
@ -417,7 +395,7 @@ do-install:
|
|||
# find for rust is 1.29.1 in 8.0_2018Q3. You can either build a required
|
||||
# version or try to cheat by installing rust via rustup and "tricking" pkgsrc
|
||||
# into using that.
|
||||
BUILDLINK_API_DEPENDS.rust+= rust>=1.31.0
|
||||
BUILDLINK_API_DEPENDS.rust+= rust>=1.40.0
|
||||
.include "../../lang/rust/cargo.mk"
|
||||
.include "../../lang/rust/buildlink3.mk"
|
||||
.include "../../audio/pulseaudio/buildlink3.mk"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,257 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
--- Cargo.lock.orig 2019-11-03 15:53:48.000000000 +0000
|
||||
+++ Cargo.lock
|
||||
@@ -678,7 +678,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "dns-parser"
|
||||
version = "0.3.2"
|
||||
-source = "git+https://github.com/plietar/dns-parser#1d3e5a5591bc72eb061c23bd426c4a25f2f73791"
|
||||
dependencies = [
|
||||
"byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1231,7 +1230,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#551daadc44a39336e1c643d1e300d38cdd8426d5"
|
||||
dependencies = [
|
||||
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1239,12 +1237,12 @@ dependencies = [
|
||||
"getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "librespot-audio 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-connect 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-metadata 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-playback 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-protocol 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
+ "librespot-audio 0.1.0",
|
||||
+ "librespot-connect 0.1.0",
|
||||
+ "librespot-core 0.1.0",
|
||||
+ "librespot-metadata 0.1.0",
|
||||
+ "librespot-playback 0.1.0",
|
||||
+ "librespot-protocol 0.1.0",
|
||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1261,25 +1259,23 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-audio"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#551daadc44a39336e1c643d1e300d38cdd8426d5"
|
||||
dependencies = [
|
||||
"aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
+ "librespot-core 0.1.0",
|
||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "tremor 0.1.0 (git+https://github.com/plietar/rust-tremor)",
|
||||
+ "tremor 0.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "librespot-connect"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#551daadc44a39336e1c643d1e300d38cdd8426d5"
|
||||
dependencies = [
|
||||
"aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1287,11 +1283,11 @@ dependencies = [
|
||||
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-playback 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-protocol 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
+ "librespot-core 0.1.0",
|
||||
+ "librespot-playback 0.1.0",
|
||||
+ "librespot-protocol 0.1.0",
|
||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "mdns 0.2.0 (git+https://github.com/plietar/rust-mdns)",
|
||||
+ "mdns 0.2.0",
|
||||
"num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1306,7 +1302,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-core"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#551daadc44a39336e1c643d1e300d38cdd8426d5"
|
||||
dependencies = [
|
||||
"aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1320,7 +1315,7 @@ dependencies = [
|
||||
"hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "librespot-protocol 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
+ "librespot-protocol 0.1.0",
|
||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1344,12 +1339,11 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-metadata"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#551daadc44a39336e1c643d1e300d38cdd8426d5"
|
||||
dependencies = [
|
||||
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-protocol 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
+ "librespot-core 0.1.0",
|
||||
+ "librespot-protocol 0.1.0",
|
||||
"linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
@@ -1357,7 +1351,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-playback"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#551daadc44a39336e1c643d1e300d38cdd8426d5"
|
||||
dependencies = [
|
||||
"alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1365,9 +1358,9 @@ dependencies = [
|
||||
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "librespot-audio 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
- "librespot-metadata 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
+ "librespot-audio 0.1.0",
|
||||
+ "librespot-core 0.1.0",
|
||||
+ "librespot-metadata 0.1.0",
|
||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"portaudio-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1376,7 +1369,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-protocol"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#551daadc44a39336e1c643d1e300d38cdd8426d5"
|
||||
dependencies = [
|
||||
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1428,10 +1420,9 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "mdns"
|
||||
version = "0.2.0"
|
||||
-source = "git+https://github.com/plietar/rust-mdns#66a74033da6c9f1a06e7b0a29f4544fd189d6479"
|
||||
dependencies = [
|
||||
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "dns-parser 0.3.2 (git+https://github.com/plietar/dns-parser)",
|
||||
+ "dns-parser 0.3.2",
|
||||
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2564,7 +2555,7 @@ dependencies = [
|
||||
"keyring 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "librespot 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
+ "librespot 0.1.0",
|
||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rspotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2572,7 +2563,7 @@ dependencies = [
|
||||
"serde_ini 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"simplelog 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "structopt 0.3.2 (git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005)",
|
||||
+ "structopt 0.3.2",
|
||||
"syslog 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2615,16 +2606,14 @@ source = "registry+https://github.com/ru
|
||||
[[package]]
|
||||
name = "structopt"
|
||||
version = "0.3.2"
|
||||
-source = "git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005#0c888e962d842f2c90c6c290d3a2a40947b37005"
|
||||
dependencies = [
|
||||
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "structopt-derive 0.3.2 (git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005)",
|
||||
+ "structopt-derive 0.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "structopt-derive"
|
||||
version = "0.3.2"
|
||||
-source = "git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005#0c888e962d842f2c90c6c290d3a2a40947b37005"
|
||||
dependencies = [
|
||||
"heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -3023,16 +3012,14 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "tremor"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/plietar/rust-tremor#5958cc302e78f535dad90e9665da981ddff4000a"
|
||||
dependencies = [
|
||||
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "tremor-sys 0.1.0 (git+https://github.com/plietar/rust-tremor)",
|
||||
+ "tremor-sys 0.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tremor-sys"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/plietar/rust-tremor#5958cc302e78f535dad90e9665da981ddff4000a"
|
||||
dependencies = [
|
||||
"gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -3357,7 +3344,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
|
||||
"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
|
||||
"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
|
||||
-"checksum dns-parser 0.3.2 (git+https://github.com/plietar/dns-parser)" = "<none>"
|
||||
"checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
|
||||
"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
|
||||
"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
|
||||
@@ -3420,20 +3406,12 @@ source = "registry+https://github.com/ru
|
||||
"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
|
||||
"checksum libm 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
|
||||
"checksum libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9bb11b06faf883500c1b625cf4453e6c7737e9df9c7ba01df3f84b22b083e4ac"
|
||||
-"checksum librespot 0.1.0 (git+https://github.com/librespot-org/librespot.git)" = "<none>"
|
||||
-"checksum librespot-audio 0.1.0 (git+https://github.com/librespot-org/librespot.git)" = "<none>"
|
||||
-"checksum librespot-connect 0.1.0 (git+https://github.com/librespot-org/librespot.git)" = "<none>"
|
||||
-"checksum librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)" = "<none>"
|
||||
-"checksum librespot-metadata 0.1.0 (git+https://github.com/librespot-org/librespot.git)" = "<none>"
|
||||
-"checksum librespot-playback 0.1.0 (git+https://github.com/librespot-org/librespot.git)" = "<none>"
|
||||
-"checksum librespot-protocol 0.1.0 (git+https://github.com/librespot-org/librespot.git)" = "<none>"
|
||||
"checksum linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee"
|
||||
"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
|
||||
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
|
||||
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
|
||||
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
|
||||
"checksum matrixmultiply 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f"
|
||||
-"checksum mdns 0.2.0 (git+https://github.com/plietar/rust-mdns)" = "<none>"
|
||||
"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
|
||||
"checksum memoffset 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a85c1a8c329f11437034d7313dca647c79096523533a1c79e86f1d0f657c7cc"
|
||||
"checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf"
|
||||
@@ -3559,8 +3537,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
|
||||
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
|
||||
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
-"checksum structopt 0.3.2 (git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005)" = "<none>"
|
||||
-"checksum structopt-derive 0.3.2 (git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005)" = "<none>"
|
||||
"checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
|
||||
"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
|
||||
"checksum syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7bedb3320d0f3035594b0b723c8a28d7d336a3eda3881db79e61d676fb644c"
|
||||
@@ -3594,8 +3570,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e"
|
||||
"checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b"
|
||||
"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
|
||||
-"checksum tremor 0.1.0 (git+https://github.com/plietar/rust-tremor)" = "<none>"
|
||||
-"checksum tremor-sys 0.1.0 (git+https://github.com/plietar/rust-tremor)" = "<none>"
|
||||
"checksum try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2"
|
||||
"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
|
||||
"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
--- Cargo.toml.orig 2019-11-03 15:53:48.000000000 +0000
|
||||
+++ Cargo.toml
|
||||
@@ -24,7 +24,7 @@ serde = { version = "1.0.99", features =
|
||||
serde_ini = "0.2.0"
|
||||
sha-1 = "0.8"
|
||||
simplelog = "0.7"
|
||||
-structopt = { git = "https://github.com/TeXitoi/structopt/", rev = "0c888e962d842f2c90c6c290d3a2a40947b37005", features = ["color"] }
|
||||
+structopt = { path = "../structopt", features = ["color"] }
|
||||
syslog = "4.0.1"
|
||||
tokio-core = "0.1"
|
||||
tokio-io = "0.1"
|
||||
@@ -35,7 +35,7 @@ whoami = "0.5.3"
|
||||
[dependencies.librespot]
|
||||
default-features = false
|
||||
features = ["with-tremor"]
|
||||
-git = "https://github.com/librespot-org/librespot.git"
|
||||
+path = "../librespot"
|
||||
|
||||
[dev-dependencies]
|
||||
env_logger = "0.7"
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
--- ../librespot/audio/Cargo.toml.orig 2019-09-26 12:25:44.000000000 +0000
|
||||
+++ ../librespot/audio/Cargo.toml
|
||||
@@ -17,7 +17,8 @@ num-traits = "0.2"
|
||||
tempfile = "3.1"
|
||||
aes-ctr = "0.3"
|
||||
|
||||
-tremor = { git = "https://github.com/plietar/rust-tremor", optional = true }
|
||||
+#tremor = { git = "https://github.com/plietar/rust-tremor", optional = true }
|
||||
+tremor = { path = "../../rust-tremor", optional = true }
|
||||
vorbis = { version ="0.1.0", optional = true }
|
||||
|
||||
[features]
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
--- ../librespot/connect/Cargo.toml.orig 2019-09-26 12:25:44.000000000 +0000
|
||||
+++ ../librespot/connect/Cargo.toml
|
||||
@@ -29,7 +29,8 @@ aes-ctr = "0.3"
|
||||
block-modes = "0.3"
|
||||
|
||||
dns-sd = { version = "0.1.3", optional = true }
|
||||
-mdns = { git = "https://github.com/plietar/rust-mdns", optional = true }
|
||||
+#mdns = { git = "https://github.com/plietar/rust-mdns", optional = true }
|
||||
+mdns = { path = "../../rust-mdns", optional = true }
|
||||
|
||||
[features]
|
||||
default = ["mdns"]
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
--- ../rust-mdns/Cargo.toml.orig 2018-12-19 13:58:45.000000000 +0000
|
||||
+++ ../rust-mdns/Cargo.toml
|
||||
@@ -20,7 +20,8 @@ nix = "0.11"
|
||||
rand = "0.5"
|
||||
tokio-core = "0.1"
|
||||
|
||||
-dns-parser = { git = "https://github.com/plietar/dns-parser" }
|
||||
+#dns-parser = { git = "https://github.com/plietar/dns-parser" }
|
||||
+dns-parser = { path = "../dns-parser" }
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
winapi = "0.2.8"
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
$NetBSD$
|
||||
|
||||
Later versions of libc have (correctly) removed `fexecve` for netbsd-like platforms therefore need
|
||||
to patch earlier versions of nix that expect this to also be removed.
|
||||
|
||||
Fixed upstream in later versions:
|
||||
|
||||
https://github.com/nix-rust/nix/blob/922d5ee118a770435b14b08ec4be6f8ae9f7c30a/CHANGELOG.md#fixed-7
|
||||
|
||||
--- ../vendor/nix-0.10.0/src/unistd.rs.orig 2018-01-21 20:52:34.000000000 +0000
|
||||
+++ ../vendor/nix-0.10.0/src/unistd.rs
|
||||
@@ -633,7 +633,6 @@ pub fn execvp(filename: &CString, args:
|
||||
#[cfg(any(target_os = "android",
|
||||
target_os = "freebsd",
|
||||
target_os = "linux",
|
||||
- target_os = "netbsd",
|
||||
target_os = "openbsd"))]
|
||||
#[inline]
|
||||
pub fn fexecve(fd: RawFd, args: &[CString], env: &[CString]) -> Result<Void> {
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
Fixed upstream in later versions
|
||||
|
||||
https://github.com/maidsafe/get_if_addrs/pull/56
|
||||
|
||||
--- ../vendor/get_if_addrs-0.5.3/src/lib.rs.orig 2018-06-21 12:35:24.000000000 +0000
|
||||
+++ ../vendor/get_if_addrs-0.5.3/src/lib.rs
|
||||
@@ -197,7 +197,7 @@ mod getifaddrs_posix {
|
||||
}
|
||||
|
||||
#[cfg(
|
||||
- any(target_os = "freebsd", target_os = "ios", target_os = "macos", target_os = "openbsd")
|
||||
+ any(target_os = "freebsd", target_os = "ios", target_os = "macos", target_os = "openbsd", target_os = "netbsd")
|
||||
)]
|
||||
fn do_broadcast(ifaddr: &posix_ifaddrs) -> Option<IpAddr> {
|
||||
sockaddr_to_ipaddr(ifaddr.ifa_dstaddr)
|
||||
Loading…
Reference in New Issue