[Lsb-messages] /var/www/bzr/lsb/devel/desktop-test r477: rework pngtest for libpng15 (need to re-tetify new upstream probably, but this is a start)

[Stew Benedict]

------------------------------------------------------------
revno: 477
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: desktop-test
timestamp: Tue 2013-02-05 10:40:06 -0500
message:
  rework pngtest for libpng15 (need to re-tetify new upstream probably, but this is a start)
modified:
  lsb-libpng/Makefile
  lsb-libpng/pngtest.c
  scripts/package/Makefile
-------------- next part --------------
=== modified file 'lsb-libpng/Makefile'
--- a/lsb-libpng/Makefile	2007-01-29 19:58:10 +0000
+++ b/lsb-libpng/Makefile	2013-02-05 15:40:06 +0000
@@ -3,8 +3,7 @@
 TETLIBS=$(LSBHOME)/tetj/libtetj.a
 
 CFLAGS  = -g -Wall -I$(LSBHOME)/tetj
-#LDFLAGS =  -lpng12 $(TETLIBS)
-LDFLAGS = -lpng12 $(TETLIBS)
+LDFLAGS = -lpng15 $(TETLIBS)
 TETFLAGS= -DLSB_TET_OUTPUT_ENABLED 
 
 TESTCASE = runtest

=== modified file 'lsb-libpng/pngtest.c'
--- a/lsb-libpng/pngtest.c	2007-12-10 16:10:13 +0000
+++ b/lsb-libpng/pngtest.c	2013-02-05 15:40:06 +0000
@@ -29,6 +29,8 @@
  */
 
 #include <png.h>
+#include <zlib.h>
+#define png_memcmp  memcmp
 
 #if defined(_WIN32_WCE)
 #  if _WIN32_WCE < 211
@@ -687,20 +689,20 @@
     png_debug(0, "Allocating read and write structures\n");
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
     read_ptr =
-	png_create_read_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-				 png_error_ptr_NULL, png_error_ptr_NULL,
-				 png_voidp_NULL,
+	png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,
+				 NULL, NULL,
+				 NULL,
 				 (png_malloc_ptr) png_debug_malloc,
 				 (png_free_ptr) png_debug_free);
 #else
 #ifdef LSB_TET_OUTPUT_ENABLED
     read_ptr =
 	png_create_read_struct(PNG_LIBPNG_VER_STRING, &test_jmpbuf_struct,
-			       test_png_error_handler, png_error_ptr_NULL);
+			       test_png_error_handler, NULL);
 #else
     read_ptr =
-	png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-			       png_error_ptr_NULL, png_error_ptr_NULL);
+	png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
+			       NULL, NULL);
 #endif
 #endif
 #if defined(PNG_NO_STDIO)
@@ -710,20 +712,20 @@
 #ifdef PNG_WRITE_SUPPORTED
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
     write_ptr =
-	png_create_write_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-				  png_error_ptr_NULL, png_error_ptr_NULL,
-				  png_voidp_NULL,
+	png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,
+				  NULL, NULL,
+				  NULL,
 				  (png_malloc_ptr) png_debug_malloc,
 				  (png_free_ptr) png_debug_free);
 #else
 #ifdef LSB_TET_OUTPUT_ENABLED
     write_ptr =
 	png_create_write_struct(PNG_LIBPNG_VER_STRING, &test_jmpbuf_struct,
-				test_png_error_handler, png_error_ptr_NULL);
+				test_png_error_handler, NULL);
 #else
     write_ptr =
-	png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-				png_error_ptr_NULL, png_error_ptr_NULL);
+	png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
+				NULL, NULL);
 #endif
 #endif
 #if defined(PNG_NO_STDIO)
@@ -960,7 +962,7 @@
 #if defined(PNG_iCCP_SUPPORTED)
     {
 	png_charp name;
-	png_charp profile;
+	png_bytep profile;
 	png_uint_32 proflen;
 	int compression_type;
 
@@ -1198,7 +1200,7 @@
 		       png_get_rowbytes(read_ptr, read_info_ptr));
 #endif				/* !SINGLE_ROWBUF_ALLOC */
 	    png_read_rows(read_ptr, (png_bytepp) & row_buf,
-			  png_bytepp_NULL, 1);
+			  NULL, 1);
 
 #ifdef PNG_WRITE_SUPPORTED
 #ifdef PNGTEST_TIMING

=== modified file 'scripts/package/Makefile'
--- a/scripts/package/Makefile	2013-01-29 16:21:23 +0000
+++ b/scripts/package/Makefile	2013-02-05 15:40:06 +0000
@@ -2,7 +2,7 @@
 # XXX a specfile from a .spec.in with this info, but not yet: 
 # XXX for now keep this in sync with the specfile
 PACKAGE=lsb-test-desktop
-VERSION=4.1.91
+VERSION=4.1.92
 RELEASE=1
 
 # for pkgck