diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-21 15:53:40 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-21 15:53:40 +0000 |
commit | dcfe764589e82ecd9d4af4cfeaff643abcc94307 (patch) | |
tree | f72cacfe0da053151cec1cc8034f5378f9b74c70 /media-sound | |
parent | old (diff) | |
download | gentoo-2-dcfe764589e82ecd9d4af4cfeaff643abcc94307.tar.gz gentoo-2-dcfe764589e82ecd9d4af4cfeaff643abcc94307.tar.bz2 gentoo-2-dcfe764589e82ecd9d4af4cfeaff643abcc94307.zip |
old
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/muine/Manifest | 1 | ||||
-rw-r--r-- | media-sound/muine/files/muine-0.8.7-flac.patch | 73 |
2 files changed, 0 insertions, 74 deletions
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest index b3ad7620ef03..e4b546579645 100644 --- a/media-sound/muine/Manifest +++ b/media-sound/muine/Manifest @@ -1,5 +1,4 @@ AUX muine-0.8.10-buttons.patch 1704 RMD160 bf2f63cf2934d5fe79f57525eb7ca7f992a5ca91 SHA1 475d49d1de86c77be745fcaa2b8fd1e8f9f9a0e2 SHA256 cc03b9203b34bb51206b554a81fd575b680a535c2bc7a93018b0f93ac128d8e0 -AUX muine-0.8.7-flac.patch 2387 RMD160 0f992e3a72436afe457d77d7157692e189ee457b SHA1 1162263558421ba791d7ee80d7f8fbc9da1710e0 SHA256 d94cbf523c9e77bbfd4b7a8f5793a5a152a63c8352f62aedbfa8f882ae4b62c1 DIST muine-0.8.10.tar.bz2 611089 RMD160 c943ae7dddf456df7fd8d619b44e2c97c03b6297 SHA1 0c1b8420cd89a8fcae86982e205255d469e9dd29 SHA256 0bbc8ed72586b7e8ebdf60786f9d9c05c2f36f210acba36f01d645f9ff89ec37 EBUILD muine-0.8.10.ebuild 2245 RMD160 725dffba69d3737604dda03fc0533d55281e3ce7 SHA1 533c61d7f2d5268b080b293ff6f8b70a142f8168 SHA256 8ebec6284b72e42d971b94de773bbffa63a4d42ec2b962513ab2c014f2ec396e MISC ChangeLog 8094 RMD160 ef70a854c5bb0153f531fe4b085549c936beb95b SHA1 a44816549aabae4ce1bf6cb1c36a38f86eae5b8c SHA256 674f8a7ac25e57e36b085877634d0b0de9451e1ad0edffe476502c07a2fe8c1d diff --git a/media-sound/muine/files/muine-0.8.7-flac.patch b/media-sound/muine/files/muine-0.8.7-flac.patch deleted file mode 100644 index 14d690c1f28c..000000000000 --- a/media-sound/muine/files/muine-0.8.7-flac.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -ur muine-0.8.7.orig/libmuine/metadata.c muine-0.8.7/libmuine/metadata.c ---- muine-0.8.7.orig/libmuine/metadata.c 2007-01-20 00:14:07.000000000 +0200 -+++ muine-0.8.7/libmuine/metadata.c 2007-07-12 17:31:03.000000000 +0300 -@@ -41,6 +41,12 @@ - #include "metadata.h" - #include "macros.h" - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ - struct _Metadata { - char *title; - -@@ -741,7 +747,14 @@ - } CallbackData; - - static FLAC__StreamDecoderReadStatus --FLAC_read_callback (const FLAC__StreamDecoder *UNUSED(decoder), FLAC__byte buffer[], unsigned *bytes, void *client_data) -+FLAC_read_callback (const FLAC__StreamDecoder *UNUSED(decoder), -+ FLAC__byte buffer[], -+#if defined(LEGACY_FLAC) -+ unsigned *bytes, -+#else -+ size_t *bytes, -+#endif -+ void *client_data) - { - CallbackData *data = (CallbackData *) client_data; - GnomeVFSFileSize read; -@@ -829,22 +842,40 @@ - - flac_decoder = FLAC__stream_decoder_new (); - -+#if defined(LEGACY_FLAC) - FLAC__stream_decoder_set_read_callback (flac_decoder, FLAC_read_callback); - FLAC__stream_decoder_set_write_callback (flac_decoder, FLAC_write_callback); - FLAC__stream_decoder_set_metadata_callback (flac_decoder, FLAC_metadata_callback); - FLAC__stream_decoder_set_error_callback (flac_decoder, FLAC_error_callback); -+#endif - - callback_data = g_new0 (CallbackData, 1); - callback_data->handle = handle; - callback_data->comment = comment; -+#if defined(LEGACY_FLAC) - FLAC__stream_decoder_set_client_data (flac_decoder, callback_data); -+#endif - - /* by default, only the STREAMINFO block is parsed and passed to - * the metadata callback. Here we instruct the decoder to also - * pass us the VORBISCOMMENT block if there is one. */ - FLAC__stream_decoder_set_metadata_respond (flac_decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); - -+#if defined(LEGACY_FLAC) - FLAC__stream_decoder_init (flac_decoder); -+#else -+ FLAC__stream_decoder_init_stream (flac_decoder, -+ FLAC_read_callback, -+ NULL, -+ NULL, -+ NULL, -+ NULL, -+ FLAC_write_callback, -+ FLAC_metadata_callback, -+ FLAC_error_callback, -+ callback_data -+ ); -+#endif - - /* this runs the decoding process, calling the callbacks as appropriate */ - if (FLAC__stream_decoder_process_until_end_of_metadata (flac_decoder) == 0) { |