rpms/TnL/devel TnL-071111-openal-compile-fixes.patch, NONE, 1.1 TnL.spec, 1.14, 1.15

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/TnL/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9727

Modified Files:
	TnL.spec 
Added Files:
	TnL-071111-openal-compile-fixes.patch 
Log Message:
* Fri Jun  4 2010 Hans de Goede <hdegoede at redhat.com> 071111-13
- Fix FTBFS (#599893)


TnL-071111-openal-compile-fixes.patch:
 sound.cc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE TnL-071111-openal-compile-fixes.patch ---
diff -up TnL-source-071111/src/sound.cc~ TnL-source-071111/src/sound.cc
--- TnL-source-071111/src/sound.cc~	2007-06-27 19:58:11.000000000 +0200
+++ TnL-source-071111/src/sound.cc	2010-06-04 08:54:22.524385601 +0200
@@ -31,7 +31,7 @@ static void alCheck() {
     ALenum error = alGetError();
     if (error != AL_NO_ERROR) {
         ls_error("OpenAL Error %d", error);
-        const ALbyte * errtxt = alGetString(error);
+        const ALchar * errtxt = alGetString(error);
         error = alGetError();
         if (error == AL_NO_ERROR) {
             ls_error(": %s \n", errtxt);
@@ -318,7 +318,7 @@ static void check(ALCdevice *dev=NULL) {
     ALCenum error = alcGetError(dev);
     if (error != ALC_NO_ERROR) {
         ls_error("OpenAL (ALC) Error %d", error);
-        const ALbyte * errtxt = alcGetString(NULL,error);
+        const ALCchar * errtxt = alcGetString(NULL,error);
         error = alcGetError(dev);
         if (error == ALC_NO_ERROR) {
             ls_error(": %s \n", errtxt);
@@ -340,7 +340,7 @@ SoundMan::SoundMan(Ptr<IConfig> config)
     if (device == NULL ) {
         throw std::runtime_error("SoundMan: Failed to initialize Sound subsystem.");
     } else {
-        const ALCbyte * device_specifier =
+        const ALCchar * device_specifier =
             alcGetString(device, ALC_DEVICE_SPECIFIER);
         check(device);
         ls_message("  Using device \"%s\"\n", device_specifier);


Index: TnL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TnL/devel/TnL.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- TnL.spec	15 Jan 2010 13:51:30 -0000	1.14
+++ TnL.spec	4 Jun 2010 07:04:17 -0000	1.15
@@ -7,7 +7,7 @@
 
 Name:           TnL
 Version:        071111
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Thunder & Lightning - A futuristic action flight simulator game
 Group:          Amusements/Games
 License:        GPL+
@@ -17,6 +17,7 @@ Source1:        %{name}.desktop
 Patch0:         TnL-070909-system-boost.patch
 Patch1:         TnL-070909-crash-on-exit.patch
 Patch2:         TnL-source-071111-gcc43.patch
+Patch3:         TnL-071111-openal-compile-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  glew-devel libpng-devel libsigc++-devel
 BuildRequires:  SDL-devel Io-language-devel boost-devel cegui-devel
@@ -43,6 +44,7 @@ scripted events for each island.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # we want to use the system version of boost
 rm -r src/boost
 # stop autoxxx from rerunning because of our patches above
@@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun  4 2010 Hans de Goede <hdegoede at redhat.com> 071111-13
+- Fix FTBFS (#599893)
+
 * Fri Jan 15 2010 Hans de Goede <hdegoede at redhat.com> 071111-12
 - Rebuild for new Io-language