audio/librespot: update to 0.1.5

Upstream does not provide a ChangeLog and, with six months since the previous
release, changes are too many to pick manually.

Unfortunately, the commit we have been pulling from, and that made it possible
to build without patches (a2f832dff171914935f7e1a98a5da3d7c8a0b789), has been
reverted.

The package again depends on get_if_addrs instead of if-addrs. get_if_addrs is
as an archived crate and needs to be patched to build on NetBSD.
It's not either possible to upstream patches. Actually, the needed patch has
already been upstremed and merged but, it didn't make it into the final release.
On the other hand, if-addrs is actively maintained and would be a better option.

I've contacted the developers by e-mail and asked for the revert reason.

4 files changed, 51 insertions, 34 deletions

diff --git a/audio/librespot/Makefile b/audio/librespot/Makefile
index f2b8ba6d06a..6b4407492b5 100644
--- a/audio/librespot/Makefile
+++ b/audio/librespot/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2021/02/07 06:30:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2021/02/21 18:53:05 pin Exp $
 
-DISTNAME=	librespot-0.1.3
-PKGREVISION=	3
+DISTNAME=	librespot-0.1.5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=librespot-org/}
-#GITHUB_TAG=	v${PKGVERSION_NOREV}
-#Track a specific commit until upstream provides a new release
-GITHUB_PROJECT=	librespot
-GITHUB_TAG=	a2f832dff171914935f7e1a98a5da3d7c8a0b789
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pin@NetBSD.org
 HOMEPAGE=	https://github.com/librespot-org/librespot/
diff --git a/audio/librespot/cargo-depends.mk b/audio/librespot/cargo-depends.mk
index 48fa8598655..0030a275c29 100644
--- a/audio/librespot/cargo-depends.mk
+++ b/audio/librespot/cargo-depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cargo-depends.mk,v 1.1 2020/10/26 08:29:15 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.2 2021/02/21 18:53:05 pin Exp $
 
 CARGO_CRATE_DEPENDS+=	aes-0.3.2
 CARGO_CRATE_DEPENDS+=	aes-ctr-0.3.0
@@ -12,8 +12,8 @@ CARGO_CRATE_DEPENDS+=	arc-swap-0.4.7
 CARGO_CRATE_DEPENDS+=	atty-0.2.14
 CARGO_CRATE_DEPENDS+=	autocfg-0.1.7
 CARGO_CRATE_DEPENDS+=	autocfg-1.0.0
-CARGO_CRATE_DEPENDS+=	base64-0.10.1
 CARGO_CRATE_DEPENDS+=	base64-0.9.3
+CARGO_CRATE_DEPENDS+=	base64-0.10.1
 CARGO_CRATE_DEPENDS+=	bindgen-0.53.3
 CARGO_CRATE_DEPENDS+=	bit-set-0.5.2
 CARGO_CRATE_DEPENDS+=	bit-vec-0.6.2
@@ -27,6 +27,7 @@ CARGO_CRATE_DEPENDS+=	block-padding-0.1.5
 CARGO_CRATE_DEPENDS+=	byte-tools-0.3.1
 CARGO_CRATE_DEPENDS+=	byteorder-1.3.4
 CARGO_CRATE_DEPENDS+=	bytes-0.4.12
+CARGO_CRATE_DEPENDS+=	c_linked_list-1.1.1
 CARGO_CRATE_DEPENDS+=	cc-1.0.58
 CARGO_CRATE_DEPENDS+=	cexpr-0.4.0
 CARGO_CRATE_DEPENDS+=	cfg-if-0.1.10
@@ -65,6 +66,8 @@ CARGO_CRATE_DEPENDS+=	futures-task-0.3.5
 CARGO_CRATE_DEPENDS+=	futures-util-0.3.5
 CARGO_CRATE_DEPENDS+=	gcc-0.3.55
 CARGO_CRATE_DEPENDS+=	generic-array-0.12.3
+CARGO_CRATE_DEPENDS+=	get_if_addrs-0.5.3
+CARGO_CRATE_DEPENDS+=	get_if_addrs-sys-0.1.1
 CARGO_CRATE_DEPENDS+=	getopts-0.2.21
 CARGO_CRATE_DEPENDS+=	getrandom-0.1.14
 CARGO_CRATE_DEPENDS+=	glib-0.9.3
@@ -86,8 +89,6 @@ CARGO_CRATE_DEPENDS+=	humantime-1.3.0
 CARGO_CRATE_DEPENDS+=	hyper-0.11.27
 CARGO_CRATE_DEPENDS+=	hyper-proxy-0.4.1
 CARGO_CRATE_DEPENDS+=	idna-0.1.5
-CARGO_CRATE_DEPENDS+=	if-addrs-0.6.4
-CARGO_CRATE_DEPENDS+=	if-addrs-sys-0.3.1
 CARGO_CRATE_DEPENDS+=	iovec-0.1.4
 CARGO_CRATE_DEPENDS+=	itoa-0.4.6
 CARGO_CRATE_DEPENDS+=	jack-0.5.7
@@ -101,9 +102,9 @@ CARGO_CRATE_DEPENDS+=	libc-0.2.73
 CARGO_CRATE_DEPENDS+=	libloading-0.4.3
 CARGO_CRATE_DEPENDS+=	libloading-0.5.2
 CARGO_CRATE_DEPENDS+=	libm-0.2.1
-CARGO_CRATE_DEPENDS+=	libmdns-0.2.7
+CARGO_CRATE_DEPENDS+=	libmdns-0.2.6
 CARGO_CRATE_DEPENDS+=	libpulse-sys-0.0.0
-CARGO_CRATE_DEPENDS+=	librespot-tremor-0.1.0
+CARGO_CRATE_DEPENDS+=	librespot-tremor-0.2.0
 CARGO_CRATE_DEPENDS+=	linear-map-1.2.0
 CARGO_CRATE_DEPENDS+=	lock_api-0.3.4
 CARGO_CRATE_DEPENDS+=	log-0.3.9
diff --git a/audio/librespot/distinfo b/audio/librespot/distinfo
index ebbd885efa4..8e4ecbd54fe 100644
--- a/audio/librespot/distinfo
+++ b/audio/librespot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2020/10/11 13:19:42 pin Exp $
+$NetBSD: distinfo,v 1.2 2021/02/21 18:53:05 pin Exp $
 
 SHA1 (aes-0.3.2.crate) = 87c13a154ff8ceebbcc6fa3332957b5ecd13d91e
 RMD160 (aes-0.3.2.crate) = c768fdbb670a592282f3f7dca1aa9511046e2644
@@ -108,6 +108,10 @@ SHA1 (bytes-0.4.12.crate) = bd522e5e0e23f0dc281b57dbce982126098457f1
 RMD160 (bytes-0.4.12.crate) = e70f56debe13fecdec4d236459b493295062099e
 SHA512 (bytes-0.4.12.crate) = 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
 Size (bytes-0.4.12.crate) = 46361 bytes
+SHA1 (c_linked_list-1.1.1.crate) = aa85458f715588c1d94b5ee89bdd33b38d7dae32
+RMD160 (c_linked_list-1.1.1.crate) = ab27dbbe53c02164ac2f99674505a89172880330
+SHA512 (c_linked_list-1.1.1.crate) = 837389914463d697323fc5b15f3d6bb0c7afeb5fb7cbd5725de532f0770e18fd1e304dc013c6e0ab034131808a78b3138685d7f64037bcdc0523139b16b81e6c
+Size (c_linked_list-1.1.1.crate) = 3056 bytes
 SHA1 (cc-1.0.58.crate) = 351fee186b6d17b1407d6633fd979a5f1194d127
 RMD160 (cc-1.0.58.crate) = 5105ec3094c7e0267835908b3dd075f4fa86c6e0
 SHA512 (cc-1.0.58.crate) = 0a208c4dd7700ba92337ad0044c0ae1614b105d6e799fc660d07e7745c60d8e4c8d3688af7ced77734a2a695ac2e7c565c2f2b7a886d71714c2f7675ea2a22f7
@@ -260,6 +264,14 @@ SHA1 (generic-array-0.12.3.crate) = f27941fb6818c07238cd036fc351bcb90a4ed08c
 RMD160 (generic-array-0.12.3.crate) = a5d6f5aea2ad9015fb762b96cfa7af9e9b37226e
 SHA512 (generic-array-0.12.3.crate) = 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
 Size (generic-array-0.12.3.crate) = 18017 bytes
+SHA1 (get_if_addrs-0.5.3.crate) = 5d8f1025af275b23459f7f82b45eee4206b7a688
+RMD160 (get_if_addrs-0.5.3.crate) = fcc8d23a81f5c5f4ec31a24c7294c1b0075ecbb3
+SHA512 (get_if_addrs-0.5.3.crate) = a548a173f9d2f14f474ee4f4eafddf9121e70d9670b53419a373a8e80e1f19688f2bc56b970bab3b663ca60329eb5f2afa1efbdf7a3ccc6a34a235ed99d6fa6e
+Size (get_if_addrs-0.5.3.crate) = 9533 bytes
+SHA1 (get_if_addrs-sys-0.1.1.crate) = 1ffff17dcb0fcf9e96fb8e25f35195626d7a046f
+RMD160 (get_if_addrs-sys-0.1.1.crate) = dec77f2c5820f7b6635248a38c7068d6bf2da615
+SHA512 (get_if_addrs-sys-0.1.1.crate) = 199fe588d3a6c30047e1be520369457fe9678f335960598cfa8c0b005fb55a5ddaee56f239915e112b3307ea224ef8537e892b0a43fbb56135f5728d952ef888
+Size (get_if_addrs-sys-0.1.1.crate) = 7200 bytes
 SHA1 (getopts-0.2.21.crate) = 9dd990ef7bee1b18b41f4e44d342b397134b0a38
 RMD160 (getopts-0.2.21.crate) = 9584128851c5564984b1603741961447d57436ec
 SHA512 (getopts-0.2.21.crate) = 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
@@ -344,14 +356,6 @@ SHA1 (idna-0.1.5.crate) = 5fd8219d324ba63bfd0a63a392086f70ec9e3f1b
 RMD160 (idna-0.1.5.crate) = e4049ab9ac2f8338e23c55d1f948c55a7f265d02
 SHA512 (idna-0.1.5.crate) = 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 Size (idna-0.1.5.crate) = 258735 bytes
-SHA1 (if-addrs-0.6.4.crate) = df98059e6ff8935ab65416dc3387f1cbd74ae9d1
-RMD160 (if-addrs-0.6.4.crate) = 9de00cb5407b95bb1c310f740b20b79ce6518a94
-SHA512 (if-addrs-0.6.4.crate) = 6edb83c2e7e5debf748ed2c82bdda4fd5e47be71cd121e3c06d5c603395830f148029d4c0970e0a1f7eabae9de0e8b9f34e6c2b869315a7595efc8e74a1782a9
-Size (if-addrs-0.6.4.crate) = 10052 bytes
-SHA1 (if-addrs-sys-0.3.1.crate) = 991425addab3109168764a877ac7de28f42a0a56
-RMD160 (if-addrs-sys-0.3.1.crate) = bca3bda9743edbf431c344da73ed6405652a38ce
-SHA512 (if-addrs-sys-0.3.1.crate) = 11183c8d0e900c02973ff29c5a9823d66cfd237dc75eee2d487080862c2689547852b6416c8634231f5a5b8d6d1dfa22850ebdd0d217d12a662f412f3445fcc7
-Size (if-addrs-sys-0.3.1.crate) = 6797 bytes
 SHA1 (iovec-0.1.4.crate) = 01f2b6e6cd1e9ec588f3383df924994fc3dfd24e
 RMD160 (iovec-0.1.4.crate) = 48b0309142ddff8963d9cf2b5a40f36a5f81db4d
 SHA512 (iovec-0.1.4.crate) = e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
@@ -404,22 +408,22 @@ SHA1 (libm-0.2.1.crate) = 3a356935a7de0aac996f035cac3c615f24249387
 RMD160 (libm-0.2.1.crate) = 048b530e8ecdd6fa2289761a440cde0907cc0295
 SHA512 (libm-0.2.1.crate) = a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 Size (libm-0.2.1.crate) = 111906 bytes
-SHA1 (libmdns-0.2.7.crate) = 02d6dfbfefdcad0ad6859dd313d1101b186b85a9
-RMD160 (libmdns-0.2.7.crate) = 7236848cd273cf9e393cf85ecd9f01dc36deb479
-SHA512 (libmdns-0.2.7.crate) = df43bdb7512d79118d76a47740a91c942338094442652afc9f07b5b856002311b61be0f654b5052dda8e2891343624d474ac4a304fe8574e995019bf08d251c1
-Size (libmdns-0.2.7.crate) = 23508 bytes
+SHA1 (libmdns-0.2.6.crate) = 9c769e72f82d29703e0781249b93577ce591b881
+RMD160 (libmdns-0.2.6.crate) = 8b456384bec48bafab6a31bbe6c9308ed4b13d01
+SHA512 (libmdns-0.2.6.crate) = 77fc9035dc67951c91748d214bbc4a3843dd7513d8a378caf017697787e2f23c4d8c6eae322e4bbcb16a2d81fdce5c18b762842efb2a83e8c301441d00a20043
+Size (libmdns-0.2.6.crate) = 23370 bytes
 SHA1 (libpulse-sys-0.0.0.crate) = 7b9092f1bbe10ebce4dfa57465d20d5a9f3f7a5c
 RMD160 (libpulse-sys-0.0.0.crate) = 1a49f2f5a5f1492236ad882d00a47e8865ad4c52
 SHA512 (libpulse-sys-0.0.0.crate) = ee81fe852944b827d20db41b89f223b860959e02d9b093bc9e91e8aa7b5a12fde4c57131381090bea2b07fd7a1af8b9a9ca716ee2f2a6d5d9f48036c07e0c96c
 Size (libpulse-sys-0.0.0.crate) = 13621 bytes
-SHA1 (librespot-0.1.3-a2f832dff171914935f7e1a98a5da3d7c8a0b789.tar.gz) = 75a6abb723ecac672349f4486a905f77c6c7f82e
-RMD160 (librespot-0.1.3-a2f832dff171914935f7e1a98a5da3d7c8a0b789.tar.gz) = e27407a79f164db2e0a7cce416ac2c9f6a55281f
-SHA512 (librespot-0.1.3-a2f832dff171914935f7e1a98a5da3d7c8a0b789.tar.gz) = efb661ec205b04f6d3c5edac0f7ba51f889aab83d40ec5eaa7e475350ec33757997c223a345f7aab5cc150b63172d40a139da1f21dbf4a4767b8773b3c5e696e
-Size (librespot-0.1.3-a2f832dff171914935f7e1a98a5da3d7c8a0b789.tar.gz) = 122008 bytes
-SHA1 (librespot-tremor-0.1.0.crate) = d238b8d39d2907a9d0a92a4e3ccf3f17f2f26c63
-RMD160 (librespot-tremor-0.1.0.crate) = 606e17af747ea3c317914c51cf1ece6c927151b6
-SHA512 (librespot-tremor-0.1.0.crate) = c2359086cc29eac55f05278ddf16b1852f918d9112e7eb67a7eace8ca73686240d9240dc903d3da20d0b2814d3107ccbfb90c77c7e325871fe2e6447dea42c1c
-Size (librespot-tremor-0.1.0.crate) = 123392 bytes
+SHA1 (librespot-0.1.5.tar.gz) = 0e9f2b56a06889413e3a5145fe3c8a1f733906e8
+RMD160 (librespot-0.1.5.tar.gz) = e46878946f7ac50538143dab916df318cb0f7d13
+SHA512 (librespot-0.1.5.tar.gz) = a96414271baedfb7895dabd84c63b9878d440f2da9134f6d267090d8f398ecd8323a743033ed0c3ccd2dc6f0496f1e574b31e4f5ef0f5cd776b14ffcccf3da0d
+Size (librespot-0.1.5.tar.gz) = 122361 bytes
+SHA1 (librespot-tremor-0.2.0.crate) = d5d3f015f5600e4b873e2676546ee5a5f9514e56
+RMD160 (librespot-tremor-0.2.0.crate) = 3fd9d6fdd801c80bda3232d1b40f2cf0b1697de7
+SHA512 (librespot-tremor-0.2.0.crate) = 7d68f6cca0e0395a2c7f8bd90b8da447779f40d0411c091129454300c9951d8087dd1ac05a92cae4d3fbcacbae955935b0c0dfb2ed01180ce34cef5f18fe14df
+Size (librespot-tremor-0.2.0.crate) = 120812 bytes
 SHA1 (linear-map-1.2.0.crate) = 5c8d7038910d501ad0e9e9b1bd2db5fb9048a458
 RMD160 (linear-map-1.2.0.crate) = a6cf55022b2302942280e9a1fc93d91cbd8788ae
 SHA512 (linear-map-1.2.0.crate) = bd24182fb2ef0a51d782dd5877ec1a08986d71c6803da077393c4b47c0fc45c4616f94acf4f29ded5f56392d2e666d0bcbce77087f4319499add813388f915d5
@@ -1076,3 +1080,4 @@ SHA1 (zerocopy-derive-0.1.4.crate) = d67f5dd4c29fa0cd3dcf34d9e960db85a1cf7974
 RMD160 (zerocopy-derive-0.1.4.crate) = f86c9342cafaafdce6aee5ab9cdce76c5ce4e221
 SHA512 (zerocopy-derive-0.1.4.crate) = 428559776ae86244d86b7c87452a684817a22d9fc3cb27e066b9d6ec88859cf2d2d666be4f1a57e094350c7d5d3bf4d304bf4c16eb2a5db25ac74de5f2da8b32
 Size (zerocopy-derive-0.1.4.crate) = 517669 bytes
+SHA1 (patch-vendor_get_if_addrs-0.5.3_src_lib.rs) = ea02f3bd2ac06f91a9cdd3bb961ea4b1d6697faf
diff --git a/audio/librespot/patches/patch-vendor_get_if_addrs-0.5.3_src_lib.rs b/audio/librespot/patches/patch-vendor_get_if_addrs-0.5.3_src_lib.rs
new file mode 100644
index 00000000000..ddb1342db49
--- /dev/null
+++ b/audio/librespot/patches/patch-vendor_get_if_addrs-0.5.3_src_lib.rs
@@ -0,0 +1,15 @@
+$NetBSD: patch-vendor_get_if_addrs-0.5.3_src_lib.rs,v 1.1 2021/02/21 18:53:05 pin Exp $
+
+Add NetBSD support to archived upstream
+
+--- ../vendor/get_if_addrs-0.5.3/src/lib.rs.orig	2018-06-21 12:35:24.000000000 +0000
++++ ../vendor/get_if_addrs-0.5.3/src/lib.rs
+@@ -197,7 +197,7 @@ mod getifaddrs_posix {
+     }
+ 
+     #[cfg(
+-        any(target_os = "freebsd", target_os = "ios", target_os = "macos", target_os = "openbsd")
++        any(target_os = "freebsd", target_os = "ios", target_os = "macos", target_os = "netbsd", target_os = "openbsd")
+     )]
+     fn do_broadcast(ifaddr: &posix_ifaddrs) -> Option<IpAddr> {
+         sockaddr_to_ipaddr(ifaddr.ifa_dstaddr)