diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2011-06-09 16:58:04 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2011-06-09 16:58:04 +0000 |
commit | 3644f79491216c48bfa641b7dc8a65ea50bfee12 (patch) | |
tree | 6bcbddd0a831926c4d37d16f84da769089090441 /sci-libs/itpp | |
parent | Fix from upstream for missing symbol versions in multilib builds #304239. (diff) | |
download | historical-3644f79491216c48bfa641b7dc8a65ea50bfee12.tar.gz historical-3644f79491216c48bfa641b7dc8a65ea50bfee12.tar.bz2 historical-3644f79491216c48bfa641b7dc8a65ea50bfee12.zip |
Applied a patch for FastICA from Gert Wollny (bug #370475). Switched to EAPI4. Removed old.
Package-Manager: portage-2.1.10/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/itpp')
-rw-r--r-- | sci-libs/itpp/ChangeLog | 10 | ||||
-rw-r--r-- | sci-libs/itpp/Manifest | 16 | ||||
-rw-r--r-- | sci-libs/itpp/files/itpp-4.0.7-window_test_fail_fix.patch | 16 | ||||
-rw-r--r-- | sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch | 26 | ||||
-rw-r--r-- | sci-libs/itpp/itpp-4.0.7-r1.ebuild | 58 | ||||
-rw-r--r-- | sci-libs/itpp/itpp-4.2-r1.ebuild (renamed from sci-libs/itpp/itpp-4.2.ebuild) | 16 |
6 files changed, 48 insertions, 94 deletions
diff --git a/sci-libs/itpp/ChangeLog b/sci-libs/itpp/ChangeLog index 9dade7d95a8e..baa1a4935003 100644 --- a/sci-libs/itpp/ChangeLog +++ b/sci-libs/itpp/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-libs/itpp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.98 2011/01/03 01:28:11 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.99 2011/06/09 16:58:04 bicatali Exp $ + +*itpp-4.2-r1 (09 Jun 2011) + + 09 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> -itpp-4.0.7-r1.ebuild, + -files/itpp-4.0.7-window_test_fail_fix.patch, -itpp-4.2.ebuild, + +itpp-4.2-r1.ebuild, +files/itpp-4.2-fastica-correct-dim.patch: + Applied a patch for FastICA from Gert Wollny (bug #370475). Switched to + EAPI4. Removed old. 03 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> itpp-4.0.7-r1.ebuild, +files/itpp-4.0.7-window_test_fail_fix.patch: diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest index ec25ac88af25..62f123185b63 100644 --- a/sci-libs/itpp/Manifest +++ b/sci-libs/itpp/Manifest @@ -3,19 +3,17 @@ Hash: SHA1 AUX itpp-4.0.6-gcc44.patch 2068 RMD160 62cf59be94f18f0bfe5c433540d5c2784bc8a8a0 SHA1 350c2ed54cb9d8c5f6188e703646e912e39fcb8c SHA256 ac0696b9b33a040fa4d8e670475fd8d922b6b99ece6a362ffdbad40363d65bd1 AUX itpp-4.0.7-fastica-fix-endless-loop.patch 4009 RMD160 60c4456ca1db737669f0b6a91de9a567103af95a SHA1 8bb848e41effa3fe49ac27e1ddacb6bbfd13d16c SHA256 f433a5c762a1461065f51b1d99537f7c782bbc9190480ac509593bb23bbf4696 -AUX itpp-4.0.7-window_test_fail_fix.patch 555 RMD160 19a58e8d5ed4921d32291723f39ad3f86691e438 SHA1 c6a3c2d7c898cbe37c82c260085871a08739d853 SHA256 b23e4b13dda934fee350d76182dffc65bea7d9f095e716ce7fe36e037bc82987 +AUX itpp-4.2-fastica-correct-dim.patch 932 RMD160 b879c83b4c8fde1abb2e5e75745bccf14cd4ee25 SHA1 8a4eff7f9939cf8a3dcdb1dadf2085630f638dcd SHA256 922f9f4c1780b98f06959f72d423b5820cc03607e34d98aff8e426f473c3bebe DIST itpp-4.0.6.tar.bz2 976917 RMD160 25ea74e9ab718c5f689145c45a0cd2712c5e94f0 SHA1 e31c51d0469f9b485b9ef4ef4f1d33a41fdde40a SHA256 a0d5fb03149c361b98556b4736980a4eae4de14a550153f343c60fd29ac5ef94 -DIST itpp-4.0.7.tar.bz2 970989 RMD160 c760e6fd0b112f23ad04ec943b83f2e7271bf8c8 SHA1 e3904dee9cf149b7e259c7ce063ab9d29f805740 SHA256 2c33b31d6c2ddbf1f0bb12a86bd9a202962df58397304706eb60ed0a3114c24d DIST itpp-4.2.tar.bz2 1050157 RMD160 ccf272d839f8178ac4729f48301bde771ffe3573 SHA1 3b75fbcbbc43ac6e47d80283ffd41673ccfa035e SHA256 732c7de212dddfd8669ef3e4d164d5d9a2f81302f3921ddd0176cfa8c49c556c EBUILD itpp-4.0.6.ebuild 2315 RMD160 52005625afb8df0d562871161d21c4bf95e16e93 SHA1 1d39dad14332c8959bf96ac0ddefa9065e581190 SHA256 2575568af2a0431f5a381b6f3264a06d4e31d4ce1630ef5b8dd91ba31bdb57e9 -EBUILD itpp-4.0.7-r1.ebuild 1864 RMD160 6c14bd34dc2957598c38323c9a5df13b179c6c7c SHA1 3c3b625406a114693b3da30be201f8eca0917d17 SHA256 964a1f53a6a172c3ee76c4de3f9db0d4bd20130d6eb1897798c8584c7284d397 -EBUILD itpp-4.2.ebuild 1708 RMD160 44572b67f0ccc6daf5ed2dc52f65169e4ad65385 SHA1 d2cd7b4b7cc43e6e4ff65635481fa772ad516f3b SHA256 df051a219fc463403d37ea90dafb4a47d7c31c237b2ae4c6598fdeb5ba7f269e -MISC ChangeLog 14730 RMD160 d22d83521a062ecf8b5ae2ad09f5bbb9cf009f5a SHA1 1a39203f94830e520326690bc00a894a9884bc4f SHA256 2d1143a591d503238913d26be58270ada57cc7d2c823003c845e65d00178c629 +EBUILD itpp-4.2-r1.ebuild 1630 RMD160 75d71262f3d3850e0d86c4fc3abed55571ea1646 SHA1 e7472beaa7126d7b06fd17845e0b79d114459e9d SHA256 05ae6059ab7e8daa5cdf15622fe400e98bce1bf266f08ddddaf85287333653e3 +MISC ChangeLog 15065 RMD160 b27cc863c9bd9bd8cac9a73395c403521dc77da6 SHA1 83583cb9b263ed5968acdc449be4992316981173 SHA256 7de00de27aa03b58cdd2fd8f77ebcf043bc07ef224d3e4f5dd1fa76c0e942125 MISC metadata.xml 690 RMD160 fb5690f308bff348b8a145ebd0dd800abc5b3521 SHA1 062064276ad6c1da2ba456b9c5a9db543835db7f SHA256 7e6949a4d1b5987cdb47501dca071bd14b179d55bedfc21418c01a677131cd1d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk0hJjUACgkQ1ycZbhPLE2BsMACdHbTjIhPwcw5L2MsPH+7GJeX/ -Z0AAoJVUSGfEkpaNjixotgErsS6Xaw9z -=tL6H +iEYEARECAAYFAk3w+6UACgkQ1ycZbhPLE2CYFACeOpn2c9B8xyjrtZkgclIdjm1D +AecAnjVugTEs6A0ntKn7bmLXEYY6hCmQ +=Gl0h -----END PGP SIGNATURE----- diff --git a/sci-libs/itpp/files/itpp-4.0.7-window_test_fail_fix.patch b/sci-libs/itpp/files/itpp-4.0.7-window_test_fail_fix.patch deleted file mode 100644 index b5e7fc3eece3..000000000000 --- a/sci-libs/itpp/files/itpp-4.0.7-window_test_fail_fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/Makefile.am b/tests/Makefile.am -index ce86ee6..c68b98b 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -20,9 +20,9 @@ FIXED_TESTS = fix_test - - OPTIM_TESTS = newton_search_test - --SIGNAL_TESTS = filter_test source_test window_test -+SIGNAL_TESTS = filter_test source_test - SIGNAL_LAP_TESTS = fastica_test poly_test --SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test -+SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test window_test - SIGNAL_LAP_FFT_TESTS = filter_design_test - - STAT_TESTS = histogram_test diff --git a/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch b/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch new file mode 100644 index 000000000000..a852abc5cc4c --- /dev/null +++ b/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch @@ -0,0 +1,26 @@ +diff -ru itpp-4.2/itpp/signal/fastica.cpp itpp-4.2.new//itpp/signal/fastica.cpp +--- itpp-4.2/itpp/signal/fastica.cpp 2011-06-07 17:47:32.261000884 +0200 ++++ itpp-4.2.new//itpp/signal/fastica.cpp 2011-06-07 17:31:25.757000915 +0200 +@@ -147,6 +147,9 @@ + + whitenv(mixedSigC, E, diag(D), whitesig, whiteningMatrix, dewhiteningMatrix); + ++ Dim = whitesig.rows(); ++ ++ if (numOfIC > Dim) numOfIC = Dim; + + ivec NcFirst = to_ivec(zeros(numOfIC)); + vec NcVp = D; +@@ -161,10 +164,6 @@ + bool result = true; + if (PCAonly == false) { + +- Dim = whitesig.rows(); +- +- if (numOfIC > Dim) numOfIC = Dim; +- + result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W); + + icasig = W * mixedSig; +Nur in itpp-4.2/itpp/signal: fastica.cpp.orig. +Nur in itpp-4.2/itpp/signal: fastica.h.orig. diff --git a/sci-libs/itpp/itpp-4.0.7-r1.ebuild b/sci-libs/itpp/itpp-4.0.7-r1.ebuild deleted file mode 100644 index d541c17100c8..000000000000 --- a/sci-libs/itpp/itpp-4.0.7-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.0.7-r1.ebuild,v 1.2 2011/01/03 01:28:11 bicatali Exp $ - -EAPI=3 -inherit eutils autotools flag-o-matic - -DESCRIPTION="C++ library of mathematical, signal processing and communication classes and functions" -LICENSE="GPL-2" -HOMEPAGE="http://itpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="blas debug doc fftw lapack minimal static-libs" - -RDEPEND="!minimal? ( fftw? ( >=sci-libs/fftw-3 ) ) - blas? ( virtual/blas lapack? ( virtual/lapack ) )" -DEPEND="${RDEPEND} - blas? ( dev-util/pkgconfig ) - lapack? ( dev-util/pkgconfig ) - doc? ( app-doc/doxygen virtual/latex-base )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-fastica-fix-endless-loop.patch - epatch "${FILESDIR}"/${P}-window_test_fail_fix.patch - eautoreconf -} - -src_configure() { - # turn off performance critical debug code - use debug || append-flags -DNDEBUG - local blasconf="no" - use blas && blasconf="$(pkg-config --libs blas)" - local lapackconf="no" - use lapack && lapackconf="$(pkg-config --libs blas lapack)" - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --enable-shared \ - $(use_enable doc html-doc) \ - $(use_enable debug) \ - $(use_enable !minimal comm) \ - $(use_enable !minimal fixed) \ - $(use_enable !minimal optim) \ - $(use_enable !minimal protocol) \ - $(use_enable !minimal signal) \ - $(use_enable !minimal srccode) \ - $(use_enable static-libs static) \ - $(use_with fftw fft) \ - --with-blas="${blasconf}" \ - --with-lapack="${lapackconf}" -} - -src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - dodoc AUTHORS ChangeLog ChangeLog-2007 ChangeLog-2006 \ - ChangeLog-2005 INSTALL NEWS NEWS-3.10 NEWS-3.99 README TODO -} diff --git a/sci-libs/itpp/itpp-4.2.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild index 3a598783f26b..97f71e4e23f8 100644 --- a/sci-libs/itpp/itpp-4.2.ebuild +++ b/sci-libs/itpp/itpp-4.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2.ebuild,v 1.1 2010/09/25 18:58:48 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r1.ebuild,v 1.1 2011/06/09 16:58:04 bicatali Exp $ -EAPI=3 -inherit flag-o-matic +EAPI=4 +inherit flag-o-matic eutils -DESCRIPTION="C++ library of mathematical, signal processing and communication classes and functions" +DESCRIPTION="C++ library of mathematical, signal processing and communication" LICENSE="GPL-3" HOMEPAGE="http://itpp.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" @@ -23,6 +23,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch + epatch "${FILESDIR}"/${PN}-4.2-fastica-correct-dim.patch } src_configure() { @@ -48,8 +49,3 @@ src_configure() { --with-blas="${blasconf}" \ --with-lapack="${lapackconf}" } - -src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - dodoc AUTHORS ChangeLog INSTALL NEWS README -} |