pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/flac Various C++ tweaks/cleanups to get this pac...
details: https://anonhg.NetBSD.org/pkgsrc/rev/644f41764ea5
branches: trunk
changeset: 483628:644f41764ea5
user: sketch <sketch%pkgsrc.org@localhost>
date: Tue Nov 16 12:05:54 2004 +0000
description:
Various C++ tweaks/cleanups to get this package compiling with SunPro.
diffstat:
audio/flac/Makefile | 10 ++++++----
audio/flac/distinfo | 20 +++++++++++++++++++-
audio/flac/patches/patch-ag | 11 +++++++++++
audio/flac/patches/patch-ah | 40 ++++++++++++++++++++++++++++++++++++++++
audio/flac/patches/patch-ai | 29 +++++++++++++++++++++++++++++
audio/flac/patches/patch-aj | 40 ++++++++++++++++++++++++++++++++++++++++
audio/flac/patches/patch-ak | 13 +++++++++++++
audio/flac/patches/patch-al | 20 ++++++++++++++++++++
audio/flac/patches/patch-am | 11 +++++++++++
audio/flac/patches/patch-an | 29 +++++++++++++++++++++++++++++
audio/flac/patches/patch-ao | 11 +++++++++++
audio/flac/patches/patch-ap | 29 +++++++++++++++++++++++++++++
audio/flac/patches/patch-aq | 11 +++++++++++
audio/flac/patches/patch-ar | 40 ++++++++++++++++++++++++++++++++++++++++
audio/flac/patches/patch-as | 40 ++++++++++++++++++++++++++++++++++++++++
audio/flac/patches/patch-at | 11 +++++++++++
audio/flac/patches/patch-au | 11 +++++++++++
audio/flac/patches/patch-av | 11 +++++++++++
audio/flac/patches/patch-aw | 11 +++++++++++
audio/flac/patches/patch-ax | 11 +++++++++++
20 files changed, 404 insertions(+), 5 deletions(-)
diffs (truncated from 513 to 300 lines):
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/Makefile
--- a/audio/flac/Makefile Tue Nov 16 11:53:07 2004 +0000
+++ b/audio/flac/Makefile Tue Nov 16 12:05:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/10/18 18:25:49 ben Exp $
+# $NetBSD: Makefile,v 1.30 2004/11/16 12:05:54 sketch Exp $
DISTNAME= flac-1.1.1
PKGREVISION= 1
@@ -32,9 +32,6 @@
.endif
.endif
-# This version of flac doesn't build with SunPro yet.
-NOT_FOR_COMPILER= sunpro
-
# This version of flac doesn't seem to build correctly with -O3 using
# the MIPSpro compiler.
.include "../../mk/compiler.mk"
@@ -42,6 +39,11 @@
BUILDLINK_TRANSFORM+= rm:-O3
.endif
+# SunPro does not support __inline
+.if !empty(PKGSRC_COMPILER:Msunpro)
+CFLAGS+= -D__inline=inline
+.endif
+
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/distinfo
--- a/audio/flac/distinfo Tue Nov 16 11:53:07 2004 +0000
+++ b/audio/flac/distinfo Tue Nov 16 12:05:54 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/10/18 14:23:29 ben Exp $
+$NetBSD: distinfo,v 1.8 2004/11/16 12:05:54 sketch Exp $
SHA1 (flac-1.1.1.tar.gz) = 97832e5acad2f20867aafc30f219e47d26b853ac
Size (flac-1.1.1.tar.gz) = 1467204 bytes
@@ -7,3 +7,21 @@
SHA1 (patch-ac) = 4da64f547cc44cc48a0fb0a761ce7654aa32704a
SHA1 (patch-ae) = a9ea14a0d0f05c0b49db08e8e62c46589e2b0f2e
SHA1 (patch-af) = b679103dcd19573bc340426573b027e97c725f8b
+SHA1 (patch-ag) = db7f1db8bc3283fdc698be41754e27bfe344d29e
+SHA1 (patch-ah) = df7c6432123988b2b3675ce93e8faf3c1c9ef691
+SHA1 (patch-ai) = 7c3844526cfd7ec5a8e59ff4052bdb86da0a61e0
+SHA1 (patch-aj) = 71bf6ecc177a58d4e809424feb5f541d8203594f
+SHA1 (patch-ak) = 5e360edc4dfe585f6ea06e23ccd986397280610d
+SHA1 (patch-al) = 09209de67a72a7d3bf01bfc4d347ce160028f837
+SHA1 (patch-am) = e7b4eaf58e92fd851084347029557f330a78b874
+SHA1 (patch-an) = c1c7fcc50e7fcff14895bdb39b4bde8b7951ab2e
+SHA1 (patch-ao) = d0b10b55eace36c763b70ad2b8307fbd82702144
+SHA1 (patch-ap) = 36a6271b5a76b1e6f974206e60cdc73adb115ddc
+SHA1 (patch-aq) = cb470aa3b5960c7aeef09b10a2c80f4073278944
+SHA1 (patch-ar) = c8c8eb0e4e3111782aecbcf156761b8f15a801bc
+SHA1 (patch-as) = 22ca67dc39346476d771c30d66d5576ca61e99f2
+SHA1 (patch-at) = 30fae8796b6d3c52ae6195dc6072dc4ce8cefa54
+SHA1 (patch-au) = 4be24f28f1b6fe73cf8141a3150a3ec9c0d0b4cc
+SHA1 (patch-av) = 5428cb54b0df1cf3efab0c8493b395d67dc549f9
+SHA1 (patch-aw) = 2b1b16c8519598981ce19b96b9228ecc92649ae7
+SHA1 (patch-ax) = 360964ea0ed90a587a738d94283f178a934e4975
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-ag Tue Nov 16 12:05:54 2004 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/file_decoder.cpp.orig 2004-11-15 18:13:52.244390000 +0000
++++ ./src/libFLAC++/file_decoder.cpp 2004-11-15 18:14:06.428905000 +0000
+@@ -232,5 +232,5 @@
+ instance->error_callback(status);
+ }
+
+- };
++ }
+ };
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-ah Tue Nov 16 12:05:54 2004 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ah,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./include/FLAC++/decoder.h.orig 2004-11-15 18:15:26.796748000 +0000
++++ ./include/FLAC++/decoder.h 2004-11-15 18:19:27.953373000 +0000
+@@ -141,7 +141,7 @@
+ virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 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 decoder_ from nested State::resolved_as_cstring()
+ friend State;
+ #endif
+@@ -236,7 +236,7 @@
+ virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 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 decoder_ from nested State::resolved_as_cstring()
+ friend State;
+ #endif
+@@ -329,7 +329,7 @@
+ virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 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 decoder_ from nested State::resolved_as_cstring()
+ friend State;
+ #endif
+@@ -346,7 +346,7 @@
+
+ /* \} */
+
+- };
++ }
+ };
+
+ #endif
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-ai Tue Nov 16 12:05:54 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ai,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/file_encoder.cpp.orig 2004-11-15 18:20:18.800446000 +0000
++++ ./src/libFLAC++/file_encoder.cpp 2004-11-15 18:26:18.841164000 +0000
+@@ -168,7 +168,7 @@
+ bool File::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
+ {
+ FLAC__ASSERT(is_valid());
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ // MSVC++ can't handle:
+ // ::FLAC__StreamMetadata *m[num_blocks];
+ // so we do this ugly workaround
+@@ -180,7 +180,7 @@
+ // we can get away with this since we know the encoder will only correct the is_last flags
+ m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]);
+ }
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ // complete the hack
+ const bool ok = (bool)::FLAC__file_encoder_set_metadata(encoder_, m, num_blocks);
+ delete [] m;
+@@ -368,5 +368,5 @@
+ instance->progress_callback(bytes_written, samples_written, frames_written, total_frames_estimate);
+ }
+
+- };
++ }
+ };
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-aj Tue Nov 16 12:05:54 2004 +0000
@@ -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
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-ak Tue Nov 16 12:05:54 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./include/FLAC++/metadata.h.orig 2004-11-15 18:23:49.895423000 +0000
++++ ./include/FLAC++/metadata.h 2004-11-15 18:24:03.120333000 +0000
+@@ -978,7 +978,7 @@
+
+ /* \} */
+
+- };
++ }
+ };
+
+ #endif
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-al Tue Nov 16 12:05:54 2004 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-al,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/metadata.cpp.orig 2004-11-16 11:00:08.317545000 +0000
++++ ./src/libFLAC++/metadata.cpp 2004-11-16 11:00:19.507566000 +0000
+@@ -75,7 +75,7 @@
+ return ret;
+ }
+
+- };
++ }
+
+ FLACPP_API Prototype *clone(const Prototype *object)
+ {
+@@ -1283,5 +1283,5 @@
+ return ret;
+ }
+
+- };
++ }
+ };
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-am Tue Nov 16 12:05:54 2004 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-am,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/seekable_stream_decoder.cpp.orig 2004-11-16 11:01:24.773461000 +0000
++++ ./src/libFLAC++/seekable_stream_decoder.cpp 2004-11-16 11:01:30.719312000 +0000
+@@ -282,5 +282,5 @@
+ instance->error_callback(status);
+ }
+
+- };
++ }
+ };
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-an Tue Nov 16 12:05:54 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-an,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/seekable_stream_encoder.cpp.orig 2004-11-16 11:02:36.626862000 +0000
++++ ./src/libFLAC++/seekable_stream_encoder.cpp 2004-11-16 11:03:14.289382000 +0000
+@@ -168,7 +168,7 @@
+ bool SeekableStream::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
+ {
+ FLAC__ASSERT(is_valid());
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ // MSVC++ can't handle:
+ // ::FLAC__StreamMetadata *m[num_blocks];
+ // so we do this ugly workaround
+@@ -180,7 +180,7 @@
+ // we can get away with this since we know the encoder will only correct the is_last flags
+ m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]);
+ }
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ // complete the hack
+ const bool ok = (bool)::FLAC__seekable_stream_encoder_set_metadata(encoder_, m, num_blocks);
+ delete [] m;
+@@ -371,5 +371,5 @@
+ return instance->write_callback(buffer, bytes, samples, current_frame);
+ }
+
+- };
++ }
+ };
diff -r 4a8363f05e0f -r 644f41764ea5 audio/flac/patches/patch-ao
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/patches/patch-ao Tue Nov 16 12:05:54 2004 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-ao,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/stream_decoder.cpp.orig 2004-11-16 11:04:04.924224000 +0000
++++ ./src/libFLAC++/stream_decoder.cpp 2004-11-16 11:04:10.117270000 +0000
+@@ -218,5 +218,5 @@
+ instance->error_callback(status);
+ }
+
+- };
Home |
Main Index |
Thread Index |
Old Index