[arch-commits] CVS update of extra/multimedia/alsaplayer (1 file)
Travis Willard
travis at archlinux.org
Sun Jun 3 04:13:22 UTC 2007
Date: Sunday, June 3, 2007 @ 00:13:22
Author: travis
Path: /home/cvs-extra/extra/multimedia/alsaplayer
Removed: alsaplayer-0.99.76+flac-1.1.3.patch (1.1)
Patch no longer needed
-------------------------------------+
alsaplayer-0.99.76+flac-1.1.3.patch | 309 ----------------------------------
1 file changed, 309 deletions(-)
Index: extra/multimedia/alsaplayer/alsaplayer-0.99.76+flac-1.1.3.patch
diff -u extra/multimedia/alsaplayer/alsaplayer-0.99.76+flac-1.1.3.patch:1.1 extra/multimedia/alsaplayer/alsaplayer-0.99.76+flac-1.1.3.patch:removed
--- extra/multimedia/alsaplayer/alsaplayer-0.99.76+flac-1.1.3.patch:1.1 Sun Mar 11 11:36:45 2007
+++ extra/multimedia/alsaplayer/alsaplayer-0.99.76+flac-1.1.3.patch Sun Jun 3 00:13:22 2007
@@ -1,309 +0,0 @@
-diff -urN alsaplayer-0.99.76.orig/config.h.in alsaplayer-0.99.76/config.h.in
---- alsaplayer-0.99.76.orig/config.h.in 2003-03-03 10:21:16 +0200
-+++ alsaplayer-0.99.76/config.h.in 2007-01-22 02:06:01 +0200
-@@ -153,6 +153,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-+/* Define if you have FLAC library < 1.1.3 */
-+#undef LEGACY_FLAC
-+
- /* Name of package */
- #undef PACKAGE
-
-diff -urN alsaplayer-0.99.76.orig/configure.ac alsaplayer-0.99.76/configure.ac
---- alsaplayer-0.99.76.orig/configure.ac 2003-12-05 15:58:28 +0200
-+++ alsaplayer-0.99.76/configure.ac 2007-01-22 02:18:07 +0200
-@@ -247,8 +247,22 @@
- dnl OggFLAC library
- dnl ===============
-
--AC_CHECK_LIB(OggFLAC, OggFLAC__stream_decoder_new,
-- OGGFLC_LDADD="-lOggFLAC -logg"; have_oggflac=yes; AC_DEFINE(HAVE_LIBOGGFLC, 1, [Define if you have OggFLAC library (-lOggFLAC)]), have_oggflac=no; OGGFLC_LDADD=, -lOggFLAC -lFLAC -logg -lm)
-+# in FLAC-1.1.3, libOggFLAC was merged into libFLAC
-+# FLAC_API_VERSION_CURRENT first appears in FLAC-1.1.3
-+AC_TRY_RUN([
-+#include <FLAC/export.h>
-+int main () { return FLAC_API_VERSION_CURRENT<8; }
-+],legacy_flac=no,legacy_flac=yes,legacy_flac=no)
-+
-+if test "x$legacy_flac" = xyes; then
-+ AC_DEFINE(LEGACY_FLAC, 1, [Define if you have FLAC library < 1.1.3])
-+ AC_CHECK_LIB(OggFLAC, OggFLAC__stream_decoder_new,
-+ OGGFLC_LDADD="-lOggFLAC -logg"; have_oggflac=yes; AC_DEFINE(HAVE_LIBOGGFLC, 1, [Define if you have OggFLAC library (-lOggFLAC)]),
-+ have_oggflac=no; OGGFLC_LDADD=, -lOggFLAC -lFLAC -logg -lm)
-+else
-+ OGGFLC_LDADD="-lFLAC -logg"; have_oggflac=yes; AC_DEFINE(HAVE_LIBOGGFLC, 1, [Define if you have FLAC library (-lFLAC)])
-+fi
-+AM_CONDITIONAL(LEGACY_FLAC, test "x$legacy_flac" = "xyes")
-
-
- AC_ARG_ENABLE(oggflac,
-@@ -557,6 +571,7 @@
- AM_CONDITIONAL(HAVE_OGGFLC, test "x$have_oggflac" = xyes)
- AM_CONDITIONAL(HAVE_JACK, test "x$have_jack" = xyes)
- AM_CONDITIONAL(HAVE_ALSA_05X, test "x$have_alsa_05x" = xyes)
-+AM_CONDITIONAL(LEGACY_FLAC, test "x$legacy_flac" = xyes)
- AM_CONDITIONAL(HAVE_ALSA_FINAL, test "x$have_alsa_final" = xyes)
- AM_CONDITIONAL(HAVE_OSS, test "x$have_oss" = xyes)
- AM_CONDITIONAL(HAVE_ESD, test "x$have_esd" = xyes)
-diff -urN alsaplayer-0.99.76.orig/input/flac/FlacSeekableStream.cpp alsaplayer-0.99.76/input/flac/FlacSeekableStream.cpp
---- alsaplayer-0.99.76.orig/input/flac/FlacSeekableStream.cpp 2003-03-03 10:21:03 +0200
-+++ alsaplayer-0.99.76/input/flac/FlacSeekableStream.cpp 2007-01-22 02:02:05 +0200
-@@ -62,6 +62,7 @@
- return false;
- }
- bool status = true;
-+#if LEGACY_FLAC
- status &= FLAC__seekable_stream_decoder_set_read_callback (_decoder,
- readCallBack);
- status &= FLAC__seekable_stream_decoder_set_write_callback (_decoder,
-@@ -85,6 +86,20 @@
- return false;
- }
- status = (FLAC__seekable_stream_decoder_init (_decoder) == FLAC__SEEKABLE_STREAM_DECODER_OK);
-+#else
-+ status = (FLAC__stream_decoder_init_stream (
-+ _decoder,
-+ readCallBack,
-+ seekCallBack,
-+ tellCallBack,
-+ lengthCallBack,
-+ eofCallBack,
-+ writeCallBack,
-+ metaCallBack,
-+ errCallBack,
-+ (void *) this
-+ ) == FLAC__STREAM_DECODER_INIT_STATUS_OK);
-+#endif
-
- if (!status) {
- apError ("FlacSeekableStream::open(): can't initialize seekable stream decoder");
-@@ -193,7 +208,11 @@
- FLAC__SeekableStreamDecoderReadStatus
- FlacSeekableStream::readCallBack (const FLAC__SeekableStreamDecoder * /*decoder*/,
- FLAC__byte buffer[],
-+#if LEGACY_FLAC
- unsigned * bytes,
-+#else
-+ size_t * bytes,
-+#endif
- void * client_data)
- {
- if (!client_data)
-diff -urN alsaplayer-0.99.76.orig/input/flac/FlacSeekableStream.h alsaplayer-0.99.76/input/flac/FlacSeekableStream.h
---- alsaplayer-0.99.76.orig/input/flac/FlacSeekableStream.h 2003-03-03 10:21:03 +0200
-+++ alsaplayer-0.99.76/input/flac/FlacSeekableStream.h 2007-01-22 02:02:05 +0200
-@@ -28,7 +28,30 @@
-
- extern "C"
- {
-+#if LEGACY_FLAC
- #include <FLAC/seekable_stream_decoder.h>
-+#else
-+#include <FLAC/stream_decoder.h>
-+#define FLAC__SeekableStreamDecoder FLAC__StreamDecoder
-+#define FLAC__SeekableStreamDecoderReadStatus FLAC__StreamDecoderReadStatus
-+#define FLAC__SeekableStreamDecoderSeekStatus FLAC__StreamDecoderSeekStatus
-+#define FLAC__SeekableStreamDecoderTellStatus FLAC__StreamDecoderTellStatus
-+#define FLAC__SeekableStreamDecoderLengthStatus FLAC__StreamDecoderLengthStatus
-+#define FLAC__seekable_stream_decoder_finish FLAC__stream_decoder_finish
-+#define FLAC__seekable_stream_decoder_delete FLAC__stream_decoder_delete
-+#define FLAC__seekable_stream_decoder_new FLAC__stream_decoder_new
-+#define FLAC__seekable_stream_decoder_process_until_end_of_metadata FLAC__stream_decoder_process_until_end_of_metadata
-+#define FLAC__seekable_stream_decoder_process_single FLAC__stream_decoder_process_single
-+#define FLAC__seekable_stream_decoder_seek_absolute FLAC__stream_decoder_seek_absolute
-+#define FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR FLAC__STREAM_DECODER_READ_STATUS_ABORT
-+#define FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK FLAC__STREAM_DECODER_READ_STATUS_CONTINUE
-+#define FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
-+#define FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK FLAC__STREAM_DECODER_SEEK_STATUS_OK
-+#define FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR FLAC__STREAM_DECODER_TELL_STATUS_ERROR
-+#define FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK FLAC__STREAM_DECODER_TELL_STATUS_OK
-+#define FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
-+#define FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK FLAC__STREAM_DECODER_LENGTH_STATUS_OK
-+#endif
- }
-
- namespace Flac
-@@ -91,7 +114,11 @@
- static FLAC__SeekableStreamDecoderReadStatus
- readCallBack (const FLAC__SeekableStreamDecoder * decoder,
- FLAC__byte buffer[],
-+#if LEGACY_FLAC
- unsigned * bytes,
-+#else
-+ size_t * bytes,
-+#endif
- void * client_data);
-
- static void errCallBack (const FLAC__SeekableStreamDecoder * decoder,
-diff -urN alsaplayer-0.99.76.orig/input/flac/FlacStream.cpp alsaplayer-0.99.76/input/flac/FlacStream.cpp
---- alsaplayer-0.99.76.orig/input/flac/FlacStream.cpp 2003-03-09 02:32:11 +0200
-+++ alsaplayer-0.99.76/input/flac/FlacStream.cpp 2007-01-22 02:02:05 +0200
-@@ -116,6 +116,7 @@
- return false;
- }
- bool status = true;
-+#if LEGACY_FLAC
- status &= FLAC__stream_decoder_set_read_callback (_decoder,
- readCallBack);
- status &= FLAC__stream_decoder_set_write_callback (_decoder,
-@@ -131,7 +132,21 @@
- return false;
- }
- status = (FLAC__stream_decoder_init (_decoder) == FLAC__STREAM_DECODER_SEARCH_FOR_METADATA);
--
-+#else
-+ status = (FLAC__stream_decoder_init_stream(
-+ _decoder,
-+ readCallBack,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ writeCallBack,
-+ metaCallBack,
-+ errCallBack,
-+ (void *) this
-+ ) == FLAC__STREAM_DECODER_INIT_STATUS_OK);
-+#endif
-+
- if (!status) {
- apError("FlacStream::open(): can't initialize stream decoder");
- return false;
-@@ -300,7 +315,11 @@
-
-
- FLAC__StreamDecoderReadStatus
-+#if LEGACY_FLAC
- FlacStream::realReadCallBack (FLAC__byte buffer[], unsigned * bytes)
-+#else
-+FlacStream::realReadCallBack (FLAC__byte buffer[], size_t * bytes)
-+#endif
- {
- *bytes = reader_read (buffer, *bytes, _datasource);
- return *bytes > 0 ? FLAC__STREAM_DECODER_READ_STATUS_CONTINUE :
-@@ -315,7 +334,11 @@
- FLAC__StreamDecoderReadStatus
- FlacStream::readCallBack (const FLAC__StreamDecoder *,
- FLAC__byte buffer[],
-+#if LEGACY_FLAC
- unsigned * bytes,
-+#else
-+ size_t * bytes,
-+#endif
- void * client_data)
- {
- if (!client_data)
-diff -urN alsaplayer-0.99.76.orig/input/flac/FlacStream.h alsaplayer-0.99.76/input/flac/FlacStream.h
---- alsaplayer-0.99.76.orig/input/flac/FlacStream.h 2003-03-03 10:21:03 +0200
-+++ alsaplayer-0.99.76/input/flac/FlacStream.h 2007-01-22 02:02:05 +0200
-@@ -25,6 +25,7 @@
-
- #include <string>
- #include "reader.h"
-+#include "config.h"
-
- extern "C"
- {
-@@ -191,7 +192,11 @@
-
- FLAC__StreamDecoderReadStatus
- realReadCallBack (FLAC__byte buffer[],
-+#if LEGACY_FLAC
- unsigned * bytes);
-+#else
-+ size_t * bytes);
-+#endif
-
-
- protected:
-@@ -233,7 +238,11 @@
- static FLAC__StreamDecoderReadStatus
- readCallBack (const FLAC__StreamDecoder * decoder,
- FLAC__byte buffer[],
-+#if LEGACY_FLAC
- unsigned * bytes,
-+#else
-+ size_t * bytes,
-+#endif
- void * client_data);
-
- static void errCallBack (const FLAC__StreamDecoder * decoder,
-diff -urN alsaplayer-0.99.76.orig/input/flac/OggFlacStream.cpp alsaplayer-0.99.76/input/flac/OggFlacStream.cpp
---- alsaplayer-0.99.76.orig/input/flac/OggFlacStream.cpp 2003-03-09 02:31:38 +0200
-+++ alsaplayer-0.99.76/input/flac/OggFlacStream.cpp 2007-01-22 02:02:05 +0200
-@@ -80,6 +80,7 @@
- return false;
-
- bool status = true;
-+#if LEGACY_FLAC
- status &= OggFLAC__stream_decoder_set_read_callback (_decoder,
- readCallBack);
- status &= OggFLAC__stream_decoder_set_write_callback (_decoder,
-@@ -96,6 +97,20 @@
-
- status = (OggFLAC__stream_decoder_init (_decoder) ==
- OggFLAC__STREAM_DECODER_OK);
-+#else
-+ status = (FLAC__stream_decoder_init_ogg_stream (
-+ _decoder,
-+ readCallBack,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ writeCallBack,
-+ metaCallBack,
-+ errCallBack,
-+ (void *) this
-+ ) == FLAC__STREAM_DECODER_INIT_STATUS_OK);
-+#endif
- if (!status)
- return false;
-
-@@ -186,7 +201,11 @@
- FLAC__StreamDecoderReadStatus
- OggFlacStream::readCallBack (const OggFLAC__StreamDecoder * decoder,
- FLAC__byte buffer[],
-+#if LEGACY_FLAC
- unsigned * bytes,
-+#else
-+ size_t * bytes,
-+#endif
- void * client_data)
- {
- if (!client_data)
-diff -urN alsaplayer-0.99.76.orig/input/flac/OggFlacStream.h alsaplayer-0.99.76/input/flac/OggFlacStream.h
---- alsaplayer-0.99.76.orig/input/flac/OggFlacStream.h 2003-03-03 10:21:03 +0200
-+++ alsaplayer-0.99.76/input/flac/OggFlacStream.h 2007-01-22 02:02:05 +0200
-@@ -29,7 +29,17 @@
-
- extern "C"
- {
-+#if LEGACY_FLAC
- #include <OggFLAC/stream_decoder.h>
-+#else
-+#include <FLAC/stream_decoder.h>
-+#define OggFLAC__StreamDecoder FLAC__StreamDecoder
-+#define OggFLAC__stream_decoder_finish FLAC__stream_decoder_finish
-+#define OggFLAC__stream_decoder_delete FLAC__stream_decoder_delete
-+#define OggFLAC__stream_decoder_new FLAC__stream_decoder_new
-+#define OggFLAC__stream_decoder_process_single FLAC__stream_decoder_process_single
-+#define OggFLAC__stream_decoder_process_until_end_of_metadata FLAC__stream_decoder_process_until_end_of_metadata
-+#endif
- }
-
- #undef DEBUG
-@@ -105,7 +115,11 @@
- static FLAC__StreamDecoderReadStatus
- readCallBack (const OggFLAC__StreamDecoder * decoder,
- FLAC__byte buffer[],
-+#if LEGACY_FLAC
- unsigned * bytes,
-+#else
-+ size_t * bytes,
-+#endif
- void * client_data);
-
- static void errCallBack (const OggFLAC__StreamDecoder * decoder,
More information about the arch-commits
mailing list