Update spotifyd to 0.2.11
- Yay! A couple of patches are no longer required - No longer need the RUST_ALSA_REV hack - Tag has changed upstream and no longer includes the v prefix - Update notes on how to update this (it confuses me each time) - Update TODO... should have done that last time when I upped the rust version requirement I ended up building Rust 1.36 for this... after my rustup hack didn't work for whatever reason (couldn't find the rust toolchain). Took me over 24 hours in all (not pure build time) to get it built!
This commit is contained in:
atomicules
parent
749d27ddbf
commit
49e4d97ee2
|
|
@ -1,10 +1,10 @@
|
|||
# $NetBSD$
|
||||
|
||||
DISTNAME= spotifyd-0.2.8
|
||||
DISTNAME= spotifyd-0.2.11
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=Spotifyd/}
|
||||
GITHUB_TAG= v${PKGVERSION_NOREV}
|
||||
GITHUB_TAG= ${PKGVERSION_NOREV}
|
||||
|
||||
MAINTAINER= base@atomicules.co.uk
|
||||
HOMEPAGE= https://github.com/Spotifyd/spotifyd/
|
||||
|
|
@ -16,7 +16,7 @@ USE_LANGUAGES= c # rust, but needs a toolchain to link
|
|||
|
||||
DISTFILES= ${DEFAULT_DISTFILES}
|
||||
|
||||
LIBRESPOT_REV= a41ab28540537e5f277fc9556bbcc16e08f065d5
|
||||
LIBRESPOT_REV= 4e3576ba7c6146cf68e1953daeec929d619b26b1
|
||||
DISTFILES+= librespot-${LIBRESPOT_REV}.tar.gz
|
||||
SITES.librespot-${LIBRESPOT_REV}.tar.gz= -https://github.com/librespot-org/librespot/archive/${LIBRESPOT_REV}.tar.gz
|
||||
|
||||
|
|
@ -28,16 +28,11 @@ 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
|
||||
|
||||
RUST_ALSA_REV= 8c63543fa0ccd971cf15f5675293d19febd6f79e
|
||||
DISTFILES+= rust-alsa-${RUST_ALSA_REV}.tar.gz
|
||||
SITES.rust-alsa-${RUST_ALSA_REV}.tar.gz= -https://github.com/plietar/rust-alsa/archive/${RUST_ALSA_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
|
||||
|
||||
# generate using make show-crate-depends
|
||||
CARGO_CRATE_DEPENDS+= MacTypes-sys-2.1.0
|
||||
# generate using make show-cargo-depends
|
||||
CARGO_CRATE_DEPENDS+= adler32-1.0.3
|
||||
CARGO_CRATE_DEPENDS+= advapi32-sys-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= aes-0.3.2
|
||||
|
|
@ -45,14 +40,15 @@ CARGO_CRATE_DEPENDS+= aes-ctr-0.3.0
|
|||
CARGO_CRATE_DEPENDS+= aes-soft-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= aesni-0.6.0
|
||||
CARGO_CRATE_DEPENDS+= aho-corasick-0.6.10
|
||||
CARGO_CRATE_DEPENDS+= alsa-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= aho-corasick-0.7.3
|
||||
CARGO_CRATE_DEPENDS+= alsa-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= alsa-sys-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= ansi_term-0.11.0
|
||||
CARGO_CRATE_DEPENDS+= arc-swap-0.3.7
|
||||
CARGO_CRATE_DEPENDS+= arc-swap-0.3.11
|
||||
CARGO_CRATE_DEPENDS+= arrayvec-0.4.10
|
||||
CARGO_CRATE_DEPENDS+= atty-0.2.11
|
||||
CARGO_CRATE_DEPENDS+= autocfg-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= backtrace-0.3.14
|
||||
CARGO_CRATE_DEPENDS+= autocfg-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= backtrace-0.3.30
|
||||
CARGO_CRATE_DEPENDS+= backtrace-sys-0.1.28
|
||||
CARGO_CRATE_DEPENDS+= base64-0.10.1
|
||||
CARGO_CRATE_DEPENDS+= base64-0.5.2
|
||||
|
|
@ -63,24 +59,26 @@ CARGO_CRATE_DEPENDS+= bit-vec-0.4.4
|
|||
CARGO_CRATE_DEPENDS+= bitflags-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= bitflags-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= bitflags-0.9.1
|
||||
CARGO_CRATE_DEPENDS+= bitflags-1.0.4
|
||||
CARGO_CRATE_DEPENDS+= block-buffer-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= bitflags-1.1.0
|
||||
CARGO_CRATE_DEPENDS+= block-buffer-0.7.3
|
||||
CARGO_CRATE_DEPENDS+= block-cipher-trait-0.6.2
|
||||
CARGO_CRATE_DEPENDS+= block-modes-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= block-padding-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= block-padding-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= build_const-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= byte-tools-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= byteorder-0.5.3
|
||||
CARGO_CRATE_DEPENDS+= byteorder-1.3.1
|
||||
CARGO_CRATE_DEPENDS+= byteorder-1.3.2
|
||||
CARGO_CRATE_DEPENDS+= bytes-0.4.12
|
||||
CARGO_CRATE_DEPENDS+= c_linked_list-1.1.1
|
||||
CARGO_CRATE_DEPENDS+= cc-1.0.31
|
||||
CARGO_CRATE_DEPENDS+= cfg-if-0.1.7
|
||||
CARGO_CRATE_DEPENDS+= cc-1.0.37
|
||||
CARGO_CRATE_DEPENDS+= cfg-if-0.1.9
|
||||
CARGO_CRATE_DEPENDS+= chrono-0.4.6
|
||||
CARGO_CRATE_DEPENDS+= clap-2.32.0
|
||||
CARGO_CRATE_DEPENDS+= clap-2.33.0
|
||||
CARGO_CRATE_DEPENDS+= cloudabi-0.0.3
|
||||
CARGO_CRATE_DEPENDS+= core-foundation-0.5.1
|
||||
CARGO_CRATE_DEPENDS+= core-foundation-sys-0.5.1
|
||||
CARGO_CRATE_DEPENDS+= cookie-0.12.0
|
||||
CARGO_CRATE_DEPENDS+= cookie_store-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= core-foundation-0.6.4
|
||||
CARGO_CRATE_DEPENDS+= core-foundation-sys-0.6.2
|
||||
CARGO_CRATE_DEPENDS+= crc-1.8.1
|
||||
CARGO_CRATE_DEPENDS+= crc32fast-1.2.0
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-deque-0.7.1
|
||||
|
|
@ -98,55 +96,56 @@ CARGO_CRATE_DEPENDS+= derive_builder-0.5.1
|
|||
CARGO_CRATE_DEPENDS+= derive_builder_core-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= digest-0.8.0
|
||||
CARGO_CRATE_DEPENDS+= dotenv-0.10.1
|
||||
CARGO_CRATE_DEPENDS+= dtoa-0.4.3
|
||||
CARGO_CRATE_DEPENDS+= either-1.5.1
|
||||
CARGO_CRATE_DEPENDS+= dtoa-0.4.4
|
||||
CARGO_CRATE_DEPENDS+= either-1.5.2
|
||||
CARGO_CRATE_DEPENDS+= encoding_rs-0.8.17
|
||||
CARGO_CRATE_DEPENDS+= env_logger-0.4.3
|
||||
CARGO_CRATE_DEPENDS+= env_logger-0.5.13
|
||||
CARGO_CRATE_DEPENDS+= env_logger-0.6.1
|
||||
CARGO_CRATE_DEPENDS+= error-chain-0.10.0
|
||||
CARGO_CRATE_DEPENDS+= error-chain-0.11.0
|
||||
CARGO_CRATE_DEPENDS+= extprim-1.6.0
|
||||
CARGO_CRATE_DEPENDS+= error-chain-0.12.1
|
||||
CARGO_CRATE_DEPENDS+= extprim-1.7.0
|
||||
CARGO_CRATE_DEPENDS+= failure-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= failure_derive-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= fake-simd-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= flate2-1.0.7
|
||||
CARGO_CRATE_DEPENDS+= flate2-1.0.8
|
||||
CARGO_CRATE_DEPENDS+= fnv-1.0.6
|
||||
CARGO_CRATE_DEPENDS+= foreign-types-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= foreign-types-shared-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= fuchsia-cprng-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= fuchsia-zircon-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= fuchsia-zircon-sys-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= futures-0.1.25
|
||||
CARGO_CRATE_DEPENDS+= futures-0.1.27
|
||||
CARGO_CRATE_DEPENDS+= futures-cpupool-0.1.8
|
||||
CARGO_CRATE_DEPENDS+= gcc-0.3.55
|
||||
CARGO_CRATE_DEPENDS+= generic-array-0.12.0
|
||||
CARGO_CRATE_DEPENDS+= get_if_addrs-0.5.3
|
||||
CARGO_CRATE_DEPENDS+= get_if_addrs-sys-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= getopts-0.2.18
|
||||
CARGO_CRATE_DEPENDS+= h2-0.1.17
|
||||
CARGO_CRATE_DEPENDS+= getopts-0.2.19
|
||||
CARGO_CRATE_DEPENDS+= h2-0.1.24
|
||||
CARGO_CRATE_DEPENDS+= hex-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= hmac-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= hostname-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= http-0.1.16
|
||||
CARGO_CRATE_DEPENDS+= http-0.1.17
|
||||
CARGO_CRATE_DEPENDS+= http-body-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= httparse-1.3.3
|
||||
CARGO_CRATE_DEPENDS+= humantime-1.2.0
|
||||
CARGO_CRATE_DEPENDS+= hyper-0.11.27
|
||||
CARGO_CRATE_DEPENDS+= hyper-0.12.25
|
||||
CARGO_CRATE_DEPENDS+= hyper-0.12.30
|
||||
CARGO_CRATE_DEPENDS+= hyper-proxy-0.4.1
|
||||
CARGO_CRATE_DEPENDS+= hyper-tls-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= idna-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= indexmap-1.0.2
|
||||
CARGO_CRATE_DEPENDS+= iovec-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= itertools-0.7.11
|
||||
CARGO_CRATE_DEPENDS+= itoa-0.4.3
|
||||
CARGO_CRATE_DEPENDS+= itoa-0.4.4
|
||||
CARGO_CRATE_DEPENDS+= kernel32-sys-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= keyring-0.6.1
|
||||
CARGO_CRATE_DEPENDS+= language-tags-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= lazy_static-0.2.11
|
||||
CARGO_CRATE_DEPENDS+= lazy_static-1.3.0
|
||||
CARGO_CRATE_DEPENDS+= lazycell-1.2.1
|
||||
CARGO_CRATE_DEPENDS+= lewton-0.9.4
|
||||
CARGO_CRATE_DEPENDS+= libc-0.2.50
|
||||
CARGO_CRATE_DEPENDS+= libc-0.2.58
|
||||
CARGO_CRATE_DEPENDS+= libdbus-sys-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= libpulse-sys-0.0.0
|
||||
CARGO_CRATE_DEPENDS+= linear-map-1.2.0
|
||||
|
|
@ -162,32 +161,33 @@ CARGO_CRATE_DEPENDS+= mime_guess-2.0.0-alpha.6
|
|||
SITES.mime_guess-2.0.0-alpha.6.crate+= -https://crates.io/api/v1/crates/mime_guess/2.0.0-alpha.6/download
|
||||
CARGO_CRATE_DEPENDS+= miniz_oxide-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= miniz_oxide_c_api-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= mio-0.6.16
|
||||
CARGO_CRATE_DEPENDS+= mio-0.6.19
|
||||
CARGO_CRATE_DEPENDS+= mio-named-pipes-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= mio-uds-0.6.7
|
||||
CARGO_CRATE_DEPENDS+= miow-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= miow-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= multimap-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= native-tls-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= native-tls-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= net2-0.2.33
|
||||
CARGO_CRATE_DEPENDS+= nix-0.11.0
|
||||
CARGO_CRATE_DEPENDS+= nix-0.11.1
|
||||
CARGO_CRATE_DEPENDS+= nix-0.9.0
|
||||
CARGO_CRATE_DEPENDS+= nodrop-0.1.13
|
||||
CARGO_CRATE_DEPENDS+= num-0.1.42
|
||||
CARGO_CRATE_DEPENDS+= num-bigint-0.1.44
|
||||
CARGO_CRATE_DEPENDS+= num-complex-0.1.43
|
||||
CARGO_CRATE_DEPENDS+= num-integer-0.1.39
|
||||
CARGO_CRATE_DEPENDS+= num-iter-0.1.37
|
||||
CARGO_CRATE_DEPENDS+= num-integer-0.1.41
|
||||
CARGO_CRATE_DEPENDS+= num-iter-0.1.39
|
||||
CARGO_CRATE_DEPENDS+= num-rational-0.1.42
|
||||
CARGO_CRATE_DEPENDS+= num-traits-0.1.43
|
||||
CARGO_CRATE_DEPENDS+= num-traits-0.2.6
|
||||
CARGO_CRATE_DEPENDS+= num_cpus-1.10.0
|
||||
CARGO_CRATE_DEPENDS+= num-traits-0.2.8
|
||||
CARGO_CRATE_DEPENDS+= num_cpus-1.10.1
|
||||
CARGO_CRATE_DEPENDS+= numtoa-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= ogg-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= ogg-sys-0.0.9
|
||||
CARGO_CRATE_DEPENDS+= opaque-debug-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= openssl-0.10.20
|
||||
CARGO_CRATE_DEPENDS+= openssl-0.10.23
|
||||
CARGO_CRATE_DEPENDS+= openssl-probe-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.43
|
||||
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.47
|
||||
CARGO_CRATE_DEPENDS+= owning_ref-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= parking_lot-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= parking_lot_core-0.4.0
|
||||
|
|
@ -198,16 +198,17 @@ CARGO_CRATE_DEPENDS+= phf_codegen-0.7.24
|
|||
CARGO_CRATE_DEPENDS+= phf_generator-0.7.24
|
||||
CARGO_CRATE_DEPENDS+= phf_shared-0.7.24
|
||||
CARGO_CRATE_DEPENDS+= pkg-config-0.3.14
|
||||
CARGO_CRATE_DEPENDS+= portaudio-rs-0.3.0
|
||||
CARGO_CRATE_DEPENDS+= portaudio-rs-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= portaudio-sys-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= proc-macro2-0.4.27
|
||||
CARGO_CRATE_DEPENDS+= protobuf-1.7.4
|
||||
CARGO_CRATE_DEPENDS+= protobuf-2.4.0
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-2.4.0
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-pure-2.4.0
|
||||
CARGO_CRATE_DEPENDS+= proc-macro2-0.4.30
|
||||
CARGO_CRATE_DEPENDS+= protobuf-1.7.5
|
||||
CARGO_CRATE_DEPENDS+= protobuf-2.6.2
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-2.6.2
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-pure-2.6.2
|
||||
CARGO_CRATE_DEPENDS+= publicsuffix-1.5.2
|
||||
CARGO_CRATE_DEPENDS+= quick-error-1.2.2
|
||||
CARGO_CRATE_DEPENDS+= quote-0.3.15
|
||||
CARGO_CRATE_DEPENDS+= quote-0.6.11
|
||||
CARGO_CRATE_DEPENDS+= quote-0.6.12
|
||||
CARGO_CRATE_DEPENDS+= rand-0.3.23
|
||||
CARGO_CRATE_DEPENDS+= rand-0.4.6
|
||||
CARGO_CRATE_DEPENDS+= rand-0.5.6
|
||||
|
|
@ -217,78 +218,80 @@ CARGO_CRATE_DEPENDS+= rand_core-0.3.1
|
|||
CARGO_CRATE_DEPENDS+= rand_core-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= rand_hc-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= rand_isaac-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= rand_jitter-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= rand_jitter-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= rand_os-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= rand_pcg-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= rand_xorshift-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= random-0.12.2
|
||||
CARGO_CRATE_DEPENDS+= rdrand-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= redox_syscall-0.1.51
|
||||
CARGO_CRATE_DEPENDS+= redox_syscall-0.1.54
|
||||
CARGO_CRATE_DEPENDS+= redox_termios-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= regex-0.2.11
|
||||
CARGO_CRATE_DEPENDS+= regex-1.1.2
|
||||
CARGO_CRATE_DEPENDS+= regex-1.1.7
|
||||
CARGO_CRATE_DEPENDS+= regex-syntax-0.5.6
|
||||
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.5
|
||||
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.7
|
||||
CARGO_CRATE_DEPENDS+= relay-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= remove_dir_all-0.5.1
|
||||
CARGO_CRATE_DEPENDS+= reqwest-0.9.12
|
||||
CARGO_CRATE_DEPENDS+= remove_dir_all-0.5.2
|
||||
CARGO_CRATE_DEPENDS+= reqwest-0.9.18
|
||||
CARGO_CRATE_DEPENDS+= rpassword-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= rpassword-2.1.0
|
||||
CARGO_CRATE_DEPENDS+= rspotify-0.2.5
|
||||
CARGO_CRATE_DEPENDS+= rust-crypto-0.2.36
|
||||
CARGO_CRATE_DEPENDS+= rust-gmp-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= rust-ini-0.13.0
|
||||
CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.13
|
||||
CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.15
|
||||
CARGO_CRATE_DEPENDS+= rustc-serialize-0.3.24
|
||||
CARGO_CRATE_DEPENDS+= rustc_version-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= ryu-0.2.7
|
||||
CARGO_CRATE_DEPENDS+= ryu-0.2.8
|
||||
CARGO_CRATE_DEPENDS+= safemem-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= safemem-0.3.0
|
||||
CARGO_CRATE_DEPENDS+= schannel-0.1.15
|
||||
CARGO_CRATE_DEPENDS+= scoped-tls-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= scopeguard-0.3.3
|
||||
CARGO_CRATE_DEPENDS+= secret-service-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= security-framework-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= security-framework-sys-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= security-framework-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= security-framework-sys-0.3.1
|
||||
CARGO_CRATE_DEPENDS+= semver-0.9.0
|
||||
CARGO_CRATE_DEPENDS+= semver-parser-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= serde-1.0.89
|
||||
CARGO_CRATE_DEPENDS+= serde_derive-1.0.89
|
||||
CARGO_CRATE_DEPENDS+= serde-1.0.92
|
||||
CARGO_CRATE_DEPENDS+= serde_derive-1.0.92
|
||||
CARGO_CRATE_DEPENDS+= serde_json-1.0.39
|
||||
CARGO_CRATE_DEPENDS+= serde_urlencoded-0.5.4
|
||||
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+= shannon-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= signal-hook-0.1.8
|
||||
CARGO_CRATE_DEPENDS+= signal-hook-0.1.9
|
||||
CARGO_CRATE_DEPENDS+= signal-hook-registry-1.0.1
|
||||
CARGO_CRATE_DEPENDS+= simplelog-0.4.4
|
||||
CARGO_CRATE_DEPENDS+= siphasher-0.2.3
|
||||
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.9
|
||||
CARGO_CRATE_DEPENDS+= smallvec-0.6.10
|
||||
CARGO_CRATE_DEPENDS+= socket2-0.2.4
|
||||
CARGO_CRATE_DEPENDS+= socket2-0.3.8
|
||||
CARGO_CRATE_DEPENDS+= socket2-0.3.9
|
||||
CARGO_CRATE_DEPENDS+= stable_deref_trait-1.1.1
|
||||
CARGO_CRATE_DEPENDS+= stream-cipher-0.3.0
|
||||
CARGO_CRATE_DEPENDS+= string-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= strsim-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= string-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= strsim-0.8.0
|
||||
CARGO_CRATE_DEPENDS+= subtle-1.0.0
|
||||
CARGO_CRATE_DEPENDS+= syn-0.11.11
|
||||
CARGO_CRATE_DEPENDS+= syn-0.15.29
|
||||
CARGO_CRATE_DEPENDS+= syn-0.15.36
|
||||
CARGO_CRATE_DEPENDS+= synom-0.11.3
|
||||
CARGO_CRATE_DEPENDS+= synstructure-0.10.1
|
||||
CARGO_CRATE_DEPENDS+= synstructure-0.10.2
|
||||
CARGO_CRATE_DEPENDS+= syslog-4.0.1
|
||||
CARGO_CRATE_DEPENDS+= take-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= tempfile-2.2.0
|
||||
CARGO_CRATE_DEPENDS+= tempfile-3.0.7
|
||||
CARGO_CRATE_DEPENDS+= tempfile-3.0.8
|
||||
CARGO_CRATE_DEPENDS+= term-0.4.6
|
||||
CARGO_CRATE_DEPENDS+= termcolor-1.0.4
|
||||
CARGO_CRATE_DEPENDS+= termion-1.5.1
|
||||
CARGO_CRATE_DEPENDS+= termcolor-1.0.5
|
||||
CARGO_CRATE_DEPENDS+= termion-1.5.3
|
||||
CARGO_CRATE_DEPENDS+= termios-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= textwrap-0.10.0
|
||||
CARGO_CRATE_DEPENDS+= textwrap-0.11.0
|
||||
CARGO_CRATE_DEPENDS+= thread_local-0.3.6
|
||||
CARGO_CRATE_DEPENDS+= time-0.1.42
|
||||
CARGO_CRATE_DEPENDS+= tokio-0.1.18
|
||||
CARGO_CRATE_DEPENDS+= tokio-0.1.21
|
||||
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
|
||||
|
|
@ -300,29 +303,30 @@ CARGO_CRATE_DEPENDS+= tokio-proto-0.1.1
|
|||
CARGO_CRATE_DEPENDS+= tokio-reactor-0.1.9
|
||||
CARGO_CRATE_DEPENDS+= tokio-service-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= tokio-signal-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= tokio-signal-0.2.8
|
||||
CARGO_CRATE_DEPENDS+= tokio-sync-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= tokio-signal-0.2.7
|
||||
CARGO_CRATE_DEPENDS+= tokio-sync-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= tokio-tcp-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= tokio-threadpool-0.1.13
|
||||
CARGO_CRATE_DEPENDS+= tokio-timer-0.2.10
|
||||
CARGO_CRATE_DEPENDS+= tokio-trace-core-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= tokio-threadpool-0.1.14
|
||||
CARGO_CRATE_DEPENDS+= tokio-timer-0.2.11
|
||||
CARGO_CRATE_DEPENDS+= tokio-trace-core-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= tokio-udp-0.1.3
|
||||
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.10.0
|
||||
CARGO_CRATE_DEPENDS+= ucd-util-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= unicase-1.4.2
|
||||
CARGO_CRATE_DEPENDS+= unicase-2.3.0
|
||||
CARGO_CRATE_DEPENDS+= unicase-2.4.0
|
||||
CARGO_CRATE_DEPENDS+= unicode-bidi-0.3.4
|
||||
CARGO_CRATE_DEPENDS+= unicode-normalization-0.1.8
|
||||
CARGO_CRATE_DEPENDS+= unicode-width-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= unicode-xid-0.0.4
|
||||
CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= url-1.7.2
|
||||
CARGO_CRATE_DEPENDS+= utf8-ranges-1.0.2
|
||||
CARGO_CRATE_DEPENDS+= utf8-ranges-1.0.3
|
||||
CARGO_CRATE_DEPENDS+= uuid-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= uuid-0.7.2
|
||||
CARGO_CRATE_DEPENDS+= uuid-0.7.4
|
||||
CARGO_CRATE_DEPENDS+= vcpkg-0.2.6
|
||||
CARGO_CRATE_DEPENDS+= vec_map-0.8.1
|
||||
CARGO_CRATE_DEPENDS+= vergen-0.1.1
|
||||
|
|
@ -332,7 +336,7 @@ CARGO_CRATE_DEPENDS+= want-0.0.4
|
|||
CARGO_CRATE_DEPENDS+= want-0.0.6
|
||||
CARGO_CRATE_DEPENDS+= webbrowser-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= winapi-0.2.8
|
||||
CARGO_CRATE_DEPENDS+= winapi-0.3.6
|
||||
CARGO_CRATE_DEPENDS+= winapi-0.3.7
|
||||
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
|
||||
|
|
@ -354,29 +358,34 @@ 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}/rust-alsa-${RUST_ALSA_REV} ${WRKDIR}/rust-alsa
|
||||
#mv ${WRKDIR}/rust-alsa-${RUST_ALSA_REV} ${WRKDIR}/rust-alsa
|
||||
mv ${WRKDIR}/dns-parser-${DNS_PARSER_REV} ${WRKDIR}/dns-parser
|
||||
|
||||
# NOTE: To update this package I think you need to do:
|
||||
# 1. remove `--frozen --locked` below
|
||||
# 2. `make extract`
|
||||
# 3. `make patch`
|
||||
# 4. `cd` into working directory
|
||||
# 5. `cargo update` to update the lock file
|
||||
# 6. `pkgdiff Cargo.lock Cargo.lock.orig > patch-Cargo.lock
|
||||
# 7. Replace the file in `patches/` with that one
|
||||
# 8. Can then re-add `--frozen --locked` below
|
||||
# NOTE: To update this package I think you need to do:
|
||||
# 1. remove `--frozen --locked` below
|
||||
# 2. `make extract`
|
||||
# 3. `make patch`
|
||||
# 4. That might fail. Need to...
|
||||
# 5. `cd` into working directory
|
||||
# 6. Manually update Cargo.lock and Cargo.toml based on *.rej
|
||||
# 7. Update patches... `pkgdiff Cargo.lock.orig Cargo.lock > ../../patches/patch-Cargo.lock`, etc
|
||||
# 8. Back in pkgsrc dir `make mdi`. Clean, extract, patch.
|
||||
# 9. `cd` into working directory
|
||||
# 10. `cargo update` to update the lock file
|
||||
# 11. Final update of patches, `pkgdiff Cargo.lock.orig Cargo.lock > patch-Cargo.lock`, etc.
|
||||
# 12. Can then re-add `--frozen --locked` below
|
||||
#
|
||||
# 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
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/target/release/spotifyd ${DESTDIR}${PREFIX}/bin
|
||||
|
||||
# Spotifyd now uses 2018 edition, need more recent version of rust.
|
||||
# NOTE: It's up to you how you meet this version requirement. The last pkgsrc
|
||||
# binary I can find for rust is 1.29.1 in 8.0_2018Q3. You can either build a
|
||||
# required version or cheat by installing rust via rustup and "tricking" pkgsrc
|
||||
# Spotifyd now uses 2018 edition, need more recent version of rust. NOTE: It's
|
||||
# up to you how you meet this version requirement. The last pkgsrc binary I can
|
||||
# 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
|
||||
.include "../../lang/rust/cargo.mk"
|
||||
|
|
|
|||
|
|
@ -1,19 +1,6 @@
|
|||
## Todo
|
||||
|
||||
1. Update reqwest
|
||||
|
||||
I've had to roll back reqwest to version 0.9.3 because the one linked
|
||||
(0.9.9) against spotifyd 0.2.5 won't build with the version of Rust I have
|
||||
(1.29.1) and I can't (be bothered) to build rust from source (it's bad enough
|
||||
building this project) so I'll have to settle for the binary I have until there
|
||||
is a more recent one available in pkgsrc (it seems to have disappeared
|
||||
temporarily). The issue that I hit is:
|
||||
|
||||
access to extern crates through prelude is experimental (see issue #44660)
|
||||
|
||||
0.9.6 introduced this with: <https://github.com/seanmonstar/reqwest/commit/4c21127f15ff814f8397a336fd647edc7cc89bc8>
|
||||
|
||||
2. In the Makefile there is this todo item:
|
||||
1. In the Makefile there is this todo item:
|
||||
|
||||
# TODO investigate why this is needed
|
||||
CHECK_WRKREF_SKIP+= bin/spotifyd
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,16 +1,8 @@
|
|||
$NetBSD$
|
||||
|
||||
--- Cargo.lock.orig 2019-03-25 21:19:18.000000000 +0000
|
||||
--- Cargo.lock.orig 2019-06-19 20:25:58.000000000 +0000
|
||||
+++ Cargo.lock
|
||||
@@ -74,7 +74,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "alsa"
|
||||
version = "0.0.1"
|
||||
-source = "git+https://github.com/plietar/rust-alsa#8c63543fa0ccd971cf15f5675293d19febd6f79e"
|
||||
dependencies = [
|
||||
"libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
@@ -504,7 +503,6 @@ dependencies = [
|
||||
@@ -519,7 +519,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "dns-parser"
|
||||
version = "0.3.2"
|
||||
|
|
@ -18,16 +10,16 @@ $NetBSD$
|
|||
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)",
|
||||
@@ -969,7 +967,6 @@ dependencies = [
|
||||
@@ -1004,7 +1003,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
|
||||
dependencies = [
|
||||
"base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -977,12 +974,12 @@ dependencies = [
|
||||
"getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1012,12 +1010,12 @@ dependencies = [
|
||||
"getopts 0.2.19 (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)",
|
||||
|
|
@ -44,17 +36,17 @@ $NetBSD$
|
|||
+ "librespot-protocol 0.1.0",
|
||||
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf 1.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1000,25 +997,23 @@ dependencies = [
|
||||
"protobuf 1.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1035,25 +1033,23 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-audio"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
|
||||
dependencies = [
|
||||
"aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"futures 0.1.25 (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.27 (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",
|
||||
|
|
@ -69,12 +61,12 @@ $NetBSD$
|
|||
[[package]]
|
||||
name = "librespot-connect"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
|
||||
dependencies = [
|
||||
"aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1026,11 +1021,11 @@ dependencies = [
|
||||
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1061,11 +1057,11 @@ dependencies = [
|
||||
"futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hmac 0.7.0 (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)",
|
||||
|
|
@ -87,17 +79,17 @@ $NetBSD$
|
|||
- "mdns 0.2.0 (git+https://github.com/plietar/rust-mdns)",
|
||||
+ "mdns 0.2.0",
|
||||
"num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf 2.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1045,7 +1040,6 @@ dependencies = [
|
||||
@@ -1080,7 +1076,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-core"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
|
||||
dependencies = [
|
||||
"aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1059,7 +1053,7 @@ dependencies = [
|
||||
@@ -1094,7 +1089,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 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -105,33 +97,32 @@ $NetBSD$
|
|||
+ "librespot-protocol 0.1.0",
|
||||
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1083,12 +1077,11 @@ dependencies = [
|
||||
"num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1118,12 +1113,11 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-metadata"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
|
||||
dependencies = [
|
||||
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"futures 0.1.25 (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.27 (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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf 2.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
@@ -1096,16 +1089,15 @@ dependencies = [
|
||||
@@ -1131,16 +1125,15 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-playback"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
|
||||
dependencies = [
|
||||
- "alsa 0.0.1 (git+https://github.com/plietar/rust-alsa)",
|
||||
+ "alsa 0.0.1",
|
||||
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"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)",
|
||||
"futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.58 (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)",
|
||||
|
|
@ -140,66 +131,44 @@ $NetBSD$
|
|||
+ "librespot-core 0.1.0",
|
||||
+ "librespot-metadata 0.1.0",
|
||||
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"portaudio-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"portaudio-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
@@ -1113,7 +1105,6 @@ dependencies = [
|
||||
@@ -1148,7 +1141,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-protocol"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
|
||||
dependencies = [
|
||||
"protobuf 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf-codegen-pure 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1157,10 +1148,9 @@ source = "registry+https://github.com/ru
|
||||
"protobuf 2.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf-codegen-pure 2.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1192,10 +1184,9 @@ source = "registry+https://github.com/ru
|
||||
[[package]]
|
||||
name = "mdns"
|
||||
version = "0.2.0"
|
||||
-source = "git+https://github.com/plietar/rust-mdns#66a74033da6c9f1a06e7b0a29f4544fd189d6479"
|
||||
dependencies = [
|
||||
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"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.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"futures 0.1.27 (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)",
|
||||
@@ -1929,7 +1919,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "rust-crypto"
|
||||
version = "0.2.36"
|
||||
-source = "git+https://github.com/awmath/rust-crypto.git?branch=avx2#394c247254dbe2ac5d44483232cf335d10cf0260"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1939,12 +1929,6 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
-name = "rust-crypto"
|
||||
-version = "0.2.36"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-replace = "rust-crypto 0.2.36 (git+https://github.com/awmath/rust-crypto.git?branch=avx2)"
|
||||
-
|
||||
-[[package]]
|
||||
name = "rust-gmp"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -2204,7 +2188,7 @@ dependencies = [
|
||||
"getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2265,7 +2256,7 @@ dependencies = [
|
||||
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"keyring 0.6.1 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rspotify 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2655,16 +2639,14 @@ dependencies = [
|
||||
"rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2730,16 +2721,14 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "tremor"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/plietar/rust-tremor#5958cc302e78f535dad90e9665da981ddff4000a"
|
||||
dependencies = [
|
||||
"libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.58 (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",
|
||||
]
|
||||
|
|
@ -210,25 +179,17 @@ $NetBSD$
|
|||
-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.50 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2901,7 +2883,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d"
|
||||
"checksum aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100"
|
||||
"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
|
||||
-"checksum alsa 0.0.1 (git+https://github.com/plietar/rust-alsa)" = "<none>"
|
||||
"checksum alsa 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fd5a75e70d45a943d2a0a818277e71d6ff777e97358529d6b460d3d4c4d0745"
|
||||
"checksum alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58"
|
||||
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
||||
@@ -2954,7 +2935,6 @@ source = "registry+https://github.com/ru
|
||||
"libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -3038,7 +3027,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum derive_builder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c998e6ab02a828dd9735c18f154e14100e674ed08cb4e1938f0e4177543f439"
|
||||
"checksum derive_builder_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "735e24ee9e5fa8e16b86da5007856e97d592e11867e45d76e0c0d0a164a0b757"
|
||||
"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c"
|
||||
-"checksum dns-parser 0.3.2 (git+https://github.com/plietar/dns-parser)" = "<none>"
|
||||
"checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3"
|
||||
"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
|
||||
"checksum either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c67353c641dc847124ea1902d69bd753dee9bb3beff9aa3662ecf86c971d1fac"
|
||||
@@ -3007,19 +2987,11 @@ source = "registry+https://github.com/ru
|
||||
"checksum libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "aab692d7759f5cd8c859e169db98ae5b52c924add2af5fbbca11d12fefb567c1"
|
||||
"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
|
||||
"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
|
||||
@@ -3092,19 +3080,11 @@ source = "registry+https://github.com/ru
|
||||
"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319"
|
||||
"checksum libdbus-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"
|
||||
"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>"
|
||||
|
|
@ -247,20 +208,12 @@ $NetBSD$
|
|||
"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
|
||||
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
|
||||
"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
|
||||
@@ -3099,7 +3071,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum rpassword 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ec4bdede957362ec6fdd550f7e79c6d14cad2bc26b2d062786234c6ee0cb27bb"
|
||||
"checksum rpassword 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37473170aedbe66ffa3ad3726939ba677d83c646ad4fd99e5b4bc38712f45ec"
|
||||
"checksum rspotify 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dee05e47d9aed6b35d9666d80c6b0d4d7ca6253e7a88464410a85dba1a8cd63d"
|
||||
-"checksum rust-crypto 0.2.36 (git+https://github.com/awmath/rust-crypto.git?branch=avx2)" = "<none>"
|
||||
"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
|
||||
"checksum rust-gmp 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4cd7d57377b309a73f69e164109203aa9ab3fee6ea68ac5fb76e2edb50662e9b"
|
||||
"checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
|
||||
@@ -3173,8 +3144,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3"
|
||||
@@ -3261,8 +3241,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum tokio-trace-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9c8a256d6956f7cb5e2bdfe8b1e8022f1a09206c6c2b1ba00f3b746b260c613"
|
||||
"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
|
||||
"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 typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
|
||||
"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
|
||||
|
|
|
|||
|
|
@ -1,21 +1,13 @@
|
|||
$NetBSD$
|
||||
|
||||
--- Cargo.toml.orig 2019-03-25 21:19:18.000000000 +0000
|
||||
--- Cargo.toml.orig 2019-06-19 20:25:58.000000000 +0000
|
||||
+++ Cargo.toml
|
||||
@@ -26,12 +26,13 @@ alsa = { version = "0.2", optional = tru
|
||||
keyring = { version = "0.6.1", optional = true }
|
||||
|
||||
@@ -29,7 +29,7 @@ xdg = "2.2"
|
||||
[dependencies.librespot]
|
||||
-git = "https://github.com/librespot-org/librespot.git"
|
||||
+#git = "https://github.com/librespot-org/librespot.git"
|
||||
+path = "../librespot"
|
||||
default-features = false
|
||||
features = ["with-tremor"]
|
||||
|
||||
-[replace]
|
||||
-"rust-crypto:0.2.36" = { git = "https://github.com/awmath/rust-crypto.git", branch = "avx2" }
|
||||
+#[replace]
|
||||
+#"rust-crypto:0.2.36" = { git = "https://github.com/awmath/rust-crypto.git", branch = "avx2" }
|
||||
-git = "https://github.com/librespot-org/librespot.git"
|
||||
+path = "../librespot"
|
||||
|
||||
[features]
|
||||
alsa_backend = ["librespot/alsa-backend", "alsa"]
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
--- ../librespot/playback/Cargo.toml.orig 2018-11-19 14:03:35.000000000 +0000
|
||||
+++ ../librespot/playback/Cargo.toml
|
||||
@@ -15,7 +15,8 @@ futures = "0.1.8"
|
||||
log = "0.3.5"
|
||||
byteorder = "1.2.1"
|
||||
|
||||
-alsa = { git = "https://github.com/plietar/rust-alsa", optional = true }
|
||||
+#alsa = { git = "https://github.com/plietar/rust-alsa", optional = true }
|
||||
+alsa = { path = "../../rust-alsa", optional = true }
|
||||
portaudio-rs = { version = "0.3.0", optional = true }
|
||||
libpulse-sys = { version = "0.0.0", optional = true }
|
||||
jack = { version = "0.5.3", optional = true }
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$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 remove.
|
||||
|
||||
--- ../vendor/nix-0.11.0/src/unistd.rs.orig 2018-06-01 02:14:43.000000000 +0000
|
||||
+++ ../vendor/nix-0.11.0/src/unistd.rs
|
||||
@@ -644,7 +644,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> {
|
||||
Loading…
Reference in New Issue