rpms/warzone2100/devel warzone2100-2.0.8.fixsound.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 warzone2100.spec, 1.13, 1.14

[Karol Trzcionka (karlik)]

Author: karlik

Update of /cvs/pkgs/rpms/warzone2100/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23782/warzone2100/devel

Modified Files:
	.cvsignore sources warzone2100.spec 
Added Files:
	warzone2100-2.0.8.fixsound.patch 
Log Message:
Update to v2.0.8 and apply fixsound


warzone2100-2.0.8.fixsound.patch:

--- NEW FILE warzone2100-2.0.8.fixsound.patch ---
diff -up ./lib/sound/openal_track.c.fixsound ./lib/sound/openal_track.c
--- ./lib/sound/openal_track.c.fixsound	2007-07-17 22:25:28.000000000 +0200
+++ ./lib/sound/openal_track.c	2007-12-03 15:46:33.000000000 +0100
@@ -288,6 +288,11 @@ static size_t ovbuf_read(void *ptr, size
 	return read_size;
 }
 
+/* 
+ * See http://xiph.org/vorbis/doc/vorbisfile/callbacks.html for what these
+ * functions have to do.
+ */
+
 static int ovbuf_seek(void *datasource, ogg_int64_t offset, int whence) {
 	ov_buffer_t* ovbuf = (ov_buffer_t*)datasource;
 	int new_pos = 0;
@@ -297,19 +302,18 @@ static int ovbuf_seek(void *datasource, 
 			new_pos = offset;
 			break;
 		case SEEK_CUR:
-			new_pos = ovbuf->pos+offset;
+			new_pos = ovbuf->pos + offset;
 			break;
 		case SEEK_END:
-			new_pos = ovbuf->size-offset-1;
+			new_pos = ovbuf->size - offset;
 			break;
 	}
 
-	if (new_pos >= 0 && new_pos < ovbuf->size) {
-		ovbuf->pos = new_pos;
-		return new_pos;
-	} else {
-		return -1;
-	}
+	if (new_pos < 0)
+		new_pos = 0;
+	else if (new_pos > ovbuf->size)
+		new_pos = ovbuf->size;
+	return ovbuf->pos = new_pos;
 }
 
 static int ovbuf_close(void *datasource) {
@@ -325,7 +329,7 @@ static long ovbuf_tell(void *datasource)
 static ov_callbacks ovbuf_callbacks = {
 	ovbuf_read,
 	ovbuf_seek,
-	ovbuf_close,
+	NULL, // close
 	ovbuf_tell
 };
 
@@ -346,11 +350,12 @@ static long ovPHYSFS_tell(void *datasour
     return -1;
 }
 
+// seek/tell/close don't do anything right now, so tell physfs not to bother.
 static ov_callbacks ovPHYSFS_callbacks = {
 	ovPHYSFS_read,
-	ovPHYSFS_seek,
-	ovPHYSFS_close,
-	ovPHYSFS_tell
+	NULL, // seek
+	NULL, // close
+	NULL  // tell
 };
 
 static BOOL sound_ReadTrack( TRACK *psTrack, ov_callbacks callbackFuncs, void* datasource )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Nov 2007 16:21:23 -0000	1.5
+++ .cvsignore	3 Dec 2007 15:35:30 -0000	1.6
@@ -1 +1 @@
-warzone2100-2.0.8_rc1.tar.bz2
+warzone2100-2.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Nov 2007 16:21:23 -0000	1.5
+++ sources	3 Dec 2007 15:35:30 -0000	1.6
@@ -1 +1 @@
-5633f8b4a859d2acde7894ea88dc829c  warzone2100-2.0.8_rc1.tar.bz2
+e804486bee52e3f6f1f3a7622fd7af1f  warzone2100-2.0.8.tar.bz2


Index: warzone2100.spec
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/warzone2100.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- warzone2100.spec	19 Nov 2007 16:21:23 -0000	1.13
+++ warzone2100.spec	3 Dec 2007 15:35:30 -0000	1.14
@@ -1,13 +1,13 @@
-%define relc rc1
 Name:           warzone2100
 Version:        2.0.8
-Release:        0.1.%{relc}%{?dist}
+Release:        1%{?dist}
 Summary:        Innovative 3D real-time strategy
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://wz2100.net/
-Source0:        http://download.gna.org/warzone/releases/2.0/%{name}-%{version}_rc1.tar.bz2
+Source0:        http://download.gna.org/warzone/releases/2.0/%{name}-%{version}.tar.bz2
+Patch0:         warzone2100-2.0.8.fixsound.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    x86_64 ppc64 sparc64 alpha
 
@@ -25,7 +25,8 @@
 ReDev project was formed to take care of its future.
 
 %prep
-%setup -q -n warzone2100-2.0.8_rc1
+%setup -q
+%patch0
 
 %build
 ./autogen.sh
@@ -52,9 +53,11 @@
 %{_datadir}/icons/warzone*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/warzone2100
-%doc AUTHORS ChangeLog COPYING COPYING.README README TODO
+%doc AUTHORS ChangeLog COPYING COPYING.README TODO
 
 %changelog
+* Mon Dec 03 2007 Karol Trzcionka <karlikt at gmail.com> - 2.0.8-1
+- Update to v2.0.8 and apply fixsound
 * Mon Nov 19 2007 Karol Trzcionka <karlikt at gmail.com> - 2.0.8-0.1.rc1
 - Update to v2.0.8_rc1
 * Wed Oct 17 2007 Karol Trzcionka <karlikt at gmail.com> - 2.0.7-5