From 972eb171fa8a55fb12e9da26b5ec14b39e3a4b85 Mon Sep 17 00:00:00 2001
From: ponce <matteo.bernardini@gmail.com>
Date: Wed, 25 Apr 2012 17:08:17 +0200
Subject: libraries/libofa: Patched for gcc47 and curl >=7.24; misc. cleanups

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 .../libofa/patches/libofa-0.9.3-gcc-4.3.patch      | 35 +++++++++++++++++++
 .../libofa/patches/libofa-0.9.3-gcc-4.7.patch      | 23 +++++++++++++
 libraries/libofa/patches/libofa-0.9.3-gcc-4.patch  | 39 ++++++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 libraries/libofa/patches/libofa-0.9.3-gcc-4.3.patch
 create mode 100644 libraries/libofa/patches/libofa-0.9.3-gcc-4.7.patch
 create mode 100644 libraries/libofa/patches/libofa-0.9.3-gcc-4.patch

(limited to 'libraries/libofa/patches')

diff --git a/libraries/libofa/patches/libofa-0.9.3-gcc-4.3.patch b/libraries/libofa/patches/libofa-0.9.3-gcc-4.3.patch
new file mode 100644
index 0000000000..22e8f76164
--- /dev/null
+++ b/libraries/libofa/patches/libofa-0.9.3-gcc-4.3.patch
@@ -0,0 +1,35 @@
+diff -Nur 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 13:05:37.000000000 -0500
++++ libofa-0.9.3/examples/example.cpp	2010-05-21 00:41:32.566411537 -0500
+@@ -9,6 +9,9 @@
+ 
+ #include "protocol.h"
+ 
++#include <string.h>
++#include <stdio.h>
++ 
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+ 
+diff -Nur 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 13:05:42.000000000 -0500
++++ libofa-0.9.3/examples/protocol.cpp	2010-05-21 00:41:21.948412917 -0500
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include <string>
+ #include <map>
+ #include <expat.h>
+diff -Nur 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 13:01:12.000000000 -0500
++++ libofa-0.9.3/lib/signal_op.cpp	2010-05-21 00:41:21.948412917 -0500
+@@ -12,6 +12,7 @@
+ // DATE CREATED: 1/12/06
+ 
+ 
++#include <cstdlib>
+ #include <math.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
diff --git a/libraries/libofa/patches/libofa-0.9.3-gcc-4.7.patch b/libraries/libofa/patches/libofa-0.9.3-gcc-4.7.patch
new file mode 100644
index 0000000000..6d696b0c5e
--- /dev/null
+++ b/libraries/libofa/patches/libofa-0.9.3-gcc-4.7.patch
@@ -0,0 +1,23 @@
+diff -Naur libofa-0.9.3.orig/examples/uselame.cpp libofa-0.9.3/examples/uselame.cpp
+--- libofa-0.9.3.orig/examples/uselame.cpp	2006-05-10 20:05:51.000000000 +0200
++++ libofa-0.9.3/examples/uselame.cpp	2012-03-30 06:19:44.072989020 +0200
+@@ -6,6 +6,8 @@
+    No rights reserved.
+ 
+ -------------------------------------------------------------------*/
++#include <string.h>
++#include <unistd.h>
+ #include "protocol.h"
+ #ifdef WIN32
+ #include "windows.h"
+diff -Naur libofa-0.9.3.orig/examples/wavefile.cpp libofa-0.9.3/examples/wavefile.cpp
+--- libofa-0.9.3.orig/examples/wavefile.cpp	2006-05-10 20:05:56.000000000 +0200
++++ libofa-0.9.3/examples/wavefile.cpp	2012-03-30 06:20:11.808008983 +0200
+@@ -6,6 +6,7 @@
+    No rights reserved.
+ 
+ -------------------------------------------------------------------*/
++#include <unistd.h>
+ #include "protocol.h"
+ #ifdef WIN32
+ #include "io.h"
diff --git a/libraries/libofa/patches/libofa-0.9.3-gcc-4.patch b/libraries/libofa/patches/libofa-0.9.3-gcc-4.patch
new file mode 100644
index 0000000000..d1059bafa5
--- /dev/null
+++ b/libraries/libofa/patches/libofa-0.9.3-gcc-4.patch
@@ -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 */
-- 
cgit v1.2.3