rpms/xmms-speex/devel speex-xmms-0.9.1-gcc4.patch, NONE, 1.1 xmms-speex.spec, 1.4, 1.5

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/xmms-speex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15387

Modified Files:
	xmms-speex.spec 
Added Files:
	speex-xmms-0.9.1-gcc4.patch 
Log Message:
Added Michael's gcc4 patch.


speex-xmms-0.9.1-gcc4.patch:

--- NEW FILE speex-xmms-0.9.1-gcc4.patch ---
diff -Nur speex-xmms-orig/speexutil.c speex-xmms/speexutil.c
--- speex-xmms-orig/speexutil.c	2003-08-03 18:18:34.000000000 +0200
+++ speex-xmms/speexutil.c	2005-04-13 12:38:58.000000000 +0200
@@ -239,7 +239,7 @@
 
 
 	//fwd vendor-length
-	((int*) packet)++;
+	packet += sizeof(int);
 	len -= sizeof(int);
 	if (comment->vendor_length > len) return 0;
 
@@ -260,7 +260,7 @@
 	comment->comments = calloc(comment->comment_num, sizeof(int));
 	
 	//fwd number of comments
-	((int*) packet)++;
+	packet += sizeof(int);
 	len -= sizeof(int);
 	if (comment->comment_num > 0 && len < sizeof(int)) return 0;
 	
@@ -270,7 +270,7 @@
 		this_length = *(int*) packet;
 
 		//fwd comment-length
-		((int*) packet)++;
+		packet += sizeof(int);
 		len -= sizeof(int);
 		if (len < this_length) return 0;
 


Index: xmms-speex.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-speex/devel/xmms-speex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-speex.spec	6 Apr 2005 22:13:53 -0000	1.4
+++ xmms-speex.spec	14 Apr 2005 15:50:24 -0000	1.5
@@ -1,17 +1,15 @@
-# $Id$
-
 %define xmms_inputdir %(xmms-config --input-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/Input)
 
 Summary: X MultiMedia System input plugin to play speex files
 Name: xmms-speex
 Version: 0.9.1
 Release: 5
-
 License: GPL
 Group: Applications/Multimedia
 URL: http://jzb.rapanden.dk/projects/speex-xmms
 Source: http://jzb.rapanden.dk/pub/speex-xmms-%{version}.tar.gz
-Patch: speex-xmms-0.9.1.patch
+Patch0: speex-xmms-0.9.1.patch
+Patch1: speex-xmms-0.9.1-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7
 BuildRequires: xmms-devel, gtk+-devel, speex-devel, libogg-devel
@@ -23,7 +21,8 @@
 
 %prep
 %setup -n speex-xmms
-%patch -p1
+%patch0 -p1
+%patch1 -p1 -b .gcc4
 
 
 %build
@@ -46,8 +45,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.9.1-5
+- Include gcc4 patch from Michael Schwendt.
+- The URL and Source headers no longer to point to a valid location, but no
+  better one can be found (yet?).
 
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.9.1-4
 - Bump release to provide Extras upgrade path.