Update spotifyd to 0.2.8
- Now requires rust 1.3.1 minimum. spotifyd itself uses edition "2018"
and it's too fiddly trying to rollback reqwest and it's dependencies to
not require a newer rust as well.
- Update Cargo patches
- No longer need patch for fuchsia since bumped require version of rust
- No longer need patch-libresport_Cargo.toml (fixed upstream)
- Update Termios patches per:
2b3df1aac3
This commit is contained in:
atomicules
parent
1d8b0c6ef6
commit
c4ec66e6d3
|
|
@ -1,7 +1,7 @@
|
|||
# $NetBSD$
|
||||
|
||||
DISTNAME= spotifyd-0.2.5
|
||||
PKGREVISION= 2
|
||||
DISTNAME= spotifyd-0.2.8
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=Spotifyd/}
|
||||
GITHUB_TAG= v${PKGVERSION_NOREV}
|
||||
|
|
@ -16,7 +16,7 @@ USE_LANGUAGES= c # rust, but needs a toolchain to link
|
|||
|
||||
DISTFILES= ${DEFAULT_DISTFILES}
|
||||
|
||||
LIBRESPOT_REV= daeeeaa122fc2d71edf11e562e23038db4210b39
|
||||
LIBRESPOT_REV= a41ab28540537e5f277fc9556bbcc16e08f065d5
|
||||
DISTFILES+= librespot-${LIBRESPOT_REV}.tar.gz
|
||||
SITES.librespot-${LIBRESPOT_REV}.tar.gz= -https://github.com/librespot-org/librespot/archive/${LIBRESPOT_REV}.tar.gz
|
||||
|
||||
|
|
@ -39,14 +39,20 @@ SITES.dns-parser-${DNS_PARSER_REV}.tar.gz= -https://github.com/plietar/dns-parse
|
|||
# generate using make show-crate-depends
|
||||
CARGO_CRATE_DEPENDS+= MacTypes-sys-2.1.0
|
||||
CARGO_CRATE_DEPENDS+= adler32-1.0.3
|
||||
CARGO_CRATE_DEPENDS+= aho-corasick-0.6.9
|
||||
CARGO_CRATE_DEPENDS+= advapi32-sys-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= aes-0.3.2
|
||||
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+= alsa-sys-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= ansi_term-0.11.0
|
||||
CARGO_CRATE_DEPENDS+= arc-swap-0.3.7
|
||||
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.13
|
||||
CARGO_CRATE_DEPENDS+= backtrace-0.3.14
|
||||
CARGO_CRATE_DEPENDS+= backtrace-sys-0.1.28
|
||||
CARGO_CRATE_DEPENDS+= base64-0.10.1
|
||||
CARGO_CRATE_DEPENDS+= base64-0.5.2
|
||||
|
|
@ -58,33 +64,43 @@ 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+= 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+= 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+= bytes-0.4.11
|
||||
CARGO_CRATE_DEPENDS+= bytes-0.4.12
|
||||
CARGO_CRATE_DEPENDS+= c_linked_list-1.1.1
|
||||
CARGO_CRATE_DEPENDS+= cc-1.0.28
|
||||
CARGO_CRATE_DEPENDS+= cfg-if-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= cc-1.0.31
|
||||
CARGO_CRATE_DEPENDS+= cfg-if-0.1.7
|
||||
CARGO_CRATE_DEPENDS+= chrono-0.4.6
|
||||
CARGO_CRATE_DEPENDS+= clap-2.32.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+= crc32fast-1.1.2
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-0.6.0
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-channel-0.3.6
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-deque-0.6.3
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.6.3
|
||||
CARGO_CRATE_DEPENDS+= ctrlc-3.1.1
|
||||
CARGO_CRATE_DEPENDS+= crc-1.8.1
|
||||
CARGO_CRATE_DEPENDS+= crc32fast-1.2.0
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-deque-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-queue-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.6.5
|
||||
CARGO_CRATE_DEPENDS+= crypto-mac-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= ctr-0.3.2
|
||||
CARGO_CRATE_DEPENDS+= daemonize-0.3.0
|
||||
CARGO_CRATE_DEPENDS+= dbus-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= dbus-0.6.4
|
||||
CARGO_CRATE_DEPENDS+= dbus-tokio-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= derive-error-chain-0.10.1
|
||||
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.0
|
||||
CARGO_CRATE_DEPENDS+= encoding_rs-0.8.14
|
||||
CARGO_CRATE_DEPENDS+= either-1.5.1
|
||||
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+= error-chain-0.10.0
|
||||
|
|
@ -92,54 +108,60 @@ CARGO_CRATE_DEPENDS+= error-chain-0.11.0
|
|||
CARGO_CRATE_DEPENDS+= extprim-1.6.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+= 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.0
|
||||
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-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.16
|
||||
CARGO_CRATE_DEPENDS+= h2-0.1.17
|
||||
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.15
|
||||
CARGO_CRATE_DEPENDS+= http-0.1.16
|
||||
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.23
|
||||
CARGO_CRATE_DEPENDS+= hyper-0.12.25
|
||||
CARGO_CRATE_DEPENDS+= hyper-proxy-0.4.1
|
||||
CARGO_CRATE_DEPENDS+= hyper-tls-0.3.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.3.4
|
||||
CARGO_CRATE_DEPENDS+= itoa-0.4.3
|
||||
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.2.0
|
||||
CARGO_CRATE_DEPENDS+= lazy_static-1.3.0
|
||||
CARGO_CRATE_DEPENDS+= lazycell-1.2.1
|
||||
CARGO_CRATE_DEPENDS+= lewton-0.9.3
|
||||
CARGO_CRATE_DEPENDS+= libc-0.2.48
|
||||
CARGO_CRATE_DEPENDS+= lewton-0.9.4
|
||||
CARGO_CRATE_DEPENDS+= libc-0.2.50
|
||||
CARGO_CRATE_DEPENDS+= libdbus-sys-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= libflate-0.1.19
|
||||
CARGO_CRATE_DEPENDS+= libpulse-sys-0.0.0
|
||||
CARGO_CRATE_DEPENDS+= linear-map-1.2.0
|
||||
CARGO_CRATE_DEPENDS+= lock_api-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= log-0.3.9
|
||||
CARGO_CRATE_DEPENDS+= log-0.4.6
|
||||
CARGO_CRATE_DEPENDS+= matches-0.1.8
|
||||
CARGO_CRATE_DEPENDS+= memchr-2.1.3
|
||||
CARGO_CRATE_DEPENDS+= memchr-2.2.0
|
||||
CARGO_CRATE_DEPENDS+= memoffset-0.2.1
|
||||
CARGO_CRATE_DEPENDS+= mime-0.3.13
|
||||
CARGO_CRATE_DEPENDS+= mime_guess-2.0.0-alpha.6
|
||||
# work around weird version pattern not supported by cargo.mk
|
||||
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-named-pipes-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= mio-uds-0.6.7
|
||||
|
|
@ -151,19 +173,25 @@ CARGO_CRATE_DEPENDS+= net2-0.2.33
|
|||
CARGO_CRATE_DEPENDS+= nix-0.11.0
|
||||
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-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.9.0
|
||||
CARGO_CRATE_DEPENDS+= num_cpus-1.10.0
|
||||
CARGO_CRATE_DEPENDS+= ogg-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= ogg-sys-0.0.9
|
||||
CARGO_CRATE_DEPENDS+= openssl-0.10.16
|
||||
CARGO_CRATE_DEPENDS+= opaque-debug-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= openssl-0.10.20
|
||||
CARGO_CRATE_DEPENDS+= openssl-probe-0.1.2
|
||||
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.40
|
||||
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.43
|
||||
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
|
||||
CARGO_CRATE_DEPENDS+= pbkdf2-0.3.0
|
||||
CARGO_CRATE_DEPENDS+= percent-encoding-1.0.1
|
||||
CARGO_CRATE_DEPENDS+= phf-0.7.24
|
||||
CARGO_CRATE_DEPENDS+= phf_codegen-0.7.24
|
||||
|
|
@ -172,12 +200,11 @@ 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-sys-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= proc-macro2-0.4.26
|
||||
CARGO_CRATE_DEPENDS+= proc-macro2-0.4.27
|
||||
CARGO_CRATE_DEPENDS+= protobuf-1.7.4
|
||||
CARGO_CRATE_DEPENDS+= protobuf-2.2.5
|
||||
CARGO_CRATE_DEPENDS+= protobuf-codegen-2.2.5
|
||||
CARGO_CRATE_DEPENDS+= protoc-2.2.5
|
||||
CARGO_CRATE_DEPENDS+= protoc-rust-2.2.5
|
||||
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+= quick-error-1.2.2
|
||||
CARGO_CRATE_DEPENDS+= quote-0.3.15
|
||||
CARGO_CRATE_DEPENDS+= quote-0.6.11
|
||||
|
|
@ -190,109 +217,114 @@ 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.0
|
||||
CARGO_CRATE_DEPENDS+= rand_os-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= rand_pcg-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= rand_jitter-0.1.3
|
||||
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_termios-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= regex-0.2.11
|
||||
CARGO_CRATE_DEPENDS+= regex-1.1.0
|
||||
CARGO_CRATE_DEPENDS+= regex-1.1.2
|
||||
CARGO_CRATE_DEPENDS+= regex-syntax-0.5.6
|
||||
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.5
|
||||
CARGO_CRATE_DEPENDS+= relay-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= remove_dir_all-0.5.1
|
||||
CARGO_CRATE_DEPENDS+= reqwest-0.9.3
|
||||
CARGO_CRATE_DEPENDS+= reqwest-0.9.12
|
||||
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-crypto-0.2.36
|
||||
CARGO_CRATE_DEPENDS+= rust-ini-0.10.3
|
||||
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-serialize-0.3.24
|
||||
CARGO_CRATE_DEPENDS+= rustc_version-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= ryu-0.2.7
|
||||
CARGO_CRATE_DEPENDS+= safemem-0.2.0
|
||||
CARGO_CRATE_DEPENDS+= safemem-0.3.0
|
||||
CARGO_CRATE_DEPENDS+= schannel-0.1.14
|
||||
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+= semver-0.9.0
|
||||
CARGO_CRATE_DEPENDS+= semver-parser-0.7.0
|
||||
CARGO_CRATE_DEPENDS+= serde-0.9.15
|
||||
CARGO_CRATE_DEPENDS+= serde-1.0.85
|
||||
CARGO_CRATE_DEPENDS+= serde_codegen_internals-0.14.2
|
||||
CARGO_CRATE_DEPENDS+= serde_derive-0.9.15
|
||||
CARGO_CRATE_DEPENDS+= serde_derive-1.0.85
|
||||
CARGO_CRATE_DEPENDS+= serde_json-0.9.10
|
||||
CARGO_CRATE_DEPENDS+= serde_json-1.0.37
|
||||
CARGO_CRATE_DEPENDS+= serde-1.0.89
|
||||
CARGO_CRATE_DEPENDS+= serde_derive-1.0.89
|
||||
CARGO_CRATE_DEPENDS+= serde_json-1.0.39
|
||||
CARGO_CRATE_DEPENDS+= serde_urlencoded-0.5.4
|
||||
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.7
|
||||
CARGO_CRATE_DEPENDS+= signal-hook-0.1.8
|
||||
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.8
|
||||
CARGO_CRATE_DEPENDS+= smallvec-0.6.9
|
||||
CARGO_CRATE_DEPENDS+= socket2-0.2.4
|
||||
CARGO_CRATE_DEPENDS+= socket2-0.3.8
|
||||
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+= subtle-1.0.0
|
||||
CARGO_CRATE_DEPENDS+= syn-0.11.11
|
||||
CARGO_CRATE_DEPENDS+= syn-0.15.26
|
||||
CARGO_CRATE_DEPENDS+= syn-0.15.29
|
||||
CARGO_CRATE_DEPENDS+= synom-0.11.3
|
||||
CARGO_CRATE_DEPENDS+= synstructure-0.10.1
|
||||
CARGO_CRATE_DEPENDS+= syslog-3.3.0
|
||||
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.5
|
||||
CARGO_CRATE_DEPENDS+= tempfile-3.0.7
|
||||
CARGO_CRATE_DEPENDS+= term-0.4.6
|
||||
CARGO_CRATE_DEPENDS+= termcolor-1.0.4
|
||||
CARGO_CRATE_DEPENDS+= termion-1.5.1
|
||||
CARGO_CRATE_DEPENDS+= termios-0.2.2
|
||||
CARGO_CRATE_DEPENDS+= textwrap-0.10.0
|
||||
CARGO_CRATE_DEPENDS+= thread_local-0.3.6
|
||||
CARGO_CRATE_DEPENDS+= time-0.1.42
|
||||
CARGO_CRATE_DEPENDS+= tokio-0.1.15
|
||||
CARGO_CRATE_DEPENDS+= tokio-0.1.18
|
||||
CARGO_CRATE_DEPENDS+= tokio-codec-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= tokio-core-0.1.17
|
||||
CARGO_CRATE_DEPENDS+= tokio-current-thread-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= tokio-executor-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= tokio-fs-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= tokio-io-0.1.11
|
||||
CARGO_CRATE_DEPENDS+= tokio-current-thread-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= tokio-executor-0.1.7
|
||||
CARGO_CRATE_DEPENDS+= tokio-fs-0.1.6
|
||||
CARGO_CRATE_DEPENDS+= tokio-io-0.1.12
|
||||
CARGO_CRATE_DEPENDS+= tokio-process-0.2.3
|
||||
CARGO_CRATE_DEPENDS+= tokio-proto-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= tokio-reactor-0.1.8
|
||||
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.7
|
||||
CARGO_CRATE_DEPENDS+= tokio-sync-0.1.0
|
||||
CARGO_CRATE_DEPENDS+= tokio-signal-0.2.8
|
||||
CARGO_CRATE_DEPENDS+= tokio-sync-0.1.4
|
||||
CARGO_CRATE_DEPENDS+= tokio-tcp-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= tokio-threadpool-0.1.11
|
||||
CARGO_CRATE_DEPENDS+= tokio-timer-0.2.9
|
||||
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-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+= typenum-1.10.0
|
||||
CARGO_CRATE_DEPENDS+= ucd-util-0.1.3
|
||||
CARGO_CRATE_DEPENDS+= unicase-1.4.2
|
||||
CARGO_CRATE_DEPENDS+= unicase-2.2.0
|
||||
CARGO_CRATE_DEPENDS+= unicase-2.3.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+= unix_socket-0.5.0
|
||||
CARGO_CRATE_DEPENDS+= unreachable-1.0.0
|
||||
CARGO_CRATE_DEPENDS+= url-1.7.2
|
||||
CARGO_CRATE_DEPENDS+= utf8-ranges-1.0.2
|
||||
CARGO_CRATE_DEPENDS+= uuid-0.4.0
|
||||
CARGO_CRATE_DEPENDS+= uuid-0.7.1
|
||||
CARGO_CRATE_DEPENDS+= uuid-0.7.2
|
||||
CARGO_CRATE_DEPENDS+= vcpkg-0.2.6
|
||||
CARGO_CRATE_DEPENDS+= vec_map-0.8.1
|
||||
CARGO_CRATE_DEPENDS+= vergen-0.1.1
|
||||
CARGO_CRATE_DEPENDS+= version_check-0.1.5
|
||||
CARGO_CRATE_DEPENDS+= void-1.0.2
|
||||
|
|
@ -341,6 +373,12 @@ do-build:
|
|||
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
|
||||
# into using that.
|
||||
BUILDLINK_API_DEPENDS.rust+= rust>=1.31.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,31 +1,16 @@
|
|||
$NetBSD$
|
||||
|
||||
--- Cargo.lock.orig 2019-02-25 20:01:17.000000000 +0000
|
||||
--- Cargo.lock.orig 2019-03-25 21:19:18.000000000 +0000
|
||||
+++ Cargo.lock
|
||||
@@ -22,7 +22,6 @@ dependencies = [
|
||||
@@ -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.48 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
@@ -124,14 +123,6 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
-name = "base64"
|
||||
-version = "0.10.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-dependencies = [
|
||||
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
name = "bit-set"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -368,7 +359,6 @@ dependencies = [
|
||||
@@ -504,7 +503,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "dns-parser"
|
||||
version = "0.3.2"
|
||||
|
|
@ -33,16 +18,17 @@ $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)",
|
||||
@@ -793,19 +783,18 @@ dependencies = [
|
||||
@@ -969,7 +967,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#daeeeaa122fc2d71edf11e562e23038db4210b39"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
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)",
|
||||
"futures 0.1.25 (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)",
|
||||
"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)",
|
||||
|
|
@ -59,22 +45,22 @@ $NetBSD$
|
|||
"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)",
|
||||
@@ -826,34 +815,32 @@ dependencies = [
|
||||
@@ -1000,25 +997,23 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-audio"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#daeeeaa122fc2d71edf11e562e23038db4210b39"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
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)",
|
||||
"lewton 0.9.3 (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.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-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tempfile 2.2.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",
|
||||
|
|
@ -83,10 +69,13 @@ $NetBSD$
|
|||
[[package]]
|
||||
name = "librespot-connect"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#daeeeaa122fc2d71edf11e562e23038db4210b39"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
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)",
|
||||
"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)",
|
||||
- "librespot-playback 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
|
||||
|
|
@ -98,17 +87,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.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -868,7 +855,6 @@ dependencies = [
|
||||
"protobuf 2.4.0 (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 = [
|
||||
[[package]]
|
||||
name = "librespot-core"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#daeeeaa122fc2d71edf11e562e23038db4210b39"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
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)",
|
||||
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -880,7 +866,7 @@ dependencies = [
|
||||
@@ -1059,7 +1053,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)",
|
||||
|
|
@ -117,11 +106,11 @@ $NetBSD$
|
|||
"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)",
|
||||
@@ -903,12 +889,11 @@ dependencies = [
|
||||
@@ -1083,12 +1077,11 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-metadata"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#daeeeaa122fc2d71edf11e562e23038db4210b39"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
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)",
|
||||
|
|
@ -130,19 +119,19 @@ $NetBSD$
|
|||
+ "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.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protobuf 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
@@ -916,16 +901,15 @@ dependencies = [
|
||||
@@ -1096,16 +1089,15 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-playback"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#daeeeaa122fc2d71edf11e562e23038db4210b39"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
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.48 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.50 (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)",
|
||||
|
|
@ -153,15 +142,15 @@ $NetBSD$
|
|||
"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)",
|
||||
]
|
||||
@@ -933,7 +917,6 @@ dependencies = [
|
||||
@@ -1113,7 +1105,6 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-protocol"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#daeeeaa122fc2d71edf11e562e23038db4210b39"
|
||||
-source = "git+https://github.com/librespot-org/librespot.git#a41ab28540537e5f277fc9556bbcc16e08f065d5"
|
||||
dependencies = [
|
||||
"protobuf 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"protoc-rust 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -977,10 +960,9 @@ source = "registry+https://github.com/ru
|
||||
"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
|
||||
[[package]]
|
||||
name = "mdns"
|
||||
version = "0.2.0"
|
||||
|
|
@ -173,40 +162,7 @@ $NetBSD$
|
|||
"futures 0.1.25 (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)",
|
||||
@@ -1606,10 +1588,10 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
-version = "0.9.9"
|
||||
+version = "0.9.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"encoding_rs 0.8.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1625,10 +1607,7 @@ dependencies = [
|
||||
"serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "tokio-threadpool 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "tokio-timer 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
@@ -1661,7 +1640,7 @@ dependencies = [
|
||||
"percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"random 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "reqwest 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "reqwest 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1672,7 +1651,7 @@ dependencies = [
|
||||
@@ -1929,7 +1919,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "rust-crypto"
|
||||
version = "0.2.36"
|
||||
|
|
@ -214,8 +170,8 @@ $NetBSD$
|
|||
+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.48 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1682,12 +1661,6 @@ dependencies = [
|
||||
"libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -1939,12 +1929,6 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -225,25 +181,25 @@ $NetBSD$
|
|||
-replace = "rust-crypto 0.2.36 (git+https://github.com/awmath/rust-crypto.git?branch=avx2)"
|
||||
-
|
||||
-[[package]]
|
||||
name = "rust-ini"
|
||||
version = "0.10.3"
|
||||
name = "rust-gmp"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
@@ -1942,7 +1915,7 @@ dependencies = [
|
||||
"futures 0.1.25 (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)",
|
||||
"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.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"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)",
|
||||
@@ -2357,16 +2330,14 @@ dependencies = [
|
||||
@@ -2655,16 +2639,14 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "tremor"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/plietar/rust-tremor#5958cc302e78f535dad90e9665da981ddff4000a"
|
||||
dependencies = [
|
||||
"libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.50 (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",
|
||||
]
|
||||
|
|
@ -254,34 +210,26 @@ $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.48 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -2605,7 +2576,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f"
|
||||
"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
|
||||
"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
|
||||
"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 arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
|
||||
@@ -2614,7 +2584,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
|
||||
"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
|
||||
"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
|
||||
-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
|
||||
"checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557"
|
||||
"checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
|
||||
"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
|
||||
@@ -2647,7 +2616,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a"
|
||||
"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
|
||||
"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.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
|
||||
@@ -2696,19 +2664,11 @@ source = "registry+https://github.com/ru
|
||||
"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 libdbus-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"
|
||||
"checksum libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "bff3ac7d6f23730d3b533c35ed75eef638167634476a499feef16c428d74b57b"
|
||||
"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>"
|
||||
|
|
@ -296,27 +244,23 @@ $NetBSD$
|
|||
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
|
||||
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
|
||||
-"checksum mdns 0.2.0 (git+https://github.com/plietar/rust-mdns)" = "<none>"
|
||||
"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
|
||||
"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"
|
||||
@@ -2777,10 +2737,9 @@ source = "registry+https://github.com/ru
|
||||
"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
|
||||
"checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a"
|
||||
"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
|
||||
-"checksum reqwest 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09d6e187a58d923ee132fcda141c94e716bcfe301c2ea2bef5c81536e0085376"
|
||||
+"checksum reqwest 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "aa238ac676ec77e62be3e70656828ca4f596fccd33c6fab92942701bc8c8b4fe"
|
||||
@@ -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-ini 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8a654c5bda722c699be6b0fe4c0d90de218928da5b724c3e467fc48865c37263"
|
||||
"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
|
||||
@@ -2849,8 +2808,6 @@ source = "registry+https://github.com/ru
|
||||
"checksum tokio-timer 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "21c04a314a1f69f73c0227beba6250e06cdc1e9a62e7eff912bf54a59b6d1b94"
|
||||
"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"
|
||||
"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 ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
|
||||
"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,9 @@
|
|||
$NetBSD$
|
||||
|
||||
--- Cargo.toml.orig 2018-10-21 10:49:11.000000000 +0000
|
||||
--- Cargo.toml.orig 2019-03-25 21:19:18.000000000 +0000
|
||||
+++ Cargo.toml
|
||||
@@ -24,11 +24,12 @@ rspotify = "0.2.5"
|
||||
chrono = "0.4"
|
||||
alsa = { version = "0.2", optional = true }
|
||||
|
||||
-[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" }
|
||||
@@ -26,12 +26,13 @@ alsa = { version = "0.2", optional = tru
|
||||
keyring = { version = "0.6.1", optional = true }
|
||||
|
||||
[dependencies.librespot]
|
||||
-git = "https://github.com/librespot-org/librespot.git"
|
||||
|
|
@ -18,3 +12,10 @@ $NetBSD$
|
|||
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" }
|
||||
|
||||
[features]
|
||||
alsa_backend = ["librespot/alsa-backend", "alsa"]
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
--- ../librespot/Cargo.toml.orig 2018-11-19 14:03:35.000000000 +0000
|
||||
+++ ../librespot/Cargo.toml
|
||||
@@ -57,8 +57,8 @@ url = "1.7.0"
|
||||
rand = "0.3.13"
|
||||
vergen = "0.1.0"
|
||||
|
||||
-[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" }
|
||||
|
||||
[features]
|
||||
alsa-backend = ["librespot-playback/alsa-backend"]
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
$NetBSD$
|
||||
|
||||
--- ../librespot/audio/Cargo.toml.orig 2018-11-19 14:03:35.000000000 +0000
|
||||
--- ../librespot/audio/Cargo.toml.orig 2019-03-21 16:21:20.000000000 +0000
|
||||
+++ ../librespot/audio/Cargo.toml
|
||||
@@ -17,7 +17,8 @@ num-traits = "0.1.36"
|
||||
rust-crypto = "0.2.36"
|
||||
tempfile = "2.1"
|
||||
aes-ctr = "0.3.0"
|
||||
|
||||
-tremor = { git = "https://github.com/plietar/rust-tremor", optional = true }
|
||||
+#tremor = { git = "https://github.com/plietar/rust-tremor", optional = true }
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD$
|
||||
|
||||
--- ../librespot/connect/Cargo.toml.orig 2018-11-19 14:03:35.000000000 +0000
|
||||
--- ../librespot/connect/Cargo.toml.orig 2019-03-21 16:21:20.000000000 +0000
|
||||
+++ ../librespot/connect/Cargo.toml
|
||||
@@ -26,7 +26,8 @@ tokio-core = "0.1.2"
|
||||
url = "1.3"
|
||||
@@ -29,7 +29,8 @@ aes-ctr = "0.3.0"
|
||||
block-modes = "0.2.0"
|
||||
|
||||
dns-sd = { version = "0.1.3", optional = true }
|
||||
-mdns = { git = "https://github.com/plietar/rust-mdns", optional = true }
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
Just to make compatible with version of Rust, etc I have (1.29.1)
|
||||
|
||||
--- ../vendor/fuchsia-cprng-0.1.0/Cargo.toml.orig 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ ../vendor/fuchsia-cprng-0.1.0/Cargo.toml
|
||||
@@ -11,7 +11,6 @@
|
||||
# will likely look very different (and much more reasonable)
|
||||
|
||||
[package]
|
||||
-edition = "2018"
|
||||
name = "fuchsia-cprng"
|
||||
version = "0.1.0"
|
||||
authors = ["Erick Tryzelaar <etryzelaar@google.com>"]
|
||||
|
|
@ -15,6 +15,15 @@ Upstream PR is wip: https://github.com/dcuddeback/termios-rs/pull/22
|
|||
//! # let fd = 1;
|
||||
//! let mut termios = Termios::from_fd(fd).unwrap();
|
||||
//! set_fastest_speed(&mut termios).unwrap();
|
||||
@@ -116,7 +120,7 @@ use libc::{c_int,pid_t};
|
||||
pub use ::os::target::{cc_t,speed_t,tcflag_t}; // types
|
||||
pub use ::os::target::{VEOF,VEOL,VERASE,VINTR,VKILL,VMIN,VQUIT,VSTART,VSTOP,VSUSP,VTIME}; // c_cc subscripts
|
||||
pub use ::os::target::{BRKINT,ICRNL,IGNBRK,IGNCR,IGNPAR,INLCR,INPCK,ISTRIP,IXANY,IXOFF,IXON,PARMRK}; // input modes
|
||||
-pub use ::os::target::{OPOST,ONLCR,OCRNL,TAB3,ONOCR,ONLRET}; // output modes
|
||||
+pub use ::os::target::{OPOST,ONLCR,OCRNL,ONOCR,ONLRET}; // output modes
|
||||
pub use ::os::target::{B0,B50,B75,B110,B134,B150,B200,B300,B600,B1200,B1800,B2400,B4800,B9600,B19200,B38400}; // baud rate selection
|
||||
pub use ::os::target::{CSIZE,CS5,CS6,CS7,CS8,CSTOPB,CREAD,PARENB,PARODD,HUPCL,CLOCAL}; // control modes
|
||||
pub use ::os::target::{ECHO,ECHOE,ECHOK,ECHONL,ICANON,IEXTEN,ISIG,NOFLSH,TOSTOP}; // local modes
|
||||
@@ -496,3 +500,4 @@ fn io_result(result: c_int) -> io::Resul
|
||||
_ => Err(io::Error::last_os_error())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,9 @@ Upstream PR is wip: https://github.com/dcuddeback/termios-rs/pull/22
|
|||
|
||||
--- ../vendor/termios-0.2.2/src/os/netbsd.rs.orig 2019-01-30 09:50:04.014973707 +0000
|
||||
+++ ../vendor/termios-0.2.2/src/os/netbsd.rs
|
||||
@@ -0,0 +1,148 @@
|
||||
@@ -0,0 +1,153 @@
|
||||
+#![allow(non_camel_case_types)]
|
||||
+
|
||||
+extern crate libc;
|
||||
+
|
||||
+use libc::{c_int,c_uint,c_uchar};
|
||||
+
|
||||
+pub type cc_t = c_uchar;
|
||||
|
|
@ -47,6 +45,8 @@ Upstream PR is wip: https://github.com/dcuddeback/termios-rs/pull/22
|
|||
+pub const VDISCARD: usize = 15;
|
||||
+pub const VMIN: usize = 16;
|
||||
+pub const VTIME: usize = 17;
|
||||
+pub const VSTATUS: usize = 18;
|
||||
+// 19 is "spare"
|
||||
+
|
||||
+// c_iflag bits
|
||||
+pub const IGNBRK: tcflag_t = 0x00000001;
|
||||
|
|
@ -66,12 +66,11 @@ Upstream PR is wip: https://github.com/dcuddeback/termios-rs/pull/22
|
|||
+// c_oflag bits
|
||||
+pub const OPOST: tcflag_t = 0x00000001;
|
||||
+pub const ONLCR: tcflag_t = 0x00000002;
|
||||
+pub const TAB3: tcflag_t = 0x00000004;
|
||||
+pub const OXTABS: tcflag_t = TAB3;
|
||||
+pub const OXTABS: tcflag_t = 0x00000004;
|
||||
+pub const ONOEOT: tcflag_t = 0x00000008;
|
||||
+pub const OCRNL: tcflag_t = 0x00000010;
|
||||
+pub const ONOCR: tcflag_t = 0x00000040;
|
||||
+pub const ONLRET: tcflag_t = 0x00000080;
|
||||
+pub const ONOCR: tcflag_t = 0x00000020;
|
||||
+pub const ONLRET: tcflag_t = 0x00000040;
|
||||
+
|
||||
+// c_cflag bits
|
||||
+pub const CIGNORE: tcflag_t = 0x00000001;
|
||||
|
|
@ -90,6 +89,10 @@ Upstream PR is wip: https://github.com/dcuddeback/termios-rs/pull/22
|
|||
+pub const CRTS_IFLOW: tcflag_t = CRTSCTS;
|
||||
+pub const CCTS_OFLOW: tcflag_t = CRTSCTS;
|
||||
+pub const MDMBUF: tcflag_t = 0x00100000;
|
||||
+// NetBSD defines CHFLOW as this:
|
||||
+// pub const CHFLOW: tcflag_t = (MDMBUF|CRTSCTS|CDTRCTS);
|
||||
+// Pick one and be consistent with above
|
||||
+pub const CHFLOW: tcflag_t = CRTSCTS;
|
||||
+
|
||||
+// c_lflag bits
|
||||
+pub const ECHOKE: tcflag_t = 0x00000001;
|
||||
|
|
@ -134,6 +137,8 @@ Upstream PR is wip: https://github.com/dcuddeback/termios-rs/pull/22
|
|||
+pub const B76800: speed_t = 76800;
|
||||
+pub const B115200: speed_t = 115200;
|
||||
+pub const B230400: speed_t = 230400;
|
||||
+pub const B460800: speed_t = 460800;
|
||||
+pub const B921600: speed_t = 921600;
|
||||
+pub const EXTA: speed_t = 19200;
|
||||
+pub const EXTB: speed_t = 38400;
|
||||
+
|
||||
|
|
|
|||
Loading…
Reference in New Issue