r15177 - in packages/trunk/antigrav/debian: . patches
Vincent Fourmond
fourmond at moszumanska.debian.org
Tue Sep 2 20:53:44 UTC 2014
Author: fourmond
Date: 2014-09-02 20:53:44 +0000 (Tue, 02 Sep 2014)
New Revision: 15177
Added:
packages/trunk/antigrav/debian/patches/05-use-sys-tinyxml.diff
Modified:
packages/trunk/antigrav/debian/changelog
packages/trunk/antigrav/debian/control
packages/trunk/antigrav/debian/patches/01_fix_png_load.diff
packages/trunk/antigrav/debian/patches/02_fix_sound.diff
packages/trunk/antigrav/debian/patches/03_daca_fixes.diff
packages/trunk/antigrav/debian/patches/04-height-selection.diff
packages/trunk/antigrav/debian/patches/series
packages/trunk/antigrav/debian/rules
Log:
[antigrav] Some improvements: drop embedded tinyxml and (hopefully) fix FTBS on new arches
Modified: packages/trunk/antigrav/debian/changelog
===================================================================
--- packages/trunk/antigrav/debian/changelog 2014-09-02 14:20:19 UTC (rev 15176)
+++ packages/trunk/antigrav/debian/changelog 2014-09-02 20:53:44 UTC (rev 15177)
@@ -1,9 +1,17 @@
-antigrav (0.0.3-6) UNRELEASED; urgency=low
+antigrav (0.0.3-6) unstable; urgency=low
+ [ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
- -- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:04 +0200
+ [ Vincent Fourmond ]
+ * Use dh-autoreconf to get rid of build problems on new architectures
+ (closes: #752014)
+ * Bump to recent standards, no need for changes
+ * Now using system tinyxml (and not the embedded copy)
+ * Refreshed patches
+ -- Vincent Fourmond <fourmond at debian.org> Tue, 02 Sep 2014 22:49:32 +0200
+
antigrav (0.0.3-5) unstable; urgency=low
* Build-depends on libpng-dev (closes: #662269)
Modified: packages/trunk/antigrav/debian/control
===================================================================
--- packages/trunk/antigrav/debian/control 2014-09-02 14:20:19 UTC (rev 15176)
+++ packages/trunk/antigrav/debian/control 2014-09-02 20:53:44 UTC (rev 15177)
@@ -4,8 +4,8 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Barry deFreese <bddebian at comcast.net>,
Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>> 7), autotools-dev, zlib1g-dev, libpng-dev, libalut-dev, libopenal-dev, libsdl1.2-dev
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>> 7), autotools-dev, zlib1g-dev, libpng-dev, libalut-dev, libopenal-dev, libsdl1.2-dev, dh-autoreconf, libtinyxml-dev
+Standards-Version: 3.9.5
Homepage: http://www.luolamies.org/software/antigrav/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/antigrav/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/antigrav/
Modified: packages/trunk/antigrav/debian/patches/01_fix_png_load.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/01_fix_png_load.diff 2014-09-02 14:20:19 UTC (rev 15176)
+++ packages/trunk/antigrav/debian/patches/01_fix_png_load.diff 2014-09-02 20:53:44 UTC (rev 15177)
@@ -1,7 +1,8 @@
-diff -urN antigrav-0.0.2.orig/src/m3dtexture.cpp antigrav-0.0.2/src/m3dtexture.cpp
---- antigrav-0.0.2.orig/src/m3dtexture.cpp 2006-08-04 15:38:31.000000000 -0400
-+++ antigrav-0.0.2/src/m3dtexture.cpp 2007-12-15 11:07:44.000000000 -0500
-@@ -104,6 +104,7 @@
+Index: antigrav-0.0.3/src/m3dtexture.cpp
+===================================================================
+--- antigrav-0.0.3.orig/src/m3dtexture.cpp
++++ antigrav-0.0.3/src/m3dtexture.cpp
+@@ -104,6 +104,7 @@ int m3dTexture::loadFromXML(const TiXmlE
if(loadPNG(texUnits[n].filename.c_str(), &data, &(texUnits[n].width), &(texUnits[n].height)) != 0)
{
fprintf(stderr, "Invalid: can't load texture %s\n", texUnits[n].filename.c_str());
@@ -9,7 +10,7 @@
return -1;
}
-@@ -148,6 +149,7 @@
+@@ -148,6 +149,7 @@ int m3dTexture::load(int num, const char
if(loadPNG(texUnits[n].filename.c_str(), &data, &(texUnits[n].width), &(texUnits[n].height)) != 0)
{
fprintf(stderr, "Invalid: can't load texture %s\n", texUnits[n].filename.c_str());
@@ -17,7 +18,7 @@
return -1;
}
-@@ -204,7 +206,7 @@
+@@ -204,7 +206,7 @@ void m3dTexture::pngReadCallbackSTDIO(pn
@param height a pointer where to store the image width
@return 0 on success, -1 on failure
*/
@@ -26,7 +27,7 @@
{
FILE *f;
int result;
-@@ -221,7 +223,7 @@
+@@ -221,7 +223,7 @@ int m3dTexture::loadPNG(const char *file
return result;
}
@@ -35,7 +36,7 @@
{
png_structp pngPtr;
png_infop pngInfoPtr;
-@@ -258,7 +260,7 @@
+@@ -258,7 +260,7 @@ int m3dTexture::loadPNG(unsigned char **
png_set_read_fn(pngPtr, handle, pngReadCallback);
png_read_info(pngPtr, pngInfoPtr);
@@ -44,7 +45,7 @@
png_set_strip_16(pngPtr);
-@@ -279,7 +281,7 @@
+@@ -279,7 +281,7 @@ int m3dTexture::loadPNG(unsigned char **
}
png_read_update_info(pngPtr, pngInfoPtr);
@@ -53,7 +54,7 @@
(*data) = new unsigned char[(*width) * (*height) * pngInfoPtr->channels];
if((*data) == NULL)
-@@ -312,7 +314,7 @@
+@@ -312,7 +314,7 @@ int m3dTexture::loadPNG(unsigned char **
return 0;
}
@@ -62,7 +63,7 @@
{
FILE *f;
int result;
-@@ -345,7 +347,7 @@
+@@ -345,7 +347,7 @@ void m3dTexture::pngFlushCallbackSTDIO(p
fflush(f);
}
@@ -71,7 +72,7 @@
{
png_structp pngPtr;
png_infop pngInfoPtr;
-@@ -435,7 +437,7 @@
+@@ -435,7 +437,7 @@ int m3dTexture::screenshot(const char *f
GLuint m3dTexture::loadTexture(const char *filename)
{
unsigned char *data;
@@ -80,7 +81,7 @@
GLuint tex;
glGenTextures(1, &tex);
-@@ -443,6 +445,7 @@
+@@ -443,6 +445,7 @@ GLuint m3dTexture::loadTexture(const cha
if(m3dTexture::loadPNG(filename, &data, &width, &height) != 0)
{
fprintf(stderr, "Can't load texture %s\n", filename);
@@ -88,10 +89,11 @@
return 0;
}
-diff -urN antigrav-0.0.2.orig/src/m3dtexture.h antigrav-0.0.2/src/m3dtexture.h
---- antigrav-0.0.2.orig/src/m3dtexture.h 2006-08-04 15:38:31.000000000 -0400
-+++ antigrav-0.0.2/src/m3dtexture.h 2007-12-15 11:07:44.000000000 -0500
-@@ -9,7 +9,7 @@
+Index: antigrav-0.0.3/src/m3dtexture.h
+===================================================================
+--- antigrav-0.0.3.orig/src/m3dtexture.h
++++ antigrav-0.0.3/src/m3dtexture.h
+@@ -9,7 +9,7 @@ struct TextureUnit
{
std::string filename;
GLuint handle;
@@ -100,7 +102,7 @@
};
/// A texture
-@@ -34,8 +34,8 @@
+@@ -34,8 +34,8 @@ public:
m3dTexture &operator=(const m3dTexture &t);
@@ -111,7 +113,7 @@
static int screenshot(const char *filename);
static GLuint loadTexture(const char *filename);
-@@ -48,8 +48,8 @@
+@@ -48,8 +48,8 @@ private:
static void pngWriteCallbackSTDIO(png_structp pngPtr, png_bytep data, png_size_t length);
static void pngFlushCallbackSTDIO(png_structp pngPtr);
Modified: packages/trunk/antigrav/debian/patches/02_fix_sound.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/02_fix_sound.diff 2014-09-02 14:20:19 UTC (rev 15176)
+++ packages/trunk/antigrav/debian/patches/02_fix_sound.diff 2014-09-02 20:53:44 UTC (rev 15177)
@@ -1,7 +1,8 @@
-diff -urN antigrav-0.0.2.orig/src/main.cpp antigrav-0.0.2/src/main.cpp
---- antigrav-0.0.2.orig/src/main.cpp 2006-08-04 15:38:31.000000000 -0400
-+++ antigrav-0.0.2/src/main.cpp 2007-12-15 11:27:56.000000000 -0500
-@@ -22,6 +22,7 @@
+Index: antigrav-0.0.3/src/main.cpp
+===================================================================
+--- antigrav-0.0.3.orig/src/main.cpp
++++ antigrav-0.0.3/src/main.cpp
+@@ -22,6 +22,7 @@ MFNGLMULTITEXCOORD2FVPROC mglMultiTexCoo
MFNGLACTIVETEXTUREARBPROC mglActiveTextureARB = NULL;
#endif
@@ -9,7 +10,7 @@
bool opt_fullscreen = true;
bool opt_fsaa = false;
int opt_width = 1024;
-@@ -135,7 +136,8 @@
+@@ -146,7 +147,8 @@ int main(int argc, char *argv[])
if(alutInit(&argc, argv) != AL_TRUE)
{
fprintf(stderr, "Can't initialize OpenAL: %s\n", alutGetErrorString(alutGetError()));
@@ -19,7 +20,7 @@
}
if(chdir(DATADIR) != 0)
-@@ -167,6 +169,11 @@
+@@ -178,6 +180,11 @@ int main(int argc, char *argv[])
return 0;
}
@@ -31,7 +32,7 @@
ALuint loadWavBuffer(const char *filename)
{
ALuint buffer;
-@@ -188,20 +195,40 @@
+@@ -199,20 +206,40 @@ ALuint loadWavBuffer(const char *filenam
if(wav_spec.channels == 1)
{
Modified: packages/trunk/antigrav/debian/patches/03_daca_fixes.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/03_daca_fixes.diff 2014-09-02 14:20:19 UTC (rev 15176)
+++ packages/trunk/antigrav/debian/patches/03_daca_fixes.diff 2014-09-02 20:53:44 UTC (rev 15177)
@@ -1,6 +1,8 @@
---- ./src/m3dtexture.cpp.orig 2006-08-04 21:38:31.000000000 +0200
-+++ ./src/m3dtexture.cpp 2011-01-17 13:32:33.000000000 +0100
-@@ -382,7 +382,7 @@
+Index: antigrav-0.0.3/src/m3dtexture.cpp
+===================================================================
+--- antigrav-0.0.3.orig/src/m3dtexture.cpp
++++ antigrav-0.0.3/src/m3dtexture.cpp
+@@ -384,7 +384,7 @@ int m3dTexture::savePNG(const unsigned c
png_write_image(pngPtr, rowPointers);
png_write_end(pngPtr, pngInfoPtr);
@@ -9,7 +11,7 @@
png_destroy_write_struct(&pngPtr, &pngInfoPtr);
return 0;
}
-@@ -423,11 +423,11 @@
+@@ -425,11 +425,11 @@ int m3dTexture::screenshot(const char *f
if(savePNG(filename, data, width, height) != 0)
{
@@ -23,9 +25,11 @@
return 0;
}
---- ./src/tinyxml/tinyxml.cpp.orig 2006-08-04 21:38:31.000000000 +0200
-+++ ./src/tinyxml/tinyxml.cpp 2011-01-17 13:34:01.000000000 +0100
-@@ -1085,6 +1085,7 @@
+Index: antigrav-0.0.3/src/tinyxml/tinyxml.cpp
+===================================================================
+--- antigrav-0.0.3.orig/src/tinyxml/tinyxml.cpp
++++ antigrav-0.0.3/src/tinyxml/tinyxml.cpp
+@@ -1085,6 +1085,7 @@ bool TiXmlDocument::LoadFile( FILE* file
if ( fread( buf, length, 1, file ) != 1 ) {
SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
Modified: packages/trunk/antigrav/debian/patches/04-height-selection.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/04-height-selection.diff 2014-09-02 14:20:19 UTC (rev 15176)
+++ packages/trunk/antigrav/debian/patches/04-height-selection.diff 2014-09-02 20:53:44 UTC (rev 15177)
@@ -1,8 +1,8 @@
Index: antigrav-0.0.3/src/main.cpp
===================================================================
---- antigrav-0.0.3.orig/src/main.cpp 2011-01-26 22:15:47.432908120 +0100
-+++ antigrav-0.0.3/src/main.cpp 2011-01-26 22:18:37.312575085 +0100
-@@ -25,13 +25,16 @@
+--- antigrav-0.0.3.orig/src/main.cpp
++++ antigrav-0.0.3/src/main.cpp
+@@ -25,13 +25,16 @@ MFNGLACTIVETEXTUREARBPROC mglActiveTextu
bool opt_fullscreen = true;
bool opt_fsaa = false;
int opt_width = 1024;
@@ -20,7 +20,7 @@
int parse_args(int argc, char *argv[])
{
-@@ -44,10 +47,11 @@
+@@ -44,10 +47,11 @@ int parse_args(int argc, char *argv[])
{"fsaa", no_argument, 0, 'f'},
{"windowed", no_argument, 0, 'w'},
{"resolution", required_argument, 0, 'r'},
@@ -33,7 +33,7 @@
if(c == -1)
break;
-@@ -66,6 +70,9 @@
+@@ -66,6 +70,9 @@ int parse_args(int argc, char *argv[])
case 'r':
opt_width = atoi(optarg);
break;
@@ -43,7 +43,7 @@
default:
puts(help_msg);
return 1;
-@@ -113,7 +120,11 @@
+@@ -113,7 +120,11 @@ int main(int argc, char *argv[])
if(opt_fullscreen) flags |= SDL_FULLSCREEN;
int width = opt_width;
Added: packages/trunk/antigrav/debian/patches/05-use-sys-tinyxml.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/05-use-sys-tinyxml.diff (rev 0)
+++ packages/trunk/antigrav/debian/patches/05-use-sys-tinyxml.diff 2014-09-02 20:53:44 UTC (rev 15177)
@@ -0,0 +1,16 @@
+Index: antigrav-0.0.3/src/Makefile.am
+===================================================================
+--- antigrav-0.0.3.orig/src/Makefile.am
++++ antigrav-0.0.3/src/Makefile.am
+@@ -1,8 +1,8 @@
+ bin_PROGRAMS = antigrav
+
+-INCLUDES = -W -Wall -DTIXML_USE_STL -Itinyxml/ -DDATADIR="\"$(datadir)/$(PACKAGE)\""
+-SUBDIRS = tinyxml
+-LDADD = tinyxml/libtinyxml.a
++INCLUDES = -W -Wall -DTIXML_USE_STL -DDATADIR="\"$(datadir)/$(PACKAGE)\""
++# SUBDIRS = tinyxml
++LDADD = -ltinyxml
+
+ antigrav_SOURCES = main.cpp antigrav.h extensions.h \
+ craft.cpp craft.h \
Modified: packages/trunk/antigrav/debian/patches/series
===================================================================
--- packages/trunk/antigrav/debian/patches/series 2014-09-02 14:20:19 UTC (rev 15176)
+++ packages/trunk/antigrav/debian/patches/series 2014-09-02 20:53:44 UTC (rev 15177)
@@ -2,3 +2,4 @@
01_fix_png_load.diff
02_fix_sound.diff
03_daca_fixes.diff
+05-use-sys-tinyxml.diff
Modified: packages/trunk/antigrav/debian/rules
===================================================================
--- packages/trunk/antigrav/debian/rules 2014-09-02 14:20:19 UTC (rev 15176)
+++ packages/trunk/antigrav/debian/rules 2014-09-02 20:53:44 UTC (rev 15177)
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
./configure --prefix=/usr \
--bindir=\$${prefix}/games --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
More information about the Pkg-games-commits
mailing list