svn commit: r375456 - in head/graphics/rawstudio: . files

[Baptiste Daroussin]

Author: bapt
Date: Wed Dec 24 13:23:32 2014
New Revision: 375456
URL: https://svnweb.freebsd.org/changeset/ports/375456
QAT: https://qat.redports.org/buildarchive/r375456/

Log:
  Properly support png 1.5
  
  Obtained from:	Gentoo

Added:
  head/graphics/rawstudio/files/patch-libpng15   (contents, props changed)
Deleted:
  head/graphics/rawstudio/files/patch-exiv2-colorspace.cpp
  head/graphics/rawstudio/files/patch-output-pngfile.c
Modified:
  head/graphics/rawstudio/Makefile

Modified: head/graphics/rawstudio/Makefile
==============================================================================
--- head/graphics/rawstudio/Makefile	Wed Dec 24 13:12:15 2014	(r375455)
+++ head/graphics/rawstudio/Makefile	Wed Dec 24 13:23:32 2014	(r375456)
@@ -13,7 +13,7 @@ COMMENT=	Open-source program to read and
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng15.so:${PORTSDIR}/graphics/png \
+		libpng.so:${PORTSDIR}/graphics/png \
 		liblcms.so:${PORTSDIR}/graphics/lcms \
 		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
@@ -28,6 +28,7 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 libxml2 gconf2
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Added: head/graphics/rawstudio/files/patch-libpng15
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/rawstudio/files/patch-libpng15	Wed Dec 24 13:23:32 2014	(r375456)
@@ -0,0 +1,35 @@
+--- plugins/output-pngfile/output-pngfile.c
++++ plugins/output-pngfile/output-pngfile.c
+@@ -23,6 +23,7 @@
+ #include <gettext.h>
+ #include "config.h"
+ #include <png.h>
++#include <zlib.h>
+ 
+ #define RS_TYPE_PNGFILE (rs_pngfile_type)
+ #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
+@@ -198,7 +199,7 @@
+ 		rs_icc_profile_get_data(profile, &data, &data_length);
+ 
+ 		// FIXME: Insert correct profile name
+-		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length);
++		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, (png_const_bytep)data, data_length);
+ 		if (pngfile->save16bit)
+ 			png_set_gAMA(png_ptr, info_ptr, 1.0);
+ 	}
+--- plugins/load-gdk/exiv2-colorspace.cpp
++++ plugins/load-gdk/exiv2-colorspace.cpp
+@@ -125,11 +125,11 @@
+ 
+ 					int compression_type;
+ 					/* Extract embedded ICC profile */
+-					if (info_ptr->valid & PNG_INFO_iCCP)
++					if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP)
+ 					{
+ 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
+ 													(png_charpp) &icc_profile_title, &compression_type,
+-													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
++													(png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size);
+ 						if (retval != 0)
+ 						{
+ 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);