Update Spotifyd to 0.2.19

Only "breaking" change here, which must be an upstream thing, is that it
no longer picks up the pulseaudio backend automatically. You need to
specify that when launching, e.g:

	spotifyd --verbose --no-daemon -b pulseaudio

or

	spotifyd -b pulseaudio

or specify `backend = pulseaudio` in `/etc/spotifyd.conf`

- Note that it reports its version internally as 0.2.18 though, i.e. via
`spotifyd --version`
- A number of vendor patch files no longer required as dependencies
themselves are no longer required
- Adds a new "special" DISTFILE in the Makefile, structopt (new upstream
dependency) that is otherwise only referenced via github and a commit
- No longer need the mime-guess version workaround thing as version has
been bumped
This commit is contained in:
atomicules 2019-10-17 21:08:49 +01:00
parent fb7d802103
commit da989ff604
11 changed files with 893 additions and 1051 deletions

View File

@ -1,6 +1,6 @@
# $NetBSD$
DISTNAME= spotifyd-0.2.11
DISTNAME= spotifyd-v0.2.19
PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=Spotifyd/}
@ -16,7 +16,7 @@ USE_LANGUAGES= c # rust, but needs a toolchain to link
DISTFILES= ${DEFAULT_DISTFILES}
LIBRESPOT_REV= 4e3576ba7c6146cf68e1953daeec929d619b26b1
LIBRESPOT_REV= 76088d0fc99501813e1a42b0acccb152fc0c7800
DISTFILES+= librespot-${LIBRESPOT_REV}.tar.gz
SITES.librespot-${LIBRESPOT_REV}.tar.gz= -https://github.com/librespot-org/librespot/archive/${LIBRESPOT_REV}.tar.gz
@ -32,135 +32,145 @@ DNS_PARSER_REV= 1d3e5a5591bc72eb061c23bd426c4a25f2f73791
DISTFILES+= dns-parser-${DNS_PARSER_REV}.tar.gz
SITES.dns-parser-${DNS_PARSER_REV}.tar.gz= -https://github.com/plietar/dns-parser/archive/${DNS_PARSER_REV}.tar.gz
STRUCTOPT_REV= 0c888e962d842f2c90c6c290d3a2a40947b37005
DISTFILES+= structopt-${STRUCTOPT_REV}.tar.gz
SITES.structopt-${STRUCTOPT_REV}.tar.gz= -https://github.com/TeXitoi/structopt/archive/${STRUCTOPT_REV}.tar.gz
# generate using make show-cargo-depends
CARGO_CRATE_DEPENDS+= adler32-1.0.3
CARGO_CRATE_DEPENDS+= adler32-1.0.4
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+= aho-corasick-0.7.3
CARGO_CRATE_DEPENDS+= aho-corasick-0.7.6
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.11
CARGO_CRATE_DEPENDS+= arrayvec-0.4.10
CARGO_CRATE_DEPENDS+= atty-0.2.11
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+= arc-swap-0.4.3
CARGO_CRATE_DEPENDS+= arrayref-0.3.5
CARGO_CRATE_DEPENDS+= arrayvec-0.4.11
CARGO_CRATE_DEPENDS+= atty-0.2.13
CARGO_CRATE_DEPENDS+= autocfg-0.1.6
CARGO_CRATE_DEPENDS+= backtrace-0.3.38
CARGO_CRATE_DEPENDS+= backtrace-sys-0.1.31
CARGO_CRATE_DEPENDS+= base64-0.10.1
CARGO_CRATE_DEPENDS+= base64-0.5.2
CARGO_CRATE_DEPENDS+= base64-0.6.0
CARGO_CRATE_DEPENDS+= base64-0.9.3
CARGO_CRATE_DEPENDS+= bit-set-0.4.0
CARGO_CRATE_DEPENDS+= bit-vec-0.4.4
CARGO_CRATE_DEPENDS+= bit-set-0.5.1
CARGO_CRATE_DEPENDS+= bit-vec-0.5.1
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.1.0
CARGO_CRATE_DEPENDS+= bitflags-1.2.0
CARGO_CRATE_DEPENDS+= blake2b_simd-0.5.8
CARGO_CRATE_DEPENDS+= block-buffer-0.7.3
CARGO_CRATE_DEPENDS+= block-cipher-trait-0.6.2
CARGO_CRATE_DEPENDS+= block-modes-0.2.0
CARGO_CRATE_DEPENDS+= block-modes-0.3.3
CARGO_CRATE_DEPENDS+= block-padding-0.1.4
CARGO_CRATE_DEPENDS+= build_const-0.2.1
CARGO_CRATE_DEPENDS+= boxfnonce-0.1.1
CARGO_CRATE_DEPENDS+= byte-tools-0.3.1
CARGO_CRATE_DEPENDS+= bytecount-0.4.0
CARGO_CRATE_DEPENDS+= byteorder-0.5.3
CARGO_CRATE_DEPENDS+= byteorder-1.3.2
CARGO_CRATE_DEPENDS+= bytes-0.4.12
CARGO_CRATE_DEPENDS+= c2-chacha-0.2.2
CARGO_CRATE_DEPENDS+= c_linked_list-1.1.1
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+= cargo_metadata-0.6.4
CARGO_CRATE_DEPENDS+= cc-1.0.45
CARGO_CRATE_DEPENDS+= cfg-if-0.1.10
CARGO_CRATE_DEPENDS+= chrono-0.4.9
CARGO_CRATE_DEPENDS+= clap-2.33.0
CARGO_CRATE_DEPENDS+= cloudabi-0.0.3
CARGO_CRATE_DEPENDS+= constant_time_eq-0.1.4
CARGO_CRATE_DEPENDS+= cookie-0.12.0
CARGO_CRATE_DEPENDS+= cookie_store-0.7.0
CARGO_CRATE_DEPENDS+= core-foundation-0.6.4
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
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.7.1
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.7.2
CARGO_CRATE_DEPENDS+= crossbeam-queue-0.1.2
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.6.5
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.6.6
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+= daemonize-0.4.1
CARGO_CRATE_DEPENDS+= darling-0.9.0
CARGO_CRATE_DEPENDS+= darling_core-0.9.0
CARGO_CRATE_DEPENDS+= darling_macro-0.9.0
CARGO_CRATE_DEPENDS+= dbus-0.2.3
CARGO_CRATE_DEPENDS+= dbus-0.6.4
CARGO_CRATE_DEPENDS+= dbus-0.6.5
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+= derive_builder-0.7.2
CARGO_CRATE_DEPENDS+= derive_builder_core-0.5.0
CARGO_CRATE_DEPENDS+= digest-0.8.1
CARGO_CRATE_DEPENDS+= dirs-2.0.2
CARGO_CRATE_DEPENDS+= dirs-sys-0.3.4
CARGO_CRATE_DEPENDS+= dotenv-0.13.0
CARGO_CRATE_DEPENDS+= dtoa-0.4.4
CARGO_CRATE_DEPENDS+= either-1.5.2
CARGO_CRATE_DEPENDS+= encoding_rs-0.8.17
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+= either-1.5.3
CARGO_CRATE_DEPENDS+= encoding_rs-0.8.20
CARGO_CRATE_DEPENDS+= env_logger-0.6.2
CARGO_CRATE_DEPENDS+= error-chain-0.11.0
CARGO_CRATE_DEPENDS+= error-chain-0.12.1
CARGO_CRATE_DEPENDS+= extprim-1.7.0
CARGO_CRATE_DEPENDS+= failure-0.1.5
CARGO_CRATE_DEPENDS+= failure_derive-0.1.5
CARGO_CRATE_DEPENDS+= fake-simd-0.1.2
CARGO_CRATE_DEPENDS+= flate2-1.0.8
CARGO_CRATE_DEPENDS+= flate2-1.0.11
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.27
CARGO_CRATE_DEPENDS+= futures-0.1.29
CARGO_CRATE_DEPENDS+= futures-cpupool-0.1.8
CARGO_CRATE_DEPENDS+= gcc-0.3.55
CARGO_CRATE_DEPENDS+= generic-array-0.12.0
CARGO_CRATE_DEPENDS+= generic-array-0.12.3
CARGO_CRATE_DEPENDS+= get_if_addrs-0.5.3
CARGO_CRATE_DEPENDS+= get_if_addrs-sys-0.1.1
CARGO_CRATE_DEPENDS+= getopts-0.2.19
CARGO_CRATE_DEPENDS+= h2-0.1.24
CARGO_CRATE_DEPENDS+= gethostname-0.2.0
CARGO_CRATE_DEPENDS+= getopts-0.2.21
CARGO_CRATE_DEPENDS+= getrandom-0.1.12
CARGO_CRATE_DEPENDS+= glob-0.2.11
CARGO_CRATE_DEPENDS+= h2-0.1.26
CARGO_CRATE_DEPENDS+= heck-0.3.1
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.17
CARGO_CRATE_DEPENDS+= hex-0.4.0
CARGO_CRATE_DEPENDS+= hkdf-0.7.1
CARGO_CRATE_DEPENDS+= hmac-0.7.1
CARGO_CRATE_DEPENDS+= http-0.1.18
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+= httparse-1.3.4
CARGO_CRATE_DEPENDS+= humantime-1.3.0
CARGO_CRATE_DEPENDS+= hyper-0.11.27
CARGO_CRATE_DEPENDS+= hyper-0.12.30
CARGO_CRATE_DEPENDS+= hyper-0.12.35
CARGO_CRATE_DEPENDS+= hyper-proxy-0.4.1
CARGO_CRATE_DEPENDS+= hyper-tls-0.3.2
CARGO_CRATE_DEPENDS+= ident_case-1.0.1
CARGO_CRATE_DEPENDS+= idna-0.1.5
CARGO_CRATE_DEPENDS+= indexmap-1.0.2
CARGO_CRATE_DEPENDS+= idna-0.2.0
CARGO_CRATE_DEPENDS+= indexmap-1.2.0
CARGO_CRATE_DEPENDS+= iovec-0.1.2
CARGO_CRATE_DEPENDS+= itertools-0.7.11
CARGO_CRATE_DEPENDS+= itertools-0.8.0
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+= keyring-0.7.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+= lazy_static-1.4.0
CARGO_CRATE_DEPENDS+= lewton-0.9.4
CARGO_CRATE_DEPENDS+= libc-0.2.58
CARGO_CRATE_DEPENDS+= libdbus-sys-0.1.5
CARGO_CRATE_DEPENDS+= libc-0.2.62
CARGO_CRATE_DEPENDS+= libdbus-sys-0.2.1
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+= log-0.4.8
CARGO_CRATE_DEPENDS+= matches-0.1.8
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+= memchr-2.2.1
CARGO_CRATE_DEPENDS+= memoffset-0.5.1
CARGO_CRATE_DEPENDS+= mime-0.3.14
CARGO_CRATE_DEPENDS+= mime_guess-2.0.1
CARGO_CRATE_DEPENDS+= miniz_oxide-0.3.2
CARGO_CRATE_DEPENDS+= mio-0.6.19
CARGO_CRATE_DEPENDS+= mio-named-pipes-0.1.6
CARGO_CRATE_DEPENDS+= mio-uds-0.6.7
@ -172,51 +182,53 @@ CARGO_CRATE_DEPENDS+= net2-0.2.33
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-0.2.0
CARGO_CRATE_DEPENDS+= num-bigint-0.2.3
CARGO_CRATE_DEPENDS+= num-complex-0.2.3
CARGO_CRATE_DEPENDS+= num-integer-0.1.41
CARGO_CRATE_DEPENDS+= num-iter-0.1.39
CARGO_CRATE_DEPENDS+= num-rational-0.1.42
CARGO_CRATE_DEPENDS+= num-traits-0.1.43
CARGO_CRATE_DEPENDS+= num-rational-0.2.2
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.23
CARGO_CRATE_DEPENDS+= opaque-debug-0.2.3
CARGO_CRATE_DEPENDS+= openssl-0.10.24
CARGO_CRATE_DEPENDS+= openssl-probe-0.1.2
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.47
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.49
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
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+= percent-encoding-2.1.0
CARGO_CRATE_DEPENDS+= pkg-config-0.3.16
CARGO_CRATE_DEPENDS+= portaudio-rs-0.3.1
CARGO_CRATE_DEPENDS+= portaudio-sys-0.1.1
CARGO_CRATE_DEPENDS+= ppv-lite86-0.2.5
CARGO_CRATE_DEPENDS+= proc-macro-error-0.2.6
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+= proc-macro2-1.0.4
CARGO_CRATE_DEPENDS+= protobuf-2.8.1
CARGO_CRATE_DEPENDS+= protobuf-codegen-2.8.1
CARGO_CRATE_DEPENDS+= protobuf-codegen-pure-2.8.1
CARGO_CRATE_DEPENDS+= publicsuffix-1.5.3
CARGO_CRATE_DEPENDS+= pulldown-cmark-0.2.0
CARGO_CRATE_DEPENDS+= quick-error-1.2.2
CARGO_CRATE_DEPENDS+= quote-0.3.15
CARGO_CRATE_DEPENDS+= quote-0.6.12
CARGO_CRATE_DEPENDS+= quote-0.6.13
CARGO_CRATE_DEPENDS+= quote-1.0.2
CARGO_CRATE_DEPENDS+= rand-0.3.23
CARGO_CRATE_DEPENDS+= rand-0.4.6
CARGO_CRATE_DEPENDS+= rand-0.5.6
CARGO_CRATE_DEPENDS+= rand-0.6.5
CARGO_CRATE_DEPENDS+= rand-0.7.2
CARGO_CRATE_DEPENDS+= rand_chacha-0.1.1
CARGO_CRATE_DEPENDS+= rand_chacha-0.2.1
CARGO_CRATE_DEPENDS+= rand_core-0.3.1
CARGO_CRATE_DEPENDS+= rand_core-0.4.0
CARGO_CRATE_DEPENDS+= rand_core-0.4.2
CARGO_CRATE_DEPENDS+= rand_core-0.5.1
CARGO_CRATE_DEPENDS+= rand_hc-0.1.0
CARGO_CRATE_DEPENDS+= rand_hc-0.2.0
CARGO_CRATE_DEPENDS+= rand_isaac-0.1.1
CARGO_CRATE_DEPENDS+= rand_jitter-0.1.4
CARGO_CRATE_DEPENDS+= rand_os-0.1.3
@ -224,81 +236,77 @@ 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.54
CARGO_CRATE_DEPENDS+= redox_termios-0.1.1
CARGO_CRATE_DEPENDS+= regex-0.2.11
CARGO_CRATE_DEPENDS+= regex-1.1.7
CARGO_CRATE_DEPENDS+= regex-syntax-0.5.6
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.7
CARGO_CRATE_DEPENDS+= redox_syscall-0.1.56
CARGO_CRATE_DEPENDS+= redox_users-0.3.1
CARGO_CRATE_DEPENDS+= regex-1.3.1
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.12
CARGO_CRATE_DEPENDS+= relay-0.1.1
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.15
CARGO_CRATE_DEPENDS+= reqwest-0.9.17
CARGO_CRATE_DEPENDS+= result-1.0.0
CARGO_CRATE_DEPENDS+= rpassword-3.0.2
CARGO_CRATE_DEPENDS+= rspotify-0.6.0
CARGO_CRATE_DEPENDS+= rust-argon2-0.5.1
CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.16
CARGO_CRATE_DEPENDS+= rustc-serialize-0.3.24
CARGO_CRATE_DEPENDS+= rustc_version-0.2.3
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+= ryu-1.0.0
CARGO_CRATE_DEPENDS+= safemem-0.3.2
CARGO_CRATE_DEPENDS+= same-file-1.0.5
CARGO_CRATE_DEPENDS+= schannel-0.1.16
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+= scopeguard-1.0.0
CARGO_CRATE_DEPENDS+= secret-service-1.0.0
CARGO_CRATE_DEPENDS+= security-framework-0.3.1
CARGO_CRATE_DEPENDS+= security-framework-sys-0.3.1
CARGO_CRATE_DEPENDS+= semver-0.9.0
CARGO_CRATE_DEPENDS+= semver-parser-0.7.0
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-1.0.101
CARGO_CRATE_DEPENDS+= serde_derive-1.0.101
CARGO_CRATE_DEPENDS+= serde_ini-0.2.0
CARGO_CRATE_DEPENDS+= serde_json-1.0.40
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.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+= signal-hook-0.1.10
CARGO_CRATE_DEPENDS+= signal-hook-registry-1.1.1
CARGO_CRATE_DEPENDS+= simplelog-0.7.3
CARGO_CRATE_DEPENDS+= skeptic-0.13.4
CARGO_CRATE_DEPENDS+= slab-0.3.0
CARGO_CRATE_DEPENDS+= slab-0.4.2
CARGO_CRATE_DEPENDS+= smallvec-0.2.1
CARGO_CRATE_DEPENDS+= smallvec-0.6.10
CARGO_CRATE_DEPENDS+= socket2-0.2.4
CARGO_CRATE_DEPENDS+= socket2-0.3.9
CARGO_CRATE_DEPENDS+= socket2-0.3.11
CARGO_CRATE_DEPENDS+= stable_deref_trait-1.1.1
CARGO_CRATE_DEPENDS+= stream-cipher-0.3.0
CARGO_CRATE_DEPENDS+= string-0.2.0
CARGO_CRATE_DEPENDS+= stream-cipher-0.3.2
CARGO_CRATE_DEPENDS+= string-0.2.1
CARGO_CRATE_DEPENDS+= strsim-0.7.0
CARGO_CRATE_DEPENDS+= strsim-0.8.0
CARGO_CRATE_DEPENDS+= subtle-1.0.0
CARGO_CRATE_DEPENDS+= syn-0.11.11
CARGO_CRATE_DEPENDS+= syn-0.15.36
CARGO_CRATE_DEPENDS+= synom-0.11.3
CARGO_CRATE_DEPENDS+= syn-0.15.44
CARGO_CRATE_DEPENDS+= syn-1.0.5
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.8
CARGO_CRATE_DEPENDS+= term-0.4.6
CARGO_CRATE_DEPENDS+= tempdir-0.3.7
CARGO_CRATE_DEPENDS+= tempfile-3.1.0
CARGO_CRATE_DEPENDS+= term-0.6.1
CARGO_CRATE_DEPENDS+= termcolor-1.0.5
CARGO_CRATE_DEPENDS+= termion-1.5.3
CARGO_CRATE_DEPENDS+= termios-0.2.2
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.21
CARGO_CRATE_DEPENDS+= tokio-0.1.22
CARGO_CRATE_DEPENDS+= tokio-buf-0.1.1
CARGO_CRATE_DEPENDS+= tokio-codec-0.1.1
CARGO_CRATE_DEPENDS+= tokio-core-0.1.17
CARGO_CRATE_DEPENDS+= tokio-current-thread-0.1.6
CARGO_CRATE_DEPENDS+= tokio-executor-0.1.7
CARGO_CRATE_DEPENDS+= tokio-executor-0.1.8
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-process-0.2.4
CARGO_CRATE_DEPENDS+= tokio-proto-0.1.1
CARGO_CRATE_DEPENDS+= tokio-reactor-0.1.9
CARGO_CRATE_DEPENDS+= tokio-service-0.1.0
@ -306,43 +314,43 @@ CARGO_CRATE_DEPENDS+= tokio-signal-0.1.5
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.14
CARGO_CRATE_DEPENDS+= tokio-threadpool-0.1.15
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-udp-0.1.5
CARGO_CRATE_DEPENDS+= tokio-uds-0.2.5
CARGO_CRATE_DEPENDS+= try-lock-0.1.0
CARGO_CRATE_DEPENDS+= try-lock-0.2.2
CARGO_CRATE_DEPENDS+= try_from-0.3.2
CARGO_CRATE_DEPENDS+= typenum-1.10.0
CARGO_CRATE_DEPENDS+= ucd-util-0.1.3
CARGO_CRATE_DEPENDS+= unicase-1.4.2
CARGO_CRATE_DEPENDS+= unicase-2.4.0
CARGO_CRATE_DEPENDS+= typenum-1.11.2
CARGO_CRATE_DEPENDS+= unicase-2.5.1
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-segmentation-1.3.0
CARGO_CRATE_DEPENDS+= unicode-width-0.1.6
CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0
CARGO_CRATE_DEPENDS+= unicode-xid-0.2.0
CARGO_CRATE_DEPENDS+= url-1.7.2
CARGO_CRATE_DEPENDS+= utf8-ranges-1.0.3
CARGO_CRATE_DEPENDS+= uuid-0.4.0
CARGO_CRATE_DEPENDS+= url-2.1.0
CARGO_CRATE_DEPENDS+= uuid-0.7.4
CARGO_CRATE_DEPENDS+= vcpkg-0.2.6
CARGO_CRATE_DEPENDS+= vcpkg-0.2.7
CARGO_CRATE_DEPENDS+= vec_map-0.8.1
CARGO_CRATE_DEPENDS+= vergen-0.1.1
CARGO_CRATE_DEPENDS+= vergen-3.0.4
CARGO_CRATE_DEPENDS+= version_check-0.1.5
CARGO_CRATE_DEPENDS+= void-1.0.2
CARGO_CRATE_DEPENDS+= walkdir-2.2.9
CARGO_CRATE_DEPENDS+= want-0.0.4
CARGO_CRATE_DEPENDS+= want-0.0.6
CARGO_CRATE_DEPENDS+= webbrowser-0.2.2
CARGO_CRATE_DEPENDS+= want-0.2.0
CARGO_CRATE_DEPENDS+= wasi-0.7.0
CARGO_CRATE_DEPENDS+= webbrowser-0.5.2
CARGO_CRATE_DEPENDS+= whoami-0.5.3
CARGO_CRATE_DEPENDS+= widestring-0.4.0
CARGO_CRATE_DEPENDS+= winapi-0.2.8
CARGO_CRATE_DEPENDS+= winapi-0.3.7
CARGO_CRATE_DEPENDS+= winapi-0.3.8
CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
CARGO_CRATE_DEPENDS+= winapi-util-0.1.2
CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
CARGO_CRATE_DEPENDS+= wincolor-1.0.1
CARGO_CRATE_DEPENDS+= winutil-0.1.1
CARGO_CRATE_DEPENDS+= wincolor-1.0.2
CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1
CARGO_CRATE_DEPENDS+= xdg-2.2.0
@ -358,8 +366,8 @@ 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}/dns-parser-${DNS_PARSER_REV} ${WRKDIR}/dns-parser
mv ${WRKDIR}/structopt-${STRUCTOPT_REV} ${WRKDIR}/structopt
# NOTE: To update this package I think you need to do:
# 1. remove `--frozen --locked` below

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
$NetBSD$
--- Cargo.lock.orig 2019-06-19 20:25:58.000000000 +0000
--- Cargo.lock.orig 2019-10-06 08:56:31.000000000 +0000
+++ Cargo.lock
@@ -519,7 +519,6 @@ dependencies = [
@@ -574,7 +574,6 @@ dependencies = [
[[package]]
name = "dns-parser"
version = "0.3.2"
@ -10,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)",
@@ -1004,7 +1003,6 @@ dependencies = [
@@ -1085,7 +1084,6 @@ dependencies = [
[[package]]
name = "librespot"
version = "0.1.0"
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
-source = "git+https://github.com/librespot-org/librespot.git#76088d0fc99501813e1a42b0acccb152fc0c7800"
dependencies = [
"base64 0.5.2 (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)",
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1093,12 +1091,12 @@ dependencies = [
"getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "librespot-audio 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
@ -34,26 +34,26 @@ $NetBSD$
+ "librespot-metadata 0.1.0",
+ "librespot-playback 0.1.0",
+ "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.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1035,25 +1033,23 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1115,25 +1113,23 @@ dependencies = [
[[package]]
name = "librespot-audio"
version = "0.1.0"
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
-source = "git+https://github.com/librespot-org/librespot.git#76088d0fc99501813e1a42b0acccb152fc0c7800"
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)",
"bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
+ "librespot-core 0.1.0",
"log 0.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)",
"tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tremor 0.1.0 (git+https://github.com/plietar/rust-tremor)",
+ "tremor 0.1.0",
]
@ -61,13 +61,13 @@ $NetBSD$
[[package]]
name = "librespot-connect"
version = "0.1.0"
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
-source = "git+https://github.com/librespot-org/librespot.git#76088d0fc99501813e1a42b0acccb152fc0c7800"
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)",
@@ -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)",
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1141,11 +1137,11 @@ dependencies = [
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
- "librespot-playback 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
@ -75,54 +75,54 @@ $NetBSD$
+ "librespot-core 0.1.0",
+ "librespot-playback 0.1.0",
+ "librespot-protocol 0.1.0",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mdns 0.2.0 (git+https://github.com/plietar/rust-mdns)",
+ "mdns 0.2.0",
"num-bigint 0.1.44 (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)",
@@ -1080,7 +1076,6 @@ dependencies = [
"num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1160,7 +1156,6 @@ dependencies = [
[[package]]
name = "librespot-core"
version = "0.1.0"
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
-source = "git+https://github.com/librespot-org/librespot.git#76088d0fc99501813e1a42b0acccb152fc0c7800"
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)",
@@ -1094,7 +1089,7 @@ dependencies = [
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1174,7 +1169,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)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "librespot-protocol 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
+ "librespot-protocol 0.1.0",
"log 0.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)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1118,12 +1113,11 @@ dependencies = [
@@ -1198,12 +1193,11 @@ dependencies = [
[[package]]
name = "librespot-metadata"
version = "0.1.0"
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
-source = "git+https://github.com/librespot-org/librespot.git#76088d0fc99501813e1a42b0acccb152fc0c7800"
dependencies = [
"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)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "librespot-core 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
- "librespot-protocol 0.1.0 (git+https://github.com/librespot-org/librespot.git)",
+ "librespot-core 0.1.0",
+ "librespot-protocol 0.1.0",
"linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf 2.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1131,16 +1125,15 @@ dependencies = [
@@ -1211,16 +1205,15 @@ dependencies = [
[[package]]
name = "librespot-playback"
version = "0.1.0"
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
-source = "git+https://github.com/librespot-org/librespot.git#76088d0fc99501813e1a42b0acccb152fc0c7800"
dependencies = [
"alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"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)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.62 (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)",
@ -130,18 +130,18 @@ $NetBSD$
+ "librespot-audio 0.1.0",
+ "librespot-core 0.1.0",
+ "librespot-metadata 0.1.0",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"portaudio-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1148,7 +1141,6 @@ dependencies = [
@@ -1228,7 +1221,6 @@ dependencies = [
[[package]]
name = "librespot-protocol"
version = "0.1.0"
-source = "git+https://github.com/librespot-org/librespot.git#4e3576ba7c6146cf68e1953daeec929d619b26b1"
-source = "git+https://github.com/librespot-org/librespot.git#76088d0fc99501813e1a42b0acccb152fc0c7800"
dependencies = [
"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
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1273,10 +1265,9 @@ source = "registry+https://github.com/ru
[[package]]
name = "mdns"
version = "0.2.0"
@ -150,25 +150,52 @@ $NetBSD$
"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.27 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -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)",
@@ -2348,7 +2339,7 @@ dependencies = [
"keyring 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.62 (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-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2730,16 +2721,14 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rspotify 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2356,7 +2347,7 @@ dependencies = [
"serde_ini 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"simplelog 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "structopt 0.3.2 (git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005)",
+ "structopt 0.3.2",
"syslog 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2399,16 +2390,14 @@ source = "registry+https://github.com/ru
[[package]]
name = "structopt"
version = "0.3.2"
-source = "git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005#0c888e962d842f2c90c6c290d3a2a40947b37005"
dependencies = [
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "structopt-derive 0.3.2 (git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005)",
+ "structopt-derive 0.3.2",
]
[[package]]
name = "structopt-derive"
version = "0.3.2"
-source = "git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005#0c888e962d842f2c90c6c290d3a2a40947b37005"
dependencies = [
"heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2807,16 +2796,14 @@ dependencies = [
[[package]]
name = "tremor"
version = "0.1.0"
-source = "git+https://github.com/plietar/rust-tremor#5958cc302e78f535dad90e9665da981ddff4000a"
dependencies = [
"libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.62 (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",
]
@ -179,18 +206,18 @@ $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.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"
"libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3131,7 +3118,6 @@ source = "registry+https://github.com/ru
"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-"checksum dns-parser 0.3.2 (git+https://github.com/plietar/dns-parser)" = "<none>"
"checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3"
"checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
"checksum either 1.5.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 either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
@@ -3189,19 +3175,11 @@ source = "registry+https://github.com/ru
"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
"checksum libdbus-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0"
"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>"
@ -202,15 +229,24 @@ $NetBSD$
"checksum linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee"
"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum mdns 0.2.0 (git+https://github.com/plietar/rust-mdns)" = "<none>"
"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"
@@ -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 memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
"checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf"
@@ -3321,8 +3299,6 @@ source = "registry+https://github.com/ru
"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum structopt 0.3.2 (git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005)" = "<none>"
-"checksum structopt-derive 0.3.2 (git+https://github.com/TeXitoi/structopt/?rev=0c888e962d842f2c90c6c290d3a2a40947b37005)" = "<none>"
"checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
@@ -3356,8 +3332,6 @@ source = "registry+https://github.com/ru
"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e"
"checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b"
"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
-"checksum tremor 0.1.0 (git+https://github.com/plietar/rust-tremor)" = "<none>"
-"checksum tremor-sys 0.1.0 (git+https://github.com/plietar/rust-tremor)" = "<none>"

View File

@ -1,13 +1,22 @@
$NetBSD$
--- Cargo.toml.orig 2019-06-19 20:25:58.000000000 +0000
--- Cargo.toml.orig 2019-10-06 08:56:31.000000000 +0000
+++ Cargo.toml
@@ -29,7 +29,7 @@ xdg = "2.2"
@@ -24,7 +24,7 @@ serde = { version = "1.0.99", features =
serde_ini = "0.2.0"
sha-1 = "0.8"
simplelog = "0.7"
-structopt = { git = "https://github.com/TeXitoi/structopt/", rev = "0c888e962d842f2c90c6c290d3a2a40947b37005", features = ["color"] }
+structopt = { path = "../structopt", features = ["color"] }
syslog = "4.0.1"
tokio-core = "0.1"
tokio-io = "0.1"
@@ -35,7 +35,7 @@ whoami = "0.5.3"
[dependencies.librespot]
default-features = false
features = ["with-tremor"]
-git = "https://github.com/librespot-org/librespot.git"
+path = "../librespot"
[features]
alsa_backend = ["librespot/alsa-backend", "alsa"]
[dev-dependencies]
env_logger = "0.6"

View File

@ -1,10 +1,10 @@
$NetBSD$
--- ../librespot/audio/Cargo.toml.orig 2019-03-21 16:21:20.000000000 +0000
--- ../librespot/audio/Cargo.toml.orig 2019-09-26 12:25:44.000000000 +0000
+++ ../librespot/audio/Cargo.toml
@@ -17,7 +17,8 @@ num-traits = "0.1.36"
tempfile = "2.1"
aes-ctr = "0.3.0"
@@ -17,7 +17,8 @@ num-traits = "0.2"
tempfile = "3.1"
aes-ctr = "0.3"
-tremor = { git = "https://github.com/plietar/rust-tremor", optional = true }
+#tremor = { git = "https://github.com/plietar/rust-tremor", optional = true }

View File

@ -1,9 +1,9 @@
$NetBSD$
--- ../librespot/connect/Cargo.toml.orig 2019-03-21 16:21:20.000000000 +0000
--- ../librespot/connect/Cargo.toml.orig 2019-09-26 12:25:44.000000000 +0000
+++ ../librespot/connect/Cargo.toml
@@ -29,7 +29,8 @@ aes-ctr = "0.3.0"
block-modes = "0.2.0"
@@ -29,7 +29,8 @@ aes-ctr = "0.3"
block-modes = "0.3"
dns-sd = { version = "0.1.3", optional = true }
-mdns = { git = "https://github.com/plietar/rust-mdns", optional = true }

View File

@ -10,11 +10,10 @@ nobody:*:32767:39:Unprivileged user:/nonexistent:/sbin/nologin
But I don't _think_ that 39 is going to be guaranteed everywhere.
Therefore simplest solution seems to be to skip this test on NetBSD.
Not submitted upstream because unsure about the gid issue.
Submitted upstream here: https://github.com/knsd/daemonize/pull/37
--- ../vendor/daemonize-0.3.0/src/ffi.rs.orig 2018-03-19 18:50:44.000000000 +0000
+++ ../vendor/daemonize-0.3.0/src/ffi.rs
--- ../vendor/daemonize-0.4.1/src/ffi.rs.orig 2019-03-26 19:09:36.000000000 +0000
+++ ../vendor/daemonize-0.4.1/src/ffi.rs
@@ -79,6 +79,11 @@ mod tests {
(i16::max_value()) as libc::uid_t
}
@ -26,10 +25,10 @@ Not submitted upstream because unsure about the gid issue.
+
#[test]
fn test_get_gid_by_name() {
let group_name = ::std::ffi::CString::new(match ::std::fs::metadata("/etc/debian_version") {
@@ -86,8 +91,11 @@ mod tests {
Err(_) => "nobody",
}).unwrap();
let group_name =
@@ -88,8 +93,11 @@ mod tests {
})
.unwrap();
unsafe {
- let gid = get_gid_by_name(&group_name);
- assert_eq!(gid, Some(nobody_uid_gid()))

View File

@ -1,25 +0,0 @@
$NetBSD$
https://github.com/awmath/rust-crypto/commit/394c247254dbe2ac5d44483232cf335d10cf0260.patch
--- ../vendor/rust-crypto-0.2.36/src/aesni_helpers.c.orig 2016-02-14 02:10:14.000000000 +0000
+++ ../vendor/rust-crypto-0.2.36/src/aesni_helpers.c
@@ -59,13 +59,14 @@ void rust_crypto_aesni_setup_working_key
\
jmp 2f; \
\
- 1: \
+ 1: \
pshufd $0xff, %%xmm2, %%xmm2; \
- vpslldq $0x04, %%xmm1, %%xmm3; \
+ movdqa %%xmm1, %%xmm3; \
+ pslldq $0x04, %%xmm3; \
pxor %%xmm3, %%xmm1; \
- vpslldq $0x4, %%xmm1, %%xmm3; \
+ pslldq $0x04, %%xmm3; \
pxor %%xmm3, %%xmm1; \
- vpslldq $0x04, %%xmm1, %%xmm3; \
+ pslldq $0x04, %%xmm3; \
pxor %%xmm3, %%xmm1; \
pxor %%xmm2, %%xmm1; \
movdqu %%xmm1, (%0); \

View File

@ -1,31 +0,0 @@
$NetBSD$
Upstream PR is wip: https://github.com/dcuddeback/termios-rs/pull/22
--- ../vendor/termios-0.2.2/src/lib.rs.orig 2016-01-20 16:52:20.000000000 +0000
+++ ../vendor/termios-0.2.2/src/lib.rs
@@ -99,6 +99,10 @@
//! cfsetspeed(termios, termios::os::openbsd::B921600)
//! }
//!
+//! #[cfg(target_os = "netbsd")]
+//! fn set_fastest_speed(termios: &mut Termios) -> io::Result<()> {
+//! cfsetspeed(termios, termios::os::openbsd::B921600)
+//! }
//! # 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())
}
}
+

View File

@ -1,17 +0,0 @@
$NetBSD$
Upstream PR is wip: https://github.com/dcuddeback/termios-rs/pull/22
--- ../vendor/termios-0.2.2/src/os/mod.rs.orig 2016-01-20 16:52:20.000000000 +0000
+++ ../vendor/termios-0.2.2/src/os/mod.rs
@@ -4,8 +4,10 @@
#[cfg(target_os = "macos")] pub use self::macos as target;
#[cfg(target_os = "freebsd")] pub use self::freebsd as target;
#[cfg(target_os = "openbsd")] pub use self::openbsd as target;
+#[cfg(target_os = "netbsd")] pub use self::netbsd as target;
#[cfg(target_os = "linux")] pub mod linux;
#[cfg(target_os = "macos")] pub mod macos;
#[cfg(target_os = "freebsd")] pub mod freebsd;
#[cfg(target_os = "openbsd")] pub mod openbsd;
+#[cfg(target_os = "netbsd")] pub mod netbsd;

View File

@ -1,160 +0,0 @@
$NetBSD$
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,153 @@
+#![allow(non_camel_case_types)]
+
+use libc::{c_int,c_uint,c_uchar};
+
+pub type cc_t = c_uchar;
+pub type speed_t = c_uint;
+pub type tcflag_t = c_uint;
+
+#[derive(Debug,Copy,Clone,Eq,PartialEq)]
+#[repr(C)]
+pub struct termios {
+ pub c_iflag: tcflag_t,
+ pub c_oflag: tcflag_t,
+ pub c_cflag: tcflag_t,
+ pub c_lflag: tcflag_t,
+ pub c_cc: [cc_t; NCCS],
+ c_ispeed: speed_t,
+ c_ospeed: speed_t
+}
+
+pub const NCCS: usize = 20;
+
+// c_cc characters
+pub const VEOF: usize = 0;
+pub const VEOL: usize = 1;
+pub const VEOL2: usize = 2;
+pub const VERASE: usize = 3;
+pub const VWERASE: usize = 4;
+pub const VKILL: usize = 5;
+pub const VREPRINT: usize = 6;
+pub const VERASE2: usize = 7;
+pub const VINTR: usize = 8;
+pub const VQUIT: usize = 9;
+pub const VSUSP: usize = 10;
+pub const VSTART: usize = 12;
+pub const VSTOP: usize = 13;
+pub const VLNEXT: usize = 14;
+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;
+pub const BRKINT: tcflag_t = 0x00000002;
+pub const IGNPAR: tcflag_t = 0x00000004;
+pub const PARMRK: tcflag_t = 0x00000008;
+pub const INPCK: tcflag_t = 0x00000010;
+pub const ISTRIP: tcflag_t = 0x00000020;
+pub const INLCR: tcflag_t = 0x00000040;
+pub const IGNCR: tcflag_t = 0x00000080;
+pub const ICRNL: tcflag_t = 0x00000100;
+pub const IXON: tcflag_t = 0x00000200;
+pub const IXOFF: tcflag_t = 0x00000400;
+pub const IXANY: tcflag_t = 0x00000800;
+pub const IMAXBEL: tcflag_t = 0x00002000;
+
+// c_oflag bits
+pub const OPOST: tcflag_t = 0x00000001;
+pub const ONLCR: tcflag_t = 0x00000002;
+pub const OXTABS: tcflag_t = 0x00000004;
+pub const ONOEOT: tcflag_t = 0x00000008;
+pub const OCRNL: tcflag_t = 0x00000010;
+pub const ONOCR: tcflag_t = 0x00000020;
+pub const ONLRET: tcflag_t = 0x00000040;
+
+// c_cflag bits
+pub const CIGNORE: tcflag_t = 0x00000001;
+pub const CSIZE: tcflag_t = 0x00000300;
+pub const CS5: tcflag_t = 0x00000000;
+pub const CS6: tcflag_t = 0x00000100;
+pub const CS7: tcflag_t = 0x00000200;
+pub const CS8: tcflag_t = 0x00000300;
+pub const CSTOPB: tcflag_t = 0x00000400;
+pub const CREAD: tcflag_t = 0x00000800;
+pub const PARENB: tcflag_t = 0x00001000;
+pub const PARODD: tcflag_t = 0x00002000;
+pub const HUPCL: tcflag_t = 0x00004000;
+pub const CLOCAL: tcflag_t = 0x00008000;
+pub const CRTSCTS: tcflag_t = 0x00010000;
+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;
+pub const ECHOE: tcflag_t = 0x00000002;
+pub const ECHOK: tcflag_t = 0x00000004;
+pub const ECHO: tcflag_t = 0x00000008;
+pub const ECHONL: tcflag_t = 0x00000010;
+pub const ECHOPRT: tcflag_t = 0x00000020;
+pub const ECHOCTL: tcflag_t = 0x00000040;
+pub const ISIG: tcflag_t = 0x00000080;
+pub const ICANON: tcflag_t = 0x00000100;
+pub const ALTWERASE: tcflag_t = 0x00000200;
+pub const IEXTEN: tcflag_t = 0x00000400;
+pub const EXTPROC: tcflag_t = 0x00000800;
+pub const TOSTOP: tcflag_t = 0x00400000;
+pub const FLUSHO: tcflag_t = 0x00800000;
+pub const NOKERNINFO: tcflag_t = 0x02000000;
+pub const PENDIN: tcflag_t = 0x20000000;
+pub const NOFLSH: tcflag_t = 0x80000000;
+
+// baud rates
+pub const B0: speed_t = 0;
+pub const B50: speed_t = 50;
+pub const B75: speed_t = 75;
+pub const B110: speed_t = 110;
+pub const B134: speed_t = 134;
+pub const B150: speed_t = 150;
+pub const B200: speed_t = 200;
+pub const B300: speed_t = 300;
+pub const B600: speed_t = 600;
+pub const B1200: speed_t = 1200;
+pub const B1800: speed_t = 1800;
+pub const B2400: speed_t = 2400;
+pub const B4800: speed_t = 4800;
+pub const B9600: speed_t = 9600;
+pub const B19200: speed_t = 19200;
+pub const B38400: speed_t = 38400;
+pub const B7200: speed_t = 7200;
+pub const B14400: speed_t = 14400;
+pub const B28800: speed_t = 28800;
+pub const B57600: speed_t = 57600;
+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;
+
+// tcflow()
+pub const TCOOFF: c_int = 1;
+pub const TCOON: c_int = 2;
+pub const TCIOFF: c_int = 3;
+pub const TCION: c_int = 4;
+
+// tcflush()
+pub const TCIFLUSH: c_int = 1;
+pub const TCOFLUSH: c_int = 2;
+pub const TCIOFLUSH: c_int = 3;
+
+// tcsetattr()
+pub const TCSANOW: c_int = 0;
+pub const TCSADRAIN: c_int = 1;
+pub const TCSAFLUSH: c_int = 2;
+pub const TCSASOFT: c_int = 0x10;