Date: Monday, October 28, 2013 @ 03:51:05
Author: eric
Revision: 197670
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libofa/repos/extra-i686/PKGBUILD
(from rev 197669, libofa/trunk/PKGBUILD)
libofa/repos/extra-i686/gcc-4.patch
(from rev 197669, libofa/trunk/gcc-4.patch)
libofa/repos/extra-i686/gcc4.3.patch
(from rev 197669, libofa/trunk/gcc4.3.patch)
libofa/repos/extra-i686/gcc4.5.patch
(from rev 197669, libofa/trunk/gcc4.5.patch)
libofa/repos/extra-i686/libofa-0.9.3-curl-7.21.patch
(from rev 197669, libofa/trunk/libofa-0.9.3-curl-7.21.patch)
libofa/repos/extra-i686/libofa-0.9.3-gcc-4.7.patch
(from rev 197669, libofa/trunk/libofa-0.9.3-gcc-4.7.patch)
libofa/repos/extra-x86_64/PKGBUILD
(from rev 197669, libofa/trunk/PKGBUILD)
libofa/repos/extra-x86_64/gcc-4.patch
(from rev 197669, libofa/trunk/gcc-4.patch)
libofa/repos/extra-x86_64/gcc4.3.patch
(from rev 197669, libofa/trunk/gcc4.3.patch)
libofa/repos/extra-x86_64/gcc4.5.patch
(from rev 197669, libofa/trunk/gcc4.5.patch)
libofa/repos/extra-x86_64/libofa-0.9.3-curl-7.21.patch
(from rev 197669, libofa/trunk/libofa-0.9.3-curl-7.21.patch)
libofa/repos/extra-x86_64/libofa-0.9.3-gcc-4.7.patch
(from rev 197669, libofa/trunk/libofa-0.9.3-gcc-4.7.patch)
Deleted:
libofa/repos/extra-i686/PKGBUILD
libofa/repos/extra-i686/gcc-4.patch
libofa/repos/extra-i686/gcc4.3.patch
libofa/repos/extra-i686/gcc4.5.patch
libofa/repos/extra-i686/libofa-0.9.3-curl-7.21.patch
libofa/repos/extra-x86_64/PKGBUILD
libofa/repos/extra-x86_64/gcc-4.patch
libofa/repos/extra-x86_64/gcc4.3.patch
libofa/repos/extra-x86_64/gcc4.5.patch
libofa/repos/extra-x86_64/libofa-0.9.3-curl-7.21.patch
-------------------------------------------+
/PKGBUILD | 92 ++++++++++++++++++++++++++++
/gcc-4.patch | 78 +++++++++++++++++++++++
/gcc4.3.patch | 70 +++++++++++++++++++++
/gcc4.5.patch | 20 ++++++
/libofa-0.9.3-curl-7.21.patch | 22 ++++++
extra-i686/PKGBUILD | 41 ------------
extra-i686/gcc-4.patch | 39 -----------
extra-i686/gcc4.3.patch | 35 ----------
extra-i686/gcc4.5.patch | 10 ---
extra-i686/libofa-0.9.3-curl-7.21.patch | 11 ---
extra-i686/libofa-0.9.3-gcc-4.7.patch | 22 ++++++
extra-x86_64/PKGBUILD | 41 ------------
extra-x86_64/gcc-4.patch | 39 -----------
extra-x86_64/gcc4.3.patch | 35 ----------
extra-x86_64/gcc4.5.patch | 10 ---
extra-x86_64/libofa-0.9.3-curl-7.21.patch | 11 ---
extra-x86_64/libofa-0.9.3-gcc-4.7.patch | 22 ++++++
17 files changed, 326 insertions(+), 272 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-10-28 02:49:10 UTC (rev 197669)
+++ extra-i686/PKGBUILD 2013-10-28 02:51:05 UTC (rev 197670)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <[email protected]>
-# Contributor: Tobias Powalowski <[email protected]>
-
-pkgname=libofa
-pkgver=0.9.3
-pkgrel=4
-pkgdesc="An open-source audio fingerprint by MusicIP"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/musicip-libofa/";
-license=('GPL2' 'custom')
-depends=('expat' 'curl' 'fftw')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz";
- 'gcc-4.patch'
- 'gcc4.3.patch'
- 'gcc4.5.patch'
- 'libofa-0.9.3-curl-7.21.patch')
-md5sums=('51507d2c4b432bd2755f48d58471696e'
- 'a6f78b90bd0f4354d022a71c3e58ef6c'
- 'dd57db13770b8f8d196e8a3d3a50e713'
- 'c245363368d0e6fa2b4676364b81b74f'
- '2e1579d74613cfbb1799d0ab5f1a4cba')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 -i ${srcdir}/gcc-4.patch
- patch -p1 -i ${srcdir}/gcc4.3.patch
- patch -p1 -i ${srcdir}/gcc4.5.patch
- patch -p1 -i ${srcdir}/libofa-0.9.3-curl-7.21.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
-
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: libofa/repos/extra-i686/PKGBUILD (from rev 197669,
libofa/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-10-28 02:51:05 UTC (rev 197670)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Andrea Scarpino <[email protected]>
+# Contributor: Tobias Powalowski <[email protected]>
+
+pkgname=libofa
+pkgver=0.9.3
+pkgrel=5
+pkgdesc="An open-source audio fingerprint by MusicIP"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/musicip-libofa/";
+license=('GPL2' 'custom')
+depends=('expat' 'curl' 'fftw')
+source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz";
+ 'gcc-4.patch'
+ 'gcc4.3.patch'
+ 'gcc4.5.patch'
+ 'libofa-0.9.3-curl-7.21.patch'
+ 'libofa-0.9.3-gcc-4.7.patch')
+md5sums=('51507d2c4b432bd2755f48d58471696e'
+ 'a6f78b90bd0f4354d022a71c3e58ef6c'
+ 'dd57db13770b8f8d196e8a3d3a50e713'
+ 'c245363368d0e6fa2b4676364b81b74f'
+ '2e1579d74613cfbb1799d0ab5f1a4cba'
+ 'a53a0104f9b5bba220322c6d0b68bf96')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0 -i "${srcdir}/gcc-4.patch"
+ patch -p1 -i "${srcdir}/gcc4.3.patch"
+ patch -p1 -i "${srcdir}/gcc4.5.patch"
+ patch -p1 -i "${srcdir}/libofa-0.9.3-gcc-4.7.patch"
+ patch -p1 -i "${srcdir}/libofa-0.9.3-curl-7.21.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-i686/gcc-4.patch
===================================================================
--- extra-i686/gcc-4.patch 2013-10-28 02:49:10 UTC (rev 197669)
+++ extra-i686/gcc-4.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -1,39 +0,0 @@
---- lib/JAMA/tnt_math_utils.h.orig 2006-06-17 01:46:22.000000000 +0300
-+++ lib/JAMA/tnt_math_utils.h 2006-06-17 01:47:02.000000000 +0300
-@@ -20,11 +20,20 @@
- namespace TNT
- {
- /**
-+ @returns the absolute value of a real (no-complex) scalar.
-+*/
-+template <class Real>
-+Real abs(const Real &a)
-+{
-+ return (a > 0 ? a : -a);
-+}
-+/**
- @returns hypotenuse of real (non-complex) scalars a and b by
- avoiding underflow/overflow
- using (a * sqrt( 1 + (b/a) * (b/a))), rather than
- sqrt(a*a + b*b).
- */
-+
- template <class Real>
- Real hypot(const Real &a, const Real &b)
- {
-@@ -56,15 +65,6 @@
- }
- */
-
--/**
-- @returns the absolute value of a real (no-complex) scalar.
--*/
--template <class Real>
--Real abs(const Real &a)
--{
-- return (a > 0 ? a : -a);
--}
--
- }
- #endif
- /* MATH_UTILS_H */
Copied: libofa/repos/extra-i686/gcc-4.patch (from rev 197669,
libofa/trunk/gcc-4.patch)
===================================================================
--- extra-i686/gcc-4.patch (rev 0)
+++ extra-i686/gcc-4.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -0,0 +1,39 @@
+--- lib/JAMA/tnt_math_utils.h.orig 2006-06-17 01:46:22.000000000 +0300
++++ lib/JAMA/tnt_math_utils.h 2006-06-17 01:47:02.000000000 +0300
+@@ -20,11 +20,20 @@
+ namespace TNT
+ {
+ /**
++ @returns the absolute value of a real (no-complex) scalar.
++*/
++template <class Real>
++Real abs(const Real &a)
++{
++ return (a > 0 ? a : -a);
++}
++/**
+ @returns hypotenuse of real (non-complex) scalars a and b by
+ avoiding underflow/overflow
+ using (a * sqrt( 1 + (b/a) * (b/a))), rather than
+ sqrt(a*a + b*b).
+ */
++
+ template <class Real>
+ Real hypot(const Real &a, const Real &b)
+ {
+@@ -56,15 +65,6 @@
+ }
+ */
+
+-/**
+- @returns the absolute value of a real (no-complex) scalar.
+-*/
+-template <class Real>
+-Real abs(const Real &a)
+-{
+- return (a > 0 ? a : -a);
+-}
+-
+ }
+ #endif
+ /* MATH_UTILS_H */
Deleted: extra-i686/gcc4.3.patch
===================================================================
--- extra-i686/gcc4.3.patch 2013-10-28 02:49:10 UTC (rev 197669)
+++ extra-i686/gcc4.3.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -1,35 +0,0 @@
-diff -ur libofa-0.9.3.orig/examples/example.cpp
libofa-0.9.3/examples/example.cpp
---- libofa-0.9.3.orig/examples/example.cpp 2006-05-10 21:05:37.000000000
+0300
-+++ libofa-0.9.3/examples/example.cpp 2008-04-16 15:51:49.000000000 +0300
-@@ -9,6 +9,8 @@
-
- #include "protocol.h"
-
-+#include <string.h>
-+
- AudioData* loadWaveFile(char *file);
- AudioData* loadDataUsingLAME(char *file);
-
-Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
-diff -ur libofa-0.9.3.orig/examples/protocol.cpp
libofa-0.9.3/examples/protocol.cpp
---- libofa-0.9.3.orig/examples/protocol.cpp 2006-05-10 21:05:42.000000000
+0300
-+++ libofa-0.9.3/examples/protocol.cpp 2008-04-16 15:51:49.000000000 +0300
-@@ -8,6 +8,7 @@
- -------------------------------------------------------------------*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include <string>
- #include <map>
- #include <expat.h>
-diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
---- libofa-0.9.3.orig/lib/signal_op.cpp 2006-05-10 21:01:12.000000000
+0300
-+++ libofa-0.9.3/lib/signal_op.cpp 2008-04-16 15:51:49.000000000 +0300
-@@ -12,6 +12,7 @@
- // DATE CREATED: 1/12/06
-
-
-+#include <cstdlib>
- #include <math.h>
- #include "signal_op.h"
- #include "AFLIB/aflibConverter.h"
Copied: libofa/repos/extra-i686/gcc4.3.patch (from rev 197669,
libofa/trunk/gcc4.3.patch)
===================================================================
--- extra-i686/gcc4.3.patch (rev 0)
+++ extra-i686/gcc4.3.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -0,0 +1,35 @@
+diff -ur libofa-0.9.3.orig/examples/example.cpp
libofa-0.9.3/examples/example.cpp
+--- libofa-0.9.3.orig/examples/example.cpp 2006-05-10 21:05:37.000000000
+0300
++++ libofa-0.9.3/examples/example.cpp 2008-04-16 15:51:49.000000000 +0300
+@@ -9,6 +9,8 @@
+
+ #include "protocol.h"
+
++#include <string.h>
++
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+
+Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
+diff -ur libofa-0.9.3.orig/examples/protocol.cpp
libofa-0.9.3/examples/protocol.cpp
+--- libofa-0.9.3.orig/examples/protocol.cpp 2006-05-10 21:05:42.000000000
+0300
++++ libofa-0.9.3/examples/protocol.cpp 2008-04-16 15:51:49.000000000 +0300
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include <string>
+ #include <map>
+ #include <expat.h>
+diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
+--- libofa-0.9.3.orig/lib/signal_op.cpp 2006-05-10 21:01:12.000000000
+0300
++++ libofa-0.9.3/lib/signal_op.cpp 2008-04-16 15:51:49.000000000 +0300
+@@ -12,6 +12,7 @@
+ // DATE CREATED: 1/12/06
+
+
++#include <cstdlib>
+ #include <math.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
Deleted: extra-i686/gcc4.5.patch
===================================================================
--- extra-i686/gcc4.5.patch 2013-10-28 02:49:10 UTC (rev 197669)
+++ extra-i686/gcc4.5.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -1,10 +0,0 @@
---- libofa-0.9.3/examples/example.cpp~ 2010-05-19 18:07:19.517650317 +0200
-+++ libofa-0.9.3/examples/example.cpp 2010-05-19 18:07:31.754317472 +0200
-@@ -6,6 +6,7 @@
- No rights reserved.
-
- -------------------------------------------------------------------*/
-+#include <cstdio>
-
- #include "protocol.h"
-
Copied: libofa/repos/extra-i686/gcc4.5.patch (from rev 197669,
libofa/trunk/gcc4.5.patch)
===================================================================
--- extra-i686/gcc4.5.patch (rev 0)
+++ extra-i686/gcc4.5.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -0,0 +1,10 @@
+--- libofa-0.9.3/examples/example.cpp~ 2010-05-19 18:07:19.517650317 +0200
++++ libofa-0.9.3/examples/example.cpp 2010-05-19 18:07:31.754317472 +0200
+@@ -6,6 +6,7 @@
+ No rights reserved.
+
+ -------------------------------------------------------------------*/
++#include <cstdio>
+
+ #include "protocol.h"
+
Deleted: extra-i686/libofa-0.9.3-curl-7.21.patch
===================================================================
--- extra-i686/libofa-0.9.3-curl-7.21.patch 2013-10-28 02:49:10 UTC (rev
197669)
+++ extra-i686/libofa-0.9.3-curl-7.21.patch 2013-10-28 02:51:05 UTC (rev
197670)
@@ -1,11 +0,0 @@
-diff -ru libofa-0.9.3.orig//examples/protocol.cpp
libofa-0.9.3//examples/protocol.cpp
---- libofa-0.9.3.orig//examples/protocol.cpp 2006-05-10 20:05:42.000000000
+0200
-+++ libofa-0.9.3//examples/protocol.cpp 2011-07-22 19:02:30.687109297
+0200
-@@ -12,7 +12,6 @@
- #include <map>
- #include <expat.h>
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- using namespace std;
Copied: libofa/repos/extra-i686/libofa-0.9.3-curl-7.21.patch (from rev 197669,
libofa/trunk/libofa-0.9.3-curl-7.21.patch)
===================================================================
--- extra-i686/libofa-0.9.3-curl-7.21.patch (rev 0)
+++ extra-i686/libofa-0.9.3-curl-7.21.patch 2013-10-28 02:51:05 UTC (rev
197670)
@@ -0,0 +1,11 @@
+diff -ru libofa-0.9.3.orig//examples/protocol.cpp
libofa-0.9.3//examples/protocol.cpp
+--- libofa-0.9.3.orig//examples/protocol.cpp 2006-05-10 20:05:42.000000000
+0200
++++ libofa-0.9.3//examples/protocol.cpp 2011-07-22 19:02:30.687109297
+0200
+@@ -12,7 +12,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ using namespace std;
Copied: libofa/repos/extra-i686/libofa-0.9.3-gcc-4.7.patch (from rev 197669,
libofa/trunk/libofa-0.9.3-gcc-4.7.patch)
===================================================================
--- extra-i686/libofa-0.9.3-gcc-4.7.patch (rev 0)
+++ extra-i686/libofa-0.9.3-gcc-4.7.patch 2013-10-28 02:51:05 UTC (rev
197670)
@@ -0,0 +1,22 @@
+diff -up libofa-0.9.3/examples/uselame.cpp.gcc47
libofa-0.9.3/examples/uselame.cpp
+--- libofa-0.9.3/examples/uselame.cpp.gcc47 2012-01-14 09:35:24.343146853
-0600
++++ libofa-0.9.3/examples/uselame.cpp 2012-01-14 09:35:49.956826634 -0600
+@@ -12,6 +12,7 @@
+ #else
+ #include <sys/wait.h>
+ #endif
++#include <unistd.h>
+
+ AudioData *loadWaveFile(char *file);
+
+diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47
libofa-0.9.3/examples/wavefile.cpp
+--- libofa-0.9.3/examples/wavefile.cpp.gcc47 2012-01-14 09:35:24.344146841
-0600
++++ libofa-0.9.3/examples/wavefile.cpp 2012-01-14 16:00:54.414981160 -0600
+@@ -11,6 +11,7 @@
+ #include "io.h"
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+
+ static bool readBytes(int fd, unsigned char *buf, int size) {
+ int ct = 0;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-10-28 02:49:10 UTC (rev 197669)
+++ extra-x86_64/PKGBUILD 2013-10-28 02:51:05 UTC (rev 197670)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <[email protected]>
-# Contributor: Tobias Powalowski <[email protected]>
-
-pkgname=libofa
-pkgver=0.9.3
-pkgrel=4
-pkgdesc="An open-source audio fingerprint by MusicIP"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/musicip-libofa/";
-license=('GPL2' 'custom')
-depends=('expat' 'curl' 'fftw')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz";
- 'gcc-4.patch'
- 'gcc4.3.patch'
- 'gcc4.5.patch'
- 'libofa-0.9.3-curl-7.21.patch')
-md5sums=('51507d2c4b432bd2755f48d58471696e'
- 'a6f78b90bd0f4354d022a71c3e58ef6c'
- 'dd57db13770b8f8d196e8a3d3a50e713'
- 'c245363368d0e6fa2b4676364b81b74f'
- '2e1579d74613cfbb1799d0ab5f1a4cba')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 -i ${srcdir}/gcc-4.patch
- patch -p1 -i ${srcdir}/gcc4.3.patch
- patch -p1 -i ${srcdir}/gcc4.5.patch
- patch -p1 -i ${srcdir}/libofa-0.9.3-curl-7.21.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
-
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: libofa/repos/extra-x86_64/PKGBUILD (from rev 197669,
libofa/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-10-28 02:51:05 UTC (rev 197670)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Andrea Scarpino <[email protected]>
+# Contributor: Tobias Powalowski <[email protected]>
+
+pkgname=libofa
+pkgver=0.9.3
+pkgrel=5
+pkgdesc="An open-source audio fingerprint by MusicIP"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/musicip-libofa/";
+license=('GPL2' 'custom')
+depends=('expat' 'curl' 'fftw')
+source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz";
+ 'gcc-4.patch'
+ 'gcc4.3.patch'
+ 'gcc4.5.patch'
+ 'libofa-0.9.3-curl-7.21.patch'
+ 'libofa-0.9.3-gcc-4.7.patch')
+md5sums=('51507d2c4b432bd2755f48d58471696e'
+ 'a6f78b90bd0f4354d022a71c3e58ef6c'
+ 'dd57db13770b8f8d196e8a3d3a50e713'
+ 'c245363368d0e6fa2b4676364b81b74f'
+ '2e1579d74613cfbb1799d0ab5f1a4cba'
+ 'a53a0104f9b5bba220322c6d0b68bf96')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0 -i "${srcdir}/gcc-4.patch"
+ patch -p1 -i "${srcdir}/gcc4.3.patch"
+ patch -p1 -i "${srcdir}/gcc4.5.patch"
+ patch -p1 -i "${srcdir}/libofa-0.9.3-gcc-4.7.patch"
+ patch -p1 -i "${srcdir}/libofa-0.9.3-curl-7.21.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/gcc-4.patch
===================================================================
--- extra-x86_64/gcc-4.patch 2013-10-28 02:49:10 UTC (rev 197669)
+++ extra-x86_64/gcc-4.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -1,39 +0,0 @@
---- lib/JAMA/tnt_math_utils.h.orig 2006-06-17 01:46:22.000000000 +0300
-+++ lib/JAMA/tnt_math_utils.h 2006-06-17 01:47:02.000000000 +0300
-@@ -20,11 +20,20 @@
- namespace TNT
- {
- /**
-+ @returns the absolute value of a real (no-complex) scalar.
-+*/
-+template <class Real>
-+Real abs(const Real &a)
-+{
-+ return (a > 0 ? a : -a);
-+}
-+/**
- @returns hypotenuse of real (non-complex) scalars a and b by
- avoiding underflow/overflow
- using (a * sqrt( 1 + (b/a) * (b/a))), rather than
- sqrt(a*a + b*b).
- */
-+
- template <class Real>
- Real hypot(const Real &a, const Real &b)
- {
-@@ -56,15 +65,6 @@
- }
- */
-
--/**
-- @returns the absolute value of a real (no-complex) scalar.
--*/
--template <class Real>
--Real abs(const Real &a)
--{
-- return (a > 0 ? a : -a);
--}
--
- }
- #endif
- /* MATH_UTILS_H */
Copied: libofa/repos/extra-x86_64/gcc-4.patch (from rev 197669,
libofa/trunk/gcc-4.patch)
===================================================================
--- extra-x86_64/gcc-4.patch (rev 0)
+++ extra-x86_64/gcc-4.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -0,0 +1,39 @@
+--- lib/JAMA/tnt_math_utils.h.orig 2006-06-17 01:46:22.000000000 +0300
++++ lib/JAMA/tnt_math_utils.h 2006-06-17 01:47:02.000000000 +0300
+@@ -20,11 +20,20 @@
+ namespace TNT
+ {
+ /**
++ @returns the absolute value of a real (no-complex) scalar.
++*/
++template <class Real>
++Real abs(const Real &a)
++{
++ return (a > 0 ? a : -a);
++}
++/**
+ @returns hypotenuse of real (non-complex) scalars a and b by
+ avoiding underflow/overflow
+ using (a * sqrt( 1 + (b/a) * (b/a))), rather than
+ sqrt(a*a + b*b).
+ */
++
+ template <class Real>
+ Real hypot(const Real &a, const Real &b)
+ {
+@@ -56,15 +65,6 @@
+ }
+ */
+
+-/**
+- @returns the absolute value of a real (no-complex) scalar.
+-*/
+-template <class Real>
+-Real abs(const Real &a)
+-{
+- return (a > 0 ? a : -a);
+-}
+-
+ }
+ #endif
+ /* MATH_UTILS_H */
Deleted: extra-x86_64/gcc4.3.patch
===================================================================
--- extra-x86_64/gcc4.3.patch 2013-10-28 02:49:10 UTC (rev 197669)
+++ extra-x86_64/gcc4.3.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -1,35 +0,0 @@
-diff -ur libofa-0.9.3.orig/examples/example.cpp
libofa-0.9.3/examples/example.cpp
---- libofa-0.9.3.orig/examples/example.cpp 2006-05-10 21:05:37.000000000
+0300
-+++ libofa-0.9.3/examples/example.cpp 2008-04-16 15:51:49.000000000 +0300
-@@ -9,6 +9,8 @@
-
- #include "protocol.h"
-
-+#include <string.h>
-+
- AudioData* loadWaveFile(char *file);
- AudioData* loadDataUsingLAME(char *file);
-
-Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
-diff -ur libofa-0.9.3.orig/examples/protocol.cpp
libofa-0.9.3/examples/protocol.cpp
---- libofa-0.9.3.orig/examples/protocol.cpp 2006-05-10 21:05:42.000000000
+0300
-+++ libofa-0.9.3/examples/protocol.cpp 2008-04-16 15:51:49.000000000 +0300
-@@ -8,6 +8,7 @@
- -------------------------------------------------------------------*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include <string>
- #include <map>
- #include <expat.h>
-diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
---- libofa-0.9.3.orig/lib/signal_op.cpp 2006-05-10 21:01:12.000000000
+0300
-+++ libofa-0.9.3/lib/signal_op.cpp 2008-04-16 15:51:49.000000000 +0300
-@@ -12,6 +12,7 @@
- // DATE CREATED: 1/12/06
-
-
-+#include <cstdlib>
- #include <math.h>
- #include "signal_op.h"
- #include "AFLIB/aflibConverter.h"
Copied: libofa/repos/extra-x86_64/gcc4.3.patch (from rev 197669,
libofa/trunk/gcc4.3.patch)
===================================================================
--- extra-x86_64/gcc4.3.patch (rev 0)
+++ extra-x86_64/gcc4.3.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -0,0 +1,35 @@
+diff -ur libofa-0.9.3.orig/examples/example.cpp
libofa-0.9.3/examples/example.cpp
+--- libofa-0.9.3.orig/examples/example.cpp 2006-05-10 21:05:37.000000000
+0300
++++ libofa-0.9.3/examples/example.cpp 2008-04-16 15:51:49.000000000 +0300
+@@ -9,6 +9,8 @@
+
+ #include "protocol.h"
+
++#include <string.h>
++
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+
+Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
+diff -ur libofa-0.9.3.orig/examples/protocol.cpp
libofa-0.9.3/examples/protocol.cpp
+--- libofa-0.9.3.orig/examples/protocol.cpp 2006-05-10 21:05:42.000000000
+0300
++++ libofa-0.9.3/examples/protocol.cpp 2008-04-16 15:51:49.000000000 +0300
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include <string>
+ #include <map>
+ #include <expat.h>
+diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
+--- libofa-0.9.3.orig/lib/signal_op.cpp 2006-05-10 21:01:12.000000000
+0300
++++ libofa-0.9.3/lib/signal_op.cpp 2008-04-16 15:51:49.000000000 +0300
+@@ -12,6 +12,7 @@
+ // DATE CREATED: 1/12/06
+
+
++#include <cstdlib>
+ #include <math.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
Deleted: extra-x86_64/gcc4.5.patch
===================================================================
--- extra-x86_64/gcc4.5.patch 2013-10-28 02:49:10 UTC (rev 197669)
+++ extra-x86_64/gcc4.5.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -1,10 +0,0 @@
---- libofa-0.9.3/examples/example.cpp~ 2010-05-19 18:07:19.517650317 +0200
-+++ libofa-0.9.3/examples/example.cpp 2010-05-19 18:07:31.754317472 +0200
-@@ -6,6 +6,7 @@
- No rights reserved.
-
- -------------------------------------------------------------------*/
-+#include <cstdio>
-
- #include "protocol.h"
-
Copied: libofa/repos/extra-x86_64/gcc4.5.patch (from rev 197669,
libofa/trunk/gcc4.5.patch)
===================================================================
--- extra-x86_64/gcc4.5.patch (rev 0)
+++ extra-x86_64/gcc4.5.patch 2013-10-28 02:51:05 UTC (rev 197670)
@@ -0,0 +1,10 @@
+--- libofa-0.9.3/examples/example.cpp~ 2010-05-19 18:07:19.517650317 +0200
++++ libofa-0.9.3/examples/example.cpp 2010-05-19 18:07:31.754317472 +0200
+@@ -6,6 +6,7 @@
+ No rights reserved.
+
+ -------------------------------------------------------------------*/
++#include <cstdio>
+
+ #include "protocol.h"
+
Deleted: extra-x86_64/libofa-0.9.3-curl-7.21.patch
===================================================================
--- extra-x86_64/libofa-0.9.3-curl-7.21.patch 2013-10-28 02:49:10 UTC (rev
197669)
+++ extra-x86_64/libofa-0.9.3-curl-7.21.patch 2013-10-28 02:51:05 UTC (rev
197670)
@@ -1,11 +0,0 @@
-diff -ru libofa-0.9.3.orig//examples/protocol.cpp
libofa-0.9.3//examples/protocol.cpp
---- libofa-0.9.3.orig//examples/protocol.cpp 2006-05-10 20:05:42.000000000
+0200
-+++ libofa-0.9.3//examples/protocol.cpp 2011-07-22 19:02:30.687109297
+0200
-@@ -12,7 +12,6 @@
- #include <map>
- #include <expat.h>
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- using namespace std;
Copied: libofa/repos/extra-x86_64/libofa-0.9.3-curl-7.21.patch (from rev
197669, libofa/trunk/libofa-0.9.3-curl-7.21.patch)
===================================================================
--- extra-x86_64/libofa-0.9.3-curl-7.21.patch (rev 0)
+++ extra-x86_64/libofa-0.9.3-curl-7.21.patch 2013-10-28 02:51:05 UTC (rev
197670)
@@ -0,0 +1,11 @@
+diff -ru libofa-0.9.3.orig//examples/protocol.cpp
libofa-0.9.3//examples/protocol.cpp
+--- libofa-0.9.3.orig//examples/protocol.cpp 2006-05-10 20:05:42.000000000
+0200
++++ libofa-0.9.3//examples/protocol.cpp 2011-07-22 19:02:30.687109297
+0200
+@@ -12,7 +12,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ using namespace std;
Copied: libofa/repos/extra-x86_64/libofa-0.9.3-gcc-4.7.patch (from rev 197669,
libofa/trunk/libofa-0.9.3-gcc-4.7.patch)
===================================================================
--- extra-x86_64/libofa-0.9.3-gcc-4.7.patch (rev 0)
+++ extra-x86_64/libofa-0.9.3-gcc-4.7.patch 2013-10-28 02:51:05 UTC (rev
197670)
@@ -0,0 +1,22 @@
+diff -up libofa-0.9.3/examples/uselame.cpp.gcc47
libofa-0.9.3/examples/uselame.cpp
+--- libofa-0.9.3/examples/uselame.cpp.gcc47 2012-01-14 09:35:24.343146853
-0600
++++ libofa-0.9.3/examples/uselame.cpp 2012-01-14 09:35:49.956826634 -0600
+@@ -12,6 +12,7 @@
+ #else
+ #include <sys/wait.h>
+ #endif
++#include <unistd.h>
+
+ AudioData *loadWaveFile(char *file);
+
+diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47
libofa-0.9.3/examples/wavefile.cpp
+--- libofa-0.9.3/examples/wavefile.cpp.gcc47 2012-01-14 09:35:24.344146841
-0600
++++ libofa-0.9.3/examples/wavefile.cpp 2012-01-14 16:00:54.414981160 -0600
+@@ -11,6 +11,7 @@
+ #include "io.h"
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+
+ static bool readBytes(int fd, unsigned char *buf, int size) {
+ int ct = 0;
