svn commit: r375534 - in head/x11-toolkits/nucleo: . files

[Baptiste Daroussin]

Author: bapt
Date: Thu Dec 25 11:16:14 2014
New Revision: 375534
URL: https://svnweb.freebsd.org/changeset/ports/375534
QAT: https://qat.redports.org/buildarchive/r375534/

Log:
  Properly support png 1.5

Modified:
  head/x11-toolkits/nucleo/Makefile
  head/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx

Modified: head/x11-toolkits/nucleo/Makefile
==============================================================================
--- head/x11-toolkits/nucleo/Makefile	Thu Dec 25 11:14:07 2014	(r375533)
+++ head/x11-toolkits/nucleo/Makefile	Thu Dec 25 11:16:14 2014	(r375534)
@@ -14,7 +14,7 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libexif.so:${PORTSDIR}/graphics/libexif \
-		libpng15.so:${PORTSDIR}/graphics/png \
+		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
 USES=		gmake libtool pathfix pkgconfig shebangfix tar:bzip2

Modified: head/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx
==============================================================================
--- head/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx	Thu Dec 25 11:14:07 2014	(r375533)
+++ head/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx	Thu Dec 25 11:16:14 2014	(r375534)
@@ -1,14 +1,24 @@
---- nucleo/image/encoding/PNGenc.cxx.orig	2008-06-05 14:52:33.000000000 +0200
-+++ nucleo/image/encoding/PNGenc.cxx	2012-05-05 08:40:18.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <nucleo/image/encoding/PNGenc.H>
+--- nucleo/image/encoding/PNGenc.cxx.orig	2008-06-05 12:52:33 UTC
++++ nucleo/image/encoding/PNGenc.cxx
+@@ -35,7 +35,7 @@ namespace nucleo {
+   static void
+   png_memory_write_data(png_structp png_ptr,
+ 				    png_bytep data, png_size_t length) {
+-    png_in_memory *pim = (png_in_memory*)png_ptr->io_ptr ;
++    png_in_memory *pim = (png_in_memory*)png_get_io_ptr(png_ptr);
+     
+     void *pdst = pim->data+pim->p ;
+     // std::cerr << "PNG: writing " << length << " bytes from " << (void *)data << " to " << pdst << std::endl ;
+@@ -130,7 +130,7 @@ namespace nucleo {
  
- #include <png.h>
-+#include <pngpriv.h>
- 
- namespace nucleo {
- 
-@@ -170,7 +171,7 @@
+   static void
+   png_memory_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
+-    png_in_memory *pim = (png_in_memory*)png_ptr->io_ptr ;
++    png_in_memory *pim = (png_in_memory*)png_get_io_ptr(png_ptr);
+     memmove(data, pim->data+pim->p, length) ;
+     pim->p+=length ;
+   }
+@@ -170,7 +170,7 @@ namespace nucleo {
  			  &compression_type, &filter_type) ;
  
      if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)