diff options
| author | joerg <joerg@pkgsrc.org> | 2011-11-25 21:30:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-11-25 21:30:19 +0000 |
| commit | 2d85397c277aaec232fef98ae338df485d58ea5b (patch) | |
| tree | d7880332a8e3811ccedc2f378432aeb5c634c23d /audio/libsidplay2/patches | |
| parent | 95ee2c71536d4c0b2b7d1abda9333da79b12336b (diff) | |
| download | pkgsrc-2d85397c277aaec232fef98ae338df485d58ea5b.tar.gz | |
Fix build with GCC 4.5
Diffstat (limited to 'audio/libsidplay2/patches')
3 files changed, 78 insertions, 0 deletions
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 |