diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
| commit | 415856bdd4f48ab4f2732996f0bae58595092bbe (patch) | |
| tree | ede2018b591f6dfb477fe9341ba17b9bc000fab9 /extra/apricots/apricots-0.2.6-freealut.patch | |
Tue Apr 5 14:26:38 UTC 2011
Diffstat (limited to 'extra/apricots/apricots-0.2.6-freealut.patch')
| -rw-r--r-- | extra/apricots/apricots-0.2.6-freealut.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/extra/apricots/apricots-0.2.6-freealut.patch b/extra/apricots/apricots-0.2.6-freealut.patch new file mode 100644 index 000000000..4f6630713 --- /dev/null +++ b/extra/apricots/apricots-0.2.6-freealut.patch @@ -0,0 +1,65 @@ +--- apricots/apricots.cpp ++++ apricots/apricots.cpp +@@ -16,6 +16,7 @@ + int main(int, char**){
+ #endif
+
++atexit(SDL_Quit);
+ // Initialize data
+ gamedata g;
+ init_data(g);
+ +--- apricots/sampleio.cpp ++++ apricots/sampleio.cpp +@@ -74,12 +74,9 @@ + alListenerfv(AL_ORIENTATION, front );
+
+ // Load in samples
+- ALvoid* data = malloc(5 * (512 * 3) * 1024);
+ alGenBuffers(numsamples, samples);
+
+ for (int i = 0; i < numsamples; i++){
+- ALsizei freq;
+- ALboolean fileok;
+ // Evil OpenAL portability fix done here
+ #ifdef _WIN32
+ ALenum format;
+@@ -87,15 +84,12 @@ + alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);
+ fileok = (alGetError() == AL_NO_ERROR);
+ #else
+- ALsizei format;
+- ALsizei trash;
+- fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
++ samples[i] = alutCreateBufferFromFile(filenames[i]);
+ #endif
+- if (!fileok){
++ if (samples[i] == AL_NONE){
+ cerr << "sampleio: could not open " << filenames[i] << endl;
+ exit(1);
+ }
+- alBufferData(samples[i], format, data, filelen, freq);
+ }
+
+ // Generate Sources
+@@ -107,7 +101,6 @@ + alSourcefv(sources[j], AL_ORIENTATION, back );
+ }
+
+- free(data);
+
+ }
+
+ +--- configure.in ++++ configure.in +@@ -100,7 +100,8 @@ + + dnl Check for OpenAL + AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"]) +-AC_CHECK_LIB( openal, alutInit) ++AC_CHECK_LIB( openal, alGetError) ++AC_CHECK_LIB( alut, alutInit) + + KDE_CHECK_EXTRA_LIBS + all_libraries="$all_libraries $USER_LDFLAGS" |