diff options
| author | ponce <matteo.bernardini@gmail.com> | 2012-04-25 17:08:17 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-08-21 08:55:34 -0500 |
| commit | 972eb171fa8a55fb12e9da26b5ec14b39e3a4b85 (patch) | |
| tree | 14cafb902198e76f7258dc09b72a27cf0a46d075 /libraries | |
| parent | 2a963a3b9e49e64580f52e17d1af3d48dad451d1 (diff) | |
libraries/libofa: Patched for gcc47 and curl >=7.24; misc. cleanups
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/libofa/libofa.SlackBuild | 10 | ||||
| -rw-r--r-- | libraries/libofa/patches/libofa-0.9.3-gcc-4.3.patch (renamed from libraries/libofa/libofa-0.9.3-gcc-4.3.patch) | 0 | ||||
| -rw-r--r-- | libraries/libofa/patches/libofa-0.9.3-gcc-4.7.patch | 23 | ||||
| -rw-r--r-- | libraries/libofa/patches/libofa-0.9.3-gcc-4.patch (renamed from libraries/libofa/libofa-0.9.3-gcc-4.patch) | 0 |
4 files changed, 30 insertions, 3 deletions
diff --git a/libraries/libofa/libofa.SlackBuild b/libraries/libofa/libofa.SlackBuild index 5e67f4fc2cc81..8a28d04d4aba4 100644 --- a/libraries/libofa/libofa.SlackBuild +++ b/libraries/libofa/libofa.SlackBuild @@ -4,7 +4,7 @@ PRGNAM=libofa VERSION=${VERSION:-0.9.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: @@ -53,8 +53,12 @@ find . \ # Thanks, Gentoo guys :-) # http://mirrors.usc.edu/pub/linux/distributions/gentoo/media-libs/libofa/files/ -patch -p0 < $CWD/libofa-0.9.3-gcc-4.patch -patch -p1 < $CWD/libofa-0.9.3-gcc-4.3.patch +patch -p0 < $CWD/patches/libofa-0.9.3-gcc-4.patch +patch -p1 < $CWD/patches/libofa-0.9.3-gcc-4.3.patch +# Fix for gcc-4.7 +patch -p1 < $CWD/patches/libofa-0.9.3-gcc-4.7.patch +# remove a deprecated curl header +sed -i "s|^#include <curl/types\.h>||" examples/protocol.cpp CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libofa/libofa-0.9.3-gcc-4.3.patch b/libraries/libofa/patches/libofa-0.9.3-gcc-4.3.patch index 22e8f76164455..22e8f76164455 100644 --- a/libraries/libofa/libofa-0.9.3-gcc-4.3.patch +++ b/libraries/libofa/patches/libofa-0.9.3-gcc-4.3.patch 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 0000000000000..6d696b0c5e6ce --- /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/libofa-0.9.3-gcc-4.patch b/libraries/libofa/patches/libofa-0.9.3-gcc-4.patch index d1059bafa55f1..d1059bafa55f1 100644 --- a/libraries/libofa/libofa-0.9.3-gcc-4.patch +++ b/libraries/libofa/patches/libofa-0.9.3-gcc-4.patch |