r15750 - in packages/trunk/antigrav/debian: . patches

Markus Koschany apo at moszumanska.debian.org
Wed Apr 13 07:43:13 UTC 2016 

Author: apo
Date: 2016-04-13 07:43:12 +0000 (Wed, 13 Apr 2016)
New Revision: 15750

Added:
   packages/trunk/antigrav/debian/install
   packages/trunk/antigrav/debian/patches/06-libpng16.patch
   packages/trunk/antigrav/debian/patches/format-not-a-string-literal.patch
Removed:
   packages/trunk/antigrav/debian/dirs
Modified:
   packages/trunk/antigrav/debian/antigravitaattori.desktop
   packages/trunk/antigrav/debian/changelog
   packages/trunk/antigrav/debian/compat
   packages/trunk/antigrav/debian/control
   packages/trunk/antigrav/debian/copyright
   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/05-use-sys-tinyxml.diff
   packages/trunk/antigrav/debian/patches/series
   packages/trunk/antigrav/debian/rules
   packages/trunk/antigrav/debian/watch
Log:
Release 0.0.3-7


Modified: packages/trunk/antigrav/debian/antigravitaattori.desktop
===================================================================
--- packages/trunk/antigrav/debian/antigravitaattori.desktop	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/antigravitaattori.desktop	2016-04-13 07:43:12 UTC (rev 15750)
@@ -2,6 +2,9 @@
 Type=Application
 Name=Antigravitaattori
 Exec=antigrav
+Icon=antigrav
 Terminal=false
 Categories=Game;ArcadeGame;
+Keywords=racing;flying;saucer;
 Comment=Multiplayer flying saucer racing game
+Comment[de]=Mehrspieler-Rennspiel mit fliegenden Untertassen

Modified: packages/trunk/antigrav/debian/changelog
===================================================================
--- packages/trunk/antigrav/debian/changelog	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/changelog	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1,3 +1,31 @@
+antigrav (0.0.3-7) unstable; urgency=medium
+
+  * Team upload.
+  * wrap-and-sort -sa.
+  * Use compat level 9 and require debhelper >= 9.
+  * Vcs-Browser: Use https.
+  * Declare compliance with Debian Policy 3.9.8.
+  * Change Homepage field to https://tracker.debian.org/pkg/antigrav
+    because the original homepage is gone.
+  * antigravitaattori.desktop: Add keywords and a comment in German.
+  * debian/watch: Stop watching upstream's website. It is gone.
+  * Drop dirs file. Not needed.
+  * Add install file and install antigrav.png and desktop file.
+    (Closes: #726206)
+  * Add DEP-3 header to all patches.
+  * Add format-not-a-string-literal.patch and fix FTBFS due to
+    -Werror=format-security flag.
+  * Override dh_clean and ensure that antigrav can be built twice in a row.
+
+ -- Markus Koschany <apo at debian.org>  Wed, 13 Apr 2016 09:16:04 +0200
+
+antigrav (0.0.3-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix for libpng16 (Closes: #741901)
+
+ -- Tobias Frost <tobi at debian.org>  Tue, 19 Jan 2016 08:01:54 +0100
+
 antigrav (0.0.3-6) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: packages/trunk/antigrav/debian/compat
===================================================================
--- packages/trunk/antigrav/debian/compat	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/compat	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/antigrav/debian/control
===================================================================
--- packages/trunk/antigrav/debian/control	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/control	2016-04-13 07:43:12 UTC (rev 15750)
@@ -2,17 +2,29 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bddebian at comcast.net>, 
+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, dh-autoreconf, libtinyxml-dev
-Standards-Version: 3.9.5
-Homepage: http://www.luolamies.org/software/antigrav/
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ dh-autoreconf,
+ libalut-dev,
+ libopenal-dev,
+ libpng-dev,
+ libsdl1.2-dev,
+ libtinyxml-dev,
+ zlib1g-dev
+Standards-Version: 3.9.8
+Homepage: https://tracker.debian.org/pkg/antigrav
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/antigrav/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/antigrav/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/antigrav/
 
 Package: antigravitaattori
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Multiplayer flying saucer racing game
  This is a multiplayer flying saucer racing game, made for
  Assembly 2006 game competition. It is a great and fun game

Modified: packages/trunk/antigrav/debian/copyright
===================================================================
--- packages/trunk/antigrav/debian/copyright	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/copyright	2016-04-13 07:43:12 UTC (rev 15750)
@@ -9,7 +9,7 @@
 Upstream Authors: Riku Salminen <RichardoX at gmail.com>,
                   Calle Laakkonen <calle at luolamies.org>
 
-License (Everything except src/tinyxml/*): 
+License (Everything except src/tinyxml/*):
 
    Copyright (C) 2006 Riku Salminen
    Copyright (C) 2006 Calle Laakkonen
@@ -30,7 +30,7 @@
 Released under the GNU GPL.
 Please see /usr/share/common-licenses/GPL-2 for the full license.
 
-License (src/tinyxml/*): 
+License (src/tinyxml/*):
 
    Copyright (C) 2000-2002 Lee Thomason
 

Deleted: packages/trunk/antigrav/debian/dirs
===================================================================
--- packages/trunk/antigrav/debian/dirs	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/dirs	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1,2 +0,0 @@
-usr/games
-usr/share/applications

Added: packages/trunk/antigrav/debian/install
===================================================================
--- packages/trunk/antigrav/debian/install	                        (rev 0)
+++ packages/trunk/antigrav/debian/install	2016-04-13 07:43:12 UTC (rev 15750)
@@ -0,0 +1,2 @@
+debian/antigravitaattori.desktop    usr/share/applications
+debian/antigrav.png                 usr/share/icons/hicolor/256x256/apps

Modified: packages/trunk/antigrav/debian/patches/01_fix_png_load.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/01_fix_png_load.diff	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/patches/01_fix_png_load.diff	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1,8 +1,18 @@
-Index: antigrav-0.0.3/src/m3dtexture.cpp
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 09:18:11 +0200
+Subject: _fix_png_load
+
 ===================================================================
---- antigrav-0.0.3.orig/src/m3dtexture.cpp
-+++ antigrav-0.0.3/src/m3dtexture.cpp
-@@ -104,6 +104,7 @@ int m3dTexture::loadFromXML(const TiXmlE
+---
+ src/m3dtexture.cpp | 17 ++++++++++-------
+ src/m3dtexture.h   | 10 +++++-----
+ 2 files changed, 15 insertions(+), 12 deletions(-)
+
+diff --git a/src/m3dtexture.cpp b/src/m3dtexture.cpp
+index e24482e..55a5a12 100644
+--- a/src/m3dtexture.cpp
++++ b/src/m3dtexture.cpp
+@@ -104,6 +104,7 @@ int m3dTexture::loadFromXML(const TiXmlElement *root)
  		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());
@@ -10,7 +20,7 @@
  			return -1;
  		}
  		
-@@ -148,6 +149,7 @@ int m3dTexture::load(int num, const char
+@@ -148,6 +149,7 @@ int m3dTexture::load(int num, const char *filenames[])
  		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());
@@ -18,7 +28,7 @@
  			return -1;
  		}
  		
-@@ -204,7 +206,7 @@ void m3dTexture::pngReadCallbackSTDIO(pn
+@@ -204,7 +206,7 @@ void m3dTexture::pngReadCallbackSTDIO(png_structp pngPtr, png_bytep data, png_si
  	@param height a pointer where to store the image width
  	@return 0 on success, -1 on failure
  */
@@ -27,7 +37,7 @@
  {
  	FILE *f;
  	int result;
-@@ -221,7 +223,7 @@ int m3dTexture::loadPNG(const char *file
+@@ -221,7 +223,7 @@ int m3dTexture::loadPNG(const char *filename, unsigned char **data, unsigned int
  	return result;
  }
  
@@ -36,7 +46,7 @@
  {
  	png_structp pngPtr;
  	png_infop pngInfoPtr;
-@@ -258,7 +260,7 @@ int m3dTexture::loadPNG(unsigned char **
+@@ -258,7 +260,7 @@ int m3dTexture::loadPNG(unsigned char **data, unsigned int *width, unsigned int
  	png_set_read_fn(pngPtr, handle, pngReadCallback);
  
  	png_read_info(pngPtr, pngInfoPtr);
@@ -45,7 +55,7 @@
  
  	png_set_strip_16(pngPtr);
  
-@@ -279,7 +281,7 @@ int m3dTexture::loadPNG(unsigned char **
+@@ -279,7 +281,7 @@ int m3dTexture::loadPNG(unsigned char **data, unsigned int *width, unsigned int
  	}
  	
  	png_read_update_info(pngPtr, pngInfoPtr);
@@ -54,7 +64,7 @@
  	
  	(*data) = new unsigned char[(*width) * (*height) * pngInfoPtr->channels];
  	if((*data) == NULL)
-@@ -312,7 +314,7 @@ int m3dTexture::loadPNG(unsigned char **
+@@ -312,7 +314,7 @@ int m3dTexture::loadPNG(unsigned char **data, unsigned int *width, unsigned int
  	return 0;
  }
  
@@ -63,7 +73,7 @@
  {
  	FILE *f;
  	int result;
-@@ -345,7 +347,7 @@ void m3dTexture::pngFlushCallbackSTDIO(p
+@@ -345,7 +347,7 @@ void m3dTexture::pngFlushCallbackSTDIO(png_structp pngPtr)
  	fflush(f);
  }
  
@@ -72,7 +82,7 @@
  {
  	png_structp pngPtr;
  	png_infop pngInfoPtr;
-@@ -435,7 +437,7 @@ int m3dTexture::screenshot(const char *f
+@@ -435,7 +437,7 @@ int m3dTexture::screenshot(const char *filename)
  GLuint m3dTexture::loadTexture(const char *filename)
  {
  	unsigned char *data;
@@ -81,7 +91,7 @@
  	GLuint tex;
  	
  	glGenTextures(1, &tex);
-@@ -443,6 +445,7 @@ GLuint m3dTexture::loadTexture(const cha
+@@ -443,6 +445,7 @@ GLuint m3dTexture::loadTexture(const char *filename)
  	if(m3dTexture::loadPNG(filename, &data, &width, &height) != 0)
  	{
  		fprintf(stderr, "Can't load texture %s\n", filename);
@@ -89,10 +99,10 @@
  		return 0;
  	}
  		
-Index: antigrav-0.0.3/src/m3dtexture.h
-===================================================================
---- antigrav-0.0.3.orig/src/m3dtexture.h
-+++ antigrav-0.0.3/src/m3dtexture.h
+diff --git a/src/m3dtexture.h b/src/m3dtexture.h
+index 361917e..7db8184 100644
+--- a/src/m3dtexture.h
++++ b/src/m3dtexture.h
 @@ -9,7 +9,7 @@ struct TextureUnit
  {
  	std::string filename;

Modified: packages/trunk/antigrav/debian/patches/02_fix_sound.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/02_fix_sound.diff	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/patches/02_fix_sound.diff	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1,8 +1,17 @@
-Index: antigrav-0.0.3/src/main.cpp
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 09:18:11 +0200
+Subject: _fix_sound
+
 ===================================================================
---- antigrav-0.0.3.orig/src/main.cpp
-+++ antigrav-0.0.3/src/main.cpp
-@@ -22,6 +22,7 @@ MFNGLMULTITEXCOORD2FVPROC mglMultiTexCoo
+---
+ src/main.cpp | 41 ++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 34 insertions(+), 7 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index d11098c..4126f23 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -22,6 +22,7 @@ MFNGLMULTITEXCOORD2FVPROC mglMultiTexCoord2fv = NULL;
  MFNGLACTIVETEXTUREARBPROC mglActiveTextureARB = NULL;
  #endif
  
@@ -32,7 +41,7 @@
  ALuint loadWavBuffer(const char *filename)
  {
  	ALuint buffer;
-@@ -199,20 +206,40 @@ ALuint loadWavBuffer(const char *filenam
+@@ -199,20 +206,40 @@ ALuint loadWavBuffer(const char *filename)
  	
  	if(wav_spec.channels == 1)
  	{

Modified: packages/trunk/antigrav/debian/patches/03_daca_fixes.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/03_daca_fixes.diff	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/patches/03_daca_fixes.diff	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1,8 +1,18 @@
-Index: antigrav-0.0.3/src/m3dtexture.cpp
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 09:18:11 +0200
+Subject: _daca_fixes
+
 ===================================================================
---- 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
+---
+ src/m3dtexture.cpp      | 6 +++---
+ src/tinyxml/tinyxml.cpp | 1 +
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/m3dtexture.cpp b/src/m3dtexture.cpp
+index 55a5a12..5fec308 100644
+--- a/src/m3dtexture.cpp
++++ b/src/m3dtexture.cpp
+@@ -384,7 +384,7 @@ int m3dTexture::savePNG(const unsigned char *data, png_uint_32 width, png_uint_3
  
  	png_write_image(pngPtr, rowPointers);
  	png_write_end(pngPtr, pngInfoPtr);
@@ -11,7 +21,7 @@
  	png_destroy_write_struct(&pngPtr, &pngInfoPtr);
  	return 0;
  }
-@@ -425,11 +425,11 @@ int m3dTexture::screenshot(const char *f
+@@ -425,11 +425,11 @@ int m3dTexture::screenshot(const char *filename)
  	
  	if(savePNG(filename, data, width, height) != 0)
  	{
@@ -25,11 +35,11 @@
  	return 0;
  }
  
-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
+diff --git a/src/tinyxml/tinyxml.cpp b/src/tinyxml/tinyxml.cpp
+index 6a83291..91f73b3 100644
+--- a/src/tinyxml/tinyxml.cpp
++++ b/src/tinyxml/tinyxml.cpp
+@@ -1085,6 +1085,7 @@ bool TiXmlDocument::LoadFile( FILE* file, TiXmlEncoding encoding )
  
  	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	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/patches/04-height-selection.diff	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1,8 +1,17 @@
-Index: antigrav-0.0.3/src/main.cpp
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 09:18:11 +0200
+Subject: height-selection
+
 ===================================================================
---- antigrav-0.0.3.orig/src/main.cpp
-+++ antigrav-0.0.3/src/main.cpp
-@@ -25,13 +25,16 @@ MFNGLACTIVETEXTUREARBPROC mglActiveTextu
+---
+ src/main.cpp | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 003159a..d11098c 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -25,13 +25,16 @@ MFNGLACTIVETEXTUREARBPROC mglActiveTextureARB = NULL;
  bool opt_fullscreen = true;
  bool opt_fsaa = false;
  int opt_width = 1024;

Modified: packages/trunk/antigrav/debian/patches/05-use-sys-tinyxml.diff
===================================================================
--- packages/trunk/antigrav/debian/patches/05-use-sys-tinyxml.diff	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/patches/05-use-sys-tinyxml.diff	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1,7 +1,16 @@
-Index: antigrav-0.0.3/src/Makefile.am
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 09:18:11 +0200
+Subject: use-sys-tinyxml
+
 ===================================================================
---- antigrav-0.0.3.orig/src/Makefile.am
-+++ antigrav-0.0.3/src/Makefile.am
+---
+ src/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6ba0c0a..009787e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,8 +1,8 @@
  bin_PROGRAMS = antigrav
  

Added: packages/trunk/antigrav/debian/patches/06-libpng16.patch
===================================================================
--- packages/trunk/antigrav/debian/patches/06-libpng16.patch	                        (rev 0)
+++ packages/trunk/antigrav/debian/patches/06-libpng16.patch	2016-04-13 07:43:12 UTC (rev 15750)
@@ -0,0 +1,93 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 13 Apr 2016 09:18:12 +0200
+Subject: libpng16
+
+---
+ src/m3dtexture.cpp | 40 ++++++++++++++++++++++------------------
+ 1 file changed, 22 insertions(+), 18 deletions(-)
+
+diff --git a/src/m3dtexture.cpp b/src/m3dtexture.cpp
+index 5fec308..dcd49ea 100644
+--- a/src/m3dtexture.cpp
++++ b/src/m3dtexture.cpp
+@@ -249,7 +249,7 @@ int m3dTexture::loadPNG(unsigned char **data, png_uint_32 *width, png_uint_32 *h
+ 		return -1;
+ 	}
+ 
+-	if(setjmp(pngPtr->jmpbuf))
++	if(setjmp(png_jmpbuf(pngPtr)))
+ 	{
+ 		perror("setjmp");
+ 		png_destroy_read_struct(&pngPtr, &pngInfoPtr, NULL);
+@@ -274,7 +274,7 @@ int m3dTexture::loadPNG(unsigned char **data, png_uint_32 *width, png_uint_32 *h
+ 		ckey = 0;
+ 	}
+ 	
+-	if(colorType != PNG_COLOR_TYPE_RGB_ALPHA || bitDepth != 8 || pngInfoPtr->channels != 4)
++	if(colorType != PNG_COLOR_TYPE_RGB_ALPHA || bitDepth != 8 || png_get_channels(pngPtr, pngInfoPtr) != 4)
+ 	{
+ 		fprintf(stderr, "Only 32-bit RGBA png images are supported\n");
+ 		return -1;
+@@ -283,7 +283,7 @@ int m3dTexture::loadPNG(unsigned char **data, png_uint_32 *width, png_uint_32 *h
+ 	png_read_update_info(pngPtr, pngInfoPtr);
+ 	png_get_IHDR(pngPtr, pngInfoPtr, width, height, &bitDepth, &colorType, &interlaceType, NULL, NULL);
+ 	
+-	(*data) = new unsigned char[(*width) * (*height) * pngInfoPtr->channels];
++	(*data) = new unsigned char[(*width) * (*height) * png_get_channels(pngPtr, pngInfoPtr)];
+ 	if((*data) == NULL)
+ 	{
+ 		fprintf(stderr, "loadPng(): Out of memory !\n");
+@@ -304,7 +304,7 @@ int m3dTexture::loadPNG(unsigned char **data, png_uint_32 *width, png_uint_32 *h
+ 
+ 	for(row = 0; (unsigned int) row < (*height); row++)
+ 	{
+-		rowPointers[row] = (png_bytep)*data + (row * (*width) * pngInfoPtr->channels);
++		rowPointers[row] = (png_bytep)*data + (row * (*width) * png_get_channels(pngPtr, pngInfoPtr));
+ 	}
+ 	png_read_image(pngPtr, rowPointers);
+ 	png_read_end(pngPtr, pngInfoPtr);
+@@ -358,26 +358,30 @@ int m3dTexture::savePNG(const unsigned char *data, png_uint_32 width, png_uint_3
+ 	pngInfoPtr = png_create_info_struct(pngPtr);
+ 	png_set_write_fn(pngPtr, handle, pngWriteCallback, pngFlushCallback);
+ 
+-	pngInfoPtr->width = width;
+-	pngInfoPtr->height = height;
+-	pngInfoPtr->rowbytes = width * 4;
+-	pngInfoPtr->bit_depth = 8;
+-	pngInfoPtr->interlace_type = 0;
+-	pngInfoPtr->num_palette = 0;
+-	pngInfoPtr->valid = 0;
++	// pngInfoPtr->width = width;
++	// pngInfoPtr->height = height;
++	// likely done by the lib now pngInfoPtr->rowbytes = width * 4;
++	// pngInfoPtr->bit_depth = 8;
++	// pngInfoPtr->interlace_type = 0;
++	// pngInfoPtr->num_palette = 0;
++	// pngInfoPtr->valid = 0;
+ 
+-	pngInfoPtr->sig_bit.red = 8;
+-	pngInfoPtr->sig_bit.green = 8;
+-	pngInfoPtr->sig_bit.blue = 8;
+-	pngInfoPtr->sig_bit.alpha = 8;
++	png_set_IHDR(pngPtr, pngInfoPtr, width, height, 8,
++	    PNG_COLOR_TYPE_RGB_ALPHA, 0, PNG_COMPRESSION_TYPE_DEFAULT,
++	    PNG_FILTER_TYPE_DEFAULT);
+ 
+-	pngInfoPtr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	// pngInfoPtr->sig_bit.red = 8;
++	// pngInfoPtr->sig_bit.green = 8;
++	// pngInfoPtr->sig_bit.blue = 8;
++	// pngInfoPtr->sig_bit.alpha = 8;
++
++	// pngInfoPtr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+ 
+ 	png_write_info(pngPtr, pngInfoPtr);
+ 
+-	rowPointers = new png_bytep[pngInfoPtr->height];
++	rowPointers = new png_bytep[png_get_image_height(pngPtr, pngInfoPtr)];
+ 
+-	for(i = 0; (unsigned int) i < pngInfoPtr->height; i++)
++	for(i = 0; (unsigned int) i < png_get_image_height(pngPtr, pngInfoPtr); i++)
+ 	{
+ 		rowPointers[i] = (unsigned char*)data + i * width * 4;
+ 	}

Added: packages/trunk/antigrav/debian/patches/format-not-a-string-literal.patch
===================================================================
--- packages/trunk/antigrav/debian/patches/format-not-a-string-literal.patch	                        (rev 0)
+++ packages/trunk/antigrav/debian/patches/format-not-a-string-literal.patch	2016-04-13 07:43:12 UTC (rev 15750)
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 13 Apr 2016 09:19:35 +0200
+Subject: format not a string literal
+
+Fix FTBFS due to -Werror=format-security flag.
+
+Forwarded: no
+---
+ src/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 4126f23..f1b85f0 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -59,7 +59,7 @@ int parse_args(int argc, char *argv[])
+ 		switch(c)
+ 		{
+ 			case 'h':
+-				printf(help_msg);
++				printf("%s",help_msg);
+ 				return 1;
+ 				break;
+ 			case 'f':

Modified: packages/trunk/antigrav/debian/patches/series
===================================================================
--- packages/trunk/antigrav/debian/patches/series	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/patches/series	2016-04-13 07:43:12 UTC (rev 15750)
@@ -3,3 +3,5 @@
 02_fix_sound.diff
 03_daca_fixes.diff
 05-use-sys-tinyxml.diff
+06-libpng16.patch
+format-not-a-string-literal.patch

Modified: packages/trunk/antigrav/debian/rules
===================================================================
--- packages/trunk/antigrav/debian/rules	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/rules	2016-04-13 07:43:12 UTC (rev 15750)
@@ -2,8 +2,18 @@
 %:
 	dh $@ --with autoreconf
 
- override_dh_auto_configure:
+override_dh_auto_configure:
 	./configure --prefix=/usr \
-	--bindir=\$${prefix}/games --mandir=\$${prefix}/share/man \
+	--bindir=\$${prefix}/games \
+	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
+
+override_dh_install:
+	cp data/planet.png debian/antigrav.png
+	dh_install
+
+override_dh_clean:
+	dh_clean
+	$(RM) debian/antigrav.png
+	$(RM) src/tinyxml/Makefile

Modified: packages/trunk/antigrav/debian/watch
===================================================================
--- packages/trunk/antigrav/debian/watch	2016-04-13 06:42:45 UTC (rev 15749)
+++ packages/trunk/antigrav/debian/watch	2016-04-13 07:43:12 UTC (rev 15750)
@@ -1,3 +1 @@
-version=3
-
-http://www.luolamies.org/software/antigrav/antigrav-([\d.]+)\.tar\.gz
+# Upstream's website is gone

More information about the Pkg-games-commits mailing list