rpms/crack-attack/F-8 crack-attack-1.1.14-audio-ppc.patch, NONE, 1.1 crack-attack-1.1.14-gcc43.patch, NONE, 1.1 crack-attack.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/crack-attack/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2786

Modified Files:
	crack-attack.spec 
Added Files:
	crack-attack-1.1.14-audio-ppc.patch 
	crack-attack-1.1.14-gcc43.patch 
Log Message:
* Tue Jun 24 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-14
- Fix sound on bigendian machines (bz 452394)


crack-attack-1.1.14-audio-ppc.patch:

--- NEW FILE crack-attack-1.1.14-audio-ppc.patch ---
diff -up crack-attack-1.1.14/src/Sound.cxx~ crack-attack-1.1.14/src/Sound.cxx
--- crack-attack-1.1.14/src/Sound.cxx~	2008-06-24 11:20:22.000000000 +0200
+++ crack-attack-1.1.14/src/Sound.cxx	2008-06-24 11:20:22.000000000 +0200
@@ -41,7 +41,7 @@ ChunkMap chunks;
 int audio_rate          = 22050;
 int audio_channels      = 2;
 int audio_buffers       = 1024; /* small enough buffer to get synchronized sound */
-Uint16 audio_format     = AUDIO_S16; /* 16-bit stereo */
+Uint16 audio_format     = AUDIO_S16SYS; /* 16-bit stereo */
 int has_audio_available = 0;
 
 void Sound::initialize( void )

crack-attack-1.1.14-gcc43.patch:

--- NEW FILE crack-attack-1.1.14-gcc43.patch ---
diff -up crack-attack-1.1.14/src/TextureLoader.h~ crack-attack-1.1.14/src/TextureLoader.h
--- crack-attack-1.1.14/src/TextureLoader.h~	2008-01-04 23:07:02.000000000 +0100
+++ crack-attack-1.1.14/src/TextureLoader.h	2008-01-04 23:07:02.000000000 +0100
@@ -28,6 +28,7 @@
 #define TEXTURELOADER_H
 
 #include <GL/glut.h>
+#include <string.h>
 
 #include "glext.h"
 #include "sstream.h"


Index: crack-attack.spec
===================================================================
RCS file: /cvs/extras/rpms/crack-attack/F-8/crack-attack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crack-attack.spec	6 Aug 2007 08:34:11 -0000	1.3
+++ crack-attack.spec	24 Jun 2008 12:38:37 -0000	1.4
@@ -1,16 +1,18 @@
 Summary:        Puzzle action game
 Name:           crack-attack
 Version:        1.1.14
-Release:        10%{?dist}
+Release:        14%{?dist}
 License:        GPLv2+
 Group:          Amusements/Games
 URL:            http://www.nongnu.org/crack-attack/
 Source0:        http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2
-Source1:        http://www.miguev.net/misc/%{name}-sounds.tar.gz
+Source1:        %{name}-sounds.tar.gz
 Source2:        %{name}-music.tar.gz
 Patch0:         crack-attack-1.1.14-glutInit.patch
 Patch1:         crack-attack-1.1.14-sanitize.patch
 Patch2:         crack-attack-1.1.14-audio.patch
+Patch3:         crack-attack-1.1.14-gcc43.patch
+Patch4:         crack-attack-1.1.14-audio-ppc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libstdc++-devel desktop-file-utils ImageMagick
 BuildRequires:  SDL-devel gtk2-devel pkgconfig SDL_mixer-devel freeglut-devel
@@ -28,6 +30,8 @@
 %patch0 -p1 -b .glutinit
 %patch1 -p1 -b .sanitize
 %patch2 -p1 -b .audio
+%patch3 -p1 -b .gcc43
+%patch4 -p1
 sed -i 's/-O3 -s//g' src/Makefile.in
 sed -i 's/-O2//g' src/gtk-gui/Makefile.in
 # fixup provided desktop file
@@ -91,6 +95,19 @@
 
 
 %changelog
+* Tue Jun 24 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-14
+- Fix sound on bigendian machines (bz 452394)
+
+* Wed Mar  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-13
+- Stop using a full URL for Source1 (upstream file somehow got trunkated to
+  0 bytes)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.14-12
+- Autorebuild for GCC 4.3
+
+* Fri Dec  4 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-11
+- Fix building with gcc 4.3
+
 * Mon Aug  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-10
 - Update License tag for new Licensing Guidelines compliance