diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
| commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-arcade/apricots/files | |
| parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-arcade/apricots/files')
| -rw-r--r-- | games-arcade/apricots/files/apricots-0.2.6-freealut.patch | 65 | ||||
| -rw-r--r-- | games-arcade/apricots/files/apricots-0.2.6-ldflags.patch | 20 |
2 files changed, 85 insertions, 0 deletions
diff --git a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch new file mode 100644 index 000000000000..d2e1b27f6f34 --- /dev/null +++ b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch @@ -0,0 +1,65 @@ +--- a/apricots/apricots.cpp ++++ b/apricots/apricots.cpp +@@ -16,6 +16,7 @@ + int main(int, char**){
+ #endif
+
++atexit(SDL_Quit);
+ // Initialize data
+ gamedata g;
+ init_data(g);
+ +--- a/apricots/sampleio.cpp ++++ b/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);
+
+ }
+
+ +--- a/configure.in ++++ b/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" diff --git a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch new file mode 100644 index 000000000000..8a7b4a9f9a8c --- /dev/null +++ b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch @@ -0,0 +1,20 @@ +--- a/apricots/Makefile.am.old 2010-10-11 15:58:18.000000000 +0200 ++++ b/apricots/Makefile.am 2010-10-11 15:59:21.000000000 +0200 +@@ -4,7 +4,8 @@ + ## INCLUDES were found outside kdevelop specific part + + apricots_SOURCES = SDLfont.cpp shape.cpp setup.cpp sampleio.cpp init.cpp game.cpp finish.cpp fall.cpp drawall.cpp drak.cpp collide.cpp apricots.cpp all.cpp ai.cpp +-apricots_LDADD = ++apricots_LDADD = $(all_libraries) ++ + + SUBDIRS = docs + +@@ -68,7 +69,3 @@ + ####### kdevelop will overwrite this part!!! (end)############ + # set the include path found by configure + INCLUDES= $(all_includes) +- +-# the library search path. +-apricots_LDFLAGS = $(all_libraries) +- |