diff -u unicap-0.9.5/debian/control unicap-0.9.5/debian/control --- unicap-0.9.5/debian/control +++ unicap-0.9.5/debian/control @@ -20,7 +20,7 @@ libtheora-dev, libvorbis-dev, libasound2-dev, - libpng12-dev, + libpng-dev (>=1.5), libxv-dev, libv4l-dev, libraw1394-dev (>= 1.1.0), diff -u unicap-0.9.5/debian/changelog unicap-0.9.5/debian/changelog --- unicap-0.9.5/debian/changelog +++ unicap-0.9.5/debian/changelog @@ -1,3 +1,10 @@ +unicap (0.9.5-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with libpng 1.5. + + -- Nobuhiro Iwamatsu Fri, 25 Nov 2011 01:16:54 +0900 + unicap (0.9.5-1.1) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- unicap-0.9.5.orig/libucil/ucil_png.c +++ unicap-0.9.5/libucil/ucil_png.c @@ -77,7 +77,7 @@ if (info_ptr == NULL) { fclose(fp); - png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); + png_destroy_read_struct(&png_ptr, NULL, NULL); return( -1 ); } @@ -89,7 +89,7 @@ if (setjmp(png_jmpbuf(png_ptr))) { /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); fclose(fp); /* If we get here, we had a problem reading the file */ return( -1 ); @@ -109,7 +109,7 @@ * adjustment), then you can read the entire image (including * pixels) into the info structure with this call: */ - png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL); + png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); /* At this point you have read the entire image */ @@ -174,7 +174,7 @@ } /* clean up after the read, and free any memory allocated - REQUIRED */ - png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); /* close the file */ fclose(fp); @@ -230,7 +230,7 @@ /* if (info_ptr == NULL) */ /* { */ /* fclose(fp); */ -/* png_destroy_write_struct(&png_ptr, png_infopp_NULL); */ +/* png_destroy_write_struct(&png_ptr, NULL); */ /* return( -1 ); */ /* } */ @@ -252,7 +252,7 @@ /* * image info living info in the structure. You could "|" many */ /* * PNG_TRANSFORM flags into the png_transforms integer here. */ /* *\/ */ -/* png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL ); */ +/* png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL ); */ /* /\* If you png_malloced a palette, free it here (don't free info_ptr->palette, */ /* as recommended in versions 1.0.5m and earlier of this example; if */