audio/spotifyd: Update to v0.3.3

Major changes:
 - Update librespot to 0.2.0
 - Rewrite DBUS/MPRIS integration
 - Improved panic error message
 - Implement VolumeUp and VolumeDown in the DBUS/MPRIS interface
 - Add debug_credentials feature for debugging BadCredentials errors

Remove powerpc patch which is not required anymore by libc crates

Add an option to use ALSA backend but PORTAUDIO remains the default

audio/spotifyd/Makefile

@@ -1,7 +1,6 @@
 PORTNAME=	spotifyd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.2
+DISTVERSION=	0.3.3
-PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	rodrigo@FreeBSD.org
@@ -19,50 +18,36 @@ USE_RC_SUBR=	spotifyd
 
 CARGO_CRATES=	addr2line-0.14.1 \
 		adler-0.2.3 \
-		aes-0.3.2 \
 		aes-0.6.0 \
-		aes-ctr-0.3.0 \
+		aes-ctr-0.6.0 \
-		aes-soft-0.3.3 \
 		aes-soft-0.6.4 \
-		aesni-0.6.0 \
 		aesni-0.10.0 \
 		aho-corasick-0.7.6 \
-		alga-0.9.2 \
+		alsa-0.5.0 \
-		alsa-0.2.2 \
+		alsa-sys-0.3.1 \
-		alsa-0.3.0 \
-		alsa-sys-0.1.2 \
 		ansi_term-0.11.0 \
-		anyhow-1.0.26 \
+		async-trait-0.1.50 \
-		approx-0.3.2 \
-		arc-swap-0.4.4 \
 		atty-0.2.14 \
 		autocfg-0.1.7 \
 		autocfg-1.0.0 \
 		backtrace-0.3.55 \
-		base64-0.9.3 \
 		base64-0.10.1 \
 		base64-0.11.0 \
+		base64-0.13.0 \
 		bindgen-0.51.1 \
-		bit-set-0.5.1 \
-		bit-vec-0.5.1 \
-		bitflags-0.9.1 \
 		bitflags-1.2.1 \
-		block-buffer-0.7.3 \
 		block-buffer-0.9.0 \
-		block-cipher-trait-0.6.2 \
-		block-modes-0.3.3 \
 		block-modes-0.7.0 \
-		block-padding-0.1.5 \
 		block-padding-0.2.1 \
 		boxfnonce-0.1.1 \
 		bumpalo-3.2.0 \
-		byte-tools-0.3.1 \
+		byteorder-1.4.3 \
-		byteorder-1.3.2 \
 		bytes-0.4.12 \
-		bytes-0.5.4 \
+		bytes-0.5.6 \
+		bytes-1.0.1 \
 		c2-chacha-0.2.3 \
-		c_linked_list-1.1.1 \
 		cc-1.0.50 \
+		cesu8-1.1.0 \
 		cexpr-0.3.6 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
@@ -73,34 +58,35 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		cloudabi-0.0.3 \
 		color-eyre-0.5.10 \
 		color-spantrace-0.1.6 \
-		core-foundation-0.6.4 \
+		combine-4.6.0 \
 		core-foundation-0.7.0 \
-		core-foundation-sys-0.5.1 \
+		core-foundation-0.9.1 \
 		core-foundation-sys-0.6.2 \
 		core-foundation-sys-0.7.0 \
-		coreaudio-rs-0.9.1 \
+		core-foundation-sys-0.8.2 \
+		coreaudio-rs-0.10.0 \
 		coreaudio-sys-0.2.3 \
-		cpal-0.8.2 \
+		cpal-0.13.3 \
 		cpuid-bool-0.1.2 \
-		crossbeam-deque-0.7.2 \
-		crossbeam-epoch-0.8.0 \
-		crossbeam-queue-0.1.2 \
 		crossbeam-utils-0.6.6 \
-		crossbeam-utils-0.7.0 \
-		crypto-mac-0.7.0 \
 		crypto-mac-0.10.0 \
-		ctr-0.3.2 \
+		crypto-mac-0.11.0 \
+		ctr-0.6.0 \
 		daemonize-0.4.1 \
 		darling-0.9.0 \
+		darling-0.10.2 \
 		darling_core-0.9.0 \
+		darling_core-0.10.2 \
 		darling_macro-0.9.0 \
+		darling_macro-0.10.2 \
 		dbus-0.2.3 \
-		dbus-0.6.5 \
+		dbus-0.9.3 \
-		dbus-tokio-0.2.1 \
+		dbus-crossroads-0.4.0 \
+		dbus-tokio-0.7.3 \
 		derefable-0.1.0 \
+		derivative-2.2.0 \
 		derive_builder-0.7.2 \
 		derive_builder_core-0.5.0 \
-		digest-0.8.1 \
 		digest-0.9.0 \
 		dotenv-0.13.0 \
 		dtoa-0.4.4 \
@@ -109,265 +95,268 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		env_logger-0.6.2 \
 		env_logger-0.7.1 \
 		error-chain-0.11.0 \
-		error-chain-0.12.1 \
 		eyre-0.6.5 \
 		failure-0.1.7 \
 		failure_derive-0.1.7 \
-		fake-simd-0.1.2 \
 		fern-0.6.0 \
 		fnv-1.0.6 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
 		fuchsia-cprng-0.1.1 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		futures-0.1.29 \
-		futures-0.3.4 \
+		futures-0.3.15 \
-		futures-channel-0.3.4 \
+		futures-channel-0.3.15 \
-		futures-core-0.3.4 \
+		futures-core-0.3.15 \
-		futures-cpupool-0.1.8 \
+		futures-executor-0.3.15 \
-		futures-executor-0.3.4 \
+		futures-io-0.3.15 \
-		futures-io-0.3.4 \
+		futures-macro-0.3.15 \
-		futures-macro-0.3.4 \
+		futures-sink-0.3.15 \
-		futures-sink-0.3.4 \
+		futures-task-0.3.15 \
-		futures-task-0.3.4 \
+		futures-util-0.3.15 \
-		futures-util-0.3.4 \
 		gcc-0.3.55 \
-		generic-array-0.12.3 \
 		generic-array-0.14.4 \
-		get_if_addrs-0.5.3 \
-		get_if_addrs-sys-0.1.1 \
 		gethostname-0.2.1 \
-		getopts-0.2.21 \
 		getrandom-0.1.14 \
+		getrandom-0.2.3 \
 		gimli-0.23.0 \
 		glob-0.3.0 \
 		h2-0.2.1 \
+		h2-0.3.3 \
+		hashbrown-0.11.2 \
 		heck-0.3.1 \
 		hermit-abi-0.1.6 \
-		hex-0.3.2 \
 		hex-0.4.2 \
 		hkdf-0.10.0 \
-		hmac-0.7.1 \
 		hmac-0.10.1 \
+		hmac-0.11.0 \
 		hostname-0.3.1 \
 		http-0.2.0 \
 		http-body-0.3.1 \
+		http-body-0.4.2 \
 		httparse-1.3.4 \
+		httpdate-0.3.2 \
 		humantime-1.3.0 \
-		hyper-0.11.27 \
 		hyper-0.13.2 \
-		hyper-proxy-0.4.1 \
+		hyper-0.14.5 \
 		hyper-tls-0.4.1 \
+		hyper-tls-0.5.0 \
 		ident_case-1.0.1 \
 		idna-0.1.5 \
 		idna-0.2.0 \
+		if-addrs-0.6.7 \
+		if-addrs-sys-0.3.2 \
 		indenter-0.3.2 \
-		indexmap-1.3.0 \
+		indexmap-1.7.0 \
+		instant-0.1.9 \
 		iovec-0.1.4 \
+		ipnet-2.3.1 \
 		itertools-0.8.2 \
 		itoa-0.4.4 \
-		js-sys-0.3.35 \
+		jni-0.18.0 \
+		jni-sys-0.3.0 \
+		jobserver-0.1.22 \
+		js-sys-0.3.51 \
 		kernel32-sys-0.2.2 \
 		keyring-0.10.1 \
-		language-tags-0.2.2 \
 		lazy_static-1.4.0 \
-		lewton-0.9.4 \
+		lewton-0.10.2 \
-		libc-0.2.82 \
+		libc-0.2.98 \
 		libdbus-sys-0.2.1 \
 		libloading-0.5.2 \
-		libm-0.1.4 \
+		libmdns-0.6.2 \
-		libmdns-0.2.6 \
+		libpulse-binding-2.23.1 \
-		libpulse-sys-0.0.0 \
+		libpulse-simple-binding-2.23.0 \
-		librespot-0.1.5 \
+		libpulse-simple-sys-1.16.1 \
-		librespot-audio-0.1.5 \
+		libpulse-sys-1.18.0 \
-		librespot-connect-0.1.5 \
+		librespot-audio-0.2.0 \
-		librespot-core-0.1.5 \
+		librespot-connect-0.2.0 \
-		librespot-metadata-0.1.5 \
+		librespot-core-0.2.0 \
-		librespot-playback-0.1.5 \
+		librespot-metadata-0.2.0 \
-		librespot-protocol-0.1.5 \
+		librespot-playback-0.2.0 \
+		librespot-protocol-0.2.0 \
 		librespot-tremor-0.2.0 \
-		linear-map-1.2.0 \
 		lock_api-0.3.3 \
-		log-0.3.9 \
+		lock_api-0.4.4 \
 		log-0.4.8 \
+		mach-0.3.2 \
 		match_cfg-0.1.0 \
 		matches-0.1.8 \
-		matrixmultiply-0.2.3 \
 		maybe-uninit-2.0.0 \
 		memchr-2.3.0 \
-		memoffset-0.5.3 \
 		mime-0.3.16 \
 		mime_guess-2.0.1 \
 		miniz_oxide-0.4.3 \
-		mio-0.6.21 \
+		mio-0.6.23 \
-		mio-named-pipes-0.1.6 \
+		mio-0.7.13 \
-		mio-uds-0.6.7 \
+		miow-0.2.2 \
-		miow-0.2.1 \
+		miow-0.3.7 \
-		miow-0.3.3 \
+		multimap-0.8.3 \
-		multimap-0.8.2 \
+		native-tls-0.2.7 \
-		nalgebra-0.18.1 \
+		ndk-0.3.0 \
-		native-tls-0.2.3 \
+		ndk-glue-0.3.0 \
-		net2-0.2.33 \
+		ndk-macro-0.2.0 \
-		nix-0.9.0 \
+		ndk-sys-0.2.1 \
-		nix-0.14.1 \
+		net2-0.2.37 \
+		nix-0.20.0 \
 		nom-4.2.3 \
+		ntapi-0.3.6 \
 		num-0.3.1 \
-		num-bigint-0.2.5 \
 		num-bigint-0.3.1 \
-		num-complex-0.2.4 \
+		num-bigint-0.4.0 \
 		num-complex-0.3.1 \
+		num-derive-0.3.3 \
 		num-integer-0.1.44 \
 		num-iter-0.1.42 \
-		num-rational-0.2.3 \
 		num-rational-0.3.2 \
 		num-traits-0.2.14 \
 		num_cpus-1.11.1 \
+		num_enum-0.5.1 \
+		num_enum_derive-0.5.1 \
 		object-0.22.0 \
-		ogg-0.7.0 \
+		oboe-0.4.2 \
+		oboe-sys-0.4.2 \
+		ogg-0.8.0 \
 		ogg-sys-0.0.9 \
 		once_cell-1.5.2 \
-		opaque-debug-0.2.3 \
 		opaque-debug-0.3.0 \
-		openssl-0.10.26 \
+		openssl-0.10.35 \
 		openssl-probe-0.1.2 \
-		openssl-sys-0.9.53 \
+		openssl-sys-0.9.65 \
 		owo-colors-1.2.1 \
 		parking_lot-0.9.0 \
+		parking_lot-0.11.1 \
 		parking_lot_core-0.6.2 \
-		pbkdf2-0.3.0 \
+		parking_lot_core-0.8.3 \
+		pbkdf2-0.8.0 \
 		peeking_take_while-0.1.2 \
 		percent-encoding-1.0.1 \
 		percent-encoding-2.1.0 \
 		pin-project-0.4.8 \
+		pin-project-1.0.7 \
 		pin-project-internal-0.4.8 \
+		pin-project-internal-1.0.7 \
 		pin-project-lite-0.1.4 \
 		pin-project-lite-0.2.4 \
-		pin-utils-0.1.0-alpha.4 \
+		pin-utils-0.1.0 \
 		pkg-config-0.3.17 \
 		portaudio-rs-0.3.2 \
 		portaudio-sys-0.1.1 \
-		ppv-lite86-0.2.6 \
+		ppv-lite86-0.2.10 \
+		priority-queue-1.1.1 \
+		proc-macro-crate-0.1.5 \
 		proc-macro-error-1.0.2 \
 		proc-macro-error-attr-1.0.2 \
-		proc-macro-hack-0.5.11 \
+		proc-macro-hack-0.5.19 \
 		proc-macro-nested-0.1.3 \
 		proc-macro2-0.4.30 \
-		proc-macro2-1.0.19 \
+		proc-macro2-1.0.27 \
 		protobuf-2.14.0 \
 		protobuf-codegen-2.14.0 \
 		protobuf-codegen-pure-2.14.0 \
 		quick-error-1.2.3 \
 		quote-0.6.13 \
-		quote-1.0.2 \
+		quote-1.0.9 \
-		rand-0.3.23 \
-		rand-0.4.6 \
-		rand-0.5.6 \
 		rand-0.6.5 \
 		rand-0.7.3 \
+		rand-0.8.4 \
 		rand_chacha-0.1.1 \
 		rand_chacha-0.2.1 \
+		rand_chacha-0.3.1 \
 		rand_core-0.3.1 \
 		rand_core-0.4.2 \
 		rand_core-0.5.1 \
+		rand_core-0.6.3 \
 		rand_hc-0.1.0 \
 		rand_hc-0.2.0 \
+		rand_hc-0.3.1 \
 		rand_isaac-0.1.1 \
 		rand_jitter-0.1.4 \
 		rand_os-0.1.3 \
 		rand_pcg-0.1.2 \
 		rand_xorshift-0.1.1 \
 		random-0.12.2 \
-		rawpointer-0.2.1 \
 		rdrand-0.4.0 \
 		redox_syscall-0.1.56 \
+		redox_syscall-0.2.9 \
 		regex-1.3.3 \
 		regex-syntax-0.6.13 \
-		relay-0.1.1 \
 		remove_dir_all-0.5.2 \
 		reqwest-0.10.1 \
-		rodio-0.9.0 \
+		reqwest-0.11.4 \
-		rpassword-3.0.2 \
+		rodio-0.13.1 \
 		rspotify-0.8.0 \
 		rustc-demangle-0.1.16 \
 		rustc-hash-1.0.1 \
 		rustc-serialize-0.3.24 \
 		rustc_version-0.2.3 \
 		ryu-1.0.2 \
-		safemem-0.3.3 \
+		same-file-1.0.6 \
 		schannel-0.1.16 \
-		scoped-tls-0.1.2 \
+		scopeguard-1.1.0 \
-		scopeguard-1.0.0 \
 		secret-service-1.1.3 \
-		security-framework-0.3.4 \
 		security-framework-0.4.4 \
-		security-framework-sys-0.3.3 \
+		security-framework-2.3.1 \
 		security-framework-sys-0.4.3 \
+		security-framework-sys-2.3.0 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-1.0.115 \
 		serde_derive-1.0.115 \
 		serde_json-1.0.44 \
 		serde_urlencoded-0.6.1 \
-		sha-1-0.8.2 \
+		serde_urlencoded-0.7.0 \
 		sha-1-0.9.1 \
-		sha2-0.8.1 \
 		sha2-0.9.2 \
 		shannon-0.2.0 \
 		sharded-slab-0.1.1 \
-		shell-words-0.1.0 \
+		shell-words-1.0.0 \
 		shlex-0.1.1 \
-		signal-hook-0.1.12 \
+		signal-hook-registry-1.4.0 \
-		signal-hook-registry-1.2.0 \
-		slab-0.3.0 \
 		slab-0.4.2 \
-		smallvec-0.2.1 \
 		smallvec-0.6.13 \
-		smallvec-1.1.0 \
+		smallvec-1.6.1 \
-		socket2-0.3.11 \
+		socket2-0.4.0 \
-		sourcefile-0.1.4 \
 		stdweb-0.1.3 \
-		stream-cipher-0.3.2 \
 		strsim-0.7.0 \
 		strsim-0.8.0 \
+		strsim-0.9.3 \
 		structopt-0.3.17 \
 		structopt-derive-0.4.10 \
-		subtle-1.0.0 \
 		subtle-2.4.0 \
 		syn-0.15.44 \
-		syn-1.0.39 \
+		syn-1.0.73 \
 		syn-mid-0.5.0 \
 		synstructure-0.12.3 \
 		syslog-4.0.1 \
-		take-0.1.0 \
 		tempfile-3.1.0 \
 		termcolor-1.1.0 \
 		textwrap-0.11.0 \
+		thiserror-1.0.26 \
+		thiserror-impl-1.0.26 \
 		thread_local-1.0.1 \
 		time-0.1.42 \
-		tokio-0.1.22 \
+		tinyvec-1.2.0 \
-		tokio-0.2.11 \
+		tinyvec_macros-0.1.0 \
-		tokio-codec-0.1.1 \
+		tokio-0.2.25 \
-		tokio-core-0.1.17 \
+		tokio-1.8.1 \
+		tokio-compat-0.1.6 \
+		tokio-compat-02-0.2.0 \
 		tokio-current-thread-0.1.6 \
 		tokio-executor-0.1.9 \
-		tokio-fs-0.1.6 \
 		tokio-io-0.1.13 \
-		tokio-process-0.2.4 \
+		tokio-macros-1.3.0 \
-		tokio-proto-0.1.1 \
+		tokio-native-tls-0.3.0 \
 		tokio-reactor-0.1.11 \
-		tokio-service-0.1.0 \
-		tokio-signal-0.1.5 \
-		tokio-signal-0.2.7 \
 		tokio-socks-0.2.0 \
+		tokio-stream-0.1.7 \
 		tokio-sync-0.1.7 \
-		tokio-tcp-0.1.3 \
-		tokio-threadpool-0.1.17 \
 		tokio-timer-0.2.12 \
 		tokio-tls-0.3.0 \
-		tokio-udp-0.1.5 \
-		tokio-uds-0.2.5 \
 		tokio-util-0.2.0 \
+		tokio-util-0.6.7 \
 		toml-0.5.8 \
 		tower-service-0.3.0 \
 		tracing-0.1.22 \
@@ -375,7 +364,6 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		tracing-core-0.1.17 \
 		tracing-error-0.1.2 \
 		tracing-subscriber-0.2.15 \
-		try-lock-0.1.0 \
 		try-lock-0.2.2 \
 		typenum-1.12.0 \
 		unicase-2.6.0 \
@@ -386,38 +374,39 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		unicode-xid-0.1.0 \
 		unicode-xid-0.2.0 \
 		url-1.7.2 \
-		url-2.1.1 \
+		url-2.2.2 \
-		uuid-0.7.4 \
+		uuid-0.8.2 \
 		vcpkg-0.2.8 \
 		vec_map-0.8.1 \
 		vergen-3.0.4 \
 		version_check-0.1.5 \
 		version_check-0.9.1 \
-		void-1.0.2 \
+		walkdir-2.3.2 \
-		want-0.0.4 \
 		want-0.3.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.58 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasm-bindgen-backend-0.2.58 \
+		wasm-bindgen-0.2.74 \
-		wasm-bindgen-futures-0.4.8 \
+		wasm-bindgen-backend-0.2.74 \
-		wasm-bindgen-macro-0.2.58 \
+		wasm-bindgen-futures-0.4.24 \
-		wasm-bindgen-macro-support-0.2.58 \
+		wasm-bindgen-macro-0.2.74 \
-		wasm-bindgen-shared-0.2.58 \
+		wasm-bindgen-macro-support-0.2.74 \
-		wasm-bindgen-webidl-0.2.58 \
+		wasm-bindgen-shared-0.2.74 \
-		web-sys-0.3.35 \
+		web-sys-0.3.51 \
 		webbrowser-0.5.2 \
-		weedle-0.10.0 \
 		whoami-0.9.0 \
 		widestring-0.4.0 \
 		winapi-0.2.8 \
-		winapi-0.3.8 \
+		winapi-0.3.9 \
 		winapi-build-0.1.1 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.3 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		winreg-0.6.2 \
+		winreg-0.7.0 \
 		ws2_32-sys-0.2.1 \
-		xdg-2.2.0
+		xdg-2.2.0 \
+		zerocopy-0.3.0 \
+		zerocopy-derive-0.2.0
 
 CARGO_FEATURES=	--no-default-features
 
@@ -425,7 +414,7 @@ PLIST_FILES=	bin/spotifyd \
 		"@sample etc/spotifyd.conf.sample"
 PORTDOCS=	README.md
 
-OPTIONS_DEFINE=		DBUS DOCS PORTAUDIO PULSEAUDIO
+OPTIONS_DEFINE=		DBUS DOCS PORTAUDIO PULSEAUDIO ALSA
 OPTIONS_DEFAULT=	PORTAUDIO
 
 DBUS_DESC=		D-Bus MPRIS support
@@ -433,6 +422,9 @@ DBUS_DESC=		D-Bus MPRIS support
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_VARS=		CARGO_FEATURES+=dbus_mpris
 
+ALSA_LIB_DEPENDS=	libasound_module_pcm_oss.so:audio/alsa-plugins
+ALSA_VARS=			CARGO_FEATURES+=alsa_backend
+
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_VARS=		CARGO_FEATURES+=portaudio_backend
 

audio/spotifyd/files/patch-powerpc

@@ -1,62 +0,0 @@
---- cargo-crates/libc-0.2.82/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2020-03-17 20:35:43 UTC
-+++ cargo-crates/libc-0.2.82/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1569,6 +1569,9 @@ cfg_if! {
-     } else if #[cfg(target_arch = "powerpc64")] {
-         mod powerpc64;
-         pub use self::powerpc64::*;
-+    } else if #[cfg(target_arch = "powerpc")] {
-+        mod powerpc;
-+        pub use self::powerpc::*;
-     } else {
-         // Unknown target_arch
-     }
---- cargo-crates/libc-0.2.73/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig	2021-06-23 22:40:24 UTC
-+++ cargo-crates/libc-0.2.73/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-@@ -0,0 +1,47 @@
-+pub type c_char = u8;
-+pub type c_long = i32;
-+pub type c_ulong = u32;
-+pub type wchar_t = i32;
-+pub type time_t = i64;
-+pub type suseconds_t = i32;
-+pub type register_t = i32;
-+
-+s! {
-+    pub struct stat {
-+        pub st_dev: ::dev_t,
-+        pub st_ino: ::ino_t,
-+        pub st_mode: ::mode_t,
-+        pub st_nlink: ::nlink_t,
-+        pub st_uid: ::uid_t,
-+        pub st_gid: ::gid_t,
-+        pub st_rdev: ::dev_t,
-+        pub st_atime: ::time_t,
-+        pub st_atime_nsec: ::c_long,
-+        pub st_mtime: ::time_t,
-+        pub st_mtime_nsec: ::c_long,
-+        pub st_ctime: ::time_t,
-+        pub st_ctime_nsec: ::c_long,
-+        pub st_size: ::off_t,
-+        pub st_blocks: ::blkcnt_t,
-+        pub st_blksize: ::blksize_t,
-+        pub st_flags: ::fflags_t,
-+        pub st_gen: u32,
-+        pub st_lspare: i32,
-+        pub st_birthtime: ::time_t,
-+        pub st_birthtime_nsec: ::c_long,
-+    }
-+}
-+
-+// should be pub(crate), but that requires Rust 1.18.0
-+cfg_if! {
-+    if #[cfg(libc_const_size_of)] {
-+        #[doc(hidden)]
-+        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
-+    } else {
-+        #[doc(hidden)]
-+        pub const _ALIGNBYTES: usize = 4 - 1;
-+    }
-+}
-+
-+pub const MAP_32BIT: ::c_int = 0x00080000;
-+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4