[arch-commits] Commit in libofa/trunk (7 files)
Antonio Rojas
arojas at archlinux.org
Sat Jul 8 12:09:17 UTC 2017
Date: Saturday, July 8, 2017 @ 12:09:16
Author: arojas
Revision: 299891
Rebuild old package, fix source url (FS#51203)
Added:
libofa/trunk/libofa-gcc4.3.patch
(from rev 299890, libofa/trunk/gcc4.3.patch)
libofa/trunk/libofa-gcc4.5.patch
(from rev 299890, libofa/trunk/gcc4.5.patch)
libofa/trunk/libofa-gcc4.patch
(from rev 299890, libofa/trunk/gcc-4.patch)
Modified:
libofa/trunk/PKGBUILD
Deleted:
libofa/trunk/gcc-4.patch
libofa/trunk/gcc4.3.patch
libofa/trunk/gcc4.5.patch
---------------------+
PKGBUILD | 28 ++++++++++++++--------------
gcc-4.patch | 39 ---------------------------------------
gcc4.3.patch | 35 -----------------------------------
gcc4.5.patch | 10 ----------
libofa-gcc4.3.patch | 35 +++++++++++++++++++++++++++++++++++
libofa-gcc4.5.patch | 10 ++++++++++
libofa-gcc4.patch | 39 +++++++++++++++++++++++++++++++++++++++
7 files changed, 98 insertions(+), 98 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-08 12:09:12 UTC (rev 299890)
+++ PKGBUILD 2017-07-08 12:09:16 UTC (rev 299891)
@@ -4,30 +4,30 @@
pkgname=libofa
pkgver=0.9.3
-pkgrel=6
+pkgrel=7
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'
+source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/libofa-$pkgver.tar.gz"
+ 'libofa-gcc4.patch'
+ 'libofa-gcc4.3.patch'
+ 'libofa-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')
+sha256sums=('0216466153e92058c5202dea03390ddc7601d916b983f71ce4f4d034405590a0'
+ '29955fe97cdb3cc2eb72b7b05f1ae38cc5c98b1740a0db96d61f51a13d380cd8'
+ '99fb50907d98640b21a42d00fccee1fa33a02dfabf94a40374766fcc823f5dd3'
+ '6557e9c5ff2a8e0d5f0a91d9faa0ac43b7278926631d45a504cd17fe07fd3c68'
+ '2fa49ced7b47cf05641d1413965244693ffd514ec9d409a784b92751ae4d1c90'
+ 'e0c28752df197ce38f9762aded5df12e1ba1181f721f42fddb83ec1178e90c58')
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 -p0 -i "${srcdir}/libofa-gcc4.patch"
+ patch -p1 -i "${srcdir}/libofa-gcc4.3.patch"
+ patch -p1 -i "${srcdir}/libofa-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"
}
Deleted: gcc-4.patch
===================================================================
--- gcc-4.patch 2017-07-08 12:09:12 UTC (rev 299890)
+++ gcc-4.patch 2017-07-08 12:09:16 UTC (rev 299891)
@@ -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 */
Deleted: gcc4.3.patch
===================================================================
--- gcc4.3.patch 2017-07-08 12:09:12 UTC (rev 299890)
+++ gcc4.3.patch 2017-07-08 12:09:16 UTC (rev 299891)
@@ -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"
Deleted: gcc4.5.patch
===================================================================
--- gcc4.5.patch 2017-07-08 12:09:12 UTC (rev 299890)
+++ gcc4.5.patch 2017-07-08 12:09:16 UTC (rev 299891)
@@ -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/trunk/libofa-gcc4.3.patch (from rev 299890, libofa/trunk/gcc4.3.patch)
===================================================================
--- libofa-gcc4.3.patch (rev 0)
+++ libofa-gcc4.3.patch 2017-07-08 12:09:16 UTC (rev 299891)
@@ -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"
Copied: libofa/trunk/libofa-gcc4.5.patch (from rev 299890, libofa/trunk/gcc4.5.patch)
===================================================================
--- libofa-gcc4.5.patch (rev 0)
+++ libofa-gcc4.5.patch 2017-07-08 12:09:16 UTC (rev 299891)
@@ -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"
+
Copied: libofa/trunk/libofa-gcc4.patch (from rev 299890, libofa/trunk/gcc-4.patch)
===================================================================
--- libofa-gcc4.patch (rev 0)
+++ libofa-gcc4.patch 2017-07-08 12:09:16 UTC (rev 299891)
@@ -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 */
More information about the arch-commits
mailing list