summaryrefslogtreecommitdiff
path: root/media-sound/mpd
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/mpd')
-rw-r--r--media-sound/mpd/Manifest7
-rw-r--r--media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch27
-rw-r--r--media-sound/mpd/metadata.xml4
-rw-r--r--media-sound/mpd/mpd-0.20.10.ebuild1
-rw-r--r--media-sound/mpd/mpd-0.20.12-r2.ebuild5
5 files changed, 40 insertions, 4 deletions
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 46fe105105e5..07a91ba844f6 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,9 +1,10 @@
AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
+AUX mpd-0.20.10-libcdio-2.patch 843 BLAKE2B d0c7eeeedb6065b1e08b1a8b1e6f5237408cd1b747aba72651441f0c203a4d32a39bf4e3c2371ae16fbde2f991c2f60870b15e8340b81bbc793355131ea57f62 SHA512 c9b62e6e0e7408ff3ab1e73c08001e498150c6bda8a9796ef23c35ba4dd0313e243129f7fb1760997f4a226f1ea3de56657eeead41f07bcaafa9affde40cc851
AUX mpd-0.20.12.logrotate 88 BLAKE2B 2ff692c0c37da35ba3d53c2050653131a0de364094a779eba7ed7b2db3334f1eef7fa261b6a94416cd6a29290fb563a4a15ef70768c2860d2d9c3b7f9fdfbc4d SHA512 6c0ad8341f24633271972a2414e945a8eb14db31b114e1c260bcc0c50e1288bdbc5e3344ff9ef53c3c28d7368985e55a944d53705302b8a3d14eccc9fe2d6b48
AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
-EBUILD mpd-0.20.10.ebuild 7248 BLAKE2B b32e3c19c811e344d70a0b0a260bc8553e7a495e2efc9596ed580cad91ac12d84314856a0e1cc5a27064a7446983c000c89e1f7ce068029ca137a67b7346a662 SHA512 244256b2a88028895e6765dc6d4bb504342009ab53193215ce6a97369216d04097d424d5b12ba97772bbd0af866a7e65a684b5dc0d2b6f9566e0c4b4bb9e4f80
-EBUILD mpd-0.20.12-r2.ebuild 7315 BLAKE2B f70d4a926544b8f424226bc3dc1e49af3473682a790a0cb5ea0ed12d1e052d69b31f984b1cf241851c8eea935f06984fa7cfa1dd48c21895849317d2c8c97c15 SHA512 a19375a8cf82b488fe3b1caf48212a33cd8096572b74c14793c63883df944dd39e3ee7ca0dfc67f31c916d892f0359372b88a46bcc95ce3d60c7acf63bd7b5b3
-MISC metadata.xml 2403 BLAKE2B d061cff6d63c179f9dd58b22a6fe6e5eb14c6163440ad9aa3bc9a30adf1ec3bb612030c3d3e739d9c2f92983441683b69cec61285a38254aa5c038df14cdc500 SHA512 97ce4e8fe377823325847e1ab013338d4394863a92d4728dbbf016ca8b4a0b0416e5803380bdcc7f834245565596bcdd2169c5d3e0db1cef8b4a1b9943a2d3a1
+EBUILD mpd-0.20.10.ebuild 7284 BLAKE2B 956c7f48e1daa7a9c5ab632253d9f252e1c63b95e947febbb70e120955c641e079f12b33a6ab0a5c9326ae8f784938f5c8d193f687ecd6bbfc408cd54989ba63 SHA512 26e006b99a88d1ce1de0e4dc096be643e5aa6a27452197dcd815b8fb59fab1c46bf0b71689ec01d10e3cde83e7898599071f888d11976d9bdf6bc8d36057f09d
+EBUILD mpd-0.20.12-r2.ebuild 7361 BLAKE2B 6c257159de263c22984a28331cf6ad9bf17ab34bc6e255901f2871588133f2ddcc99cabe142f14a75e831faaad9cf2588889286cb6183716d9a14bd4e4f74624 SHA512 c5d52149a1ac383c35fdf5f22c756459545f1f0ca630d0ba3a433e6f856c9ad49482e3a39e94abc025c2e094abe2e260e8716fbda78e1ff8280a92957e720a36
+MISC metadata.xml 2517 BLAKE2B 1723729d1962eb361c8231e9351164008b3f2e47097846afc6a06d2ae8157a6ef0643f1ddc53f0fd7ca5569eaf1f30ad28ec18079ec2a9f92cf0ad3b287f4798 SHA512 f829d7424245ff87e86d1bdd4c59cd4a102823b8796aa44d202f2b0afdf902f88fa43d478b9cf610c1ffb52595d3bc2d37bc4d67ddd440110009ff9cbcfaad46
diff --git a/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch b/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
new file mode 100644
index 000000000000..9153a87dcf9d
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
@@ -0,0 +1,27 @@
+From 12fd1cad0cc5472cbe931516970c1ac7aeb7ec00 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max@musicpd.org>
+Date: Sat, 3 Feb 2018 19:32:31 +0100
+Subject: [PATCH] archive/iso9660: libcdio 2.0 compatibility
+
+Closes #173
+---
+ src/archive/plugins/Iso9660ArchivePlugin.cxx | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx
+index 536745d85..363921527 100644
+--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
++++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
+@@ -115,7 +115,12 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
+ visitor.VisitArchiveEntry(path + 1);
+ }
+ }
++
++#if LIBCDIO_VERSION_NUM >= 20000
++ iso9660_filelist_free(entlist);
++#else
+ _cdio_list_free (entlist, true);
++#endif
+ }
+
+ static ArchiveFile *
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 006975e46128..422ce7b850ea 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -5,6 +5,10 @@
<email>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>
+ <maintainer type="person">
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
+ </maintainer>
<use>
<flag name="adplug">Enable the AdPlug decoder plugin</flag>
<flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
index f6cea8f7ebd7..e5b9f541a62f 100644
--- a/media-sound/mpd/mpd-0.20.10.ebuild
+++ b/media-sound/mpd/mpd-0.20.10.ebuild
@@ -100,6 +100,7 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.18.conf.patch
+ "${FILESDIR}"/${P}-libcdio-2.patch
)
pkg_setup() {
diff --git a/media-sound/mpd/mpd-0.20.12-r2.ebuild b/media-sound/mpd/mpd-0.20.12-r2.ebuild
index 85119e9eebe7..78b954370d78 100644
--- a/media-sound/mpd/mpd-0.20.12-r2.ebuild
+++ b/media-sound/mpd/mpd-0.20.12-r2.ebuild
@@ -105,7 +105,10 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-mpd )
"
-PATCHES=( "${FILESDIR}"/${PN}-0.18.conf.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.conf.patch
+ "${FILESDIR}"/${PN}-0.20.10-libcdio-2.patch
+)
pkg_setup() {
use network || ewarn "Icecast and Shoutcast streaming needs networking."