pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/gst-plugins0.10-good Add patches for gst-pl...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6ad25f64ea8b
branches: trunk
changeset: 523760:6ad25f64ea8b
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Jan 13 09:18:21 2007 +0000
description:
Add patches for gst-plugins0.10-flac to support flac-1.1.3.
>From Mandriva Cooker source rpm.
diffstat:
multimedia/gst-plugins0.10-good/distinfo | 8 +-
multimedia/gst-plugins0.10-good/patches/patch-ab | 114 ++++-
multimedia/gst-plugins0.10-good/patches/patch-ac | 488 +++++++++++++++++++++
multimedia/gst-plugins0.10-good/patches/patch-ad | 16 +
multimedia/gst-plugins0.10-good/patches/patch-ae | 524 +++++++++++++++++++++++
multimedia/gst-plugins0.10-good/patches/patch-af | 16 +
6 files changed, 1162 insertions(+), 4 deletions(-)
diffs (truncated from 1202 to 300 lines):
diff -r f8c6d184f645 -r 6ad25f64ea8b multimedia/gst-plugins0.10-good/distinfo
--- a/multimedia/gst-plugins0.10-good/distinfo Sat Jan 13 09:17:26 2007 +0000
+++ b/multimedia/gst-plugins0.10-good/distinfo Sat Jan 13 09:18:21 2007 +0000
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.7 2007/01/09 15:16:56 drochner Exp $
+$NetBSD: distinfo,v 1.8 2007/01/13 09:18:21 wiz 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) = 056eb2987a62cedc1b42c56cd15cd4771cff8964
+SHA1 (patch-ab) = d01874956fa966bff3d7b57345a9d20bd7213d4d
+SHA1 (patch-ac) = 67e2a470f280a4e20ffd700249b3ef9a1f762920
+SHA1 (patch-ad) = 833f22db9d18e8bef7ec7668b1537770493cdba3
+SHA1 (patch-ae) = b359f69b897d2aba0e5235bf4610bac45dd8e6a9
+SHA1 (patch-af) = 3fde5e94d57f27d2971699254bfc8e586a4b2440
diff -r f8c6d184f645 -r 6ad25f64ea8b multimedia/gst-plugins0.10-good/patches/patch-ab
--- a/multimedia/gst-plugins0.10-good/patches/patch-ab Sat Jan 13 09:17:26 2007 +0000
+++ b/multimedia/gst-plugins0.10-good/patches/patch-ab Sat Jan 13 09:18:21 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2007/01/09 15:16:56 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2007/01/13 09:18:21 wiz Exp $
---- configure.orig 2006-12-21 15:21:53.000000000 +0100
+--- configure.orig 2007-01-13 09:14:05.000000000 +0000
+++ configure
@@ -27646,7 +27646,7 @@ rm -f conftest.mmap
@@ -29,3 +29,113 @@
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
+ HAVE_FLAC=no
+
+
+- { echo "$as_me:$LINENO: checking for FLAC__seekable_stream_encoder_new in -lFLAC" >&5
+-echo $ECHO_N "checking for FLAC__seekable_stream_encoder_new in -lFLAC... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new+set}" = set; then
++ { echo "$as_me:$LINENO: checking for FLAC__stream_encoder_new in -lFLAC" >&5
++echo $ECHO_N "checking for FLAC__stream_encoder_new in -lFLAC... $ECHO_C" >&6; }
++if test "${ac_cv_lib_FLAC_FLAC__stream_encoder_new+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -35206,11 +35206,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char FLAC__seekable_stream_encoder_new ();
++char FLAC__stream_encoder_new ();
+ int
+ main ()
+ {
+-return FLAC__seekable_stream_encoder_new ();
++return FLAC__stream_encoder_new ();
+ ;
+ 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 -r f8c6d184f645 -r 6ad25f64ea8b multimedia/gst-plugins0.10-good/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/gst-plugins0.10-good/patches/patch-ac Sat Jan 13 09:18:21 2007 +0000
@@ -0,0 +1,488 @@
+$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
Home |
Main Index |
Thread Index |
Old Index