diff options
author | drochner <drochner@pkgsrc.org> | 2007-07-06 19:13:13 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2007-07-06 19:13:13 +0000 |
commit | 8f7abc1505b347bb11bd035fa45ab2414edfca08 (patch) | |
tree | 1d688fac63b89e918b35a3c4e08aa50ffef3d447 /multimedia | |
parent | f2fa6c9d7fb885673d90c8f0a48f5aaa4fae4b2d (diff) | |
download | pkgsrc-8f7abc1505b347bb11bd035fa45ab2414edfca08.tar.gz |
update to 0.10.6
changes:
-Much improved RTSP/RTP and V4l2 support
-New plugins - audiopanorama, audioinvert, audiodynamic, audioamplify
-qtdemux, videocrop and wavpack elements moved from Bad Plugins
-Fixes in avi and matroska muxing
-Fixes in wavparse, sunaudio, AVI demuxing, ID3 tag handling
-gamma element ported to 0.10
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/gst-plugins0.10-good/Makefile | 5 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-good/Makefile.common | 4 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-good/PLIST | 6 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-good/distinfo | 14 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-good/patches/patch-ab | 97 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-good/patches/patch-ac | 488 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-good/patches/patch-ad | 16 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-good/patches/patch-ae | 524 | ||||
-rw-r--r-- | multimedia/gst-plugins0.10-good/patches/patch-af | 16 |
9 files changed, 23 insertions, 1147 deletions
diff --git a/multimedia/gst-plugins0.10-good/Makefile b/multimedia/gst-plugins0.10-good/Makefile index cf3a7e0b25b..3cea64393b9 100644 --- a/multimedia/gst-plugins0.10-good/Makefile +++ b/multimedia/gst-plugins0.10-good/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.8 2007/02/08 21:30:24 drochner Exp $ +# $NetBSD: Makefile,v 1.9 2007/07/06 19:13:13 drochner Exp $ # .include "Makefile.common" COMMENT+= good plugins +# libgstqtdemux.la and libgstvideocrop.la were moved from bad to good +CONFLICTS+= gst-plugins0.10-bad<0.10.5 + CONFIGURE_ARGS+= --enable-gconf CONFIGURE_ARGS+= --enable-gconftool CONFIGURE_ARGS+= --enable-zlib diff --git a/multimedia/gst-plugins0.10-good/Makefile.common b/multimedia/gst-plugins0.10-good/Makefile.common index f414033e3fa..376c8cff898 100644 --- a/multimedia/gst-plugins0.10-good/Makefile.common +++ b/multimedia/gst-plugins0.10-good/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.8 2007/01/09 15:16:56 drochner Exp $ +# $NetBSD: Makefile.common,v 1.9 2007/07/06 19:13:13 drochner Exp $ # GST_PLUGINS0.10_TYPE= good -GST_PLUGINS0.10_VER= 0.10.5 +GST_PLUGINS0.10_VER= 0.10.6 # Disable all drivers and features by default. .for driver in aalib \ diff --git a/multimedia/gst-plugins0.10-good/PLIST b/multimedia/gst-plugins0.10-good/PLIST index d225acf5725..0a505a7c333 100644 --- a/multimedia/gst-plugins0.10-good/PLIST +++ b/multimedia/gst-plugins0.10-good/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2007/01/09 15:16:56 drochner Exp $ +@comment $NetBSD: PLIST,v 1.7 2007/07/06 19:13:13 drochner Exp $ lib/gstreamer-0.10/libgstalaw.la lib/gstreamer-0.10/libgstalpha.la lib/gstreamer-0.10/libgstalphacolor.la @@ -13,6 +13,7 @@ lib/gstreamer-0.10/libgstdebug.la lib/gstreamer-0.10/libgstefence.la lib/gstreamer-0.10/libgsteffectv.la lib/gstreamer-0.10/libgstflxdec.la +lib/gstreamer-0.10/libgstgamma.la lib/gstreamer-0.10/libgstgconfelements.la lib/gstreamer-0.10/libgstgoom.la lib/gstreamer-0.10/libgstid3demux.la @@ -22,12 +23,14 @@ lib/gstreamer-0.10/libgstmatroska.la lib/gstreamer-0.10/libgstmulaw.la lib/gstreamer-0.10/libgstmultipart.la lib/gstreamer-0.10/libgstnavigationtest.la +lib/gstreamer-0.10/libgstqtdemux.la lib/gstreamer-0.10/libgstrtp.la lib/gstreamer-0.10/libgstrtsp.la lib/gstreamer-0.10/libgstsmpte.la lib/gstreamer-0.10/libgstudp.la lib/gstreamer-0.10/libgstvideobalance.la lib/gstreamer-0.10/libgstvideobox.la +lib/gstreamer-0.10/libgstvideocrop.la lib/gstreamer-0.10/libgstvideoflip.la lib/gstreamer-0.10/libgstvideomixer.la lib/gstreamer-0.10/libgstwavenc.la @@ -39,6 +42,7 @@ share/locale/cs/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/hu/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/it/LC_MESSAGES/gst-plugins-good-0.10.mo +share/locale/ja/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/nb/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/nl/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/or/LC_MESSAGES/gst-plugins-good-0.10.mo diff --git a/multimedia/gst-plugins0.10-good/distinfo b/multimedia/gst-plugins0.10-good/distinfo index 236b0490737..163f1082b7d 100644 --- a/multimedia/gst-plugins0.10-good/distinfo +++ b/multimedia/gst-plugins0.10-good/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.8 2007/01/13 09:18:21 wiz Exp $ +$NetBSD: distinfo,v 1.9 2007/07/06 19:13:13 drochner Exp $ -SHA1 (gst-plugins-good-0.10.5.tar.bz2) = 21bdf42c401129d1b8e019b1d5200f5b0d237557 -RMD160 (gst-plugins-good-0.10.5.tar.bz2) = 93d0b31a5c54c58185f73a0bf5b0223cdf12cad7 -Size (gst-plugins-good-0.10.5.tar.bz2) = 1356388 bytes -SHA1 (patch-ab) = d01874956fa966bff3d7b57345a9d20bd7213d4d -SHA1 (patch-ac) = 67e2a470f280a4e20ffd700249b3ef9a1f762920 -SHA1 (patch-ad) = 833f22db9d18e8bef7ec7668b1537770493cdba3 -SHA1 (patch-ae) = b359f69b897d2aba0e5235bf4610bac45dd8e6a9 -SHA1 (patch-af) = 3fde5e94d57f27d2971699254bfc8e586a4b2440 +SHA1 (gst-plugins-good-0.10.6.tar.bz2) = eb918b6876e90f4ac803d209a14b32c1b3e26695 +RMD160 (gst-plugins-good-0.10.6.tar.bz2) = fd0102617759611f9b6e9e490101b95f4369f4e8 +Size (gst-plugins-good-0.10.6.tar.bz2) = 1576121 bytes +SHA1 (patch-ab) = 5038e7d958d249ec969fac92c6c3126d79102e2c diff --git a/multimedia/gst-plugins0.10-good/patches/patch-ab b/multimedia/gst-plugins0.10-good/patches/patch-ab index cb4007ca362..da3236290ad 100644 --- a/multimedia/gst-plugins0.10-good/patches/patch-ab +++ b/multimedia/gst-plugins0.10-good/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2007/01/13 09:18:21 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2007/07/06 19:13:13 drochner Exp $ ---- configure.orig 2007-01-13 09:14:05.000000000 +0000 +--- configure.orig 2007-06-18 18:54:07.000000000 +0200 +++ configure -@@ -27646,7 +27646,7 @@ rm -f conftest.mmap +@@ -29520,7 +29520,7 @@ rm -f conftest.mmap @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2007/01/13 09:18:21 wiz Exp $ GST_HAVE_MMAP_TRUE= GST_HAVE_MMAP_FALSE='#' else -@@ -29541,7 +29541,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -31352,7 +31352,7 @@ rm -f core conftest.err conftest.$ac_obj echo "${ECHO_T}$flag_ok" >&6; } @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.5 2007/01/13 09:18:21 wiz Exp $ then { echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all,no%E_EMPTY_DECLARATION,no%E_STATEMENT_NOT_REACHED" >&5 -@@ -29621,7 +29621,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -31415,7 +31415,7 @@ rm -f core conftest.err conftest.$ac_obj echo "${ECHO_T}$flag_ok" >&6; } @@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.5 2007/01/13 09:18:21 wiz Exp $ then { echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5 -@@ -35186,9 +35186,9 @@ if test x$USE_FLAC = xyes; then +@@ -37189,9 +37189,9 @@ if test x$USE_FLAC = xyes; then HAVE_FLAC=no @@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.5 2007/01/13 09:18:21 wiz Exp $ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -35206,11 +35206,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -37209,11 +37209,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -56,86 +56,3 @@ $NetBSD: patch-ab,v 1.5 2007/01/13 09:18:21 wiz Exp $ ; return 0; } -@@ -35249,21 +35249,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new=yes -+ ac_cv_lib_FLAC_FLAC__stream_encoder_new=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new=no -+ ac_cv_lib_FLAC_FLAC__stream_encoder_new=no - fi - - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new" >&5 --echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new" >&6; } --if test $ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new = yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_encoder_new" >&5 -+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_encoder_new" >&6; } -+if test $ac_cv_lib_FLAC_FLAC__stream_encoder_new = yes; then - HAVE_FLAC=yes - else - HAVE_FLAC=no -@@ -35443,9 +35443,9 @@ fi - - - if test x$HAVE_FLAC = xyes; then -- { echo "$as_me:$LINENO: checking whether FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR is declared" >&5 --echo $ECHO_N "checking whether FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR is declared... $ECHO_C" >&6; } --if test "${ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR+set}" = set; then -+ { echo "$as_me:$LINENO: checking whether FLAC__STREAM_ENCODER_TELL_STATUS_ERROR is declared" >&5 -+echo $ECHO_N "checking whether FLAC__STREAM_ENCODER_TELL_STATUS_ERROR is declared... $ECHO_C" >&6; } -+if test "${ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -35455,14 +35455,14 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --#include <FLAC/seekable_stream_encoder.h> -+#include <FLAC/stream_encoder.h> - - - int - main () - { --#ifndef FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR -- char *p = (char *) FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR; -+#ifndef FLAC__STREAM_ENCODER_TELL_STATUS_ERROR -+ char *p = (char *) FLAC__STREAM_ENCODER_TELL_STATUS_ERROR; - return !p; - #endif - -@@ -35504,19 +35504,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR=yes -+ ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR=no -+ ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR" >&5 --echo "${ECHO_T}$ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR" >&6; } --if test $ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR = yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR" >&5 -+echo "${ECHO_T}$ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR" >&6; } -+if test $ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR = yes; then - HAVE_FLAC="yes" - else - HAVE_FLAC="no" diff --git a/multimedia/gst-plugins0.10-good/patches/patch-ac b/multimedia/gst-plugins0.10-good/patches/patch-ac deleted file mode 100644 index da906a97658..00000000000 --- a/multimedia/gst-plugins0.10-good/patches/patch-ac +++ /dev/null @@ -1,488 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2007/01/13 09:18:21 wiz Exp $ - ---- ext/flac/gstflacdec.c.orig 2006-10-16 18:22:46.000000000 +0000 -+++ ext/flac/gstflacdec.c -@@ -56,6 +56,12 @@ - - #include <gst/tag/tag.h> - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ - GST_DEBUG_CATEGORY_STATIC (flacdec_debug); - #define GST_CAT_DEFAULT flacdec_debug - -@@ -93,9 +99,13 @@ static void gst_flac_dec_reset_decoders - static void gst_flac_dec_setup_seekable_decoder (GstFlacDec * flacdec); - static void gst_flac_dec_setup_stream_decoder (GstFlacDec * flacdec); - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderReadStatus - gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, - FLAC__byte buffer[], unsigned *bytes, void *client_data); -+static FLAC__StreamDecoderReadStatus -+gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, -+ FLAC__byte buffer[], unsigned *bytes, void *client_data); - static FLAC__SeekableStreamDecoderSeekStatus - gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, - FLAC__uint64 position, void *client_data); -@@ -107,9 +117,6 @@ gst_flac_dec_length (const FLAC__Seekabl - FLAC__uint64 * length, void *client_data); - static FLAC__bool gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, - void *client_data); --static FLAC__StreamDecoderReadStatus --gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, -- FLAC__byte buffer[], unsigned *bytes, void *client_data); - static FLAC__StreamDecoderWriteStatus - gst_flac_dec_write_seekable (const FLAC__SeekableStreamDecoder * decoder, - const FLAC__Frame * frame, -@@ -123,13 +130,38 @@ static void gst_flac_dec_metadata_callba - const FLAC__StreamMetadata * metadata, void *client_data); - static void gst_flac_dec_metadata_callback_stream (const FLAC__StreamDecoder * - decoder, const FLAC__StreamMetadata * metadata, void *client_data); --static void gst_flac_dec_metadata_callback (GstFlacDec * flacdec, -- const FLAC__StreamMetadata * metadata); - static void gst_flac_dec_error_callback_seekable (const - FLAC__SeekableStreamDecoder * decoder, - FLAC__StreamDecoderErrorStatus status, void *client_data); - static void gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder * - decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); -+#else -+static FLAC__StreamDecoderReadStatus -+gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder, -+ FLAC__byte buffer[], size_t *bytes, void *client_data); -+static FLAC__StreamDecoderReadStatus -+gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, -+ FLAC__byte buffer[], size_t *bytes, void *client_data); -+static FLAC__StreamDecoderSeekStatus -+gst_flac_dec_seek (const FLAC__StreamDecoder * decoder, -+ FLAC__uint64 position, void *client_data); -+static FLAC__StreamDecoderTellStatus -+gst_flac_dec_tell (const FLAC__StreamDecoder * decoder, -+ FLAC__uint64 * position, void *client_data); -+static FLAC__StreamDecoderLengthStatus -+gst_flac_dec_length (const FLAC__StreamDecoder * decoder, -+ FLAC__uint64 * length, void *client_data); -+static FLAC__bool gst_flac_dec_eof (const FLAC__StreamDecoder * decoder, -+ void *client_data); -+static FLAC__StreamDecoderWriteStatus -+gst_flac_dec_write_stream (const FLAC__StreamDecoder * decoder, -+ const FLAC__Frame * frame, -+ const FLAC__int32 * const buffer[], void *client_data); -+static void gst_flac_dec_metadata_callback_stream (const FLAC__StreamDecoder * -+ decoder, const FLAC__StreamMetadata * metadata, void *client_data); -+static void gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder * -+ decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); -+#endif - - GST_BOILERPLATE (GstFlacDec, gst_flac_dec, GstElement, GST_TYPE_ELEMENT); - #define GST_FLAC_DEC_SRC_CAPS \ -@@ -212,7 +244,11 @@ static void - gst_flac_dec_reset_decoders (GstFlacDec * flacdec) - { - if (flacdec->seekable_decoder) { -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_decoder_delete (flacdec->seekable_decoder); -+#else -+ FLAC__stream_decoder_delete (flacdec->seekable_decoder); -+#endif - flacdec->seekable_decoder = NULL; - } - -@@ -238,6 +274,7 @@ gst_flac_dec_setup_seekable_decoder (Gst - { - gst_flac_dec_reset_decoders (dec); - -+#ifdef LEGACY_FLAC - dec->seekable_decoder = FLAC__seekable_stream_decoder_new (); - - FLAC__seekable_stream_decoder_set_read_callback (dec->seekable_decoder, -@@ -259,6 +296,12 @@ gst_flac_dec_setup_seekable_decoder (Gst - FLAC__seekable_stream_decoder_set_error_callback (dec->seekable_decoder, - gst_flac_dec_error_callback_seekable); - FLAC__seekable_stream_decoder_set_client_data (dec->seekable_decoder, dec); -+#else -+ dec->seekable_decoder = FLAC__stream_decoder_new (); -+ -+ FLAC__stream_decoder_set_metadata_respond (dec->seekable_decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); -+ FLAC__stream_decoder_set_md5_checking (dec->seekable_decoder, false); /* no point calculating since it's never checked here */ -+#endif - } - - static void -@@ -270,17 +313,21 @@ gst_flac_dec_setup_stream_decoder (GstFl - - dec->stream_decoder = FLAC__stream_decoder_new (); - -+#ifdef LEGACY_FLAC - FLAC__stream_decoder_set_read_callback (dec->stream_decoder, - gst_flac_dec_read_stream); - FLAC__stream_decoder_set_write_callback (dec->stream_decoder, - gst_flac_dec_write_stream); -- FLAC__stream_decoder_set_metadata_respond (dec->stream_decoder, -- FLAC__METADATA_TYPE_VORBIS_COMMENT); - FLAC__stream_decoder_set_metadata_callback (dec->stream_decoder, - gst_flac_dec_metadata_callback_stream); - FLAC__stream_decoder_set_error_callback (dec->stream_decoder, - gst_flac_dec_error_callback_stream); - FLAC__stream_decoder_set_client_data (dec->stream_decoder, dec); -+#else -+ FLAC__stream_decoder_set_md5_checking (dec->stream_decoder, false); /* no point calculating since it's never checked here */ -+#endif -+ FLAC__stream_decoder_set_metadata_respond (dec->stream_decoder, -+ FLAC__METADATA_TYPE_VORBIS_COMMENT); - } - - static void -@@ -544,6 +591,7 @@ gst_flac_dec_metadata_callback (GstFlacD - } - } - -+#ifdef LEGACY_FLAC - static void - gst_flac_dec_metadata_callback_seekable (const FLAC__SeekableStreamDecoder * d, - const FLAC__StreamMetadata * metadata, void *client_data) -@@ -552,6 +600,7 @@ gst_flac_dec_metadata_callback_seekable - - gst_flac_dec_metadata_callback (dec, metadata); - } -+#endif - - static void - gst_flac_dec_metadata_callback_stream (const FLAC__StreamDecoder * decoder, -@@ -587,12 +636,14 @@ gst_flac_dec_error_callback (GstFlacDec - dec->last_flow = GST_FLOW_ERROR; - } - -+#ifdef LEGACY_FLAC - static void - gst_flac_dec_error_callback_seekable (const FLAC__SeekableStreamDecoder * d, - FLAC__StreamDecoderErrorStatus status, void *client_data) - { - gst_flac_dec_error_callback (GST_FLAC_DEC (client_data), status); - } -+#endif - - static void - gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder * d, -@@ -601,9 +652,15 @@ gst_flac_dec_error_callback_stream (cons - gst_flac_dec_error_callback (GST_FLAC_DEC (client_data), status); - } - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderSeekStatus - gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, - FLAC__uint64 position, void *client_data) -+#else -+static FLAC__StreamDecoderSeekStatus -+gst_flac_dec_seek (const FLAC__StreamDecoder * decoder, -+ FLAC__uint64 position, void *client_data) -+#endif - { - GstFlacDec *flacdec; - -@@ -612,12 +669,22 @@ gst_flac_dec_seek (const FLAC__SeekableS - GST_DEBUG ("seek %" G_GINT64_FORMAT, position); - flacdec->offset = position; - -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK; -+#else -+ return FLAC__STREAM_DECODER_SEEK_STATUS_OK; -+#endif - } - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderTellStatus - gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * decoder, - FLAC__uint64 * position, void *client_data) -+#else -+static FLAC__StreamDecoderTellStatus -+gst_flac_dec_tell (const FLAC__StreamDecoder * decoder, -+ FLAC__uint64 * position, void *client_data) -+#endif - { - GstFlacDec *flacdec; - -@@ -627,12 +694,22 @@ gst_flac_dec_tell (const FLAC__SeekableS - - GST_DEBUG ("tell %" G_GINT64_FORMAT, *position); - -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; -+#else -+ return FLAC__STREAM_DECODER_TELL_STATUS_OK; -+#endif - } - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderLengthStatus - gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, - FLAC__uint64 * length, void *client_data) -+#else -+static FLAC__StreamDecoderLengthStatus -+gst_flac_dec_length (const FLAC__StreamDecoder * decoder, -+ FLAC__uint64 * length, void *client_data) -+#endif - { - GstFlacDec *flacdec; - GstFormat fmt = GST_FORMAT_BYTES; -@@ -642,22 +719,40 @@ gst_flac_dec_length (const FLAC__Seekabl - flacdec = GST_FLAC_DEC (client_data); - - if (!(peer = gst_pad_get_peer (flacdec->sinkpad))) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; -+#else -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; -+#endif - gst_pad_query_duration (peer, &fmt, &len); - gst_object_unref (peer); - if (fmt != GST_FORMAT_BYTES || len == -1) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; -+#else -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; -+#endif - - *length = len; - - GST_DEBUG ("length %" G_GINT64_FORMAT, *length); - -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; -+#else -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK; -+#endif - } - -+#ifdef LEGACY_FLAC - static FLAC__bool - gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, - void *client_data) -+#else -+static FLAC__bool -+gst_flac_dec_eof (const FLAC__StreamDecoder * decoder, -+ void *client_data) -+#endif - { - GstFlacDec *flacdec; - GstFormat fmt; -@@ -685,9 +780,15 @@ gst_flac_dec_eof (const FLAC__SeekableSt - return ret; - } - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamDecoderReadStatus - gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, - FLAC__byte buffer[], unsigned *bytes, void *client_data) -+#else -+static FLAC__StreamDecoderReadStatus -+gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder, -+ FLAC__byte buffer[], size_t *bytes, void *client_data) -+#endif - { - GstFlacDec *flacdec; - GstBuffer *buf; -@@ -696,7 +797,11 @@ gst_flac_dec_read_seekable (const FLAC__ - - if (gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes, - &buf) != GST_FLOW_OK) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; -+#else -+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT; -+#endif - - GST_DEBUG ("Read %d bytes at %" G_GUINT64_FORMAT, - GST_BUFFER_SIZE (buf), flacdec->offset); -@@ -705,12 +810,22 @@ gst_flac_dec_read_seekable (const FLAC__ - gst_buffer_unref (buf); - flacdec->offset += *bytes; - -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK; -+#else -+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; -+#endif - } - -+#ifdef LEGACY_FLAC - static FLAC__StreamDecoderReadStatus - gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, - FLAC__byte buffer[], unsigned *bytes, void *client_data) -+#else -+static FLAC__StreamDecoderReadStatus -+gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, -+ FLAC__byte buffer[], size_t *bytes, void *client_data) -+#endif - { - GstFlacDec *dec = GST_FLAC_DEC (client_data); - guint len; -@@ -880,6 +995,7 @@ done: - return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; - } - -+#ifdef LEGACY_FLAC - static FLAC__StreamDecoderWriteStatus - gst_flac_dec_write_seekable (const FLAC__SeekableStreamDecoder * decoder, - const FLAC__Frame * frame, -@@ -887,6 +1003,7 @@ gst_flac_dec_write_seekable (const FLAC_ - { - return gst_flac_dec_write (GST_FLAC_DEC (client_data), frame, buffer); - } -+#endif - - static FLAC__StreamDecoderWriteStatus - gst_flac_dec_write_stream (const FLAC__StreamDecoder * decoder, -@@ -900,7 +1017,12 @@ static void - gst_flac_dec_loop (GstPad * sinkpad) - { - GstFlacDec *flacdec; -+#ifdef LEGACY_FLAC - FLAC__SeekableStreamDecoderState s; -+#else -+ FLAC__StreamDecoderState s; -+ FLAC__StreamDecoderInitStatus is; -+#endif - - flacdec = GST_FLAC_DEC (GST_OBJECT_PARENT (sinkpad)); - -@@ -908,9 +1030,15 @@ gst_flac_dec_loop (GstPad * sinkpad) - - if (flacdec->init) { - GST_DEBUG_OBJECT (flacdec, "initializing decoder"); -+#ifdef LEGACY_FLAC - s = FLAC__seekable_stream_decoder_init (flacdec->seekable_decoder); - if (s != FLAC__SEEKABLE_STREAM_DECODER_OK) - goto analyze_state; -+#else -+ is = FLAC__stream_decoder_init_stream (flacdec->seekable_decoder, gst_flac_dec_read_seekable, gst_flac_dec_seek, gst_flac_dec_tell, gst_flac_dec_length, gst_flac_dec_eof, gst_flac_dec_write_stream, gst_flac_dec_metadata_callback_stream, gst_flac_dec_error_callback_stream, flacdec); -+ if (is != FLAC__STREAM_DECODER_INIT_STATUS_OK) -+ goto analyze_state; -+#endif - /* FLAC__seekable_stream_decoder_process_metadata (flacdec->seekable_decoder); */ - flacdec->init = FALSE; - } -@@ -920,15 +1048,31 @@ gst_flac_dec_loop (GstPad * sinkpad) - flacdec->last_flow = GST_FLOW_OK; - - GST_LOG_OBJECT (flacdec, "processing single"); -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_decoder_process_single (flacdec->seekable_decoder); -+#else -+ FLAC__stream_decoder_process_single (flacdec->seekable_decoder); -+#endif - - analyze_state: - - GST_LOG_OBJECT (flacdec, "done processing, checking encoder state"); -+#ifdef LEGACY_FLAC - s = FLAC__seekable_stream_decoder_get_state (flacdec->seekable_decoder); -+#else -+ s = FLAC__stream_decoder_get_state (flacdec->seekable_decoder); -+#endif - switch (s) { -+#ifdef LEGACY_FLAC - case FLAC__SEEKABLE_STREAM_DECODER_OK: -- case FLAC__SEEKABLE_STREAM_DECODER_SEEKING:{ -+ case FLAC__SEEKABLE_STREAM_DECODER_SEEKING: -+#else -+ case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA: -+ case FLAC__STREAM_DECODER_READ_METADATA: -+ case FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC: -+ case FLAC__STREAM_DECODER_READ_FRAME: -+#endif -+ { - GST_DEBUG_OBJECT (flacdec, "everything ok"); - - if (flacdec->last_flow != GST_FLOW_OK && -@@ -956,9 +1100,18 @@ analyze_state: - return; - } - -- case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM:{ -+#ifdef LEGACY_FLAC -+ case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM: -+#else -+ case FLAC__STREAM_DECODER_END_OF_STREAM: -+#endif -+ { - GST_DEBUG_OBJECT (flacdec, "EOS"); -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_decoder_reset (flacdec->seekable_decoder); -+#else -+ FLAC__stream_decoder_reset (flacdec->seekable_decoder); -+#endif - - if ((flacdec->segment.flags & GST_SEEK_FLAG_SEGMENT) != 0) { - if (flacdec->segment.duration > 0) { -@@ -972,6 +1125,7 @@ analyze_state: - goto eos_and_pause; - } - -+#ifdef LEGACY_FLAC - case FLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR: - case FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR: - case FLAC__SEEKABLE_STREAM_DECODER_READ_ERROR: -@@ -979,11 +1133,23 @@ analyze_state: - case FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED: - case FLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK: - case FLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED: -+#else -+ case FLAC__STREAM_DECODER_OGG_ERROR: -+ case FLAC__STREAM_DECODER_SEEK_ERROR: -+ case FLAC__STREAM_DECODER_ABORTED: -+ case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: -+ case FLAC__STREAM_DECODER_UNINITIALIZED: -+#endif - default:{ - /* fixme: this error sucks -- should try to figure out when/if an more - specific error was already sent via the callback */ -+#ifdef LEGACY_FLAC - GST_ELEMENT_ERROR (flacdec, STREAM, DECODE, (NULL), - ("%s", FLAC__SeekableStreamDecoderStateString[s])); -+#else -+ GST_ELEMENT_ERROR (flacdec, STREAM, DECODE, (NULL), -+ ("%s", FLAC__StreamDecoderStateString[s])); -+#endif - goto eos_and_pause; - } - } -@@ -1113,11 +1279,19 @@ gst_flac_dec_chain (GstPad * pad, GstBuf - - if (dec->init) { - GST_DEBUG_OBJECT (dec, "initializing decoder"); -+#ifdef LEGACY_FLAC - s = FLAC__stream_decoder_init (dec->stream_decoder); - if (s != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) { - GST_ELEMENT_ERROR (GST_ELEMENT (dec), LIBRARY, INIT, (NULL), (NULL)); - return GST_FLOW_ERROR; - } -+#else -+ s = FLAC__stream_decoder_init_stream (dec->stream_decoder, gst_flac_dec_read_stream, NULL, NULL, NULL, NULL, gst_flac_dec_write_stream, gst_flac_dec_metadata_callback_stream, gst_flac_dec_error_callback_stream, dec); -+ if (s != FLAC__STREAM_DECODER_INIT_STATUS_OK) { -+ GST_ELEMENT_ERROR (GST_ELEMENT (dec), LIBRARY, INIT, (NULL), (NULL)); -+ return GST_FLOW_ERROR; -+ } -+#endif - GST_DEBUG_OBJECT (dec, "initialized (framed=%d)", dec->framed); - dec->init = FALSE; - } -@@ -1598,8 +1772,13 @@ gst_flac_dec_handle_seek_event (GstFlacD - flacdec->seeking = TRUE; - - seek_ok = -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_decoder_seek_absolute (flacdec->seekable_decoder, - segment.start); -+#else -+ FLAC__stream_decoder_seek_absolute (flacdec->seekable_decoder, -+ segment.start); -+#endif - - flacdec->seeking = FALSE; - diff --git a/multimedia/gst-plugins0.10-good/patches/patch-ad b/multimedia/gst-plugins0.10-good/patches/patch-ad deleted file mode 100644 index bbb57db4f98..00000000000 --- a/multimedia/gst-plugins0.10-good/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2007/01/13 09:18:22 wiz Exp $ - ---- ext/flac/gstflacdec.h.orig 2006-08-22 12:28:24.000000000 +0000 -+++ ext/flac/gstflacdec.h -@@ -41,7 +41,11 @@ typedef struct _GstFlacDecClass GstFlacD - struct _GstFlacDec { - GstElement element; - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 - FLAC__SeekableStreamDecoder *seekable_decoder; /* for pull-based operation */ -+#else -+ FLAC__StreamDecoder *seekable_decoder; /* for pull-based operation */ -+#endif - - FLAC__StreamDecoder *stream_decoder; /* for chain-based operation */ - GstAdapter *adapter; diff --git a/multimedia/gst-plugins0.10-good/patches/patch-ae b/multimedia/gst-plugins0.10-good/patches/patch-ae deleted file mode 100644 index c7511f9bec1..00000000000 --- a/multimedia/gst-plugins0.10-good/patches/patch-ae +++ /dev/null @@ -1,524 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2007/01/13 09:18:22 wiz Exp $ - ---- ext/flac/gstflacenc.c.orig 2006-10-16 18:22:46.000000000 +0000 -+++ ext/flac/gstflacenc.c -@@ -29,6 +29,12 @@ - #include <gst/tag/tag.h> - #include <gst/gsttagsetter.h> - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ - - static const GstElementDetails flacenc_details = - GST_ELEMENT_DETAILS ("FLAC audio encoder", -@@ -108,6 +114,7 @@ static void gst_flac_enc_get_property (G - static GstStateChangeReturn gst_flac_enc_change_state (GstElement * element, - GstStateChange transition); - -+#ifdef LEGACY_FLAC - static FLAC__StreamEncoderWriteStatus - gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder, - const FLAC__byte buffer[], unsigned bytes, -@@ -118,6 +125,18 @@ gst_flac_enc_seek_callback (const FLAC__ - static FLAC__SeekableStreamEncoderTellStatus - gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, - FLAC__uint64 * absolute_byte_offset, void *client_data); -+#else -+static FLAC__StreamEncoderWriteStatus -+gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder, -+ const FLAC__byte buffer[], size_t bytes, -+ unsigned samples, unsigned current_frame, void *client_data); -+static FLAC__StreamEncoderSeekStatus -+gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder, -+ FLAC__uint64 absolute_byte_offset, void *client_data); -+static FLAC__StreamEncoderTellStatus -+gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder, -+ FLAC__uint64 * absolute_byte_offset, void *client_data); -+#endif - - typedef struct - { -@@ -302,7 +321,11 @@ gst_flac_enc_init (GstFlacEnc * flacenc, - gst_pad_use_fixed_caps (flacenc->srcpad); - gst_element_add_pad (GST_ELEMENT (flacenc), flacenc->srcpad); - -+#ifdef LEGACY_FLAC - flacenc->encoder = FLAC__seekable_stream_encoder_new (); -+#else -+ flacenc->encoder = FLAC__stream_encoder_new (); -+#endif - - flacenc->offset = 0; - flacenc->samples_written = 0; -@@ -315,7 +338,11 @@ gst_flac_enc_finalize (GObject * object) - { - GstFlacEnc *flacenc = GST_FLAC_ENC (object); - -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_delete (flacenc->encoder); -+#else -+ FLAC__stream_encoder_delete (flacenc->encoder); -+#endif - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -360,8 +387,13 @@ gst_flac_enc_set_metadata (GstFlacEnc * - FLAC__metadata_object_new (FLAC__METADATA_TYPE_VORBIS_COMMENT); - gst_tag_list_foreach (copy, add_one_tag, flacenc); - -+#ifdef LEGACY_FLAC - if (FLAC__seekable_stream_encoder_set_metadata (flacenc->encoder, - flacenc->meta, 1) != true) -+#else -+ if (FLAC__stream_encoder_set_metadata (flacenc->encoder, -+ flacenc->meta, 1) != true) -+#endif - g_warning ("Dude, i'm already initialized!"); - gst_tag_list_free (copy); - } -@@ -371,13 +403,22 @@ gst_flac_enc_sink_setcaps (GstPad * pad, - { - GstFlacEnc *flacenc; - GstStructure *structure; -+#ifdef LEGACY_FLAC - FLAC__SeekableStreamEncoderState state; -+#else -+ FLAC__StreamEncoderInitStatus init_status; -+#endif - - /* takes a ref on flacenc */ - flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad)); - -+#ifdef LEGACY_FLAC - if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != - FLAC__SEEKABLE_STREAM_ENCODER_UNINITIALIZED) -+#else -+ if (FLAC__stream_encoder_get_state (flacenc->encoder) != -+ FLAC__STREAM_ENCODER_UNINITIALIZED) -+#endif - goto encoder_already_initialized; - - structure = gst_caps_get_structure (caps, 0); -@@ -397,6 +438,7 @@ gst_flac_enc_sink_setcaps (GstPad * pad, - - gst_caps_unref (caps); - -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_bits_per_sample (flacenc->encoder, - flacenc->depth); - FLAC__seekable_stream_encoder_set_sample_rate (flacenc->encoder, -@@ -412,12 +454,25 @@ gst_flac_enc_sink_setcaps (GstPad * pad, - gst_flac_enc_tell_callback); - - FLAC__seekable_stream_encoder_set_client_data (flacenc->encoder, flacenc); -+#else -+ FLAC__stream_encoder_set_bits_per_sample (flacenc->encoder, flacenc->depth); -+ FLAC__stream_encoder_set_sample_rate (flacenc->encoder, flacenc->sample_rate); -+ FLAC__stream_encoder_set_channels (flacenc->encoder, flacenc->channels); -+#endif - - gst_flac_enc_set_metadata (flacenc); - -+#ifdef LEGACY_FLAC - state = FLAC__seekable_stream_encoder_init (flacenc->encoder); - if (state != FLAC__STREAM_ENCODER_OK) - goto failed_to_initialize; -+#else -+ init_status = FLAC__stream_encoder_init_stream (flacenc->encoder, -+ gst_flac_enc_write_callback, gst_flac_enc_seek_callback, -+ gst_flac_enc_tell_callback, NULL, flacenc); -+ if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK) -+ goto failed_to_initialize; -+#endif - - gst_object_unref (flacenc); - -@@ -451,6 +506,7 @@ gst_flac_enc_update_quality (GstFlacEnc - { - flacenc->quality = quality; - -+#ifdef LEGACY_FLAC - #define DO_UPDATE(name, val, str) \ - G_STMT_START { \ - if (FLAC__seekable_stream_encoder_get_##name (flacenc->encoder) != \ -@@ -460,6 +516,17 @@ gst_flac_enc_update_quality (GstFlacEnc - g_object_notify (G_OBJECT (flacenc), str); \ - } \ - } G_STMT_END -+#else -+#define DO_UPDATE(name, val, str) \ -+ G_STMT_START { \ -+ if (FLAC__stream_encoder_get_##name (flacenc->encoder) != \ -+ flacenc_params[quality].val) { \ -+ FLAC__stream_encoder_set_##name (flacenc->encoder, \ -+ flacenc_params[quality].val); \ -+ g_object_notify (G_OBJECT (flacenc), str); \ -+ } \ -+ } G_STMT_END -+#endif - - g_object_freeze_notify (G_OBJECT (flacenc)); - -@@ -490,9 +557,15 @@ gst_flac_enc_update_quality (GstFlacEnc - return TRUE; - } - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamEncoderSeekStatus - gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, - FLAC__uint64 absolute_byte_offset, void *client_data) -+#else -+static FLAC__StreamEncoderSeekStatus -+gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder, -+ FLAC__uint64 absolute_byte_offset, void *client_data) -+#endif - { - GstFlacEnc *flacenc; - GstEvent *event; -@@ -501,7 +574,11 @@ gst_flac_enc_seek_callback (const FLAC__ - flacenc = GST_FLAC_ENC (client_data); - - if (flacenc->stopped) -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; -+#else -+ return FLAC__STREAM_ENCODER_SEEK_STATUS_OK; -+#endif - - event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES, - absolute_byte_offset, GST_BUFFER_OFFSET_NONE, 0); -@@ -525,13 +602,24 @@ gst_flac_enc_seek_callback (const FLAC__ - - flacenc->offset = absolute_byte_offset; - -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; -+#else -+ return FLAC__STREAM_ENCODER_SEEK_STATUS_OK; -+#endif - } - -+#ifdef LEGACY_FLAC - static FLAC__StreamEncoderWriteStatus - gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder, - const FLAC__byte buffer[], unsigned bytes, - unsigned samples, unsigned current_frame, void *client_data) -+#else -+static FLAC__StreamEncoderWriteStatus -+gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder, -+ const FLAC__byte buffer[], size_t bytes, -+ unsigned samples, unsigned current_frame, void *client_data) -+#endif - { - GstFlowReturn ret; - GstFlacEnc *flacenc; -@@ -577,15 +665,25 @@ gst_flac_enc_write_callback (const FLAC_ - return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; - } - -+#ifdef LEGACY_FLAC - static FLAC__SeekableStreamEncoderTellStatus - gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, - FLAC__uint64 * absolute_byte_offset, void *client_data) -+#else -+static FLAC__StreamEncoderTellStatus -+gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder, -+ FLAC__uint64 * absolute_byte_offset, void *client_data) -+#endif - { - GstFlacEnc *flacenc = GST_FLAC_ENC (client_data); - - *absolute_byte_offset = flacenc->offset; - -+#ifdef LEGACY_FLAC - return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK; -+#else -+ return FLAC__STREAM_ENCODER_TELL_STATUS_OK; -+#endif - } - - static gboolean -@@ -629,7 +727,11 @@ gst_flac_enc_sink_event (GstPad * pad, G - break; - } - case GST_EVENT_EOS: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_finish (flacenc->encoder); -+#else -+ FLAC__stream_encoder_finish (flacenc->encoder); -+#endif - ret = gst_pad_event_default (pad, event); - break; - case GST_EVENT_TAG: -@@ -686,8 +788,13 @@ gst_flac_enc_chain (GstPad * pad, GstBuf - - gst_buffer_unref (buffer); - -+#ifdef LEGACY_FLAC - res = FLAC__seekable_stream_encoder_process_interleaved (flacenc->encoder, - (const FLAC__int32 *) data, samples / flacenc->channels); -+#else -+ res = FLAC__stream_encoder_process_interleaved (flacenc->encoder, -+ (const FLAC__int32 *) data, samples / flacenc->channels); -+#endif - - g_free (data); - -@@ -712,52 +819,112 @@ gst_flac_enc_set_property (GObject * obj - gst_flac_enc_update_quality (this, g_value_get_enum (value)); - break; - case PROP_STREAMABLE_SUBSET: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_streamable_subset (this->encoder, - g_value_get_boolean (value)); -+#else -+ FLAC__stream_encoder_set_streamable_subset (this->encoder, -+ g_value_get_boolean (value)); -+#endif - break; - case PROP_MID_SIDE_STEREO: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_do_mid_side_stereo (this->encoder, - g_value_get_boolean (value)); -+#else -+ FLAC__stream_encoder_set_do_mid_side_stereo (this->encoder, -+ g_value_get_boolean (value)); -+#endif - break; - case PROP_LOOSE_MID_SIDE_STEREO: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_loose_mid_side_stereo (this->encoder, - g_value_get_boolean (value)); -+#else -+ FLAC__stream_encoder_set_loose_mid_side_stereo (this->encoder, -+ g_value_get_boolean (value)); -+#endif - break; - case PROP_BLOCKSIZE: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_blocksize (this->encoder, - g_value_get_uint (value)); -+#else -+ FLAC__stream_encoder_set_blocksize (this->encoder, -+ g_value_get_uint (value)); -+#endif - break; - case PROP_MAX_LPC_ORDER: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_max_lpc_order (this->encoder, - g_value_get_uint (value)); -+#else -+ FLAC__stream_encoder_set_max_lpc_order (this->encoder, -+ g_value_get_uint (value)); -+#endif - break; - case PROP_QLP_COEFF_PRECISION: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_qlp_coeff_precision (this->encoder, - g_value_get_uint (value)); -+#else -+ FLAC__stream_encoder_set_qlp_coeff_precision (this->encoder, -+ g_value_get_uint (value)); -+#endif - break; - case PROP_QLP_COEFF_PREC_SEARCH: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search (this->encoder, - g_value_get_boolean (value)); -+#else -+ FLAC__stream_encoder_set_do_qlp_coeff_prec_search (this->encoder, -+ g_value_get_boolean (value)); -+#endif - break; - case PROP_ESCAPE_CODING: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_do_escape_coding (this->encoder, - g_value_get_boolean (value)); -+#else -+ FLAC__stream_encoder_set_do_escape_coding (this->encoder, -+ g_value_get_boolean (value)); -+#endif - break; - case PROP_EXHAUSTIVE_MODEL_SEARCH: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_do_exhaustive_model_search (this-> - encoder, g_value_get_boolean (value)); -+#else -+ FLAC__stream_encoder_set_do_exhaustive_model_search (this-> -+ encoder, g_value_get_boolean (value)); -+#endif - break; - case PROP_MIN_RESIDUAL_PARTITION_ORDER: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_min_residual_partition_order (this-> - encoder, g_value_get_uint (value)); -+#else -+ FLAC__stream_encoder_set_min_residual_partition_order (this-> -+ encoder, g_value_get_uint (value)); -+#endif - break; - case PROP_MAX_RESIDUAL_PARTITION_ORDER: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_max_residual_partition_order (this-> - encoder, g_value_get_uint (value)); -+#else -+ FLAC__stream_encoder_set_max_residual_partition_order (this-> -+ encoder, g_value_get_uint (value)); -+#endif - break; - case PROP_RICE_PARAMETER_SEARCH_DIST: -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_encoder_set_rice_parameter_search_dist (this-> - encoder, g_value_get_uint (value)); -+#else -+ FLAC__stream_encoder_set_rice_parameter_search_dist (this-> -+ encoder, g_value_get_uint (value)); -+#endif - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -780,59 +947,119 @@ gst_flac_enc_get_property (GObject * obj - g_value_set_enum (value, this->quality); - break; - case PROP_STREAMABLE_SUBSET: -+#ifdef LEGACY_FLAC - g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_streamable_subset (this->encoder)); -+#else -+ g_value_set_boolean (value, -+ FLAC__stream_encoder_get_streamable_subset (this->encoder)); -+#endif - break; - case PROP_MID_SIDE_STEREO: -+#ifdef LEGACY_FLAC - g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_do_mid_side_stereo (this->encoder)); -+#else -+ g_value_set_boolean (value, -+ FLAC__stream_encoder_get_do_mid_side_stereo (this->encoder)); -+#endif - break; - case PROP_LOOSE_MID_SIDE_STEREO: -+#ifdef LEGACY_FLAC - g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_loose_mid_side_stereo (this-> - encoder)); -+#else -+ g_value_set_boolean (value, -+ FLAC__stream_encoder_get_loose_mid_side_stereo (this->encoder)); -+#endif - break; - case PROP_BLOCKSIZE: -+#ifdef LEGACY_FLAC - g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_blocksize (this->encoder)); -+#else -+ g_value_set_uint (value, -+ FLAC__stream_encoder_get_blocksize (this->encoder)); -+#endif - break; - case PROP_MAX_LPC_ORDER: -+#ifdef LEGACY_FLAC - g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_max_lpc_order (this->encoder)); -+#else -+ g_value_set_uint (value, -+ FLAC__stream_encoder_get_max_lpc_order (this->encoder)); -+#endif - break; - case PROP_QLP_COEFF_PRECISION: -+#ifdef LEGACY_FLAC - g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_qlp_coeff_precision (this-> - encoder)); -+#else -+ g_value_set_uint (value, -+ FLAC__stream_encoder_get_qlp_coeff_precision (this->encoder)); -+#endif - break; - case PROP_QLP_COEFF_PREC_SEARCH: -+#ifdef LEGACY_FLAC - g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search (this-> - encoder)); -+#else -+ g_value_set_boolean (value, -+ FLAC__stream_encoder_get_do_qlp_coeff_prec_search (this->encoder)); -+#endif - break; - case PROP_ESCAPE_CODING: -+#ifdef LEGACY_FLAC - g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_do_escape_coding (this->encoder)); -+#else -+ g_value_set_boolean (value, -+ FLAC__stream_encoder_get_do_escape_coding (this->encoder)); -+#endif - break; - case PROP_EXHAUSTIVE_MODEL_SEARCH: -+#ifdef LEGACY_FLAC - g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_do_exhaustive_model_search (this-> - encoder)); -+#else -+ g_value_set_boolean (value, -+ FLAC__stream_encoder_get_do_exhaustive_model_search (this->encoder)); -+#endif - break; - case PROP_MIN_RESIDUAL_PARTITION_ORDER: -+#ifdef LEGACY_FLAC - g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_min_residual_partition_order (this-> - encoder)); -+#else -+ g_value_set_uint (value, -+ FLAC__stream_encoder_get_min_residual_partition_order (this->encoder)); -+#endif - break; - case PROP_MAX_RESIDUAL_PARTITION_ORDER: -+#ifdef LEGACY_FLAC - g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_max_residual_partition_order (this-> - encoder)); -+#else -+ g_value_set_uint (value, -+ FLAC__stream_encoder_get_max_residual_partition_order (this->encoder)); -+#endif - break; - case PROP_RICE_PARAMETER_SEARCH_DIST: -+#ifdef LEGACY_FLAC - g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_rice_parameter_search_dist (this-> - encoder)); -+#else -+ g_value_set_uint (value, -+ FLAC__stream_encoder_get_rice_parameter_search_dist (this->encoder)); -+#endif - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -864,11 +1091,19 @@ gst_flac_enc_change_state (GstElement * - case GST_STATE_CHANGE_PLAYING_TO_PAUSED: - break; - case GST_STATE_CHANGE_PAUSED_TO_READY: -+#ifdef LEGACY_FLAC - if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != -- FLAC__STREAM_ENCODER_UNINITIALIZED) { -+ FLAC__SEEKABLE_STREAM_ENCODER_UNINITIALIZED) { - flacenc->stopped = TRUE; - FLAC__seekable_stream_encoder_finish (flacenc->encoder); - } -+#else -+ if (FLAC__stream_encoder_get_state (flacenc->encoder) != -+ FLAC__STREAM_ENCODER_UNINITIALIZED) { -+ flacenc->stopped = TRUE; -+ FLAC__stream_encoder_finish (flacenc->encoder); -+ } -+#endif - flacenc->offset = 0; - flacenc->samples_written = 0; - if (flacenc->meta) { diff --git a/multimedia/gst-plugins0.10-good/patches/patch-af b/multimedia/gst-plugins0.10-good/patches/patch-af deleted file mode 100644 index 4dcd559b272..00000000000 --- a/multimedia/gst-plugins0.10-good/patches/patch-af +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-af,v 1.1 2007/01/13 09:18:22 wiz Exp $ - ---- ext/flac/gstflacenc.h.orig 2006-06-01 21:07:23.000000000 +0000 -+++ ext/flac/gstflacenc.h -@@ -54,7 +54,11 @@ struct _GstFlacEnc { - gboolean stopped; - FLAC__int32 *data; - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 - FLAC__SeekableStreamEncoder *encoder; -+#else -+ FLAC__StreamEncoder *encoder; -+#endif - FLAC__StreamMetadata **meta; - - GstTagList * tags; |