diff options
Diffstat (limited to 'games-strategy/scorched3d/files/scorched3d-40-freealut.patch')
-rw-r--r-- | games-strategy/scorched3d/files/scorched3d-40-freealut.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/games-strategy/scorched3d/files/scorched3d-40-freealut.patch b/games-strategy/scorched3d/files/scorched3d-40-freealut.patch deleted file mode 100644 index 8fe0706cac81..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-40-freealut.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- configure -+++ configure -@@ -3946,7 +3946,7 @@ - if test x"$use_static_openal" = x"yes"; then - LIBS="$LIBS /usr/local/lib/libopenal.a" - else -- LIBS="$LIBS `$OPENAL_CONFIG --libs`" -+ LIBS="$LIBS `$OPENAL_CONFIG --libs` -lalut" - fi - - CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`" - ---- src/sound/SoundBufferStaticWav.cpp -+++ src/sound/SoundBufferStaticWav.cpp -@@ -57,44 +57,7 @@ - SoundBuffer(fileName), - buffer_(0) - { -- unsigned int error; -- -- // Create a buffer -- alGetError(); -- alGenBuffers(1, &buffer_); -- if ((error = alGetError()) != AL_NO_ERROR) -- { -- return; -- } -- -- // Load WAV -- void *data; -- ALenum format; -- ALsizei size; -- ALsizei freq; -- ALboolean loop; -- --#ifdef __DARWIN__ -- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq); --#else -- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq,&loop); --#endif -- -- if ((error = alGetError()) != AL_NO_ERROR) -- { -- return; -- } -- -- // Load WAV into buffer -- alBufferData(buffer_,format,data,size,freq); -- if ((error = alGetError()) != AL_NO_ERROR) -- { -- return; -- } -- -- // Delete WAV memory -- alutUnloadWAV(format,data,size,freq); -- if ((error = alGetError()) != AL_NO_ERROR) -+ if ((buffer_ = alutCreateBufferFromFile(fileName)) == AL_NONE) - { - return; - } - ---- src/sound/Sound.cpp -+++ src/sound/Sound.cpp -@@ -28,6 +28,7 @@ - #include <sound/PlayingSoundSource.h> - #include <AL/al.h> - #include <AL/alc.h> -+#include <AL/alut.h> - #include <algorithm> - - Sound *Sound::instance_ = 0; -@@ -150,6 +151,7 @@ - totalSources_.push_back(source); - availableSources_.push_back(source); - } -+ alutInitWithoutContext(NULL, NULL); - - init_ = true; - return init_; |