[gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/files/, media-sound/mpd/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     79b15a0228e634e9418706ff8b27d21ced8ba0ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 12:56:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 13:20:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b15a02

media-sound/mpd: Fix build with >=dev-libs/libcdio-2

Closes: https://bugs.gentoo.org/641078
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch | 27 +++++++++++++++++++++++
 media-sound/mpd/mpd-0.20.10.ebuild                |  1 +
 media-sound/mpd/mpd-0.20.12-r2.ebuild             |  5 ++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

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 00000000000..9153a87dcf9
--- /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/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
index f6cea8f7ebd..e5b9f541a62 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 85119e9eebe..78b954370d7 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."