diff options
| -rw-r--r-- | media-sound/muine/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/muine/Manifest | 30 | ||||
| -rw-r--r-- | media-sound/muine/files/muine-0.8.7-flac.patch | 73 | ||||
| -rw-r--r-- | media-sound/muine/muine-0.8.7.ebuild | 9 |
4 files changed, 94 insertions, 24 deletions
diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog index 1c55ea1ba492..14709ca1501b 100644 --- a/media-sound/muine/ChangeLog +++ b/media-sound/muine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/muine # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.41 2007/05/01 00:17:11 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.42 2007/07/12 14:51:16 drac Exp $ + + 12 Jul 2007; Samuli Suominen <drac@gentoo.org> + +files/muine-0.8.7-flac.patch, muine-0.8.7.ebuild: + >=flac 1.1.3 compatibility patch from bug 181829. 01 May 2007; Marius Mauch <genone@gentoo.org> muine-0.8.7.ebuild: Replacing einfo with elog diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest index 58367b87e378..0b7b2b88dd6a 100644 --- a/media-sound/muine/Manifest +++ b/media-sound/muine/Manifest @@ -1,15 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX muine-0.8.7-flac.patch 2387 RMD160 0f992e3a72436afe457d77d7157692e189ee457b SHA1 1162263558421ba791d7ee80d7f8fbc9da1710e0 SHA256 d94cbf523c9e77bbfd4b7a8f5793a5a152a63c8352f62aedbfa8f882ae4b62c1 +MD5 af0ce1d3a863a698b77143472f381efc files/muine-0.8.7-flac.patch 2387 +RMD160 0f992e3a72436afe457d77d7157692e189ee457b files/muine-0.8.7-flac.patch 2387 +SHA256 d94cbf523c9e77bbfd4b7a8f5793a5a152a63c8352f62aedbfa8f882ae4b62c1 files/muine-0.8.7-flac.patch 2387 DIST muine-0.8.7.tar.gz 765786 RMD160 ca16c833abe335f753f8c7fabb1d986f490dd05f SHA1 e1667d5a0fd4a79504307fb9261bb8b2a4dda87b SHA256 c3ce4665c156ec15d952fc18267d9b50c1445fbf8b26953ee9448c7a7db6a1e3 -EBUILD muine-0.8.7.ebuild 2350 RMD160 d481698e6e804711e1dcc3d3c307a3c49cf3eb76 SHA1 a66ff7c352c1927b09a9493d7b70a0afb079139f SHA256 9a55f035bdb5f316481114be940bc3a946f946c3efc22c4f164e3e83feeef811 -MD5 4a4151c6524fceb9f5ed14f26aec3cbf muine-0.8.7.ebuild 2350 -RMD160 d481698e6e804711e1dcc3d3c307a3c49cf3eb76 muine-0.8.7.ebuild 2350 -SHA256 9a55f035bdb5f316481114be940bc3a946f946c3efc22c4f164e3e83feeef811 muine-0.8.7.ebuild 2350 -MISC ChangeLog 6381 RMD160 672058f0f321846a47802c3cd624600a391c0bfe SHA1 8818f5767439ef524766fdbabcf43827699e4511 SHA256 388f02cf37675e5890923e8fc5507e7a40f6c6f6abf38a177af556e805554622 -MD5 b99444fa5a6e2f8e6d1315056c090e93 ChangeLog 6381 -RMD160 672058f0f321846a47802c3cd624600a391c0bfe ChangeLog 6381 -SHA256 388f02cf37675e5890923e8fc5507e7a40f6c6f6abf38a177af556e805554622 ChangeLog 6381 +EBUILD muine-0.8.7.ebuild 2387 RMD160 85b40ea125a68a4af067c4552d45ace5313387a8 SHA1 f93f6c06aa1f3188bacd5ff3ec24455398b2c3b5 SHA256 ae230c0958a0a6f8813c99370d8646fb7e34a903da0e192dc98bc7d846833d65 +MD5 7037e34dde85aa6b245506964046b6ef muine-0.8.7.ebuild 2387 +RMD160 85b40ea125a68a4af067c4552d45ace5313387a8 muine-0.8.7.ebuild 2387 +SHA256 ae230c0958a0a6f8813c99370d8646fb7e34a903da0e192dc98bc7d846833d65 muine-0.8.7.ebuild 2387 +MISC ChangeLog 6534 RMD160 d10e09b15973428e35c682639f24431df1ea2347 SHA1 7e95f58de96031b9e05a39615c308a59cbce0cc4 SHA256 07eadd70c32a79cc956b0c4d3ad2584e6c6b87a102efc1f3a92e36109b79920c +MD5 c04a92fc7af7f62fe34dc63121f273ad ChangeLog 6534 +RMD160 d10e09b15973428e35c682639f24431df1ea2347 ChangeLog 6534 +SHA256 07eadd70c32a79cc956b0c4d3ad2584e6c6b87a102efc1f3a92e36109b79920c ChangeLog 6534 MISC metadata.xml 245 RMD160 1616aa879e13e5d3f8ee6b140d342f83017a1b2b SHA1 784f47492a87ac299b76a07110f7a41a6cd2a0b7 SHA256 1b1fd4c1c14c9c902fcb27fc5a13587386c662b5b2da3b130b15fbac4afce1ce MD5 42dcaa983276bbd8e849c07f13677337 metadata.xml 245 RMD160 1616aa879e13e5d3f8ee6b140d342f83017a1b2b metadata.xml 245 @@ -17,10 +18,3 @@ SHA256 1b1fd4c1c14c9c902fcb27fc5a13587386c662b5b2da3b130b15fbac4afce1ce metadata MD5 f857e8fa4d841cc097b7ebf230f6ee7c files/digest-muine-0.8.7 235 RMD160 4ec6bab86cf8687434c548cd83ef65e581f39894 files/digest-muine-0.8.7 235 SHA256 fa827b65f7c10227c526fc794531663c681311f0365edb53cf37eb4b0ad4e643 files/digest-muine-0.8.7 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGNodL6J2i8a8J4okRAha0AKCs9nH/6xG/ZOEi1RNrxj6vwI7PawCgxskt -W/ICXsqKPoK+42Gvvtxl/IM= -=vEZi ------END PGP SIGNATURE----- diff --git a/media-sound/muine/files/muine-0.8.7-flac.patch b/media-sound/muine/files/muine-0.8.7-flac.patch new file mode 100644 index 000000000000..14d690c1f28c --- /dev/null +++ b/media-sound/muine/files/muine-0.8.7-flac.patch @@ -0,0 +1,73 @@ +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) { diff --git a/media-sound/muine/muine-0.8.7.ebuild b/media-sound/muine/muine-0.8.7.ebuild index cd37e595482e..f25ce65c9562 100644 --- a/media-sound/muine/muine-0.8.7.ebuild +++ b/media-sound/muine/muine-0.8.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.7.ebuild,v 1.2 2007/05/01 00:17:11 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.7.ebuild,v 1.3 2007/07/12 14:51:16 drac Exp $ inherit gnome2 mono eutils multilib autotools @@ -22,7 +22,7 @@ RDEPEND=">=dev-lang/mono-1.1 >=dev-dotnet/gconf-sharp-2.6.0 >=dev-dotnet/gnomevfs-sharp-2.6.0 sys-libs/gdbm - ~media-libs/flac-1.1.2 + >=media-libs/flac-1.1.2 >=media-libs/libvorbis-1.0 >=media-libs/libid3tag-0.15.0b xine? ( >=media-libs/xine-lib-1_rc4 ) @@ -52,7 +52,6 @@ DOCS="AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README TODO" MAKEOPTS="${MAKEOPTS} -j1" pkg_setup() { - G2CONF="${G2CONF} $(use_enable aac faad2)" if use xine ; then @@ -64,8 +63,8 @@ pkg_setup() { src_unpack() { unpack ${A} - cd ${S} - + cd "${S}" + epatch "${FILESDIR}"/${P}-flac.patch intltoolize --force --copy || die "intltoolize failed" AT_M4DIR="${S}/m4" eautoreconf } |