rpms/stormbaancoureur/devel stormbaancoureur-2.0.2-snd-debug.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 stormbaancoureur.spec, 1.6, 1.7 stormbaancoureur-2.0.0-pulseaudio.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources stormbaancoureur.spec 
Added Files:
	stormbaancoureur-2.0.2-snd-debug.patch 
Removed Files:
	stormbaancoureur-2.0.0-pulseaudio.patch 
Log Message:
* Sun Jan  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-1
- new upstream release 2.0.2
- drop most patches (upstreamed)
- better sound error messages in an attempt to debug bz 427592


stormbaancoureur-2.0.2-snd-debug.patch:

--- NEW FILE stormbaancoureur-2.0.2-snd-debug.patch ---
diff -up stormbaancoureur-2.0.2/src-stormbaancoureur/main.cxx.snd stormbaancoureur-2.0.2/src-stormbaancoureur/main.cxx
--- stormbaancoureur-2.0.2/src-stormbaancoureur/main.cxx.snd	2008-01-06 22:09:09.000000000 +0100
+++ stormbaancoureur-2.0.2/src-stormbaancoureur/main.cxx	2008-01-06 22:09:14.000000000 +0100
@@ -1300,7 +1300,7 @@ int main(int argc, char *argv[]) 
   bool nosound = getenv("PLODE_NO_SOUND");
   if (!nosound)
   {
-    sengine = new SoundEngineAlsa(5000);
+    sengine = new SoundEngineAlsa(8000);
     if (!sengine->opened)
     {
       delete sengine;
diff -up stormbaancoureur-2.0.2/src-common/soundenginealsa.cxx.snd stormbaancoureur-2.0.2/src-common/soundenginealsa.cxx
--- stormbaancoureur-2.0.2/src-common/soundenginealsa.cxx.snd	2008-01-05 04:32:34.000000000 +0100
+++ stormbaancoureur-2.0.2/src-common/soundenginealsa.cxx	2008-01-06 22:09:00.000000000 +0100
@@ -195,12 +195,14 @@ float SoundEngineAlsa::Sustain(void)
   snd_pcm_sframes_t delay;
   int avail = snd_pcm_avail_update(handle);
   int rc = snd_pcm_delay(handle, &delay);
-  if (rc<0)
-    snd_strerror(rc);
   if (rc==-EPIPE)
     fprintf(stderr,"soundenginealsa.cxx: EPIPE\n");
-  else
+  else {
+    if (rc<0)
+      fprintf(stderr, "Unexpected error getting sound-delay: %s\n",
+        snd_strerror(rc));
     assert(!rc);
+  }
 
   // We can only trust pcm_delay if the state is running.
   snd_pcm_state_t pcm_state = snd_pcm_state(handle);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Dec 2007 23:12:02 -0000	1.9
+++ .cvsignore	8 Jan 2008 20:37:43 -0000	1.10
@@ -1 +1 @@
-stormbaancoureur-2.0.0.tar.gz
+stormbaancoureur-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Dec 2007 23:12:02 -0000	1.9
+++ sources	8 Jan 2008 20:37:43 -0000	1.10
@@ -1 +1 @@
-2d20b536c7616c74376b277132bd09c9  stormbaancoureur-2.0.0.tar.gz
+49a2f58689093efe4f1f729a076de143  stormbaancoureur-2.0.2.tar.gz


Index: stormbaancoureur.spec
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/stormbaancoureur.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- stormbaancoureur.spec	31 Dec 2007 23:12:02 -0000	1.6
+++ stormbaancoureur.spec	8 Jan 2008 20:37:43 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           stormbaancoureur
-Version:        2.0.0
+Version:        2.0.2
 Release:        1%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
@@ -9,7 +9,7 @@
 Source1:        %{name}.desktop
 Source2:        sturmbahnfahrer.png
 Patch0:         stormbaancoureur-1.5.3-no-static-ode.patch
-Patch1:         stormbaancoureur-2.0.0-pulseaudio.patch
+Patch1:         stormbaancoureur-2.0.2-snd-debug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel ode-devel freeglut-devel desktop-file-utils
 BuildRequires:  alsa-lib-devel
@@ -32,7 +32,8 @@
 
 %build
 pushd src-%{name}
-make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -I../src-common"
+make %{?_smp_mflags} \
+  CXXFLAGS="$RPM_OPT_FLAGS -I../src-common -DGAMEVERSION=%{version}-Fedora"
 popd
 
 
@@ -90,6 +91,15 @@
 
 
 %changelog
+* Sun Jan  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-1
+- new upstream release 2.0.2
+- drop most patches (upstreamed)
+- better sound error messages in an attempt to debug bz 427592
+
+* Fri Jan  4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.0-2
+- Fix compilation with gcc-4.3
+- Fix running with the nvidea-legacy drivers, patch by Alexis de Ruelle
+
 * Mon Dec 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.0-1
 - New upstream release 2.0.0
 - Fix sound when using pulseaudio


--- stormbaancoureur-2.0.0-pulseaudio.patch DELETED ---