From b4935a25bbe5c286265c3b13ef735cbef26db435 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Thu, 3 Oct 2019 04:21:39 +0200
Subject: [PATCH] MPD: bump, disable cdio (#4219)

* MPD: bump, disable cdio

* Sync patchset
---
 .../mpd/{mpd-0.21.14.recipe => mpd-0.21.15.recipe}   |  6 +++---
 .../{mpd-0.21.14.patchset => mpd-0.21.15.patchset}   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename media-sound/mpd/{mpd-0.21.14.recipe => mpd-0.21.15.recipe} (97%)
 rename media-sound/mpd/patches/{mpd-0.21.14.patchset => mpd-0.21.15.patchset} (96%)

diff --git a/media-sound/mpd/mpd-0.21.14.recipe b/media-sound/mpd/mpd-0.21.15.recipe
similarity index 97%
rename from media-sound/mpd/mpd-0.21.14.recipe
rename to media-sound/mpd/mpd-0.21.15.recipe
index 08c5c7b68..a40bb38ee 100644
--- a/media-sound/mpd/mpd-0.21.14.recipe
+++ b/media-sound/mpd/mpd-0.21.15.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2003-2019 The Music Player Daemon Project"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://www.musicpd.org/download/mpd/${portVersion%.*}/mpd-$portVersion.tar.xz"
-CHECKSUM_SHA256="1e2c8a8d89e8792b1849075cf51aa0695e1957cd5c4281209acff1dd53b57646"
+CHECKSUM_SHA256="4595adba2d8aa80b5a912bbb5185578abac3623ccc7e4897286993e4650a5022"
 PATCHES="mpd-$portVersion.patchset"
 ADDITIONAL_FILES="userlaunch.in"
 
@@ -36,7 +36,7 @@ REQUIRES="
 	lib:libavutil$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 #	lib:libcdio$secondaryArchSuffix
-	lib:libcdio_paranoia$secondaryArchSuffix
+#	lib:libcdio_paranoia$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 #	lib:ldns_sd$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
@@ -94,7 +94,7 @@ BUILD_REQUIRES="
 	devel:libboost_system$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
 #	devel:libcdio$secondaryArchSuffix
-	devel:libcdio_paranoia$secondaryArchSuffix
+#	devel:libcdio_paranoia$secondaryArchSuffix
 	devel:libchromaprint$secondaryArchSuffix
 	devel:libcppunit$secondaryArchSuffix
 	devel:libcurl$secondaryArchSuffix
diff --git a/media-sound/mpd/patches/mpd-0.21.14.patchset b/media-sound/mpd/patches/mpd-0.21.15.patchset
similarity index 96%
rename from media-sound/mpd/patches/mpd-0.21.14.patchset
rename to media-sound/mpd/patches/mpd-0.21.15.patchset
index 9240b8fad..d50f0188c 100644
--- a/media-sound/mpd/patches/mpd-0.21.14.patchset
+++ b/media-sound/mpd/patches/mpd-0.21.15.patchset
@@ -1,4 +1,4 @@
-From 6d32f7048acf26cd840af84d8ec291f9dcffcdef Mon Sep 17 00:00:00 2001
+From b1fcd53d895256d41cf95945328c57877cb3c8c6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Thu, 31 Jul 2014 23:09:29 +0200
 Subject: Haiku: add icon as resource definition file
@@ -75,10 +75,10 @@ index 0000000..30fcfe4
 +	$"2204"
 +};
 -- 
-2.21.0
+2.23.0
 
 
-From 6896f6801a332a35d836fd7c0ed4d290760dadab Mon Sep 17 00:00:00 2001
+From 686270399ad8d40c2f3b636c4b1df6be41b3bf89 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Thu, 31 Jul 2014 23:12:56 +0200
 Subject: Haiku: add resources: application signature and flags
@@ -100,10 +100,10 @@ index 30fcfe4..6f1aca2 100644
  resource vector_icon {
  	$"6E6369661F050102031604BEE29BBEC5403EC540BEE29B4A10004A10000001C6"
 -- 
-2.21.0
+2.23.0
 
 
-From 818f35d16ac0898a09d1c0ddb4b4ced6def93660 Mon Sep 17 00:00:00 2001
+From 7be7f641bd39f1499dc14fbb4b4f9a4d998f6312 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 4 May 2019 21:34:56 +0200
 Subject: haiku: enable the output plugin, add libmedia dependency.
@@ -138,5 +138,5 @@ index bdfd471..9d68274 100644
      libshout_dep,
      libsndio_dep,
 -- 
-2.21.0
+2.23.0