summaryrefslogtreecommitdiff
path: root/audio/flac/patches/patch-aj
diff options
context:
space:
mode:
Diffstat (limited to 'audio/flac/patches/patch-aj')
-rw-r--r--audio/flac/patches/patch-aj40
1 files changed, 40 insertions, 0 deletions
diff --git a/audio/flac/patches/patch-aj b/audio/flac/patches/patch-aj
new file mode 100644
index 00000000000..351b7daa464
--- /dev/null
+++ b/audio/flac/patches/patch-aj
@@ -0,0 +1,40 @@
+$NetBSD: patch-aj,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./include/FLAC++/encoder.h.orig 2004-11-15 18:22:45.246765000 +0000
++++ ./include/FLAC++/encoder.h 2004-11-15 18:23:16.227987000 +0000
+@@ -159,7 +159,7 @@
+ virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
+ virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ friend State;
+ #endif
+@@ -259,7 +259,7 @@
+ virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
+ virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
+
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ friend State;
+ #endif
+@@ -360,7 +360,7 @@
+ protected:
+ virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
+
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ friend State;
+ #endif
+@@ -375,7 +375,7 @@
+
+ /* \} */
+
+- };
++ }
+ };
+
+ #endif