mr_bones_ 14/12/09 22:08:49
Added: scorched3d-44-jpeg9.patch
scorched3d-44-fixups.patch
scorched3d-44-win32.patch scorched3d-44-odbc.patch
scorched3d-44-freetype.patch
scorched3d-44-gcc43.patch
Log:
version bump
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.1 games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch?rev=1.1&content-type=text/plain
Index: scorched3d-44-jpeg9.patch
===================================================================
--- src/common/image/ImageJpgFactory.cpp.old 2014-12-03 09:52:03.306552513
+0100
+++ src/common/image/ImageJpgFactory.cpp 2014-12-03 09:53:22.117786304
+0100
@@ -79,7 +79,7 @@
src->next_input_byte = FakeEOI;
src->bytes_in_buffer = 2;
- return TRUE;
+ return (boolean)TRUE;
}
METHODDEF(void)
@@ -166,7 +166,7 @@
src->bytes_in_buffer = buffer.getBufferUsed();
src->next_input_byte = (JOCTET *) buffer.getBuffer();
- jpeg_read_header(&cinfo, TRUE);
+ jpeg_read_header(&cinfo, (boolean)TRUE);
jpeg_start_decompress(&cinfo);
if ((cinfo.output_components == 3 && !readalpha) ||
1.1 games-strategy/scorched3d/files/scorched3d-44-fixups.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-fixups.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-fixups.patch?rev=1.1&content-type=text/plain
Index: scorched3d-44-fixups.patch
===================================================================
--- scorched.orig/configure.ac
+++ scorched/configure.ac
@@ -13,22 +13,6 @@
AC_PROG_INSTALL
AC_PROG_RANLIB
-LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/X11R6"
-CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include -I/usr/X11R6"
-
-if test `uname` == Darwin; then
-LDFLAGS="$LDFLAGS -lmx"
-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
-else
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-fi
-
-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
- echo "Warning: No beer found in fridge!";
- echo "We highly suggest that you rectify this situation immediately."
-])
-
AC_ARG_ENABLE(serveronly,
[ --enable-serveronly Enable server only compilation],
, enable_serveronly=no,
1.1 games-strategy/scorched3d/files/scorched3d-44-win32.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-win32.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-win32.patch?rev=1.1&content-type=text/plain
Index: scorched3d-44-win32.patch
===================================================================
--- scorched.old/src/common/porting/windows.h
+++ scorched/src/common/porting/windows.h
@@ -9,6 +9,7 @@
#include <ctype.h>
#include <common/Defines.h>
+#ifdef _WIN32
typedef char * LPSTR;
typedef const char * LPCTSTR;
typedef unsigned int DWORD;
@@ -27,6 +28,7 @@
typedef int LRESULT;
typedef void * HDC;
typedef void * HGLRC;
+#endif /* _WIN32 */
#define _strnicmp(a,b,c) strncasecmp(a,b,c)
#define stricmp(a,b) strcasecmp(a,b)
1.1 games-strategy/scorched3d/files/scorched3d-44-odbc.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-odbc.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-odbc.patch?rev=1.1&content-type=text/plain
Index: scorched3d-44-odbc.patch
===================================================================
When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build.
bug #285384 - patch from Bob Johnson
--- scorched/src/common/porting/windows.h
+++ fix_scorched/src/common/porting/windows.h
@@ -11,8 +11,8 @@
typedef char * LPSTR;
typedef const char * LPCTSTR;
-typedef unsigned int DWORD;
-typedef unsigned int * LPDWORD;
+typedef unsigned long DWORD;
+typedef DWORD * LPDWORD;
typedef unsigned char * LPBYTE;
typedef int INT;
typedef long LONG;
1.1
games-strategy/scorched3d/files/scorched3d-44-freetype.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-freetype.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-freetype.patch?rev=1.1&content-type=text/plain
Index: scorched3d-44-freetype.patch
===================================================================
--- acinclude.m4.orig
+++ acinclude.m4
@@ -437,7 +437,7 @@
if test "$FT2_CONFIG" = "no" ; then
no_ft=yes
else
- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+ FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG
$ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`"
FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--- src.orig/client/GLEXT/GLFont2dFreeType.h
+++ src/client/GLEXT/GLFont2dFreeType.h
@@ -23,10 +23,10 @@
#include <GLEXT/GLFont2dStorage.h>
#include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include <freetype.h>
+#include <ftglyph.h>
+#include <ftoutln.h>
+#include <fttrigon.h>
#include <string>
class GLFont2dFreeType
--- src.orig/launcher/wxdialogs/TrueTypeFont.h
+++ src/launcher/wxdialogs/TrueTypeFont.h
@@ -25,10 +25,10 @@
#include <wx/image.h>
#include <ft2build.h>
#include <string>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include <freetype.h>
+#include <ftglyph.h>
+#include <ftoutln.h>
+#include <fttrigon.h>
class TrueTypeFont
{
1.1 games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch?rev=1.1&content-type=text/plain
Index: scorched3d-44-gcc43.patch
===================================================================
--- scorched.old/src/common/common/main.h
+++ scorched/src/common/common/main.h
@@ -40,7 +40,7 @@
void _no_storage()
{
printf("Failed to allocate memory!!");
- std::exit(1);
+ exit(1);
}
void run_main(int argc, char *argv[], OptionsParameters ¶ms)
--- scorched.old/src/common/porting/windows.h
+++ scorched/src/common/porting/windows.h
@@ -20,7 +20,7 @@
typedef unsigned short WORD;
typedef unsigned char BYTE;
-typedef int HWND;
+// typedef int HWND;
typedef void * HINSTANCE;
typedef int WPARAM;
typedef int LPARAM;
