summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2008-12-01 15:04:33 -0800
committerEric Sandall2008-12-01 15:04:33 -0800
commitc99d33520abb2cc70321a1e2e7d2af680892f21a (patch)
tree879a0a80e6edbf06f580638fbf40d005fdaa9069
parent60e54b5dad0f00540d568b6a5209184a34cdec61 (diff)
sidplay-libs: Added patches for Bug 14905 from gentoo.
Removed BUILD and added PRE_BUILD for patching. (cherry-picked from commit 349a243d455b65212f11071eac1928e67ac51b5a)
-rwxr-xr-xaudio-libs/sidplay-libs/BUILD2
-rw-r--r--audio-libs/sidplay-libs/HISTORY6
-rw-r--r--audio-libs/sidplay-libs/PRE_BUILD9
-rw-r--r--audio-libs/sidplay-libs/gcc43.patch31
-rw-r--r--audio-libs/sidplay-libs/openmode.patch38
5 files changed, 84 insertions, 2 deletions
diff --git a/audio-libs/sidplay-libs/BUILD b/audio-libs/sidplay-libs/BUILD
deleted file mode 100755
index bf9376c4b2..0000000000
--- a/audio-libs/sidplay-libs/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch &&
-default_build
diff --git a/audio-libs/sidplay-libs/HISTORY b/audio-libs/sidplay-libs/HISTORY
index e5532f4f6c..599a7bbf46 100644
--- a/audio-libs/sidplay-libs/HISTORY
+++ b/audio-libs/sidplay-libs/HISTORY
@@ -1,3 +1,9 @@
+2008-11-22 George Sherwood <gsherwood@sourcemage.org>
+ * BUILD: Deleted. Patches should be in PRE_BUILD
+ * PRE_BUILD: Added to apply patches
+ * openmode.patch: Added gentoo patch for Bug 14905.
+ * gcc43.patch: Added patch to build with gcc 4.3.x
+
2006-07-24 Unet <unet@sourcemage.org>
* BUILD: Added gcc4.patch
* DETAILS: Updated to 2.1.1
diff --git a/audio-libs/sidplay-libs/PRE_BUILD b/audio-libs/sidplay-libs/PRE_BUILD
new file mode 100644
index 0000000000..90238301b5
--- /dev/null
+++ b/audio-libs/sidplay-libs/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch &&
+
+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&
+
+patch -p0 < $SCRIPT_DIRECTORY/openmode.patch
diff --git a/audio-libs/sidplay-libs/gcc43.patch b/audio-libs/sidplay-libs/gcc43.patch
new file mode 100644
index 0000000000..6f336ba34d
--- /dev/null
+++ b/audio-libs/sidplay-libs/gcc43.patch
@@ -0,0 +1,31 @@
+--- builders/resid-builder/src/resid.cpp.old 2008-07-25 17:00:41.000000000 +0000
++++ builders/resid-builder/src/resid.cpp 2008-07-25 16:59:44.000000000 +0000
+@@ -16,6 +16,8 @@
+ * *
+ ***************************************************************************/
+
++#include <cstring>
++
+ #include "config.h"
+
+ #ifdef HAVE_EXCEPTIONS
+--- builders/resid-builder/src/resid-builder.cpp.old 2008-07-25 17:02:00.000000000 +0000
++++ builders/resid-builder/src/resid-builder.cpp 2008-07-25 17:01:47.000000000 +0000
+@@ -37,6 +37,7 @@
+ ***************************************************************************/
+
+ #include <stdio.h>
++#include <cstring>
+
+ #include "config.h"
+ #ifdef HAVE_EXCEPTIONS
+--- builders/hardsid-builder/src/hardsid-builder.cpp.old 2008-07-25 17:08:50.000000000 +0000
++++ builders/hardsid-builder/src/hardsid-builder.cpp 2008-07-25 17:08:17.000000000 +0000
+@@ -47,6 +47,7 @@
+ ***************************************************************************/
+
+ #include <stdio.h>
++#include <cstring>
+ #include "config.h"
+
+ #ifdef HAVE_EXCEPTIONS
diff --git a/audio-libs/sidplay-libs/openmode.patch b/audio-libs/sidplay-libs/openmode.patch
new file mode 100644
index 0000000000..57c29a9723
--- /dev/null
+++ b/audio-libs/sidplay-libs/openmode.patch
@@ -0,0 +1,38 @@
+--- libsidplay/src/sidtune/SidTune.cpp 2008-07-25 16:55:02.000000000 +0000
++++ libsidplay/src/sidtune/SidTune.cpp 2008-07-25 16:53:58.000000000 +0000
+@@ -283,7 +283,7 @@
+ uint_least32_t fileLen = 0;
+
+ // This sucks big time
+- openmode createAtrr = std::ios::in;
++ std::_Ios_Openmode createAtrr = std::ios::in;
+ #ifdef HAVE_IOS_NOCREATE
+ createAtrr |= std::ios::nocreate;
+ #endif
+@@ -952,7 +952,7 @@
+ if ( status )
+ {
+ // Open binary output file stream.
+- openmode createAttr = std::ios::out;
++ std::_Ios_Openmode createAttr = std::ios::out;
+ #if defined(HAVE_IOS_BIN)
+ createAttr |= std::ios::bin;
+ #else
+@@ -1002,7 +1002,7 @@
+ if ( status )
+ {
+ // Open ASCII output file stream.
+- openmode createAttr = std::ios::out;
++ std::_Ios_Openmode createAttr = std::ios::out;
+ if ( overWriteFlag )
+ createAttr |= std::ios::trunc;
+ else
+@@ -1036,7 +1036,7 @@
+ if ( status )
+ {
+ // Open binary output file stream.
+- openmode createAttr = std::ios::out;
++ std::_Ios_Openmode createAttr = std::ios::out;
+ #if defined(HAVE_IOS_BIN)
+ createAttr |= std::ios::bin;
+ #else