r13996 - in packages/trunk/enemylines7/debian: . patches
Markus Koschany
apo-guest at alioth.debian.org
Wed Apr 10 17:56:43 UTC 2013
Author: apo-guest
Date: 2013-04-10 17:56:42 +0000 (Wed, 10 Apr 2013)
New Revision: 13996
Added:
packages/trunk/enemylines7/debian/patches/debug.patch
packages/trunk/enemylines7/debian/patches/rapidxml_print.hpp-gcc4.7.patch
packages/trunk/enemylines7/debian/patches/util_math.h-gcc4.7.patch
Modified:
packages/trunk/enemylines7/debian/compat
Log:
- Make version 0.8+dfsg compile
- Add two patches which ensure compilation with gcc4.7
Modified: packages/trunk/enemylines7/debian/compat
===================================================================
--- packages/trunk/enemylines7/debian/compat 2013-04-10 17:52:46 UTC (rev 13995)
+++ packages/trunk/enemylines7/debian/compat 2013-04-10 17:56:42 UTC (rev 13996)
@@ -1 +1 @@
-5
+9
Added: packages/trunk/enemylines7/debian/patches/debug.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/debug.patch (rev 0)
+++ packages/trunk/enemylines7/debian/patches/debug.patch 2013-04-10 17:56:42 UTC (rev 13996)
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Wed, 10 Apr 2013 18:13:19 +0200
+Subject: debug
+
+---
+ src/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index c7ab04c..9476873 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -2,8 +2,8 @@ DESTDIR ?= /usr/local
+ TARGET = enelin7
+ CXX= g++
+ LIB01_OPTIONS=-DL01_GLEE -DL01_SDL -DL01_GAMEPLAY -DL01_V=08 -DL01_S=el7 -DL01_OPENGL -DL01_PHYSFS_INT -DL01_FORMATIONS -DL01_FILESYSTEM1 -DL01_R=15 -DL01_BLOCK -DL01_VBLOCK -DL01_MODEL1 -DL01_PARTICLES3 -DNDEBUG
+-CXXFLAGS = -O2 -Wall `sdl-config --cflags` -I./ $(LIB01_OPTIONS)
+-CFLAGS = -O2 -Wall `sdl-config --cflags` -I./ $(LIB01_OPTIONS)
++CXXFLAGS = -g -O0 -Wall `sdl-config --cflags` -I./ $(LIB01_OPTIONS)
++CFLAGS = -g -O0 -Wall `sdl-config --cflags` -I./ $(LIB01_OPTIONS)
+ LDFLAGS = `sdl-config --libs` -lGL -lGLU
+ OFILES= lib01/tset/tset.o lib01/tweak/tweak.o lib01/tweak/tweakobject.o lib01/tweak/tweakerror.o lib01/tweak/tweakcore.o lib01/tweak/tweakaccess.o lib01/tweak/tweakconstant.o lib01/tweak/tweakbool.o lib01/tweak/tweakint.o lib01/tweak/tweakuint.o lib01/tweak/tweakfloat.o lib01/tweak/tweakstring.o lib01/tweak/tweakc3.o lib01/tweak/tweakc3f.o lib01/tweak/tweakenum.o lib01/tweak/tweakbitset.o lib01/tweak/tweakreference.o lib01/tweak/tweakiterator.o lib01/tweak/tweakrequest.o lib01/tweak/tweakserver.o lib01/tweak/tweakloader.o lib01/tweak/tweaksaver.o lib01/tweak/tweakargs.o lib01/tweak/tweakfile.o lib01/tweak/tweakdebug.o lib01/tweak/t_tweak.o lib01/tweak/tests_tweak_basic.o lib01/tweak/tests_tweak.o lib01/model1/model.o lib01/model1/loader_obj.o lib01/model1/loader.o lib01/model1/keeper.o lib01/model1/v_model.o lib01/model1/t_model1_viewer.o lib01/model1/tests_model.o lib01/random/random.o lib01/random/tests_random.o lib01/filesystem1/filesystem1.o lib01/filesystem1/t_filesystem1.o lib01/filesystem1/tests_filesystem1.o lib01/general/util_general.o lib01/general/defineinfo.o lib01/general/imagedata.o lib01/general/fontdata.o lib01/general/stringified.o lib01/general/alert.o lib01/general/tests_general.o lib01/wrappers/posix/posix.o lib01/wrappers/posix/tests_posix.o lib01/tools/tools.o lib01/opengl/util_opengl.o lib01/opengl/primitives.o lib01/opengl/glut_geometry.o lib01/opengl/lighttweak.o lib01/opengl/setuptweak.o lib01/opengl/fogtweak.o lib01/opengl/glstate.o lib01/opengl/draw_im.o lib01/opengl/draw_vbo.o lib01/opengl/shader.o lib01/opengl/enums.o lib01/opengl/texturekeeper_base.o lib01/opengl/reflection.o lib01/opengl/t_shader_test.o lib01/opengl/water1.o lib01/opengl/water2.o lib01/opengl/minimap.o lib01/opengl/tests_opengl.o lib01/formations/formationclasses.o lib01/formations/formations.o lib01/formations/formationstweak.o lib01/formations/t_formations.o lib01/formations/tests_formations.o lib01/assimilated/rapidxml/util_rapidxml.o lib01/assimilated/rapidxml/tests_rapidxml.o lib01/math/frustum.o lib01/math/bits.o lib01/math/pick.o lib01/math/trig.o lib01/math/position.o lib01/math/quaternion.o lib01/math/direction123.o lib01/math/direction.o lib01/math/direction3d.o lib01/math/direction3d_val.o lib01/math/quad.o lib01/math/matrix4.o lib01/math/obox3f.o lib01/math/intersection.o lib01/math/util_math.o lib01/math/t_intersectiontest.o lib01/math/t_frustumtest.o lib01/math/tests_math.o lib01/v_block/v_block.o lib01/v_block/v_block_edit.o lib01/v_block/v_block_select.o lib01/v_block/cacher_displaylist.o lib01/v_block/cacher_vbo.o lib01/v_block/v_cube.o lib01/v_block/v_material.o lib01/v_block/util_v_block.o lib01/v_block/t_block_viewer.o lib01/v_block/t_block_destruct.o lib01/v_block/tests_v_block.o lib01/assimilated/glee/GLee.o lib01/assimilated/glee/util_glee.o lib01/sdl/util_sdl.o lib01/sdl/util_sdlopengl.o lib01/sdl/clipstack.o lib01/sdl/image.o lib01/sdl/mixer.o lib01/sdl/ttf.o lib01/sdl/video.o lib01/sdl/imagekeeper.o lib01/sdl/texturekeeper.o lib01/sdl/audiokeeper.o lib01/sdl/write.o lib01/sdl/draw.o lib01/sdl/dirt.o lib01/sdl/input.o lib01/sdl/map_sdl.o lib01/sdl/t_sdl_viewer.o lib01/sdl/t_sdl_info.o lib01/sdl/t_sdl_input.o lib01/sdl/t_sdl_modes.o lib01/sdl/tests_sdl.o lib01/gameplay/wavetweak.o lib01/gameplay/energy.o lib01/gameplay/money.o lib01/gameplay/timeleft.o lib01/gameplay/score.o lib01/gameplay/difficulty.o lib01/gameplay/radio2.o lib01/gameplay/skills3.o lib01/gameplay/factions1.o lib01/gameplay/tests_gameplay.o lib01/assimilated/misc/md5.o lib01/assimilated/misc/tests_assimilated.o lib01/stringstuff/filenames.o lib01/stringstuff/files.o lib01/stringstuff/split.o lib01/stringstuff/numbers.o lib01/stringstuff/util_stringstuff.o lib01/stringstuff/tests_stringstuff.o lib01/assimilated/physfs/physfs.o lib01/assimilated/physfs/physfs_byteorder.o lib01/assimilated/physfs/physfs_unicode.o lib01/assimilated/physfs/extras/physfsrwops.o lib01/assimilated/physfs/archivers/zip.o lib01/assimilated/physfs/archivers/dir.o lib01/assimilated/physfs/platform/beos.o lib01/assimilated/physfs/platform/macosx.o lib01/assimilated/physfs/platform/os2.o lib01/assimilated/physfs/platform/pocketpc.o lib01/assimilated/physfs/platform/posix.o lib01/assimilated/physfs/platform/unix.o lib01/assimilated/physfs/platform/windows.o lib01/particles3/particles3.o lib01/particles3/step1.o lib01/particles3/step2.o lib01/particles3/v_particles3.o lib01/particles3/t_particles3.o lib01/particles3/tests_particles3.o lib01/algorithms/misc.o lib01/algorithms/active.o lib01/algorithms/sectors.o lib01/algorithms/uistack.o lib01/algorithms/drawnlist.o lib01/algorithms/areapick.o lib01/algorithms/container_tpl.o lib01/algorithms/proximity_tpl.o lib01/algorithms/collisionmatrix.o lib01/algorithms/collisiondistances.o lib01/algorithms/framecounter.o lib01/algorithms/animation.o lib01/algorithms/sequences.o lib01/algorithms/tests_algorithms.o lib01/debug/dout.o lib01/debug/tune.o lib01/block/block.o lib01/block/blockdata.o lib01/block/blockinfo.o lib01/block/blockenvironment.o lib01/block/material.o lib01/block/triangulator.o lib01/block/texturer.o lib01/block/iterator.o lib01/block/collider.o lib01/block/rotator.o lib01/block/debugger.o lib01/block/infostack.o lib01/block/merger.o lib01/block/selection.o lib01/block/world.o lib01/block/saver.o lib01/block/loader.o lib01/block/builtin.o lib01/block/lookup.o lib01/block/neighbour.o lib01/block/sidechecker.o lib01/block/faceremover3.o lib01/block/faceremover6.o lib01/block/faceremover8.o lib01/block/faceremover9.o lib01/block/destructor6.o lib01/block/creator1.o lib01/block/gravity1.o lib01/block/gravity2.o lib01/block/gravity3.o lib01/block/mirror.o lib01/block/gridaccess.o lib01/block/sphere.o lib01/block/util_block.o lib01/block/t_block_info.o lib01/block/tests_block_multi.o lib01/block/tests_block.o main.o base.o world.o control.o entity.o destructor.o view.o v_mech.o tool.o
+ all: $(TARGET)
Added: packages/trunk/enemylines7/debian/patches/rapidxml_print.hpp-gcc4.7.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/rapidxml_print.hpp-gcc4.7.patch (rev 0)
+++ packages/trunk/enemylines7/debian/patches/rapidxml_print.hpp-gcc4.7.patch 2013-04-10 17:56:42 UTC (rev 13996)
@@ -0,0 +1,55 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 9 Apr 2013 23:29:09 +0200
+Subject: rapidxml_print.hpp gcc4.7
+
+---
+ src/lib01/assimilated/rapidxml/rapidxml_print.hpp | 36 +++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/src/lib01/assimilated/rapidxml/rapidxml_print.hpp b/src/lib01/assimilated/rapidxml/rapidxml_print.hpp
+index 008705b..1b08f1a 100644
+--- a/src/lib01/assimilated/rapidxml/rapidxml_print.hpp
++++ b/src/lib01/assimilated/rapidxml/rapidxml_print.hpp
+@@ -117,6 +117,42 @@ namespace rapidxml
+ return false;
+ }
+
++ template<class OutIt, class Ch>
++ inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags,
++ int indent);
++
++ template<class OutIt, class Ch>
++ inline OutIt print_attributes(OutIt out, const xml_node<Ch> *node, int
++ flags);
++
++ template<class OutIt, class Ch>
++ inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int
++ flags, int indent);
++
++ template<class OutIt, class Ch>
++ inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int
++ flags, int indent);
++
++ template<class OutIt, class Ch>
++ inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int
++ flags, int indent);
++
++ template<class OutIt, class Ch>
++ inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node,
++ int flags, int indent);
++
++ template<class OutIt, class Ch>
++ inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int
++ flags, int indent);
++
++ template<class OutIt, class Ch>
++ inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int
++ flags, int indent);
++
++ template<class OutIt, class Ch>
++ inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags,
++ int indent);
++
+ ///////////////////////////////////////////////////////////////////////////
+ // Internal printing operations
+
Added: packages/trunk/enemylines7/debian/patches/util_math.h-gcc4.7.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/util_math.h-gcc4.7.patch (rev 0)
+++ packages/trunk/enemylines7/debian/patches/util_math.h-gcc4.7.patch 2013-04-10 17:56:42 UTC (rev 13996)
@@ -0,0 +1,62 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 9 Apr 2013 23:51:00 +0200
+Subject: util_math.h gcc4.7
+
+---
+ src/lib01/math/util_math.h | 31 ++++++++++++++-----------------
+ 1 file changed, 14 insertions(+), 17 deletions(-)
+
+diff --git a/src/lib01/math/util_math.h b/src/lib01/math/util_math.h
+index d5840ac..9012109 100644
+--- a/src/lib01/math/util_math.h
++++ b/src/lib01/math/util_math.h
+@@ -26,35 +26,32 @@
+ namespace lib01 {
+ namespace util_math {
+
++template <class T> T cantor(T x,T y) {
++ return (x+y)*(x+y+1)/2+y;
++}
++template <class T> T cantor_y(T z) {
++ T j = static_cast<T>(floor(sqrt(0.25 + 2*z) - 0.5));
++ return z - j*(j+1)/2;
++}
+ template <class T> T cantor3(T x,T y,T z) {
+ T a=cantor(x,y);
+ return cantor(a,z);
+ }
+-template <class T> T cantor3_x(T z) {
+- T a=cantor_x(z);
+- return cantor_x(a);
+-}
+-template <class T> T cantor3_y(T z) {
+- T a=cantor_x(z);
+- return cantor_y(a);
+-}
+ template <class T> T cantor3_z(T z) {
+ return cantor_y(z);
+ }
+-
+-
+-template <class T> T cantor(T x,T y) {
+- return (x+y)*(x+y+1)/2+y;
+-}
+ template <class T> T cantor_x(T z) {
+ T j = static_cast<T>(floor(sqrt(0.25 + 2*z) - 0.5));
+ return j - cantor_y(z);
+ }
+-template <class T> T cantor_y(T z) {
+- T j = static_cast<T>(floor(sqrt(0.25 + 2*z) - 0.5));
+- return z - j*(j+1)/2;
++template <class T> T cantor3_y(T z) {
++ T a=cantor_x(z);
++ return cantor_y(a);
++}
++template <class T> T cantor3_x(T z) {
++ T a=cantor_x(z);
++ return cantor_x(a);
+ }
+-
+
+ int ggt(int a,int b);
+ void get_aspect_ratio(int& a,int& b);
More information about the Pkg-games-commits
mailing list