Date: Tuesday, December 24, 2013 @ 19:48:07 Author: bisson Revision: 202686
upstream update Modified: mpd/trunk/PKGBUILD Deleted: mpd/trunk/paranoia.patch ----------------+ PKGBUILD | 12 ++---------- paranoia.patch | 27 --------------------------- 2 files changed, 2 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-12-24 18:41:12 UTC (rev 202685) +++ PKGBUILD 2013-12-24 18:48:07 UTC (rev 202686) @@ -6,7 +6,7 @@ # Contributor: Ben <[email protected]> pkgname=mpd -pkgver=0.18.5 +pkgver=0.18.6 pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' @@ -16,11 +16,9 @@ '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' +sha1sums=('06951d043a57ce460b728402768a235d8b18ba93' 'SKIP' 'f4d5922abb69abb739542d8e93f4dfd748acdad7' '67c145c046cddd885630d72ce8ebe71f8321ff3b') @@ -27,12 +25,6 @@ backup=('etc/mpd.conf') install=install -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../paranoia.patch - autoconf -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ Deleted: paranoia.patch =================================================================== --- paranoia.patch 2013-12-24 18:41:12 UTC (rev 202685) +++ paranoia.patch 2013-12-24 18:48:07 UTC (rev 202686) @@ -1,27 +0,0 @@ -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 {
