[fedora-extras-commits] rpms/xmms-sid/devel xmms-sid-0.7.4-gcc34.patch, NONE, 1.1 xmms-sid.spec, 1.4, 1.5

[Michael Schwendt (mschwendt)]

Update of /cvs/extras/rpms/xmms-sid/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv3031

Modified Files:
	xmms-sid.spec 
Added Files:
	xmms-sid-0.7.4-gcc34.patch 
Log Message:
Fix src/xmms-sid.cc for GCC 3.4/FC3.


xmms-sid-0.7.4-gcc34.patch:

--- NEW FILE xmms-sid-0.7.4-gcc34.patch ---
diff -Nur xmms-sid-0.7.4-orig/src/xmms-sid.cc xmms-sid-0.7.4/src/xmms-sid.cc
--- xmms-sid-0.7.4-orig/src/xmms-sid.cc	2002-09-02 23:55:29.000000000 +0200
+++ xmms-sid-0.7.4/src/xmms-sid.cc	2004-11-10 04:13:37.000000000 +0100
@@ -196,7 +196,7 @@
 	int fxlen, tn;
 	struct sidTuneInfo sidInf;
 	char *name;
-	enum AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8;
+	AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8;
 	gint chn = xs_emuConf.channels;
 
 	tune->getInfo(sidInf);


Index: xmms-sid.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-sid.spec	8 Nov 2004 05:35:54 -0000	1.4
+++ xmms-sid.spec	10 Nov 2004 04:05:42 -0000	1.5
@@ -3,13 +3,14 @@
 Summary: SIDPlay input plugin for X MultiMedia System (XMMS)
 Name: xmms-sid
 Version: 0.7.4
-Release: 0.fdr.3.1.90
+Release: 4
 Epoch: 0
 URL: http://www.tnsp.org/xmms-sid.php
 License: GPL
 Group: Applications/Multimedia
 Source0: http://www.tnsp.org/xs-files/%{name}-%{version}.tar.bz2
 Patch0: xmms-sid-0.7.4-cflags.patch
+Patch1: xmms-sid-0.7.4-gcc34.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 0:1.2.7
 BuildRequires: xmms-devel >= 0:1.2, libsidplay-devel >= 0:1.36.57
@@ -31,6 +32,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
+%patch1 -p1 -b .gcc34
 
 
 #---------------------------------------------------------------------
@@ -62,6 +64,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.7.4-4
+- Fix src/xmms-sid.cc for GCC 3.4/FC3.
+
 * Fri May 02 2003 Panu Matilainen <pmatilai at welho.com> 0:0.7.4-0.fdr.3
 - patch to make it honor rpm optflags
 - use bz2 source instead of gz