r14492 - in packages/trunk/pink-pony/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Fri Aug 16 09:22:47 UTC 2013
Author: miriam
Date: 2013-08-16 09:22:47 +0000 (Fri, 16 Aug 2013)
New Revision: 14492
Added:
packages/trunk/pink-pony/debian/patches/scons.patch
Removed:
packages/trunk/pink-pony/debian/patches/build.patch
Modified:
packages/trunk/pink-pony/debian/changelog
packages/trunk/pink-pony/debian/compat
packages/trunk/pink-pony/debian/control
packages/trunk/pink-pony/debian/copyright
packages/trunk/pink-pony/debian/patches/datadir.patch
packages/trunk/pink-pony/debian/patches/glee.patch
packages/trunk/pink-pony/debian/patches/series
packages/trunk/pink-pony/debian/patches/tinyxml.patch
packages/trunk/pink-pony/debian/rules
Log:
Fixed packaging stuff to build the latest version
Modified: packages/trunk/pink-pony/debian/changelog
===================================================================
--- packages/trunk/pink-pony/debian/changelog 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/changelog 2013-08-16 09:22:47 UTC (rev 14492)
@@ -1,11 +1,12 @@
-pink-pony (1.2.1-2) UNRELEASED; urgency=low
+pink-pony (1.2.1+git20110821-1) UNRELEASED; urgency=low
[ Miriam Ruiz ]
* New Upstream Release
* Added protobuf-compiler, libsigc++-2.0-dev and libftgl-dev
libtinyxml-dev, glee-dev to build dependencies
* Removed dependency from libaudiere (not in Debian enymore)
- * Upgraded Standards-Version to 3.9.2
+ * Upgraded Standards-Version to 3.9.4
+ * Upgraded compat level to 9
[ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
Modified: packages/trunk/pink-pony/debian/compat
===================================================================
--- packages/trunk/pink-pony/debian/compat 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/compat 2013-08-16 09:22:47 UTC (rev 14492)
@@ -1 +1 @@
-7
+9
Modified: packages/trunk/pink-pony/debian/control
===================================================================
--- packages/trunk/pink-pony/debian/control 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/control 2013-08-16 09:22:47 UTC (rev 14492)
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 7), quilt, scons, pkg-config, dh-buildinfo,
+Build-Depends: debhelper (>= 9), quilt, scons, pkg-config, dh-buildinfo,
mesa-common-dev, libglu1-mesa-dev, libglfw-dev, libxrandr-dev, glee-dev,
libilmbase-dev, libdevil-dev, libftgl-dev, libsigc++-2.0-dev,
libprotobuf-dev (>= 2), protobuf-compiler (>= 2), libtinyxml-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Homepage: http://code.google.com/p/pink-pony/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/pink-pony/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/pink-pony/
Modified: packages/trunk/pink-pony/debian/copyright
===================================================================
--- packages/trunk/pink-pony/debian/copyright 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/copyright 2013-08-16 09:22:47 UTC (rev 14492)
@@ -1,11 +1,11 @@
Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
Upstream-Source: http://code.google.com/p/pink-pony/
-Upstream-Maintainer: UPSTREAM NAME <UPSTREAM at EMAIL>
+Upstream-Maintainer: Thomas Weber <ginko at cg.tuwien.ac.at>
Debianized-By: Miriam Ruiz <little_miry at yahoo.es>
Debianized-Date: Sun, 12 Jul 2009 16:12:35 +0200
Files: *
-Copyright: Copyright (C) 2009, Ginkgo
+Copyright: Copyright (C) 2009-2011, Thomas Weber ("Ginkgo")
Licence: GPL-3+
Files: models/Pony.mesh.xml, models/pony.blend, textures/pony.png, textures/pony-blue.png
Deleted: packages/trunk/pink-pony/debian/patches/build.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/build.patch 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/patches/build.patch 2013-08-16 09:22:47 UTC (rev 14492)
@@ -1,14 +0,0 @@
-# Copyright (C) 2009 Miriam Ruiz <little_miry at yahoo.es>
-# Distributed under the same license as the game (GPL3+). See debian/copyright
-
---- pink-pony.orig/SConstruct
-+++ pink-pony/SConstruct
-@@ -2,7 +2,7 @@
-
- env = Environment()
- env['CC'] = 'g++'
--env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O2 -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
-+env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O2 -g -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
- env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL', 'ILUT', 'audiere']
- env.ParseConfig("pkg-config IlmBase --cflags --libs")
- env.ParseConfig("pkg-config libglfw --cflags --libs")
Modified: packages/trunk/pink-pony/debian/patches/datadir.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/datadir.patch 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/patches/datadir.patch 2013-08-16 09:22:47 UTC (rev 14492)
@@ -1,19 +1,21 @@
# Copyright (C) 2009 Miriam Ruiz <little_miry at yahoo.es>
# Distributed under the same license as the game (GPL3+). See debian/copyright
---- pink-pony-1.2.1.orig/pony.options
-+++ pink-pony-1.2.1/pony.options
+Index: pink-pony-master-ee91daf647/pony.options
+===================================================================
+--- pink-pony-master-ee91daf647.orig/pony.options 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/pony.options 2013-08-16 10:43:47.000000000 +0200
@@ -16,18 +16,18 @@
// Level properties
-levels_file = "levels.xml";
+levels_file = "/usr/share/games/pink-pony/levels.xml";
- selected_level = 1;
+ selected_level = 0;
-heightmap_file = "levels/heart.png";
+heightmap_file = "/usr/share/games/pink-pony/levels/heart.png";
level_size = (1500 90 1500);
- water_level = 30;
+ water_level = 45;
heightmap_specular = (1 1 1 1);
heightmap_diffuse = (0 0 0 0);
heightmap_shininess = 50;
@@ -24,9 +26,9 @@
+sand_texture = "/usr/share/games/pink-pony/textures/sand.png";
+grass_texture = "/usr/share/games/pink-pony/textures/grass.png";
+noise_texture = "/usr/share/games/pink-pony/textures/noise.png";
- pony_start[0] = (98.1826 -166.452);
- pony_start_angle[0] = 353.63;
- pony_start[1] = (360.84 228.471);
+ pony_start[0] = (219.916 -156.095);
+ pony_start_angle[0] = 74.4115;
+ pony_start[1] = (-334.356 -109.495);
@@ -91,18 +91,18 @@
// General appearance
@@ -54,8 +56,10 @@
pony_color[0] = (1 0.75 0.792968 1);
pony_color[1] = (0.25 0.875 0.8125 1);
pony_color[2] = (1 0.839844 0 1);
---- pink-pony-1.2.1.orig/lib/Config.cc
-+++ pink-pony-1.2.1/lib/Config.cc
+Index: pink-pony-master-ee91daf647/lib/Config.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/Config.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/Config.cc 2013-08-16 10:40:34.000000000 +0200
@@ -8,9 +8,9 @@
fsaa_samples(4),
swap_interval(1),
@@ -119,8 +123,10 @@
return false;
}
---- pink-pony-1.2.1.orig/lib/ParticleSystem.cc
-+++ pink-pony-1.2.1/lib/ParticleSystem.cc
+Index: pink-pony-master-ee91daf647/lib/ParticleSystem.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/ParticleSystem.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/ParticleSystem.cc 2013-08-16 10:40:34.000000000 +0200
@@ -45,8 +45,8 @@
CPUParticleSystem::CPUParticleSystem
(GLuint max_particles, Config* config)
@@ -158,10 +164,12 @@
heightmap(config->heightmap_file.c_str())
{
heightmap.normalize();
---- pink-pony-1.2.1.orig/lib/Pony.cc
-+++ pink-pony-1.2.1/lib/Pony.cc
-@@ -16,7 +16,7 @@
- right(right),
+Index: pink-pony-master-ee91daf647/lib/Pony.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/Pony.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/Pony.cc 2013-08-16 10:40:34.000000000 +0200
+@@ -109,7 +109,7 @@
+ right(config->pony_right[i]),
shader(config->pony_shader),
mesh(),
- animation("models/Pony-animated.pskeleton"),
@@ -169,8 +177,10 @@
mesh_drawer(&mesh),
texture(config->pony_texture.c_str()),
out(false), out_delay(false), particle_source(particle_system)
---- pink-pony-1.2.1.orig/lib/PonyPoints.cc
-+++ pink-pony-1.2.1/lib/PonyPoints.cc
+Index: pink-pony-master-ee91daf647/lib/PonyPoints.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/PonyPoints.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/PonyPoints.cc 2013-08-16 10:40:34.000000000 +0200
@@ -68,10 +68,10 @@
PonyPoints::PonyPoints(int i) : points(i)
{
@@ -186,8 +196,10 @@
}
PonyPoints::~PonyPoints()
---- pink-pony-1.2.1.orig/lib/Heightmap.cc
-+++ pink-pony-1.2.1/lib/Heightmap.cc
+Index: pink-pony-master-ee91daf647/lib/Heightmap.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/Heightmap.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/Heightmap.cc 2013-08-16 10:40:34.000000000 +0200
@@ -6,8 +6,8 @@
string sand, string grass, string noise)
: mesh(),
@@ -199,10 +211,12 @@
heightmap(filename.c_str(),
GL_CLAMP, GL_CLAMP, GL_LINEAR, GL_LINEAR),
sand_texture(sand.c_str()),
---- pink-pony-1.2.1.orig/lib/PonyGame.cc
-+++ pink-pony-1.2.1/lib/PonyGame.cc
-@@ -17,7 +17,7 @@
- music(music),
+Index: pink-pony-master-ee91daf647/lib/PonyGame.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/PonyGame.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/PonyGame.cc 2013-08-16 10:40:34.000000000 +0200
+@@ -15,7 +15,7 @@
+ skydome(skydome),
heart(),
heart_drawer(&heart),
- heart_shader("GLSL/heart")
@@ -210,9 +224,11 @@
{
int human_count = m_config->player_count - m_config->ai_count;
if (human_count == 0) human_count = m_config->player_count;
---- pink-pony-1.2.1.orig/Pony.cc
-+++ pink-pony-1.2.1/Pony.cc
-@@ -14,7 +14,7 @@
+Index: pink-pony-master-ee91daf647/Pony.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/Pony.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/Pony.cc 2013-08-16 10:40:34.000000000 +0200
+@@ -11,7 +11,7 @@
int main(int argc, char** argv)
{
@@ -221,7 +237,7 @@
bool running = true;
Config config;
-@@ -84,7 +84,7 @@
+@@ -62,7 +62,7 @@
// between braces, so that stack variables that need a GL context
// are destructed, while the context still exists.
{
@@ -230,11 +246,13 @@
Menu::MenuStatus menu_status;
{
---- pink-pony-1.2.1.orig/lib/Menu.cc
-+++ pink-pony-1.2.1/lib/Menu.cc
-@@ -87,39 +87,39 @@
+Index: pink-pony-master-ee91daf647/lib/Menu.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/Menu.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/Menu.cc 2013-08-16 10:40:34.000000000 +0200
+@@ -85,39 +85,39 @@
+ config(config),
skydome(skydome),
- music(music),
heightmap(NULL),
- logo_button("textures/logo.png"),
+ logo_button("/usr/share/games/pink-pony/textures/logo.png"),
@@ -292,18 +310,20 @@
needs_reset(false)
{
---- pink-pony-1.2.1.orig/lib/Widget.cc
-+++ pink-pony-1.2.1/lib/Widget.cc
+Index: pink-pony-master-ee91daf647/lib/Widget.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/Widget.cc 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/Widget.cc 2013-08-16 10:44:19.000000000 +0200
@@ -88,7 +88,7 @@
{
int face_size = 72;
-- font = new FTBufferFont("fonts/DaveDS_-_Sketchy.ttf");
-+ font = new FTBufferFont("/usr/share/games/pink-pony/fonts/DaveDS_-_Sketchy.ttf");
+- font = new FTBufferFont("fonts/dijkstra.ttf");
++ font = new FTBufferFont("/usr/share/games/pink-pony/fonts/dijkstra.ttf");
if (font->Error()) {
cerr << "Something went wrong with loading the font." << endl;
-@@ -246,8 +246,8 @@
+@@ -247,8 +247,8 @@
Slider::Slider()
: Widget(1.0),
@@ -314,8 +334,10 @@
{
up_button.on_click()
.connect(sigc::bind(sigc::mem_fun(this, &Slider::change), 1));
---- pink-pony-1.2.1.orig/levels.xml
-+++ pink-pony-1.2.1/levels.xml
+Index: pink-pony-master-ee91daf647/levels.xml
+===================================================================
+--- pink-pony-master-ee91daf647.orig/levels.xml 2013-08-16 10:40:34.000000000 +0200
++++ pink-pony-master-ee91daf647/levels.xml 2013-08-16 10:40:34.000000000 +0200
@@ -1,8 +1,8 @@
<levels>
- <level name="Lagoon" file="levels/heart.png" size="(1500 90 1500)" water_level="45"/>
Modified: packages/trunk/pink-pony/debian/patches/glee.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/glee.patch 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/patches/glee.patch 2013-08-16 09:22:47 UTC (rev 14492)
@@ -1,5 +1,7 @@
---- pink-pony-1.2.1.orig/lib/GL/GLee.c
-+++ /dev/null
+Index: pink-pony-master-ee91daf647/lib/GL/GLee.c
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/GL/GLee.c 2013-08-16 10:45:50.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,11359 +0,0 @@
-/***************************************************************************
-*
@@ -11360,8 +11362,10 @@
- __GLeeExtList_clean(&extensionNames);
- return GL_TRUE;
-}
---- pink-pony-1.2.1.orig/lib/GL/GLee.h
-+++ /dev/null
+Index: pink-pony-master-ee91daf647/lib/GL/GLee.h
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/GL/GLee.h 2013-08-16 10:45:50.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,10797 +0,0 @@
-/***************************************************************************
-*
@@ -22160,8 +22164,10 @@
-#endif
-
-#endif /* __glee_h_ defined */
---- pink-pony-1.2.1.orig/SConstruct
-+++ pink-pony-1.2.1/SConstruct
+Index: pink-pony-master-ee91daf647/SConstruct
+===================================================================
+--- pink-pony-master-ee91daf647.orig/SConstruct 2013-08-16 10:45:50.000000000 +0200
++++ pink-pony-master-ee91daf647/SConstruct 2013-08-16 10:45:50.000000000 +0200
@@ -3,7 +3,7 @@
env = Environment()
env['CC'] = 'g++'
@@ -22171,7 +22177,7 @@
env.ParseConfig("pkg-config IlmBase --cflags --libs")
env.ParseConfig("pkg-config libglfw --cflags --libs")
env.ParseConfig("pkg-config ftgl --cflags --libs")
-@@ -14,18 +14,18 @@
+@@ -28,18 +28,18 @@
env.Program('mesh_compile',
@@ -22195,8 +22201,10 @@
- ['ConfigFile.cc', 'lib/GL/GLee.c']
+ ['ConfigFile.cc']
+ Glob('lib/*cc'))
---- pink-pony-1.2.1.orig/lib/cinquo.hh
-+++ pink-pony-1.2.1/lib/cinquo.hh
+Index: pink-pony-master-ee91daf647/lib/cinquo.hh
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/cinquo.hh 2013-08-16 10:45:50.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/cinquo.hh 2013-08-16 10:45:50.000000000 +0200
@@ -2,7 +2,7 @@
#define ILUT_USE_OPENGL
Copied: packages/trunk/pink-pony/debian/patches/scons.patch (from rev 14491, packages/trunk/pink-pony/debian/patches/build.patch)
===================================================================
--- packages/trunk/pink-pony/debian/patches/scons.patch (rev 0)
+++ packages/trunk/pink-pony/debian/patches/scons.patch 2013-08-16 09:22:47 UTC (rev 14492)
@@ -0,0 +1,16 @@
+# Copyright (C) 2009 Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game (GPL3+). See debian/copyright
+
+Index: pink-pony-master-ee91daf647/SConstruct
+===================================================================
+--- pink-pony-master-ee91daf647.orig/SConstruct 2013-08-16 10:39:11.000000000 +0200
++++ pink-pony-master-ee91daf647/SConstruct 2013-08-16 10:39:11.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ env = Environment()
+ env['CC'] = 'g++'
+-env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O3 -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
++env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O2 -g -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
+ env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL', 'ILUT']
+ env.ParseConfig("pkg-config IlmBase --cflags --libs")
+ env.ParseConfig("pkg-config libglfw --cflags --libs")
Modified: packages/trunk/pink-pony/debian/patches/series
===================================================================
--- packages/trunk/pink-pony/debian/patches/series 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/patches/series 2013-08-16 09:22:47 UTC (rev 14492)
@@ -1,5 +1,5 @@
-build.patch
+scons.patch
datadir.patch
-audiere.patch
+#audiere.patch
tinyxml.patch
glee.patch
Modified: packages/trunk/pink-pony/debian/patches/tinyxml.patch
===================================================================
--- packages/trunk/pink-pony/debian/patches/tinyxml.patch 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/patches/tinyxml.patch 2013-08-16 09:22:47 UTC (rev 14492)
@@ -1,5 +1,7 @@
---- pink-pony-1.2.1.orig/external/tinyXML/tinystr.cpp
-+++ /dev/null
+Index: pink-pony-master-ee91daf647/external/tinyXML/tinystr.cpp
+===================================================================
+--- pink-pony-master-ee91daf647.orig/external/tinyXML/tinystr.cpp 2013-08-16 11:02:15.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
@@ -117,8 +119,10 @@
-
-
-#endif // TIXML_USE_STL
---- pink-pony-1.2.1.orig/external/tinyXML/tinystr.h
-+++ /dev/null
+Index: pink-pony-master-ee91daf647/external/tinyXML/tinystr.h
+===================================================================
+--- pink-pony-master-ee91daf647.orig/external/tinyXML/tinystr.h 2013-08-16 11:02:15.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,319 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
@@ -439,8 +443,10 @@
-
-#endif // TIXML_STRING_INCLUDED
-#endif // TIXML_USE_STL
---- pink-pony-1.2.1.orig/external/tinyXML/tinyxml.cpp
-+++ /dev/null
+Index: pink-pony-master-ee91daf647/external/tinyXML/tinyxml.cpp
+===================================================================
+--- pink-pony-master-ee91daf647.orig/external/tinyXML/tinyxml.cpp 2013-08-16 11:02:15.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1888 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
@@ -2330,8 +2336,10 @@
- return true;
-}
-
---- pink-pony-1.2.1.orig/external/tinyXML/tinyxml.h
-+++ /dev/null
+Index: pink-pony-master-ee91daf647/external/tinyXML/tinyxml.h
+===================================================================
+--- pink-pony-master-ee91daf647.orig/external/tinyXML/tinyxml.h 2013-08-16 11:02:15.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1802 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
@@ -4135,8 +4143,10 @@
-
-#endif
-
---- pink-pony-1.2.1.orig/external/tinyXML/tinyxmlerror.cpp
-+++ /dev/null
+Index: pink-pony-master-ee91daf647/external/tinyXML/tinyxmlerror.cpp
+===================================================================
+--- pink-pony-master-ee91daf647.orig/external/tinyXML/tinyxmlerror.cpp 2013-08-16 11:02:15.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
@@ -4191,8 +4201,10 @@
- "Error parsing CDATA.",
- "Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
-};
---- pink-pony-1.2.1.orig/external/tinyXML/tinyxmlparser.cpp
-+++ /dev/null
+Index: pink-pony-master-ee91daf647/external/tinyXML/tinyxmlparser.cpp
+===================================================================
+--- pink-pony-master-ee91daf647.orig/external/tinyXML/tinyxmlparser.cpp 2013-08-16 11:02:15.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1638 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
@@ -5832,8 +5844,10 @@
- return true;
-}
-
---- pink-pony-1.2.1.orig/SConstruct
-+++ pink-pony-1.2.1/SConstruct
+Index: pink-pony-master-ee91daf647/SConstruct
+===================================================================
+--- pink-pony-master-ee91daf647.orig/SConstruct 2013-08-16 11:02:18.000000000 +0200
++++ pink-pony-master-ee91daf647/SConstruct 2013-08-16 11:05:35.000000000 +0200
@@ -2,8 +2,8 @@
env = Environment()
@@ -5845,7 +5859,7 @@
env.ParseConfig("pkg-config IlmBase --cflags --libs")
env.ParseConfig("pkg-config libglfw --cflags --libs")
env.ParseConfig("pkg-config ftgl --cflags --libs")
-@@ -15,17 +15,17 @@
+@@ -29,17 +29,17 @@
env.Program('mesh_compile',
['mesh_compile.cc', 'lib/GL/GLee.c']
@@ -5868,3 +5882,212 @@
['ConfigFile.cc', 'lib/GL/GLee.c']
- + Glob('lib/*cc') + Glob('external/tinyXML/*cpp'))
+ + Glob('lib/*cc'))
+Index: pink-pony-master-ee91daf647/lib/Menu.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/lib/Menu.cc 2013-08-16 11:02:18.000000000 +0200
++++ pink-pony-master-ee91daf647/lib/Menu.cc 2013-08-16 11:02:18.000000000 +0200
+@@ -271,7 +271,7 @@
+
+ TiXmlNode* levels_node = doc.FirstChild();
+
+- if (levels_node->Type() != TiXmlNode::ELEMENT ||
++ if (levels_node->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(levels_node->Value()) != "levels") {
+ cerr << "Could not find 'levels' element in " << levels_file << endl;
+ assert(0);
+@@ -280,7 +280,7 @@
+ for (TiXmlNode* level_node = levels_node->ToElement()->FirstChild(); level_node != NULL;
+ level_node = level_node->NextSibling()) {
+
+- if (level_node->Type() != TiXmlNode::ELEMENT ||
++ if (level_node->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(level_node->Value()) != "level") {
+ cerr << "Could not find 'level' element in " << levels_file << endl;
+ assert(0);
+Index: pink-pony-master-ee91daf647/mesh_compile.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/mesh_compile.cc 2013-08-16 11:02:15.000000000 +0200
++++ pink-pony-master-ee91daf647/mesh_compile.cc 2013-08-16 11:02:18.000000000 +0200
+@@ -373,7 +373,7 @@
+ for (TiXmlNode* n = elem->FirstChild(); n != NULL;
+ n = n->NextSibling()) {
+
+- if (n->Type() == TiXmlNode::ELEMENT) {
++ if (n->Type() == TiXmlNode::TINYXML_ELEMENT) {
+ if (string(n->Value()) == "faces") {
+ faces = load_OgreXMLFaces(mesh, n->ToElement());
+ } else if (string(n->Value()) == "geometry") {
+@@ -386,7 +386,7 @@
+ for (TiXmlNode* n = elem->FirstChild(); n != NULL;
+ n = n->NextSibling()) {
+
+- if (n->Type() == TiXmlNode::ELEMENT) {
++ if (n->Type() == TiXmlNode::TINYXML_ELEMENT) {
+ if (string(n->Value()) == "boneassignments") {
+ bool r = add_OgreXMLBoneAssignments(mesh, n->ToElement());
+
+@@ -404,7 +404,7 @@
+ for (TiXmlNode* n = elem->FirstChild(); n != NULL;
+ n = n->NextSibling()) {
+
+- if (n->Type() == TiXmlNode::ELEMENT &&
++ if (n->Type() == TiXmlNode::TINYXML_ELEMENT &&
+ string(n->Value()) == "submesh") {
+ return load_OgreXMLSubmesh(mesh, n->ToElement());
+ }
+@@ -418,7 +418,7 @@
+ for (TiXmlNode* n = elem->FirstChild(); n != NULL;
+ n = n->NextSibling()) {
+
+- if (n->Type() == TiXmlNode::ELEMENT &&
++ if (n->Type() == TiXmlNode::TINYXML_ELEMENT &&
+ string(n->Value()) == "submeshes") {
+ return load_OgreXMLSubmeshes(mesh, n->ToElement());
+ }
+@@ -431,7 +431,7 @@
+ for (TiXmlNode* n = doc.FirstChild(); n != NULL;
+ n = n->NextSibling()) {
+
+- if (n->Type() == TiXmlNode::ELEMENT &&
++ if (n->Type() == TiXmlNode::TINYXML_ELEMENT &&
+ string(n->Value()) == "mesh") {
+ return load_OgreXMLMesh(mesh, n->ToElement());
+ }
+Index: pink-pony-master-ee91daf647/skeleton_compile.cc
+===================================================================
+--- pink-pony-master-ee91daf647.orig/skeleton_compile.cc 2011-08-21 18:17:16.000000000 +0200
++++ pink-pony-master-ee91daf647/skeleton_compile.cc 2013-08-16 11:06:18.000000000 +0200
+@@ -76,7 +76,7 @@
+ for (TiXmlNode* n = doc.FirstChild(); n != NULL;
+ n = n->NextSibling()) {
+
+- if (n->Type() == TiXmlNode::ELEMENT &&
++ if (n->Type() == TiXmlNode::TINYXML_ELEMENT &&
+ string(n->Value()) == "skeleton") {
+ bool bones = false;
+ bool hierarchy = false;
+@@ -84,7 +84,7 @@
+
+ for (TiXmlNode* m = n->ToElement()->FirstChild(); m != NULL;
+ m = m->NextSibling()) {
+- if (m->Type() == TiXmlNode::ELEMENT &&
++ if (m->Type() == TiXmlNode::TINYXML_ELEMENT &&
+ string(m->Value()) == "bones") {
+ bones = load_OgreXMLBones(skeleton, m->ToElement());
+ }
+@@ -92,7 +92,7 @@
+
+ for (TiXmlNode* m = n->ToElement()->FirstChild(); m != NULL;
+ m = m->NextSibling()) {
+- if (m->Type() == TiXmlNode::ELEMENT &&
++ if (m->Type() == TiXmlNode::TINYXML_ELEMENT &&
+ string(m->Value()) == "bonehierarchy") {
+ hierarchy = load_OgreXMLBoneHierarchy(skeleton, m->ToElement());
+ }
+@@ -100,7 +100,7 @@
+
+ for (TiXmlNode* m = n->ToElement()->FirstChild(); m != NULL;
+ m = m->NextSibling()) {
+- if (m->Type() == TiXmlNode::ELEMENT &&
++ if (m->Type() == TiXmlNode::TINYXML_ELEMENT &&
+ string(m->Value()) == "animations") {
+ animations = load_OgreXMLAnimations(skeleton, m->ToElement());
+ }
+@@ -124,7 +124,7 @@
+
+ // Parse bone
+
+- if (n->Type() != TiXmlNode::ELEMENT ||
++ if (n->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(n->Value()) != "bone") {
+ assert(0);
+ }
+@@ -144,7 +144,7 @@
+
+ for (TiXmlNode* m = e->FirstChild(); m != NULL;
+ m = m->NextSibling()) {
+- if (m->Type() != TiXmlNode::ELEMENT)
++ if (m->Type() != TiXmlNode::TINYXML_ELEMENT)
+ assert(0);
+
+ TiXmlElement* e = m->ToElement();
+@@ -163,7 +163,7 @@
+ if (e->QueryFloatAttribute("angle", &angle) != TIXML_SUCCESS)
+ assert(0);
+
+- if (e->FirstChild()->Type() != TiXmlNode::ELEMENT ||
++ if (e->FirstChild()->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(e->FirstChild()->Value()) != "axis")
+ assert(0);
+
+@@ -248,7 +248,7 @@
+ n = n->NextSibling()) {
+ const char *from, *to;
+
+- if (n->Type() != TiXmlNode::ELEMENT ||
++ if (n->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(n->Value()) != "boneparent")
+ assert(0);
+
+@@ -306,7 +306,7 @@
+ for (TiXmlNode* n = elem->FirstChild(); n != NULL;
+ n = n->NextSibling()) {
+
+- if (n->Type() != TiXmlNode::ELEMENT ||
++ if (n->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(n->Value()) != "animation")
+ assert(0);
+
+@@ -343,14 +343,14 @@
+ anim->set_name(string(name));
+ anim->set_duration(duration);
+
+- if (elem->FirstChild()->Type() != TiXmlNode::ELEMENT ||
++ if (elem->FirstChild()->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(elem->FirstChild()->Value()) != "tracks")
+ assert(0);
+
+ for (TiXmlNode* n = elem->FirstChild()->ToElement()->FirstChild(); n != NULL;
+ n = n->NextSibling()) {
+
+- if (n->Type() != TiXmlNode::ELEMENT ||
++ if (n->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(n->Value()) != "track")
+ assert(0);
+
+@@ -365,7 +365,7 @@
+ bone_id = ids[string(bone)];
+
+
+- if (e->FirstChild()->Type() != TiXmlNode::ELEMENT ||
++ if (e->FirstChild()->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(e->FirstChild()->Value()) != "keyframes")
+ assert(0);
+
+@@ -380,7 +380,7 @@
+ float sx,sy,sz;
+
+
+- if (o->Type() != TiXmlNode::ELEMENT ||
++ if (o->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(o->Value()) != "keyframe")
+ assert(0);
+
+@@ -393,7 +393,7 @@
+
+ for (TiXmlNode* m = e->FirstChild(); m != NULL;
+ m = m->NextSibling()) {
+- if (m->Type() != TiXmlNode::ELEMENT)
++ if (m->Type() != TiXmlNode::TINYXML_ELEMENT)
+ assert(0);
+
+ TiXmlElement* e = m->ToElement();
+@@ -412,7 +412,7 @@
+ if (e->QueryFloatAttribute("angle", &angle) != TIXML_SUCCESS)
+ assert(0);
+
+- if (e->FirstChild()->Type() != TiXmlNode::ELEMENT ||
++ if (e->FirstChild()->Type() != TiXmlNode::TINYXML_ELEMENT ||
+ string(e->FirstChild()->Value()) != "axis")
+ assert(0);
+
Modified: packages/trunk/pink-pony/debian/rules
===================================================================
--- packages/trunk/pink-pony/debian/rules 2013-08-15 21:53:16 UTC (rev 14491)
+++ packages/trunk/pink-pony/debian/rules 2013-08-16 09:22:47 UTC (rev 14492)
@@ -3,6 +3,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined
+
config: config-stamp
config-stamp:
dh_testdir
@@ -19,10 +25,9 @@
# grep -r \"pony.options\" * | grep -v debian/
# grep -r \"levels.xml\" * | grep -v debian/
- sed -e 's/:CFLAGS:/$(CFLAGS)/' < debian/options.cache > options.cache
+ sed -e 's/:CFLAGS:/$(CFLAGS) $(CPPFLAGS)/' < debian/options.cache > options.cache
touch $@
-build: build-stamp
build-stamp: config
dh_testdir
protoc mesh.proto --cpp_out=lib/
@@ -32,6 +37,12 @@
lib_dir="$(CURDIR)"
touch $@
+build-indep: build-stamp
+
+build-arch: build-stamp
+
+build: build-arch build-indep
+
clean:
dh_testdir
dh_testroot
More information about the Pkg-games-commits
mailing list