Version bump with fftw compability patch wrt #268293, thanks to Robert Szczesiak for reporting.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 90 insertions, 13 deletions

diff --git a/media-sound/k3guitune/ChangeLog b/media-sound/k3guitune/ChangeLog
index be10afb6e922..6823a9994a8f 100644
--- a/media-sound/k3guitune/ChangeLog
+++ b/media-sound/k3guitune/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/k3guitune
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/ChangeLog,v 1.18 2008/08/06 22:57:52 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/ChangeLog,v 1.19 2009/05/04 17:15:42 ssuominen Exp $
+
+*k3guitune-1.01 (04 May 2009)
+
+  04 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +k3guitune-1.01.ebuild, +files/k3guitune-1.01-fftw.patch:
+  Version bump with fftw compability patch wrt #268293, thanks to Robert
+  Szczesiak for reporting.
 
   06 Aug 2008; Alexis Ballier <aballier@gentoo.org>
   -files/k3guitune-0.4.1-configure.patch,
diff --git a/media-sound/k3guitune/Manifest b/media-sound/k3guitune/Manifest
index 197227dfc6fa..6ba26c377fa8 100644
--- a/media-sound/k3guitune/Manifest
+++ b/media-sound/k3guitune/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX k3guitune-1.0-gcc43.patch 676 RMD160 b0dce1252fd3efe3319c660ff37b2aa4b248b071 SHA1 131bd10b6492df6fe7b6cf1e03f8186abe094722 SHA256 908bdccd7f61b7b8ebd1674166a7291ae5af5cacf788eeee6d24020746e93c55
+AUX k3guitune-1.01-fftw.patch 1077 RMD160 fb7c4d97a50db0656c31f61a78a9cdbd8d4f11d3 SHA1 9aaaa6126998ae8af4949a475344565539688dc9 SHA256 82da1b0c51a09733459423a60a42731768e9fdffb5b3ea3fc11b9ef7632de6a2
 DIST k3guitune-1.0.tar.bz2 442510 RMD160 c948a40c9bbb61b32f27d671e0b82a97d6bea7f9 SHA1 c3771e38477ceb8f6505fab6d4a552d5773a9506 SHA256 9053ee4add457e994b73b9e2d048d68acab1257316e757a3e24a558c01b884db
+DIST k3guitune-1.01.tar.gz 1650319 RMD160 65e50ebde164767f41790cc447b36f793ba80757 SHA1 60adc200670026e5ab49f9cb79539ab275be3bc8 SHA256 19cfcb611991757100ceb8b37b173085fb5cb8d355527a76e4022ebc5ae060e3
 DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
 EBUILD k3guitune-1.0.ebuild 1514 RMD160 e0783b9ee98689897aa47e8168640b7f60b553f6 SHA1 37d0313d6c76d73c12b92dfbb97334d41fe4b1ff SHA256 ea7a3b209bb3c5b379e52f0e524ba845b6d163893392d7fde02befe2ec788562
-MISC ChangeLog 2749 RMD160 4fd8c6d7f7701181de460d7db0b88c0c916e0c43 SHA1 3fbad4e09783d8b3dd258eae3e73465a048fc711 SHA256 c05a8d5d527af73e197d707d6c0f6f53c88a28b9cdd22331e1e281377a699b6f
+EBUILD k3guitune-1.01.ebuild 1547 RMD160 4b9c4d2fa5b1a96fc66801b0e1c2b673c6398e67 SHA1 1a6ec85d5683c3da52b6622b9ed70d3cb042d6ae SHA256 d8b797c343e4cbfb89c6ddf605874f8010ac5f27049e4602ccef494398b6b72f
+MISC ChangeLog 2996 RMD160 29864774ad522b83d133071a5f8eefe8cd072af6 SHA1 91e899d4ae1f59aa0bd7cc5e839acb799ffad026 SHA256 1b4b46755197b0c826c1359367dfbb3765cb0ea8ed2ca62e67f0915e07925d89
 MISC metadata.xml 175 RMD160 8217c4a76a964b25b18eb6446b5364cf64b138a8 SHA1 8ae12528d1d4edb7a19134a659e8e7e8027fdec8 SHA256 2f35f6077ef4ecfad27847015b45c84c02488fb5a80413e5537e28b410141053
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiaLHUACgkQvFcC4BYPU0ropgCgugDzHpm+2LGFU0OCFEiXEetV
-bfQAoJ9WgDJ4liVhyXQUGTrehWbajhV3
-=xcBI
------END PGP SIGNATURE-----
diff --git a/media-sound/k3guitune/files/k3guitune-1.01-fftw.patch b/media-sound/k3guitune/files/k3guitune-1.01-fftw.patch
new file mode 100644
index 000000000000..7a8648e010f4
--- /dev/null
+++ b/media-sound/k3guitune/files/k3guitune-1.01-fftw.patch
@@ -0,0 +1,19 @@
+diff -Naur k3guitune-1.01/k3guitune/osziview.cpp k3guitune-1.01_1/k3guitune/osziview.cpp
+--- k3guitune-1.01/k3guitune/osziview.cpp	2007-12-15 18:16:27.000000000 +0500
++++ k3guitune-1.01_1/k3guitune/osziview.cpp	2008-10-23 03:21:11.000000000 +0600
+@@ -254,12 +254,12 @@
+     }
+     fftw_in  = (double*)       fftw_malloc(sizeof(double) * nr);
+     fftw_out = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * nr);
+-    fftw_p   = fftw_plan_dft_r2c_1d(nr, fftw_in, fftw_out, FFTW_FORWARD);
++    fftw_p   = fftw_plan_dft_r2c_1d(nr, fftw_in, fftw_out, FFTW_MEASURE);
+ 
+     fftw_in2  = (double*)       fftw_malloc(sizeof(double) * nr * 2);
+     fftw_out2 = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * nr * 2);
+-    fftw_p2   = fftw_plan_dft_r2c_1d(nr*2, fftw_in2, fftw_out2, FFTW_FORWARD);
+-    fftw_p3   = fftw_plan_dft_c2r_1d(nr*2, fftw_out2, fftw_in2, FFTW_BACKWARD);
++    fftw_p2   = fftw_plan_dft_r2c_1d(nr*2, fftw_in2, fftw_out2, FFTW_MEASURE);
++    fftw_p3   = fftw_plan_dft_c2r_1d(nr*2, fftw_out2, fftw_in2, FFTW_MEASURE);
+ }
+ 
+    void OsziView::setNotch(bool n) 
diff --git a/media-sound/k3guitune/k3guitune-1.01.ebuild b/media-sound/k3guitune/k3guitune-1.01.ebuild
new file mode 100644
index 000000000000..8d309bfe7034
--- /dev/null
+++ b/media-sound/k3guitune/k3guitune-1.01.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/k3guitune-1.01.ebuild,v 1.1 2009/05/04 17:15:42 ssuominen Exp $
+
+inherit kde eutils
+
+DESCRIPTION="A program for KDE that lets you tune musical instruments."
+HOMEPAGE="http://home.planet.nl/~lamer024/k3guitune.html"
+SRC_URI="http://home.planet.nl/~lamer024/files/${P}.tar.gz
+		mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa oss jack"
+
+DEPEND="=sci-libs/fftw-3*
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-libs/bio2jack )"
+RDEPEND="${DEPEND}"
+
+need-kde 3.5
+
+LANGS="de fr nl sk"
+LANGS_DOC="de en nl"
+
+for X in ${LANGS} ${LANGS_DOC} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}"/${PN}-1.0-gcc43.patch \
+		"${FILESDIR}"/${P}-fftw.patch
+
+	for X in ${LANGS} ; do
+		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}.po"
+	done
+	cd "${S}/po"
+	sed -i -e "s:POFILES =.*:POFILES = ${MAKE_LANGS}:" Makefile.am \
+		|| die "sed for translations failed"
+
+	MAKE_DOC=$(echo $(echo "${LINGUAS} ${LANGS_DOC}" | tr ' ' '\n' | sort | uniq -d))
+	[[ -n ${MAKE_DOC} ]] && MAKE_DOC=$(echo "${MAKE_DOC}" | tr '\n' ' ')
+	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_DOC} :" \
+		"${KDE_S}/doc/Makefile.am" || die "sed for docs locale failed"
+
+	rm -f "${S}/configure"
+}
+
+src_compile() {
+	local myconf="$(use_enable alsa)
+		$(use_enable arts)
+		$(use_enable oss)
+		$(use_enable jack)"
+
+	kde_src_compile
+}