summaryrefslogtreecommitdiffstats
path: root/audio-players
diff options
context:
space:
mode:
authorPavel Vinogradov2018-02-02 20:36:44 -0500
committerPavel Vinogradov2018-02-02 21:13:46 -0500
commit528622bb26e925b1fcc66fc4f32df4989ed838ee (patch)
treeb64b1fb5aa6d79f2631926e304d28a9d401b96b8 /audio-players
parentaeda1685abe0352ed0eb3da2a8c95be1861884b4 (diff)
audio-players/mpd: added optional libcdio dependency and appropriate API fix
Diffstat (limited to 'audio-players')
-rwxr-xr-xaudio-players/mpd/DEPENDS5
-rw-r--r--audio-players/mpd/HISTORY2
-rwxr-xr-xaudio-players/mpd/PRE_BUILD4
-rw-r--r--audio-players/mpd/libcdio.patch11
4 files changed, 22 insertions, 0 deletions
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index 4d35bcd68b..e3f17ca23a 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -202,6 +202,11 @@ optional_depends libmms \
"--disable-mms" \
"for MMS protocol support" &&
+optional_depends libcdio \
+ "--enable-iso9660" \
+ "--disable-iso9660" \
+ "for libiso9660 archive plugin" &&
+
optional_depends libcdio-paranoia \
"--enable-cdio-paranoia" \
"--disable-cdio-paranoia" \
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 22142d72f9..47cee22720 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,5 +1,7 @@
2018-02-02 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 0.20.15
+ * DEPENDS: added optional libcdio
+ * PRE_BUILD, libcdio.patch: added a fix for new libcdio API
2017-11-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 0.20.12
diff --git a/audio-players/mpd/PRE_BUILD b/audio-players/mpd/PRE_BUILD
new file mode 100755
index 0000000000..c0fdd7798c
--- /dev/null
+++ b/audio-players/mpd/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p1 < "${SPELL_DIRECTORY}/libcdio.patch"
diff --git a/audio-players/mpd/libcdio.patch b/audio-players/mpd/libcdio.patch
new file mode 100644
index 0000000000..b4dd40f4a8
--- /dev/null
+++ b/audio-players/mpd/libcdio.patch
@@ -0,0 +1,11 @@
+--- mpd-0.20.15.orig/src/archive/plugins/Iso9660ArchivePlugin.cxx
++++ mpd-0.20.15/src/archive/plugins/Iso9660ArchivePlugin.cxx
+@@ -115,7 +115,7 @@
+ visitor.VisitArchiveEntry(path + 1);
+ }
+ }
+- _cdio_list_free (entlist, true);
++ iso9660_filelist_free(entlist);
+ }
+
+ static ArchiveFile *