Control: fixed -1 2.1.0-git20160229+dfsg-2~exp1
Control: tags -1 pending
Hi all,
On 19/09/16 12:20, Adrian Bunk wrote:
> Control: tags 811612 +fixed-upstream
> Control: tags 811612 +patch
>
> On Wed, Jan 20, 2016 at 11:14:09PM +0100, Lennart Weller wrote:
>> On 20.01.2016 18:30, Martin Michlmayr wrote
>>> This builds fine.
>> Nice. So I either just have to add the patches for 2.0.8 or get 0ad to work
>> with 2.1.0. I'll look into that in the next few days as time permits.
>> ...
>
> This bug is the reason why 0ad is not in testing, and if it doesn't get
> fixed then 0ad will not be in the next Debian stable.
>
> I've attached the trivial fix.
Thanks for the patch Adrian.
I've uploaded the attached NMU which fixes this to DELAYED/5. Please
tell me if you want me to delay / cancel it. I've also pushed the fix to
the git repository on collab-maint.
The bug doesn't appear to affect the newer version in experimental.
Thanks,
James
diff -Nru nvidia-texture-tools-2.0.8-1+dfsg/debian/changelog nvidia-texture-tools-2.0.8-1+dfsg/debian/changelog
--- nvidia-texture-tools-2.0.8-1+dfsg/debian/changelog 2015-12-08 07:51:31.0 +
+++ nvidia-texture-tools-2.0.8-1+dfsg/debian/changelog 2016-09-19 12:41:04.0 +
@@ -1,3 +1,12 @@
+nvidia-texture-tools (2.0.8-1+dfsg-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Adrian Bunk ]
+ * Fix FTBFS with GCC 6. (Closes: #811612)
+
+ -- James Cowgill Mon, 19 Sep 2016 12:41:04 +
+
nvidia-texture-tools (2.0.8-1+dfsg-8) unstable; urgency=medium
* Removed symbols file
diff -Nru nvidia-texture-tools-2.0.8-1+dfsg/debian/patches/14-gcc6.patch nvidia-texture-tools-2.0.8-1+dfsg/debian/patches/14-gcc6.patch
--- nvidia-texture-tools-2.0.8-1+dfsg/debian/patches/14-gcc6.patch 1970-01-01 00:00:00.0 +
+++ nvidia-texture-tools-2.0.8-1+dfsg/debian/patches/14-gcc6.patch 2016-09-19 12:32:14.0 +
@@ -0,0 +1,60 @@
+Description: Fix building with gcc 6
+Author: Adrian Bunk
+Bug-Debian: https://bugs.debian.org/811612
+Reviewed-By: James Cowgill
+
+--- nvidia-texture-tools-2.0.8-1+dfsg.orig/src/nvimage/ImageIO.cpp
nvidia-texture-tools-2.0.8-1+dfsg/src/nvimage/ImageIO.cpp
+@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(cons
+ StdInputStream stream(fileName);
+
+ if (stream.isError()) {
+- return false;
++ return NULL;
+ }
+
+ return loadFloat(fileName, stream);
+@@ -233,7 +233,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
+ case TGA_TYPE_INDEXED:
+ if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
+ nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
+-return false;
++return NULL;
+ }
+ pal = true;
+ break;
+@@ -254,7 +254,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
+
+ default:
+ nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
+- return false;
++ return NULL;
+ }
+
+ const uint pixel_size = (tga.pixel_size/8);
+@@ -621,7 +621,7 @@ Image * nv::ImageIO::loadPNG(Stream & s)
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ if (png_ptr == NULL) {
+ // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
+- return false;
++ return NULL;
+ }
+
+ // Allocate/initialize a memory block for the image information
+@@ -629,14 +629,14 @@ Image * nv::ImageIO::loadPNG(Stream & s)
+ if (info_ptr == NULL) {
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
+- return false;
++ return NULL;
+ }
+
+ // Set up the error handling
+ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
+- return false;
++ return NULL;
+ }
+
+ // Set up the I/O functions.
diff -Nru nvidia-texture-tools-2.0.8-1+dfsg/debian/patches/series nvidia-texture-tools-2.0.8-1+dfsg/debian/patches/series
--- nvidia-texture-tools-2.0.8-1+dfsg/debian/patches/series 2015-12-08 07:51:31.0 +
+++ nvidia-texture-tools-2.0.8-1+dfsg/debian/patches/series 2016-09-19 12:30:02.0 +
@@ -11,3 +11,4 @@
11-arm64-support.patch
12-fix-simd-warning.patch
13-typos.patch
+14-gcc6.patch
signature.asc
Description: OpenPGP digital signature
