gentoo resync : 25.09.2021

3 files changed, 10 insertions, 85 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
deleted file mode 100644
index d2e1b27f6f34..000000000000
--- a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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
deleted file mode 100644
index 8a7b4a9f9a8c..000000000000
--- a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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) 
--                                                                                
diff --git a/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
new file mode 100644
index 000000000000..c1904ea9f8be
--- /dev/null
+++ b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
@@ -0,0 +1,10 @@
+Undefined reference to sign() when using -O1 or above.
+--- a/apricots/all.cpp
++++ b/apricots/all.cpp
+@@ -19,5 +19,5 @@
+ // Sign function
+ 
+-inline int sign(int n) { return (0 < n) - (n < 0); }
++int sign(int n) { return (0 < n) - (n < 0); }
+ 
+ // Error message for switch statements that shouldn't ever get to default