summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2008-10-14 12:47:40 +0200
committerJaka Kranjc2008-10-14 12:47:40 +0200
commit2af337e0cb5acc83570dab3f04d092f2cf480a8b (patch)
tree3eb7299c489ff035bd9371452479eedc896ce6e0
parentfbc23620c17ab0dcb73d9cd269447e741ab373c5 (diff)
libgig: compile with gcc 4.3 #14785
(cherry-picked from commit 9d39e0df55e939f0cada69ae957409c8576c8506)
-rw-r--r--audio-libs/libgig/HISTORY3
-rwxr-xr-xaudio-libs/libgig/PRE_BUILD4
-rwxr-xr-xaudio-libs/libgig/gcc43.patch33
3 files changed, 39 insertions, 1 deletions
diff --git a/audio-libs/libgig/HISTORY b/audio-libs/libgig/HISTORY
index 7ad711857d..85ca9194ab 100644
--- a/audio-libs/libgig/HISTORY
+++ b/audio-libs/libgig/HISTORY
@@ -1,3 +1,6 @@
+2008-10-09 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * gcc43.patch, PRE_BUILD: compile with gcc 4.3 #14785
+
2008-05-25 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS, PREPARE, PRE_BUILD, DEPENDS: Added cvs version.
* PREPARE, PRE_BUILD: Added files because of cvs version.
diff --git a/audio-libs/libgig/PRE_BUILD b/audio-libs/libgig/PRE_BUILD
index f3f77dd502..cb2687d6c6 100755
--- a/audio-libs/libgig/PRE_BUILD
+++ b/audio-libs/libgig/PRE_BUILD
@@ -4,4 +4,6 @@ cd "$SOURCE_DIRECTORY" &&
if [[ $LIBGIG_VCS == y ]]
then
make -f Makefile.cvs
-fi
+fi &&
+
+patch -p1 < $SPELL_DIRECTORY/gcc43.patch
diff --git a/audio-libs/libgig/gcc43.patch b/audio-libs/libgig/gcc43.patch
new file mode 100755
index 0000000000..821548f30f
--- /dev/null
+++ b/audio-libs/libgig/gcc43.patch
@@ -0,0 +1,33 @@
+diff -aur libgig-3.2.1-orig/src/DLS.cpp libgig-3.2.1/src/DLS.cpp
+--- libgig-3.2.1-orig/src/DLS.cpp 2008-06-24 13:35:32.000000000 +0200
++++ libgig-3.2.1/src/DLS.cpp 2008-06-24 13:37:23.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "DLS.h"
+
+ #include <time.h>
++#include <algorithm>
+
+ #ifdef __APPLE__
+ #include <CoreFoundation/CFUUID.h>
+diff -aur libgig-3.2.1-orig/src/gig.cpp libgig-3.2.1/src/gig.cpp
+--- libgig-3.2.1-orig/src/gig.cpp 2008-06-24 13:35:32.000000000 +0200
++++ libgig-3.2.1/src/gig.cpp 2008-06-24 13:36:57.000000000 +0200
+@@ -27,6 +27,7 @@
+
+ #include <math.h>
+ #include <iostream>
++#include <algorithm>
+
+ /// Initial size of the sample buffer which is used for decompression of
+ /// compressed sample wave streams - this value should always be bigger than
+diff -aur libgig-3.2.1-orig/src/RIFF.cpp libgig-3.2.1/src/RIFF.cpp
+--- libgig-3.2.1-orig/src/RIFF.cpp 2008-06-24 13:35:32.000000000 +0200
++++ libgig-3.2.1/src/RIFF.cpp 2008-06-24 13:36:40.000000000 +0200
+@@ -22,6 +22,7 @@
+ ***************************************************************************/
+
+ #include <string.h>
++#include <algorithm>
+
+ #include "RIFF.h"
+