summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-action/btanks/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-action/btanks/files')
-rw-r--r--games-action/btanks/files/btanks-0.9.8083-gcc46.patch10
-rw-r--r--games-action/btanks/files/btanks-0.9.8083-gcc47.patch103
-rw-r--r--games-action/btanks/files/btanks-0.9.8083-scons-blows.patch93
3 files changed, 206 insertions, 0 deletions
diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch b/games-action/btanks/files/btanks-0.9.8083-gcc46.patch
new file mode 100644
index 000000000000..367c33cc6f24
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.9.8083-gcc46.patch
@@ -0,0 +1,10 @@
+--- engine/sl08/sl08.h.old 2011-04-19 17:20:34.055776870 +0200
++++ engine/sl08/sl08.h 2011-04-19 17:20:59.471398921 +0200
+@@ -22,6 +22,7 @@
+ /* DO NOT MODIFY THIS FILE: IT'S AUTOGENERATED */
+
+ #include <list>
++#include <cstddef>
+
+ #ifndef NULL
+ #define NULL ((void*) 0)
diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
new file mode 100644
index 000000000000..13a4cf3723ae
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
@@ -0,0 +1,103 @@
+--- mrt/base_file.h.old 2012-10-08 10:16:43.941487723 +0200
++++ mrt/base_file.h 2012-10-08 10:18:55.788771445 +0200
+@@ -20,6 +20,7 @@
+ */
+
+ #include <string>
++#include <unistd.h>
+ #include "export_mrt.h"
+
+ namespace mrt {
+--- math/range_list.h.old 2012-10-08 09:49:34.283887937 +0200
++++ math/range_list.h 2012-10-08 09:50:36.258212096 +0200
+@@ -53,14 +53,14 @@
+ return;
+ }
+
+- typename parent_type::iterator i = lower_bound(value);
++ typename parent_type::iterator i = this->lower_bound(value);
+ if (i != parent_type::end()) {
+ if (i->first == value)
+ return;
+
+ if (value + 1 == i->first) {
+ T e = i->second;
+- erase(i);
++ this->erase(i);
+ i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
+ i = pack_left(i);
+ }
+--- engine/sl08/sl08.h.old 2012-10-04 09:50:37.845681514 +0200
++++ engine/sl08/sl08.h 2012-10-08 09:58:32.873166723 +0200
+@@ -272,7 +272,7 @@
+ inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1) const {
+ return (object->*func) (a1) ;
+@@ -293,7 +293,7 @@
+ inline slot1 () : object(NULL), func(NULL) {}
+ inline slot1 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1) const {
+ (object->*func) (a1);
+@@ -447,7 +447,7 @@
+ inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1, arg2_type a2) const {
+ return (object->*func) (a1, a2) ;
+@@ -468,7 +468,7 @@
+ inline slot2 () : object(NULL), func(NULL) {}
+ inline slot2 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1, arg2_type a2) const {
+ (object->*func) (a1, a2);
+@@ -643,7 +643,7 @@
+ inline slot3 () : object(NULL), func(NULL) {}
+ inline slot3 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const {
+ (object->*func) (a1, a2, a3);
+@@ -797,7 +797,7 @@
+ inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const {
+ return (object->*func) (a1, a2, a3, a4) ;
+@@ -818,7 +818,7 @@
+ inline slot4 () : object(NULL), func(NULL) {}
+ inline slot4 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const {
+ (object->*func) (a1, a2, a3, a4);
+@@ -972,7 +972,7 @@
+ inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const {
+ return (object->*func) (a1, a2, a3, a4, a5) ;
diff --git a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch
new file mode 100644
index 000000000000..47ce410f0bf8
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch
@@ -0,0 +1,93 @@
+--- mrt/export_base.h.old 2010-01-09 17:38:47.000000000 +0100
++++ mrt/export_base.h 2010-01-09 17:39:23.000000000 +0100
+@@ -1,7 +1,7 @@
+ #ifndef MRT_EXPORT_MACRO_H__
+ #define MRT_EXPORT_MACRO_H__
+
+-// Shared library support
++/* Shared library support */
+ #ifdef _WINDOWS
+
+ # pragma warning(disable:4251) /* needs to have dll-interface used by client */
+--- SConstruct.old 2010-01-09 17:43:36.000000000 +0100
++++ SConstruct 2010-01-09 17:45:25.000000000 +0100
+@@ -50,7 +50,7 @@
+ if os.environ.has_key('CC'):
+ env['CC'] = os.environ['CC']
+ if os.environ.has_key('CFLAGS'):
+- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++ env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+ if os.environ.has_key('CXX'):
+ env['CXX'] = os.environ['CXX']
+ if os.environ.has_key('CXXFLAGS'):
+@@ -91,19 +91,9 @@
+ #env.Append(CPPDEFINES = ['NDEBUG'])
+
+ else:
+- if env['gcc_visibility']:
+- env.Append(CCFLAGS=['-fvisibility=hidden']);
+- env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden']);
+-
+- if debug:
+- env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
+- env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
+- else:
+- env.Append(CCFLAGS=['-O3'])
+- env.Append(CPPFLAGS=['-O3'])
+
+- env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
+- env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
++ env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread'])
++ env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread'])
+
+
+ conf_env = env.Clone()
+--- sdlx/SConscript.old 2010-01-09 17:46:05.000000000 +0100
++++ sdlx/SConscript 2010-01-09 17:46:55.000000000 +0100
+@@ -12,7 +12,7 @@
+
+ env.MergeFlags(sdl_cflags, sdl_libs)
+
+-libs = ['mrt', 'SDL', 'SDL_image']
++libs = ['mrt', 'SDL', 'SDL_image', 'SDL_gfx']
+
+ if sys.platform != "win32":
+ c_map_env= env.Clone()
+@@ -35,7 +35,6 @@
+ sdlx_sources = ['cursor.cpp', 'sdl_ex.cpp', 'surface.cpp', 'system.cpp', 'joystick.cpp',
+ 'thread.cpp', 'mutex.cpp', 'semaphore.cpp', 'color.cpp',
+ c_map, 'font.cpp', 'timer.cpp', 'module.cpp', 'file_rw.cpp',
+- 'gfx/SDL_rotozoom.c',
+ ] # 'ttf.cpp',
+
+ if sys.platform == 'win32':
+--- sdlx/surface.cpp.old 2010-01-09 17:47:33.000000000 +0100
++++ sdlx/surface.cpp 2010-01-09 17:48:19.000000000 +0100
+@@ -425,7 +425,7 @@
+ throw_sdl(("SDL_SetColorKey"));
+ }
+
+-#include "gfx/SDL_rotozoom.h"
++#include <SDL_rotozoom.h>
+
+ void Surface::rotozoom(const sdlx::Surface &src, double angle, double zoom, bool smooth) {
+ if (src.isNull())
+--- sdlx/wrappers/glSDL.c.old 2010-01-09 17:48:50.000000000 +0100
++++ sdlx/wrappers/glSDL.c 2010-01-09 17:49:23.000000000 +0100
+@@ -11,8 +11,6 @@
+
+ #ifdef HAVE_OPENGL
+
+-//#define LEAK_TRACKING
+-
+ #define DBG(x) /*error messages, warnings*/
+ #define DBG2(x) /*texture allocation*/
+ #define DBG3(x) /*chopping/tiling*/
+@@ -951,7 +949,6 @@
+ }
+ gl_doublebuf = flags & SDL_DOUBLEBUF;
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, gl_doublebuf);
+- //SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, gl_doublebuf ? 1: 0);
+
+ scale = 1;
+