| 1 |
mr_bones_ 10/04/04 20:46:55 |
| 2 |
|
| 3 |
Added: scorched3d-43-gcc43.patch scorched3d-43-odbc.patch |
| 4 |
scorched3d-43-libpng14.patch |
| 5 |
scorched3d-43-win32.patch |
| 6 |
scorched3d-43-fixups.patch |
| 7 |
Log: |
| 8 |
version bump |
| 9 |
(Portage version: 2.1.7.17/cvs/Linux i686) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 games-strategy/scorched3d/files/scorched3d-43-gcc43.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-gcc43.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-gcc43.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: scorched3d-43-gcc43.patch |
| 18 |
=================================================================== |
| 19 |
diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h |
| 20 |
--- scorched.old/src/common/common/main.h 2009-02-18 20:06:22.000000000 +0200 |
| 21 |
+++ scorched/src/common/common/main.h 2009-02-18 20:07:18.000000000 +0200 |
| 22 |
@@ -40,7 +40,7 @@ |
| 23 |
void _no_storage() |
| 24 |
{ |
| 25 |
printf("Failed to allocate memory!!"); |
| 26 |
- std::exit(1); |
| 27 |
+ exit(1); |
| 28 |
} |
| 29 |
|
| 30 |
void run_main(int argc, char *argv[], OptionsParameters ¶ms) |
| 31 |
diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h |
| 32 |
--- scorched.old/src/common/porting/windows.h 2009-02-18 20:06:22.000000000 +0200 |
| 33 |
+++ scorched/src/common/porting/windows.h 2009-02-18 20:06:46.000000000 +0200 |
| 34 |
@@ -20,7 +20,7 @@ |
| 35 |
typedef unsigned short WORD; |
| 36 |
typedef unsigned char BYTE; |
| 37 |
|
| 38 |
-typedef int HWND; |
| 39 |
+// typedef int HWND; |
| 40 |
typedef void * HINSTANCE; |
| 41 |
typedef int WPARAM; |
| 42 |
typedef int LPARAM; |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 games-strategy/scorched3d/files/scorched3d-43-odbc.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-odbc.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-odbc.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: scorched3d-43-odbc.patch |
| 52 |
=================================================================== |
| 53 |
When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build. |
| 54 |
bug #285384 - patch from Bob Johnson |
| 55 |
|
| 56 |
diff -urN scorched/src/common/porting/windows.h fix_scorched/src/common/porting/windows.h |
| 57 |
--- scorched/src/common/porting/windows.h 2009-09-21 10:21:16.000000000 -0700 |
| 58 |
+++ fix_scorched/src/common/porting/windows.h 2009-09-21 10:39:02.000000000 -0700 |
| 59 |
@@ -11,8 +11,8 @@ |
| 60 |
|
| 61 |
typedef char * LPSTR; |
| 62 |
typedef const char * LPCTSTR; |
| 63 |
-typedef unsigned int DWORD; |
| 64 |
-typedef unsigned int * LPDWORD; |
| 65 |
+typedef unsigned long DWORD; |
| 66 |
+typedef DWORD * LPDWORD; |
| 67 |
typedef unsigned char * LPBYTE; |
| 68 |
typedef int INT; |
| 69 |
typedef long LONG; |
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
1.1 games-strategy/scorched3d/files/scorched3d-43-libpng14.patch |
| 74 |
|
| 75 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-libpng14.patch?rev=1.1&view=markup |
| 76 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-libpng14.patch?rev=1.1&content-type=text/plain |
| 77 |
|
| 78 |
Index: scorched3d-43-libpng14.patch |
| 79 |
=================================================================== |
| 80 |
http://bugs.gentoo.org/show_bug.cgi?id=308867 |
| 81 |
|
| 82 |
--- src/common/image/ImagePng.cpp |
| 83 |
+++ src/common/image/ImagePng.cpp |
| 84 |
@@ -189,7 +189,7 @@ bool ImagePng::loadFromBuffer(NetBuffer |
| 85 |
info_ptr = png_create_info_struct(png_ptr); |
| 86 |
if (info_ptr == NULL) |
| 87 |
{ |
| 88 |
- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); |
| 89 |
+ png_destroy_read_struct(&png_ptr, NULL, NULL); |
| 90 |
return false; |
| 91 |
} |
| 92 |
|
| 93 |
@@ -200,7 +200,7 @@ bool ImagePng::loadFromBuffer(NetBuffer |
| 94 |
if (setjmp(png_jmpbuf(png_ptr))) |
| 95 |
{ |
| 96 |
/* Free all of the memory associated with the png_ptr and info_ptr */ |
| 97 |
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); |
| 98 |
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); |
| 99 |
/* If we get here, we had a problem reading the file */ |
| 100 |
return false; |
| 101 |
} |
| 102 |
@@ -258,7 +258,7 @@ bool ImagePng::loadFromBuffer(NetBuffer |
| 103 |
} |
| 104 |
else |
| 105 |
{ |
| 106 |
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); |
| 107 |
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); |
| 108 |
|
| 109 |
Logger::log(S3D::formatStringBuffer( |
| 110 |
"Invalid PNG format.\n" |
| 111 |
@@ -272,7 +272,7 @@ bool ImagePng::loadFromBuffer(NetBuffer |
| 112 |
// END NEW CODE |
| 113 |
|
| 114 |
/* clean up after the read, and free any memory allocated - REQUIRED */ |
| 115 |
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); |
| 116 |
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); |
| 117 |
|
| 118 |
/* that's it */ |
| 119 |
return true; |
| 120 |
|
| 121 |
|
| 122 |
|
| 123 |
1.1 games-strategy/scorched3d/files/scorched3d-43-win32.patch |
| 124 |
|
| 125 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-win32.patch?rev=1.1&view=markup |
| 126 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-win32.patch?rev=1.1&content-type=text/plain |
| 127 |
|
| 128 |
Index: scorched3d-43-win32.patch |
| 129 |
=================================================================== |
| 130 |
diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h |
| 131 |
--- scorched.old/src/common/porting/windows.h 2009-12-17 15:18:41.000000000 +0200 |
| 132 |
+++ scorched/src/common/porting/windows.h 2009-12-17 15:22:20.000000000 +0200 |
| 133 |
@@ -9,6 +9,7 @@ |
| 134 |
#include <ctype.h> |
| 135 |
#include <common/Defines.h> |
| 136 |
|
| 137 |
+#ifdef _WIN32 |
| 138 |
typedef char * LPSTR; |
| 139 |
typedef const char * LPCTSTR; |
| 140 |
typedef unsigned int DWORD; |
| 141 |
@@ -27,6 +28,7 @@ |
| 142 |
typedef int LRESULT; |
| 143 |
typedef void * HDC; |
| 144 |
typedef void * HGLRC; |
| 145 |
+#endif /* _WIN32 */ |
| 146 |
|
| 147 |
#define _strnicmp(a,b,c) strncasecmp(a,b,c) |
| 148 |
#define stricmp(a,b) strcasecmp(a,b) |
| 149 |
|
| 150 |
|
| 151 |
|
| 152 |
1.1 games-strategy/scorched3d/files/scorched3d-43-fixups.patch |
| 153 |
|
| 154 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-fixups.patch?rev=1.1&view=markup |
| 155 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43-fixups.patch?rev=1.1&content-type=text/plain |
| 156 |
|
| 157 |
Index: scorched3d-43-fixups.patch |
| 158 |
=================================================================== |
| 159 |
diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4 |
| 160 |
--- scorched.orig/configure-al.m4 2008-03-03 16:17:18.000000000 -0500 |
| 161 |
+++ scorched/configure-al.m4 2009-02-15 20:43:35.000000000 -0500 |
| 162 |
@@ -7,25 +7,9 @@ |
| 163 |
[ --disable-openaltest Do not try to compile and run a test OpenAL program], |
| 164 |
, enable_openaltest=yes) |
| 165 |
AC_MSG_CHECKING(for OpenAL support) |
| 166 |
-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) |
| 167 |
-if test x$OPENAL_CONFIG = xno; then |
| 168 |
- echo "*** The openal-config script installed by OpenAL could not be found" |
| 169 |
- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG" |
| 170 |
- echo "*** environment variable to the full path to openal-config." |
| 171 |
- |
| 172 |
- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/]) |
| 173 |
-else |
| 174 |
- |
| 175 |
- if test x"$use_static_openal" = x"yes"; then |
| 176 |
- AL_LIBS="/usr/local/lib/libopenal.a" |
| 177 |
- else |
| 178 |
- AL_LIBS="`$OPENAL_CONFIG --libs`" |
| 179 |
- fi |
| 180 |
- |
| 181 |
- AL_CFLAGS="`$OPENAL_CONFIG --cflags`" |
| 182 |
- |
| 183 |
- AC_MSG_RESULT(yes) |
| 184 |
-fi |
| 185 |
+AL_LIBS="-lopenal" |
| 186 |
+AL_CFLAGS="-I/usr/include/AL" |
| 187 |
+AC_MSG_RESULT(yes) |
| 188 |
|
| 189 |
AC_MSG_CHECKING(for Freealut support) |
| 190 |
AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no) |
| 191 |
diff -ru scorched.orig/configure.ac scorched/configure.ac |
| 192 |
--- scorched.orig/configure.ac 2008-03-03 16:17:18.000000000 -0500 |
| 193 |
+++ scorched/configure.ac 2009-02-15 20:40:30.000000000 -0500 |
| 194 |
@@ -13,22 +13,6 @@ |
| 195 |
AC_PROG_INSTALL |
| 196 |
AC_PROG_RANLIB |
| 197 |
|
| 198 |
-LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6" |
| 199 |
-CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6" |
| 200 |
- |
| 201 |
-if test `uname` == Darwin; then |
| 202 |
-LDFLAGS="$LDFLAGS -lmx" |
| 203 |
-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__" |
| 204 |
-else |
| 205 |
-LDFLAGS="$LDFLAGS -L/usr/local/lib" |
| 206 |
-CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
| 207 |
-fi |
| 208 |
- |
| 209 |
-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[ |
| 210 |
- echo "Warning: No beer found in fridge!"; |
| 211 |
- echo "We highly suggest that you rectify this situation immediately." |
| 212 |
-]) |
| 213 |
- |
| 214 |
AC_ARG_ENABLE(serveronly, |
| 215 |
[ --enable-serveronly Enable server only compilation], |
| 216 |
, enable_serveronly=no, |
Archives