[arch-commits] Commit in mpd/trunk (PKGBUILD paranoia.patch)

[Gaetan Bisson]

    Date: Wednesday, November 27, 2013 @ 04:20:13
  Author: bisson
Revision: 200359

proper patch for paranoia header location issue

Added:
  mpd/trunk/paranoia.patch
Modified:
  mpd/trunk/PKGBUILD

----------------+
 PKGBUILD       |    5 ++++-
 paranoia.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-27 01:51:53 UTC (rev 200358)
+++ PKGBUILD	2013-11-27 03:20:13 UTC (rev 200359)
@@ -16,9 +16,11 @@
          'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient')
 makedepends=('doxygen')
 source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+        'paranoia.patch'
         'tmpfiles.d'
         'conf')
 sha1sums=('4078755d77b7de4135458ae7db2518d2e057e745' 'SKIP'
+          '8cd46e2d7782181279660f994d2cd5a941344aea'
           'f4d5922abb69abb739542d8e93f4dfd748acdad7'
           '67c145c046cddd885630d72ce8ebe71f8321ff3b')
 
@@ -27,7 +29,8 @@
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/CdioParanoiaInputPlugin.cxx
+	patch -p1 -i ../paranoia.patch
+	autoconf
 }
 
 build() {

Added: paranoia.patch
===================================================================
--- paranoia.patch	                        (rev 0)
+++ paranoia.patch	2013-11-27 03:20:13 UTC (rev 200359)
@@ -0,0 +1,27 @@
+diff -Naur old/configure.ac new/configure.ac
+--- old/configure.ac	2013-11-23 07:08:24.000000000 -1000
++++ new/configure.ac	2013-11-26 17:05:23.108828275 -1000
+@@ -749,6 +749,7 @@
+ if test x$enable_cdio_paranoia = xyes; then
+ 	AC_DEFINE([ENABLE_CDIO_PARANOIA], 1,
+ 		[Define to enable libcdio_paranoia support])
++	AC_CHECK_HEADERS(cdio/paranoia/paranoia.h)
+ fi
+ 
+ AM_CONDITIONAL(ENABLE_CDIO_PARANOIA, test x$enable_cdio_paranoia = xyes)
+diff -Naur old/src/input/CdioParanoiaInputPlugin.cxx new/src/input/CdioParanoiaInputPlugin.cxx
+--- old/src/input/CdioParanoiaInputPlugin.cxx	2013-11-18 12:50:46.000000000 -1000
++++ new/src/input/CdioParanoiaInputPlugin.cxx	2013-11-26 17:05:35.152212566 -1000
+@@ -41,7 +41,12 @@
+ #include <glib.h>
+ #include <assert.h>
+ 
++#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
++#include <cdio/parannoia/paranoia.h>
++#else
+ #include <cdio/paranoia.h>
++#endif
++
+ #include <cdio/cd_types.h>
+ 
+ struct CdioParanoiaInputStream {