diff options
Diffstat (limited to 'games/chromium/files')
-rw-r--r-- | games/chromium/files/patch-Makefile.no-setup | 8 | ||||
-rw-r--r-- | games/chromium/files/patch-NCString.cpp | 19 | ||||
-rw-r--r-- | games/chromium/files/patch-glpng-src-Makefile | 13 | ||||
-rw-r--r-- | games/chromium/files/patch-main.cpp | 30 | ||||
-rw-r--r-- | games/chromium/files/patch-src-AudioOpenAL.cpp | 76 | ||||
-rw-r--r-- | games/chromium/files/patch-src-MainGLUT.cpp | 13 | ||||
-rw-r--r-- | games/chromium/files/patch-src-Makefile | 18 |
7 files changed, 13 insertions, 164 deletions
diff --git a/games/chromium/files/patch-Makefile.no-setup b/games/chromium/files/patch-Makefile.no-setup deleted file mode 100644 index c155f9f3c855..000000000000 --- a/games/chromium/files/patch-Makefile.no-setup +++ /dev/null @@ -1,8 +0,0 @@ ---- scripts/Makefile.no-setup.orig Fri Mar 14 20:45:01 2003 -+++ scripts/Makefile.no-setup Fri Mar 14 20:45:07 2003 -@@ -1,5 +1,4 @@ - SUPPORT_DIRS = \ -- ./support/openal/ \ - ./support/glpng/src - - CHROMIUM_DIRS = \ diff --git a/games/chromium/files/patch-NCString.cpp b/games/chromium/files/patch-NCString.cpp deleted file mode 100644 index f1c98cd4a8f9..000000000000 --- a/games/chromium/files/patch-NCString.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/NCString.cpp.orig Fri Mar 14 19:57:50 2003 -+++ src/NCString.cpp Fri Mar 14 20:06:44 2003 -@@ -5,6 +5,7 @@ - #include <stdlib.h> - #include <string.h> - #include <limits.h> -+#include <stdarg.h> - - /** - * ctor -@@ -1055,7 +1056,7 @@ - uint NCString::toULong(const char *str, bool *ok) - { - int n; -- ulong tmp = 0; -+ unsigned long tmp = 0; - if(str) - { - n = sscanf(str, "%lu", &tmp); diff --git a/games/chromium/files/patch-glpng-src-Makefile b/games/chromium/files/patch-glpng-src-Makefile deleted file mode 100644 index 2ed9b3ce3d47..000000000000 --- a/games/chromium/files/patch-glpng-src-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- support/glpng/src/Makefile.orig Fri Mar 14 20:53:54 2003 -+++ support/glpng/src/Makefile Fri Mar 14 20:54:26 2003 -@@ -7,10 +7,6 @@ - - ####### Compiler, tools and options - --CC = gcc --CXX = g++ --CFLAGS = -pipe -O2 --CXXFLAGS= -pipe -O2 - INCPATH = -I../include -I/usr/include -I/usr/X11R6/include - AR = ar cqs - RANLIB = diff --git a/games/chromium/files/patch-main.cpp b/games/chromium/files/patch-main.cpp deleted file mode 100644 index 721801210fe7..000000000000 --- a/games/chromium/files/patch-main.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- src/main.cpp.orig Fri Mar 14 21:01:12 2003 -+++ src/main.cpp Fri Mar 14 21:01:12 2003 -@@ -109,10 +109,6 @@ - } - } - --#ifdef PKGDATADIR -- strcpy(dataDir, PKGDATADIR); -- strcat(dataDir, "/data"); --#else - char *chromData = getenv("CHROMIUM_DATA"); - if(chromData) - strcpy(dataDir, chromData); -@@ -121,7 +117,7 @@ - #ifdef macintosh - strcpy(dataDir, "::data"); - #else -- strcpy(dataDir, "../data"); -+ strcpy(dataDir, CHROMIUM_DATA_DIR); - #endif - fprintf(stderr, "!!\n"); - fprintf(stderr, "!! WARNING - CHROMIUM_DATA environment variable is not set!\n"); -@@ -131,7 +127,6 @@ - fprintf(stderr, "!! (using %s)\n", dataDir); - fprintf(stderr, "!!\n"); - } --#endif - - srand(time(NULL)); - diff --git a/games/chromium/files/patch-src-AudioOpenAL.cpp b/games/chromium/files/patch-src-AudioOpenAL.cpp deleted file mode 100644 index 5965504f08a7..000000000000 --- a/games/chromium/files/patch-src-AudioOpenAL.cpp +++ /dev/null @@ -1,76 +0,0 @@ ---- src/AudioOpenAL.cpp.orig Thu Mar 30 15:34:34 2006 -+++ src/AudioOpenAL.cpp Thu Mar 30 16:32:00 2006 -@@ -153,13 +153,8 @@ - - checkError("AudioOpenAL::~Audio()"); - -- #ifdef _WIN32 - if(context_id) - alcDestroyContext((ALCcontext*)context_id); -- #else -- if(context_id) -- alcDestroyContext(context_id); -- #endif - - fprintf(stderr, "done.\n"); - } -@@ -200,7 +195,7 @@ - ALCdevice *dev; - dev = alcOpenDevice( NULL ); - context_id = alcCreateContext(dev, NULL); -- alcMakeContextCurrent(context_id); -+ alcMakeContextCurrent((ALCcontext*)context_id); - #endif - #endif - -@@ -310,7 +305,7 @@ - - //-- check AttenuationScale extension - alAttenuationScale = (void (*)(ALfloat param)) -- alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI"); -+ alGetProcAddress((ALchar *)"alAttenuationScale_LOKI"); - if(alAttenuationScale == NULL) - fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n"); - else -@@ -318,9 +313,9 @@ - - //-- check Audio Channel extension - alcGetAudioChannel = (float (*)(ALuint channel)) -- alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI"); -+ alGetProcAddress((const ALchar *)"alcGetAudioChannel_LOKI"); - alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume)) -- alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI"); -+ alGetProcAddress((const ALchar *)"alcSetAudioChannel_LOKI"); - #ifdef CD_VOLUME - if(alcGetAudioChannel) - origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI); -@@ -328,10 +323,10 @@ - - //-- check MP3 extension - alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint)) -- alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI"); -+ alGetProcAddress((const ALchar *)"alutLoadMP3_LOKI"); - //-- check Ogg/Vorbis extension - alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint)) -- alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI"); -+ alGetProcAddress((const ALchar *)"alutLoadVorbis_LOKI"); - - #endif //_WIN32 - } -@@ -471,6 +466,7 @@ - ALsizei size, freq, bits; - ALenum format; - ALvoid *data; -+ ALboolean loop; - - for(i = 0; i < NumSoundTypes; i++) - { -@@ -481,7 +477,7 @@ - else - { - #ifndef _WIN32 -- alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq); -+ alutLoadWAVFile((ALbyte*)dataLoc(fileNames[i]), &format, &data, &size, &freq, &loop); - alBufferData (buffer[i], format, data, size, freq); - free(data); - #else //_WIN32 diff --git a/games/chromium/files/patch-src-MainGLUT.cpp b/games/chromium/files/patch-src-MainGLUT.cpp new file mode 100644 index 000000000000..7e9f4e4bb8dc --- /dev/null +++ b/games/chromium/files/patch-src-MainGLUT.cpp @@ -0,0 +1,13 @@ +--- src/MainGLUT.cpp.orig 2008-03-15 13:42:48.000000000 +0300 ++++ src/MainGLUT.cpp 2008-07-11 00:45:02.000000000 +0400 +@@ -5,6 +5,10 @@ + * it and/or use it and/or modify it under the terms of the + * "Artistic License" + */ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ + #include "MainGLUT.h" + + #ifdef USE_GLUT diff --git a/games/chromium/files/patch-src-Makefile b/games/chromium/files/patch-src-Makefile deleted file mode 100644 index b984ee7513a9..000000000000 --- a/games/chromium/files/patch-src-Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- src/Makefile.orig Mon May 21 22:25:50 2001 -+++ src/Makefile Fri Mar 14 20:56:28 2003 -@@ -8,12 +8,10 @@ - include ../config.mak - ####### Compiler, tools and options - --CC = gcc --CXX = g++ --CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT --CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT -+CFLAGS += $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -DAUDIO_OPENAL -D_REENTRANT -+CXXFLAGS+= $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -DAUDIO_OPENAL -D_REENTRANT - INCPATH = -I../support/include -I../support/glpng/include -I/usr/X11R6/include --LINK = g++ -+LINK = ${CXX} - LFLAGS = - LIBS = $(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS) - MOC = $(QTDIR)/bin/moc |