| 1 |
mr_bones_ 09/03/03 17:59:07 |
| 2 |
|
| 3 |
Added: scorched3d-42.1-fixups.patch |
| 4 |
scorched3d-42.1-gcc43.patch |
| 5 |
Removed: scorched3d-42-fixups.patch |
| 6 |
scorched3d-42-amd64.patch scorched3d-42-gcc43.patch |
| 7 |
Log: |
| 8 |
version bump; clean old |
| 9 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 games-strategy/scorched3d/files/scorched3d-42.1-fixups.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-42.1-fixups.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-42.1-fixups.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: scorched3d-42.1-fixups.patch |
| 18 |
=================================================================== |
| 19 |
diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4 |
| 20 |
--- scorched.orig/configure-al.m4 2008-03-03 16:17:18.000000000 -0500 |
| 21 |
+++ scorched/configure-al.m4 2009-02-15 20:43:35.000000000 -0500 |
| 22 |
@@ -7,25 +7,9 @@ |
| 23 |
[ --disable-openaltest Do not try to compile and run a test OpenAL program], |
| 24 |
, enable_openaltest=yes) |
| 25 |
AC_MSG_CHECKING(for OpenAL support) |
| 26 |
-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) |
| 27 |
-if test x$OPENAL_CONFIG = xno; then |
| 28 |
- echo "*** The openal-config script installed by OpenAL could not be found" |
| 29 |
- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG" |
| 30 |
- echo "*** environment variable to the full path to openal-config." |
| 31 |
- |
| 32 |
- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/]) |
| 33 |
-else |
| 34 |
- |
| 35 |
- if test x"$use_static_openal" = x"yes"; then |
| 36 |
- AL_LIBS="/usr/local/lib/libopenal.a" |
| 37 |
- else |
| 38 |
- AL_LIBS="`$OPENAL_CONFIG --libs`" |
| 39 |
- fi |
| 40 |
- |
| 41 |
- AL_CFLAGS="`$OPENAL_CONFIG --cflags`" |
| 42 |
- |
| 43 |
- AC_MSG_RESULT(yes) |
| 44 |
-fi |
| 45 |
+AL_LIBS="-lopenal" |
| 46 |
+AL_CFLAGS="-I/usr/include/AL" |
| 47 |
+AC_MSG_RESULT(yes) |
| 48 |
|
| 49 |
AC_MSG_CHECKING(for Freealut support) |
| 50 |
AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no) |
| 51 |
diff -ru scorched.orig/configure.ac scorched/configure.ac |
| 52 |
--- scorched.orig/configure.ac 2008-03-03 16:17:18.000000000 -0500 |
| 53 |
+++ scorched/configure.ac 2009-02-15 20:40:30.000000000 -0500 |
| 54 |
@@ -13,22 +13,6 @@ |
| 55 |
AC_PROG_INSTALL |
| 56 |
AC_PROG_RANLIB |
| 57 |
|
| 58 |
-LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6" |
| 59 |
-CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6" |
| 60 |
- |
| 61 |
-if test `uname` == Darwin; then |
| 62 |
-LDFLAGS="$LDFLAGS -lmx" |
| 63 |
-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__" |
| 64 |
-else |
| 65 |
-LDFLAGS="$LDFLAGS -L/usr/local/lib" |
| 66 |
-CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
| 67 |
-fi |
| 68 |
- |
| 69 |
-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[ |
| 70 |
- echo "Warning: No beer found in fridge!"; |
| 71 |
- echo "We highly suggest that you rectify this situation immediately." |
| 72 |
-]) |
| 73 |
- |
| 74 |
AC_ARG_ENABLE(serveronly, |
| 75 |
[ --enable-serveronly Enable server only compilation], |
| 76 |
, enable_serveronly=no, |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.1 games-strategy/scorched3d/files/scorched3d-42.1-gcc43.patch |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-42.1-gcc43.patch?rev=1.1&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/scorched3d/files/scorched3d-42.1-gcc43.patch?rev=1.1&content-type=text/plain |
| 84 |
|
| 85 |
Index: scorched3d-42.1-gcc43.patch |
| 86 |
=================================================================== |
| 87 |
diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h |
| 88 |
--- scorched.old/src/common/common/main.h 2009-02-18 20:06:22.000000000 +0200 |
| 89 |
+++ scorched/src/common/common/main.h 2009-02-18 20:07:18.000000000 +0200 |
| 90 |
@@ -40,7 +40,7 @@ |
| 91 |
void _no_storage() |
| 92 |
{ |
| 93 |
printf("Failed to allocate memory!!"); |
| 94 |
- std::exit(1); |
| 95 |
+ exit(1); |
| 96 |
} |
| 97 |
|
| 98 |
void run_main(int argc, char *argv[], OptionsParameters ¶ms) |
| 99 |
diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h |
| 100 |
--- scorched.old/src/common/porting/windows.h 2009-02-18 20:06:22.000000000 +0200 |
| 101 |
+++ scorched/src/common/porting/windows.h 2009-02-18 20:06:46.000000000 +0200 |
| 102 |
@@ -20,7 +20,7 @@ |
| 103 |
typedef unsigned short WORD; |
| 104 |
typedef unsigned char BYTE; |
| 105 |
|
| 106 |
-typedef int HWND; |
| 107 |
+// typedef int HWND; |
| 108 |
typedef void * HINSTANCE; |
| 109 |
typedef int WPARAM; |
| 110 |
typedef int LPARAM; |
Archives