Bug#636003: libvigraimpex: FTBFS with libpng 1.5

2011-08-03 Thread Ralf Treinen 
On Sat, Jul 30, 2011 at 04:36:32PM +0900, Nobuhiro Iwamatsu wrote:
 Source: libvigraimpex
 Version: 1.7.1+dfsg1-1
 Severity: important
 Tags: patch
 User: lib...@packages.debian.org
 Usertags: libpng15-transition
 
 Hi,
 
 I uploaded libpng 1.5.2 to experimental.
 libpng maintainers plan to transition from libpng 1.2 to 1.5.
 I am checking build it the package depend to libpng.
 
 I noticed your package FTBFS by libpng 1.5.
 I created the patch that revise this problem.
 Could you check and apply this patch?

Konnichiwa,

I tried to compile with your patch but this makes the package
FTBFS with libpng12-dev, so I guess the patch has to wait until
libpng 1.5 enters unstable:

[ 61%] Building CXX object src/impex/CMakeFiles/vigraimpex.dir/png.cxx.o
cd 
/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/obj/src/impex
  /usr/bin/c++   -Dvigraimpex_EXPORTS -DHasJPEG -DHasPNG -DHasTIFF -DHasHDF5 
-W -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-unused-variable 
-Wno-ignored-qualifiers -Wno-type-limits -g -O2 -fPIC 
-I/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/include 
-I/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/obj/include
-o CMakeFiles/vigraimpex.dir/png.cxx.o -c 
/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/src/impex/png.cxx
/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/src/impex/png.cxx:
 In member function ‘void vigra::PngDecoderImpl::init()’:
/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/src/impex/png.cxx:326:89:
 error: invalid conversion from ‘png_byte** {aka unsigned char**}’ to 
‘png_charpp {aka char**}’ [-fpermissive]
/usr/include/png.h:2476:8: error:   initializing argument 5 of ‘png_uint_32 
png_get_iCCP(png_structp, png_infop, png_charpp, int*, png_charpp, 
png_uint_32*)’ [-fpermissive]
/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/src/impex/png.cxx:
 In member function ‘void vigra::PngEncoderImpl::finalize()’:
/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/src/impex/png.cxx:595:27:
 error: ‘png_const_bytep’ was not declared in this scope
make[4]: *** [src/impex/CMakeFiles/vigraimpex.dir/png.cxx.o] Error 1
make[4]: Leaving directory 
`/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/obj'
make[3]: *** [src/impex/CMakeFiles/vigraimpex.dir/all] Error 2
make[3]: Leaving directory 
`/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/obj'
make[2]: *** [all] Error 2
make[2]: Leaving directory 
`/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1/obj'
make[1]: *** [obj/build-stamp] Error 2
make[1]: Leaving directory 
`/home/rt/debian/packages/qa/libvigraimpex/libvigraimpex-1.7.1+dfsg1'
make: *** [build-arch] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2

-Ralf



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#636003: libvigraimpex: FTBFS with libpng 1.5

2011-08-03 Thread Joachim Schleicher 
Hi Ralf,
you could apply the upstream patch instead: 
https://github.com/ukoethe/vigra/commit/7f7b24
That uses #ifdef to build with both 1.2 and 1.5 png versions.

Best regards
Joachim
commit 7f7b24e78ff56d66239e4a34ca66a85bdd2f44fb
Author: Ullrich Koethe ullrich.koe...@iwr.uni-heidelberg.de
Date:   Fri Mar 11 14:55:42 2011 +0100

update for libpng 1.5 (fix by Mark Brand, mingw-cross-env)

diff --git a/src/impex/png.cxx b/src/impex/png.cxx
index e525fc6..5b7e84a 100644
--- a/src/impex/png.cxx
+++ b/src/impex/png.cxx
@@ -320,7 +320,11 @@ namespace vigra {
 #if (PNG_LIBPNG_VER  10008)  defined(PNG_READ_iCCP_SUPPORTED)
 char * dummyName;
 int dummyCompType;
+#if (PNG_LIBPNG_VER  10500)
 char * profilePtr;
+#else
+png_byte * profilePtr;
+#endif
 png_uint_32 profileLen;
 if (png_get_valid( png, info, PNG_INFO_iCCP )) {
 png_get_iCCP(png, info, dummyName, dummyCompType, profilePtr, profileLen) ;
@@ -593,7 +597,11 @@ namespace vigra {
 // set icc profile
 if (iccProfile.size()  0) {
 png_set_iCCP(png, info, (png_charp)(icc), 0,
+#if (PNG_LIBPNG_VER  10500)
  (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
+#else
+ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
+#endif
 }
 #endif

Bug#636003: libvigraimpex: FTBFS with libpng 1.5

2011-08-03 Thread Nobuhiro Iwamatsu 
Hi,

2011/8/3 Joachim Schleicher joachi...@gmx.de:
 Hi Ralf,
 you could apply the upstream patch instead: 
 https://github.com/ukoethe/vigra/commit/7f7b24
 That uses #ifdef to build with both 1.2 and 1.5 png versions.

Thank you, Joachim. Your patch seems to be good.
I attached new patch. This was checked building on sid and experimental.

Best regards,
  Nobuhiro
-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6


libvigraimpex_1.7.1+dfsg1-1.1.dpatch
Description: Binary data

Bug#636003: libvigraimpex: FTBFS with libpng 1.5

2011-07-30 Thread Nobuhiro Iwamatsu 
Source: libvigraimpex
Version: 1.7.1+dfsg1-1
Severity: important
Tags: patch
User: lib...@packages.debian.org
Usertags: libpng15-transition

Hi,

I uploaded libpng 1.5.2 to experimental.
libpng maintainers plan to transition from libpng 1.2 to 1.5.
I am checking build it the package depend to libpng.

I noticed your package FTBFS by libpng 1.5.
I created the patch that revise this problem.
Could you check and apply this patch?

Best regards,
  Nobuhiro

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash


-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6
--- libvigraimpex-1.7.1+dfsg.orig/src/impex/png.cxx	2010-12-04 02:40:34.0 +0900
+++ libvigraimpex-1.7.1+dfsg/src/impex/png.cxx	2011-06-08 10:16:17.0 +0900
@@ -320,7 +320,7 @@
 #if (PNG_LIBPNG_VER  10008)  defined(PNG_READ_iCCP_SUPPORTED)
 char * dummyName;
 int dummyCompType;
-char * profilePtr;
+png_bytep profilePtr;
 png_uint_32 profileLen;
 if (png_get_valid( png, info, PNG_INFO_iCCP )) {
 png_get_iCCP(png, info, dummyName, dummyCompType, profilePtr, profileLen) ;
@@ -592,7 +592,7 @@
 // set icc profile
 if (iccProfile.size()  0) {
 png_set_iCCP(png, info, (png_charp)(icc), 0,
- (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
+ (png_const_bytep)iccProfile.begin(), (png_uint_32)iccProfile.size());
 }
 #endif