Fix build with GCC 4.5

4 files changed, 82 insertions, 1 deletions

diff --git a/audio/libsidplay2/distinfo b/audio/libsidplay2/distinfo
index d24f27d82e4..c3cfeff869b 100644
--- a/audio/libsidplay2/distinfo
+++ b/audio/libsidplay2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/07/30 10:32:30 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/11/25 21:30:19 joerg Exp $
 
 SHA1 (sidplay-libs-2.1.1.tar.gz) = 8af6350866edc30b0d331e075fa97292f6f645a5
 RMD160 (sidplay-libs-2.1.1.tar.gz) = 1ce4c3cb80470a834c5887b3f3be0b61ca71e4cd
@@ -6,3 +6,6 @@ Size (sidplay-libs-2.1.1.tar.gz) = 1900252 bytes
 SHA1 (patch-aa) = 78d39563d5296070ef4dd7f51df39f488dcc5343
 SHA1 (patch-ab) = 9013c29637ba0c9f07052049b6a77541c76e8c90
 SHA1 (patch-ac) = ea4aae589032f9317d5f557cfe819fa71b4d415f
+SHA1 (patch-builders_resid-builder_src_resid-builder.cpp) = 46d3686eb67256397458df1eac2c017465b616d8
+SHA1 (patch-builders_resid-builder_src_resid.cpp) = db9f0bf3658c38e88eba7ced3f6102587558160d
+SHA1 (patch-libsidplay_src_sidtune_SidTune.cpp) = 20f2a2f36db8c08989ad1239da15a91d82cd2a2f
diff --git a/audio/libsidplay2/patches/patch-builders_resid-builder_src_resid-builder.cpp b/audio/libsidplay2/patches/patch-builders_resid-builder_src_resid-builder.cpp
new file mode 100644
index 00000000000..c3bd00be0a6
--- /dev/null
+++ b/audio/libsidplay2/patches/patch-builders_resid-builder_src_resid-builder.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-builders_resid-builder_src_resid-builder.cpp,v 1.1 2011/11/25 21:30:19 joerg Exp $
+
+--- builders/resid-builder/src/resid-builder.cpp.orig	2011-11-25 19:35:59.000000000 +0000
++++ builders/resid-builder/src/resid-builder.cpp
+@@ -42,6 +42,7 @@
+ #ifdef HAVE_EXCEPTIONS
+ #   include <new>
+ #endif
++#include <cstring>
+ 
+ #include "resid.h"
+ #include "resid-emu.h"
diff --git a/audio/libsidplay2/patches/patch-builders_resid-builder_src_resid.cpp b/audio/libsidplay2/patches/patch-builders_resid-builder_src_resid.cpp
new file mode 100644
index 00000000000..2f36f7f189f
--- /dev/null
+++ b/audio/libsidplay2/patches/patch-builders_resid-builder_src_resid.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-builders_resid-builder_src_resid.cpp,v 1.1 2011/11/25 21:30:19 joerg Exp $
+
+--- builders/resid-builder/src/resid.cpp.orig	2011-11-25 19:35:44.000000000 +0000
++++ builders/resid-builder/src/resid.cpp
+@@ -21,6 +21,7 @@
+ #ifdef HAVE_EXCEPTIONS
+ #   include <new>
+ #endif
++#include <cstring>
+ 
+ #include "resid.h"
+ #include "resid-emu.h"
diff --git a/audio/libsidplay2/patches/patch-libsidplay_src_sidtune_SidTune.cpp b/audio/libsidplay2/patches/patch-libsidplay_src_sidtune_SidTune.cpp
new file mode 100644
index 00000000000..57e0519fb9f
--- /dev/null
+++ b/audio/libsidplay2/patches/patch-libsidplay_src_sidtune_SidTune.cpp
@@ -0,0 +1,54 @@
+$NetBSD: patch-libsidplay_src_sidtune_SidTune.cpp,v 1.1 2011/11/25 21:30:19 joerg Exp $
+
+--- libsidplay/src/sidtune/SidTune.cpp.orig	2011-11-25 19:32:28.000000000 +0000
++++ libsidplay/src/sidtune/SidTune.cpp
+@@ -33,13 +33,6 @@
+ #include <string.h>
+ #include <limits.h>
+ 
+-#if defined(HAVE_IOS_OPENMODE)
+-    typedef std::ios::openmode openmode;
+-#else
+-    typedef int openmode;
+-#endif
+-
+-
+ const char* SidTune::txt_songNumberExceed = "SIDTUNE WARNING: Selected song number was too high";
+ const char* SidTune::txt_empty = "SIDTUNE ERROR: No data to load";
+ const char* SidTune::txt_unrecognizedFormat = "SIDTUNE ERROR: Could not determine file format";
+@@ -283,7 +276,7 @@ bool SidTune::loadFile(const char* fileN
+     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 +945,7 @@ bool SidTune::saveC64dataFile( const cha
+     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 +995,7 @@ bool SidTune::saveSIDfile( const char* f
+     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 +1029,7 @@ bool SidTune::savePSIDfile( const char* 
+     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