diff options
Diffstat (limited to 'audio/flac')
26 files changed, 25 insertions, 443 deletions
diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 9aad4e528a0..f0c55d57dcf 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2004/11/16 12:07:03 sketch Exp $ +# $NetBSD: Makefile,v 1.32 2005/02/28 14:09:19 wiz Exp $ -DISTNAME= flac-1.1.1 -PKGREVISION= 1 +DISTNAME= flac-1.1.2 CATEGORIES= audio archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/} diff --git a/audio/flac/PLIST b/audio/flac/PLIST index 3b231bce535..2a3748b6e54 100644 --- a/audio/flac/PLIST +++ b/audio/flac/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/10/01 13:17:50 adam Exp $ +@comment $NetBSD: PLIST,v 1.8 2005/02/28 14:09:19 wiz Exp $ bin/flac bin/metaflac include/FLAC++/all.h @@ -24,9 +24,9 @@ include/OggFLAC++/decoder.h include/OggFLAC++/encoder.h include/OggFLAC++/export.h include/OggFLAC/all.h +include/OggFLAC/export.h include/OggFLAC/file_decoder.h include/OggFLAC/file_encoder.h -include/OggFLAC/export.h include/OggFLAC/seekable_stream_decoder.h include/OggFLAC/seekable_stream_encoder.h include/OggFLAC/stream_decoder.h @@ -48,6 +48,7 @@ share/doc/html/flac/developers.html share/doc/html/flac/documentation.html share/doc/html/flac/download.html share/doc/html/flac/faq.html +share/doc/html/flac/favicon.ico share/doc/html/flac/features.html share/doc/html/flac/format.html share/doc/html/flac/goals.html diff --git a/audio/flac/distinfo b/audio/flac/distinfo index aad21ac6d88..b42bfa8e93c 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1,28 +1,9 @@ -$NetBSD: distinfo,v 1.9 2005/02/23 20:39:45 agc Exp $ +$NetBSD: distinfo,v 1.10 2005/02/28 14:09:19 wiz Exp $ -SHA1 (flac-1.1.1.tar.gz) = 97832e5acad2f20867aafc30f219e47d26b853ac -RMD160 (flac-1.1.1.tar.gz) = 2bf336514bf76d7d12279a896deb919a4194b36c -Size (flac-1.1.1.tar.gz) = 1467204 bytes -SHA1 (patch-aa) = 8389e42e3a90877af795d8e401c438de98ddcc8f -SHA1 (patch-ab) = abf4df5033956d9c4214064660f82a82619cb3fd -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 +SHA1 (flac-1.1.2.tar.gz) = 65501f3547df99b153951edb2ee7bfc13dd56946 +RMD160 (flac-1.1.2.tar.gz) = 58656837b02e211eaed5010d84c4ed59841c82d3 +Size (flac-1.1.2.tar.gz) = 1516235 bytes +SHA1 (patch-aa) = debaf60c08f942682aca8a8461475a743c53034f +SHA1 (patch-ab) = 232db53797c1533bfbe8bb619e713d771ddf27d1 +SHA1 (patch-ac) = 1d305f4a48d96dc3e7cd80fd02f73340a643a982 +SHA1 (patch-ae) = 60e14c3d6622d616b5ff2987224f57145c7fb504 diff --git a/audio/flac/patches/patch-aa b/audio/flac/patches/patch-aa index ec0ea3493e2..4435ccf7365 100644 --- a/audio/flac/patches/patch-aa +++ b/audio/flac/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2004/10/01 13:17:50 adam Exp $ +$NetBSD: patch-aa,v 1.4 2005/02/28 14:09:19 wiz Exp $ ---- doc/Makefile.in.orig 2004-09-29 04:18:28.000000000 +0000 +--- doc/Makefile.in.orig 2005-02-05 03:23:27.000000000 +0100 +++ doc/Makefile.in -@@ -222,7 +222,7 @@ sysconfdir = @sysconfdir@ +@@ -236,7 +236,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign SUBDIRS = . html diff --git a/audio/flac/patches/patch-ab b/audio/flac/patches/patch-ab index 882752553ed..503344cd1b2 100644 --- a/audio/flac/patches/patch-ab +++ b/audio/flac/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2004/10/01 13:17:50 adam Exp $ +$NetBSD: patch-ab,v 1.4 2005/02/28 14:09:19 wiz Exp $ ---- doc/html/images/Makefile.in.orig 2004-09-29 04:18:29.000000000 +0000 +--- doc/html/images/Makefile.in.orig 2005-02-05 03:23:28.000000000 +0100 +++ doc/html/images/Makefile.in -@@ -212,7 +212,7 @@ sharedstatedir = @sharedstatedir@ +@@ -226,7 +226,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign diff --git a/audio/flac/patches/patch-ac b/audio/flac/patches/patch-ac index 2500a968c4a..ac4b4206ea7 100644 --- a/audio/flac/patches/patch-ac +++ b/audio/flac/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2004/10/01 13:17:50 adam Exp $ +$NetBSD: patch-ac,v 1.4 2005/02/28 14:09:19 wiz Exp $ ---- doc/html/ru/Makefile.in.orig 2004-09-29 04:18:30.000000000 +0000 +--- doc/html/ru/Makefile.in.orig 2005-02-05 03:23:29.000000000 +0100 +++ doc/html/ru/Makefile.in -@@ -212,7 +212,7 @@ sharedstatedir = @sharedstatedir@ +@@ -226,7 +226,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign diff --git a/audio/flac/patches/patch-ae b/audio/flac/patches/patch-ae index c136a9ea951..1c34049cffd 100644 --- a/audio/flac/patches/patch-ae +++ b/audio/flac/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2004/10/01 13:17:50 adam Exp $ +$NetBSD: patch-ae,v 1.3 2005/02/28 14:09:19 wiz Exp $ ---- doc/html/Makefile.in.orig 2004-09-29 04:18:29.000000000 +0000 +--- doc/html/Makefile.in.orig 2005-02-05 03:23:28.000000000 +0100 +++ doc/html/Makefile.in -@@ -222,7 +222,7 @@ sysconfdir = @sysconfdir@ +@@ -236,7 +236,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign SUBDIRS = ru images diff --git a/audio/flac/patches/patch-af b/audio/flac/patches/patch-af deleted file mode 100644 index 314c4f5f99a..00000000000 --- a/audio/flac/patches/patch-af +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-af,v 1.1 2004/10/18 14:23:29 ben Exp $ - ---- src/libFLAC/include/private/lpc.h.orig Tue Jul 27 12:13:25 2004 -+++ src/libFLAC/include/private/lpc.h -@@ -61,6 +61,7 @@ void FLAC__lpc_compute_autocorrelation_a - void FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); - #endif - #endif -+#endif - - /* - * FLAC__lpc_compute_lp_coefficients() -@@ -154,7 +155,6 @@ void FLAC__lpc_restore_signal_asm_ia32_m - #elif defined FLAC__CPU_PPC - void FLAC__lpc_restore_signal_asm_ppc_altivec_16(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); - void FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); --#endif - #endif - #endif - diff --git a/audio/flac/patches/patch-ag b/audio/flac/patches/patch-ag deleted file mode 100644 index a8528928d80..00000000000 --- a/audio/flac/patches/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ -$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 --git a/audio/flac/patches/patch-ah b/audio/flac/patches/patch-ah deleted file mode 100644 index 34aff724663..00000000000 --- a/audio/flac/patches/patch-ah +++ /dev/null @@ -1,40 +0,0 @@ -$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 --git a/audio/flac/patches/patch-ai b/audio/flac/patches/patch-ai deleted file mode 100644 index 5c0c833b577..00000000000 --- a/audio/flac/patches/patch-ai +++ /dev/null @@ -1,29 +0,0 @@ -$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 --git a/audio/flac/patches/patch-aj b/audio/flac/patches/patch-aj deleted file mode 100644 index 351b7daa464..00000000000 --- a/audio/flac/patches/patch-aj +++ /dev/null @@ -1,40 +0,0 @@ -$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 --git a/audio/flac/patches/patch-ak b/audio/flac/patches/patch-ak deleted file mode 100644 index 27648ab12cc..00000000000 --- a/audio/flac/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$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 --git a/audio/flac/patches/patch-al b/audio/flac/patches/patch-al deleted file mode 100644 index 6ab7d370e55..00000000000 --- a/audio/flac/patches/patch-al +++ /dev/null @@ -1,20 +0,0 @@ -$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 --git a/audio/flac/patches/patch-am b/audio/flac/patches/patch-am deleted file mode 100644 index 0c9196f1c9e..00000000000 --- a/audio/flac/patches/patch-am +++ /dev/null @@ -1,11 +0,0 @@ -$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 --git a/audio/flac/patches/patch-an b/audio/flac/patches/patch-an deleted file mode 100644 index 8847fe4267c..00000000000 --- a/audio/flac/patches/patch-an +++ /dev/null @@ -1,29 +0,0 @@ -$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 --git a/audio/flac/patches/patch-ao b/audio/flac/patches/patch-ao deleted file mode 100644 index 7f8341ecf60..00000000000 --- a/audio/flac/patches/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ -$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); - } - -- }; -+ } - }; diff --git a/audio/flac/patches/patch-ap b/audio/flac/patches/patch-ap deleted file mode 100644 index 43e915a0407..00000000000 --- a/audio/flac/patches/patch-ap +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./src/libFLAC++/stream_encoder.cpp.orig 2004-11-16 11:05:01.874049000 +0000 -+++ ./src/libFLAC++/stream_encoder.cpp 2004-11-16 11:05:29.674481000 +0000 -@@ -169,7 +169,7 @@ - bool Stream::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 -@@ -181,7 +181,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__stream_encoder_set_metadata(encoder_, m, num_blocks); - delete [] m; -@@ -356,5 +356,5 @@ - instance->metadata_callback(metadata); - } - -- }; -+ } - }; diff --git a/audio/flac/patches/patch-aq b/audio/flac/patches/patch-aq deleted file mode 100644 index 317a28632d5..00000000000 --- a/audio/flac/patches/patch-aq +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./src/libOggFLAC++/file_decoder.cpp.orig 2004-11-16 11:08:42.176457000 +0000 -+++ ./src/libOggFLAC++/file_decoder.cpp 2004-11-16 11:08:59.074183000 +0000 -@@ -238,5 +238,5 @@ - instance->error_callback(status); - } - -- }; -+ } - }; diff --git a/audio/flac/patches/patch-ar b/audio/flac/patches/patch-ar deleted file mode 100644 index 7c34b0be12a..00000000000 --- a/audio/flac/patches/patch-ar +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./include/OggFLAC++/decoder.h.orig 2004-11-16 11:09:28.868389000 +0000 -+++ ./include/OggFLAC++/decoder.h 2004-11-16 11:10:55.717825000 +0000 -@@ -144,7 +144,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 -@@ -240,7 +240,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 -@@ -334,7 +334,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 -@@ -351,7 +351,7 @@ - - /* \} */ - -- }; -+ } - }; - - #endif diff --git a/audio/flac/patches/patch-as b/audio/flac/patches/patch-as deleted file mode 100644 index ae33be1df07..00000000000 --- a/audio/flac/patches/patch-as +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-as,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./include/OggFLAC++/encoder.h.orig 2004-11-16 11:11:52.196262000 +0000 -+++ ./include/OggFLAC++/encoder.h 2004-11-16 11:12:18.445244000 +0000 -@@ -162,7 +162,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 -@@ -263,7 +263,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 -@@ -365,7 +365,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 -@@ -380,7 +380,7 @@ - - /* \} */ - -- }; -+ } - }; - - #endif diff --git a/audio/flac/patches/patch-at b/audio/flac/patches/patch-at deleted file mode 100644 index 9c0842e3448..00000000000 --- a/audio/flac/patches/patch-at +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-at,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./src/libOggFLAC++/file_encoder.cpp.orig 2004-11-16 11:12:44.142879000 +0000 -+++ ./src/libOggFLAC++/file_encoder.cpp 2004-11-16 11:12:52.120091000 +0000 -@@ -349,5 +349,5 @@ - instance->progress_callback(bytes_written, samples_written, frames_written, total_frames_estimate); - } - -- }; -+ } - }; diff --git a/audio/flac/patches/patch-au b/audio/flac/patches/patch-au deleted file mode 100644 index 47442fa4101..00000000000 --- a/audio/flac/patches/patch-au +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-au,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./src/libOggFLAC++/seekable_stream_decoder.cpp.orig 2004-11-16 11:14:14.924132000 +0000 -+++ ./src/libOggFLAC++/seekable_stream_decoder.cpp 2004-11-16 11:14:19.658710000 +0000 -@@ -288,5 +288,5 @@ - instance->error_callback(status); - } - -- }; -+ } - }; diff --git a/audio/flac/patches/patch-av b/audio/flac/patches/patch-av deleted file mode 100644 index 6018a2c5d97..00000000000 --- a/audio/flac/patches/patch-av +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-av,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./src/libOggFLAC++/seekable_stream_encoder.cpp.orig 2004-11-16 11:15:04.815910000 +0000 -+++ ./src/libOggFLAC++/seekable_stream_encoder.cpp 2004-11-16 11:15:09.120236000 +0000 -@@ -362,5 +362,5 @@ - return instance->write_callback(buffer, bytes, samples, current_frame); - } - -- }; -+ } - }; diff --git a/audio/flac/patches/patch-aw b/audio/flac/patches/patch-aw deleted file mode 100644 index 1a546481319..00000000000 --- a/audio/flac/patches/patch-aw +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./src/libOggFLAC++/stream_decoder.cpp.orig 2004-11-16 11:15:53.283905000 +0000 -+++ ./src/libOggFLAC++/stream_decoder.cpp 2004-11-16 11:15:57.951343000 +0000 -@@ -224,5 +224,5 @@ - instance->error_callback(status); - } - -- }; -+ } - }; diff --git a/audio/flac/patches/patch-ax b/audio/flac/patches/patch-ax deleted file mode 100644 index fd42b8ccdbc..00000000000 --- a/audio/flac/patches/patch-ax +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2004/11/16 12:05:54 sketch Exp $ - ---- ./src/libOggFLAC++/stream_encoder.cpp.orig 2004-11-16 11:17:13.087258000 +0000 -+++ ./src/libOggFLAC++/stream_encoder.cpp 2004-11-16 11:17:17.124073000 +0000 -@@ -342,5 +342,5 @@ - instance->metadata_callback(metadata); - } - -- }; -+ } - }; |