[proaudio] [2240] media-sound/zita-at1 add patch for >=media-libs/zita-resampler-1.1.0

[subversion@xxxxxxxxxxxxx]

Revision: 2240
Author:   gavlee
Date:     2012-10-04 17:56:03 +0200 (Thu, 04 Oct 2012)
Log Message:
-----------
media-sound/zita-at1 add patch for >=media-libs/zita-resampler-1.1.0

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/zita-at1/ChangeLog
    trunk/overlays/proaudio/media-sound/zita-at1/Manifest
    trunk/overlays/proaudio/media-sound/zita-at1/zita-at1-0.2.3.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/zita-at1/files/zita-at1-0.2.3-includes.patch

Modified: trunk/overlays/proaudio/media-sound/zita-at1/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/zita-at1/ChangeLog	2012-10-04 15:41:48 UTC (rev 2239)
+++ trunk/overlays/proaudio/media-sound/zita-at1/ChangeLog	2012-10-04 15:56:03 UTC (rev 2240)
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Oct 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+  zita-at1-0.2.3.ebuild, +files/zita-at1-0.2.3-includes.patch:
+  add patch for compiling with >=media-libs/zita-resampler-1.1.0 reported by
+  Arve Barsnes
+
 *zita-at1-0.2.3 (06 Jan 2012)
 
   06 Jan 2012; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> -zita-at1-0.2.1.ebuild,

Modified: trunk/overlays/proaudio/media-sound/zita-at1/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zita-at1/Manifest	2012-10-04 15:41:48 UTC (rev 2239)
+++ trunk/overlays/proaudio/media-sound/zita-at1/Manifest	2012-10-04 15:56:03 UTC (rev 2240)
@@ -1,5 +1,6 @@
-AUX zita-at1-0.2.3-Makefile.patch 936 RMD160 24cbc3c3682ecd6eeafb6628330f6dfe2345f2df SHA1 bf834a32d11bbf9b4cd2b3886b2c3f164768925a SHA256 dc2c88b33b9f5ac68ccd61a6a996101c5cf93e9b85beaa9d4c63daf468760bc2
-DIST zita-at1-0.2.3.tar.bz2 51270 RMD160 a1b52a520195d33bf28d50ba471134c7b420b3c1 SHA1 78d8ecfad38302723041465247c02f55a4d2c6f5 SHA256 aca3ba9f747b614953381eb56f319ba4321236d75fc76f597cd2ab77793b375f
-EBUILD zita-at1-0.2.3.ebuild 975 RMD160 9a08075cab8c73375dc2059a3166b7f7864bf15b SHA1 12dd365e4e0d426d4679c52c73f79a3b1a5c380f SHA256 794601c8c37c7398d5f3da9c23e91fd0e42d840d33ae6c21c678b117da7e67e2
-MISC ChangeLog 931 RMD160 e193d78add556c383bb9615d0ea144644aff2140 SHA1 5a5f2cdd35e047c5e97ba1e91b08a1ec82426699 SHA256 a182cbef00dd21eaad19d142c066881ab5287f1920948f5175926b1729c62737
-MISC metadata.xml 246 RMD160 cdd725771833663c8cfa684c4c71e57d86d9993d SHA1 973be5799e631fd26fb4abcfc8da942f2f759d06 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f
+AUX zita-at1-0.2.3-Makefile.patch 936 SHA256 dc2c88b33b9f5ac68ccd61a6a996101c5cf93e9b85beaa9d4c63daf468760bc2 SHA512 2bf3595493ac164f878550f1be73be457ac58770059d12f70c5cd56c21e7f4e15ad79f6350da2fefd6e7b6df590b5d1dc3c9268bb7f2c45d850a0bcc249e32b9 WHIRLPOOL 83094d4645ae5c2c0d1b777ecd07784e0815f9f6c8e79631543148e99fc2d1d53573985bacd3fbfb373a13881f506585a125362e951e25f4e3a260bfaceef476
+AUX zita-at1-0.2.3-includes.patch 248 SHA256 0bdfddd0a99a71c2c752915f472ae236b6c6b53f3471d75df498c755eb186eee SHA512 d7a83835b18e263a25958cee238fd13cab2f615d3494f645738053222507388488196416c174b066921ec4dff05863d921bfffea1f42f6a4eba0466f9c3e8101 WHIRLPOOL 701687f5c409ff257f158e36b21691c969797b4093bcc7aa5a222acd46596947796ebe96226f1ed67f24d629d89e63ec269b6af5ca1537fc4487fae4295197ba
+DIST zita-at1-0.2.3.tar.bz2 51270 SHA256 aca3ba9f747b614953381eb56f319ba4321236d75fc76f597cd2ab77793b375f SHA512 7567dd943eaf049bb79df225fd1af52c1f47a551416b8cd7b4df71cf4c848056880e2c941733e634b96acc5694f110ef5557fdaecb20c07857c354ec0ab87ae9 WHIRLPOOL 2c9f2b41ea1556d66f932f3b6a21839ce4a46ee65ff83065b9d1967ffdba4041f09f894de73f0814f257d8a70a4bce473fed7ad4945e83eebf89f7a8dfaf9b9c
+EBUILD zita-at1-0.2.3.ebuild 965 SHA256 c2a8d6537b13bc5526081c1276ab104a18652ef82e693f2947bcf49c47c23b54 SHA512 87d54154e774ffdf5b147ddf89e1667803397b4ec0579ed7940bd252896f4477e6f1ecaec732dfef3fabcfc60d2c7fc459f0f8102e7c36903a119b80159ec758 WHIRLPOOL 13fc901b02182370d721a0982dee995e8ac752553a5ce131ca9cbd1f3729653e89ebc05e9c5754f998623f80f6928bf2745bfadeddff177ff1200793fae8ec4f
+MISC ChangeLog 1152 SHA256 81f15061503652e62bf44401da4718ecea30e9dbed791c8c873c62f6052d4564 SHA512 1ade0d2e557b10a6301f98036d54849c9e0ba09d57eeb892dcb92c03eb2e03db0c78b6a2fa6fb72ed383137f8599d9b1da38fcf3fc6a5b7e313fd29ace9c63eb WHIRLPOOL 7fe6e2da9e59f84065b2b20cd7bc9ee367223b9cb7ee8a4190ccd2281c176d5a472959082fb51bd03db8274f246d6e97d395823a2fe290b9504e585b183b9c8c
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Added: trunk/overlays/proaudio/media-sound/zita-at1/files/zita-at1-0.2.3-includes.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zita-at1/files/zita-at1-0.2.3-includes.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/zita-at1/files/zita-at1-0.2.3-includes.patch	2012-10-04 15:56:03 UTC (rev 2240)
@@ -0,0 +1,11 @@
+--- source/retuner.h.orig	2012-10-04 15:38:13.143326088 +0100
++++ source/retuner.h	2012-10-04 15:38:51.092127163 +0100
+@@ -24,7 +24,7 @@
+ 
+ 
+ #include <fftw3.h>
+-#include <zita-resampler.h>
++#include <zita-resampler/resampler.h>
+ 
+ 
+ class Retuner

Modified: trunk/overlays/proaudio/media-sound/zita-at1/zita-at1-0.2.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zita-at1/zita-at1-0.2.3.ebuild	2012-10-04 15:41:48 UTC (rev 2239)
+++ trunk/overlays/proaudio/media-sound/zita-at1/zita-at1-0.2.3.ebuild	2012-10-04 15:56:03 UTC (rev 2240)
@@ -2,44 +2,38 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=4
+inherit base toolchain-funcs
 
 DESCRIPTION="An autotuner, normally used to correct the pitch of a voice singing (slightly) out of tune"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/";
 SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2";
 
-RESTRICT="mirror"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE=""
 
 DEPEND=">=media-libs/libclthreads-2.4.0
 	>=media-libs/libclxclient-3.6.1
-	>=media-libs/zita-resampler-0.1.1
+	>=media-libs/zita-resampler-1.1.0
 	media-sound/jack-audio-connection-kit
 	>=sci-libs/fftw-3.2.2:3.0"
 RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/source"
+RESTRICT="mirror"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
+DOCS=(../AUTHORS ../README)
+HTML_DOCS=(../doc/)
 
+PATCHES=("${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-includes.patch")
+
 src_compile() {
-	CXX="$(tc-getCXX)" emake PREFIX=/usr || die
+	CXX="$(tc-getCXX)" base_src_make PREFIX="${EPREFIX}/usr"
 }
 
 src_install() {
-	make DESTDIR="${D}" PREFIX=/usr install || die
-
-	dodoc ../AUTHORS ../README
-
-	if use doc ; then
-		cd ../doc
-		dohtml -r *
-	fi
+	base_src_install PREFIX="${EPREFIX}/usr"
 }