rpms/muine/devel muine-0.8.7-64bit.patch, NONE, 1.1 muine-0.8.7-flac-1.1.3.patch, NONE, 1.1 muine.spec, 1.11, 1.12

[Sindre Pedersen Bjørdal (sindrepb)]

Author: sindrepb

Update of /cvs/extras/rpms/muine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26842

Modified Files:
	muine.spec 
Added Files:
	muine-0.8.7-64bit.patch muine-0.8.7-flac-1.1.3.patch 
Log Message:
"Make build work with flac 1.1.3


muine-0.8.7-64bit.patch:

--- NEW FILE muine-0.8.7-64bit.patch ---
--- muine-0.8.7/libmuine/metadata.c.64bit	2007-01-22 16:14:39.000000000 +0100
+++ muine-0.8.7/libmuine/metadata.c	2007-01-22 16:14:52.000000000 +0100
@@ -747,7 +747,7 @@
 } 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[], size_t *bytes, void *client_data)
 {
 	CallbackData *data = (CallbackData *) client_data;
 	GnomeVFSFileSize read;

muine-0.8.7-flac-1.1.3.patch:

--- NEW FILE muine-0.8.7-flac-1.1.3.patch ---
--- muine-0.8.7/libmuine/metadata.c.flac	2007-01-19 23:14:07.000000000 +0100
+++ muine-0.8.7/libmuine/metadata.c	2007-01-22 13:52:05.000000000 +0100
@@ -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;
 
@@ -829,22 +835,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) {


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/devel/muine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- muine.spec	22 Jan 2007 03:03:32 -0000	1.11
+++ muine.spec	26 Feb 2007 03:32:15 -0000	1.12
@@ -1,12 +1,14 @@
 Name:           muine
 Version:        0.8.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.muine-player.org/
 Source0:        http://www.muine-player.org/releases/muine-%{version}.tar.gz
+Patch0:         %{name}-%{version}-flac-1.1.3.patch
+Patch1:         %{name}-%{version}-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel, gtk-sharp2-gapi, gtk-sharp2-devel
@@ -42,6 +44,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -118,6 +122,8 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Feb 26 2007 Sindre Pedersen Bjørdal <foolish[AT]guezz.net> - 0.8.7-2
+- Add patches to make build work with flac 1.1.3
 * Mon Jan 22 2007 Sindre Pedersen Bjørdal <foolish[AT]guezz.net> - 0.8.7-1
 - Update to 0.8.7
 - Remove obsoleted dbus-sharp dependency