From 3ef043392c849f3042acc630942a35fa722a3943 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Tue, 6 Aug 2019 11:09:36 +0200
Subject: [PATCH] input/cdio_paranoia: drop support for libcdio-paranoia older
 than 10.2+0.93+1

Version 10.2+0.93+1 was released five years ago in 2014 and is the
first version to feature cdio_cddap_free_messages().  There is no way
to check the libcdio-paranoia version at compile time, so let's just
remove support for older versions instead of attempting to fix the
cdio_cddap_free_messages() check at build time.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/613
---
 NEWS                                          | 2 ++
 src/input/plugins/CdioParanoiaInputPlugin.cxx | 4 ----
 src/input/plugins/meson.build                 | 2 +-
 src/lib/cdio/Paranoia.hxx                     | 4 ----
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 34b6c0a00..c4218b86d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.21.13 (not yet released)
+* input
+  - cdio_paranoia: require libcdio-paranoia 10.2+0.93+1
 * decoder
   - mad: fix crackling sound (0.21.12 regression)
 
diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx
index 2a96b6082..6b7630941 100644
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@@ -298,11 +298,7 @@ CdioParanoiaInputStream::Read(void *ptr, size_t length)
 				if (s_err) {
 					FormatError(cdio_domain,
 						    "paranoia_read: %s", s_err);
-#if LIBCDIO_VERSION_NUM >= 90
 					cdio_cddap_free_messages(s_err);
-#else
-					free(s_err);
-#endif
 				}
 
 				throw;
diff --git a/src/input/plugins/meson.build b/src/input/plugins/meson.build
index 5fc2f122b..cf866a0ee 100644
--- a/src/input/plugins/meson.build
+++ b/src/input/plugins/meson.build
@@ -6,7 +6,7 @@ if alsa_dep.found()
   input_plugins_sources += 'AlsaInputPlugin.cxx'
 endif
 
-libcdio_paranoia_dep = dependency('libcdio_paranoia', version: '>= 0.4', required: get_option('cdio_paranoia'))
+libcdio_paranoia_dep = dependency('libcdio_paranoia', version: '>= 10.2+0.93+1', required: get_option('cdio_paranoia'))
 conf.set('ENABLE_CDIO_PARANOIA', libcdio_paranoia_dep.found())
 if libcdio_paranoia_dep.found()
   input_plugins_sources += 'CdioParanoiaInputPlugin.cxx'
diff --git a/src/lib/cdio/Paranoia.hxx b/src/lib/cdio/Paranoia.hxx
index 19b4c4483..596d23666 100644
--- a/src/lib/cdio/Paranoia.hxx
+++ b/src/lib/cdio/Paranoia.hxx
@@ -34,11 +34,7 @@
 #include "util/Compiler.h"
 
 #include <cdio/version.h>
-#if LIBCDIO_VERSION_NUM >= 90
 #include <cdio/paranoia/paranoia.h>
-#else
-#include <cdio/paranoia.h>
-#endif
 
 #include <stdexcept>
 #include <utility>