[vegastrike] Fix problem with missing music

Bruno Wolff III bruno at fedoraproject.org
Sun Apr 29 13:09:41 UTC 2012


commit 0643ff480fc09bb578a21fdbd5e3f4c0704aff55
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Apr 29 07:08:00 2012 -0500

    Fix problem with missing music
    
    Upstream has a patch (Rev:13355 [klaussfreire] - Merge music fix from trunk)
    to fix the missing music problem.

 vegastrike-0.5.1-music.patch |   11 +++++++++++
 vegastrike.spec              |    5 +++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/vegastrike-0.5.1-music.patch b/vegastrike-0.5.1-music.patch
new file mode 100644
index 0000000..cf99764
--- /dev/null
+++ b/vegastrike-0.5.1-music.patch
@@ -0,0 +1,11 @@
+--- branches/vegastrike_0_5_1/vegastrike/src/cmd/music.cpp	2012/04/11 00:50:39	13354
++++ branches/vegastrike_0_5_1/vegastrike/src/cmd/music.cpp	2012/04/11 00:59:02	13355
+@@ -448,6 +448,8 @@
+             if (foundcache) {
+                 *me->music_load_info = wherecache->second;
+                 me->freeWav = false;
++            } else if ( !AUDLoadSoundFile( songname, me->music_load_info, true ) ) { 	 
++	        VSFileSystem::vs_dprintf(1, "Failed to load music file \"%s\"", songname);
+             }
+         }
+         if (me->freeWav && docacheme) {
diff --git a/vegastrike.spec b/vegastrike.spec
index 2b70351..3e53bb8 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -22,6 +22,7 @@ Patch8:         vegastrike-0.5.1-gcc44.patch
 Patch9:         vegastrike-0.5.0-glext.patch
 Patch12:        vegastrike-0.5.1-boost146.patch
 Patch14:        vegastrike-0.5.1-gcc47.patch
+Pathc15:        vegastrike-0.5.1-music.patch
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
 BuildRequires:  SDL_mixer-devel openal-soft-devel freealut-devel
@@ -49,6 +50,7 @@ Yet danger lurks in the space beyond.
 %patch9 -p1
 %patch12 -p0
 %patch14 -p1
+%patch15 -p1
 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
 touch -r README README.tmp
 mv README.tmp README
@@ -98,6 +100,9 @@ desktop-file-install --vendor fedora            \
 
 
 %changelog
+* Sun Apr 29 2012 Bruno Wolff III <bruno at wolff.to> - 0.5.1-2.r1
+- Apply upstream patch to fix music issue
+
 * Wed Apr 04 2012 Bruno Wolff III <bruno at wolff.to> - 0.5.1-1.r1
 - Update to 0.5.1 release
 


More information about the scm-commits mailing list