svn commit: r375360 - in head/graphics/jbig2dec: . files

[Baptiste Daroussin]

Author: bapt
Date: Tue Dec 23 22:40:21 2014
New Revision: 375360
URL: https://svnweb.freebsd.org/changeset/ports/375360
QAT: https://qat.redports.org/buildarchive/r375360/

Log:
  Properly patch jbig2dec for png > 1.5 instead of exposing png internals

Added:
  head/graphics/jbig2dec/files/patch-libpng15   (contents, props changed)
Deleted:
  head/graphics/jbig2dec/files/patch-jbig2_image_png.c
Modified:
  head/graphics/jbig2dec/Makefile

Modified: head/graphics/jbig2dec/Makefile
==============================================================================
--- head/graphics/jbig2dec/Makefile	Tue Dec 23 21:57:51 2014	(r375359)
+++ head/graphics/jbig2dec/Makefile	Tue Dec 23 22:40:21 2014	(r375360)
@@ -2,7 +2,7 @@
 
 PORTNAME=	jbig2dec
 PORTVERSION=	0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -25,9 +25,8 @@ TESTS_DESC=	Download and use test-images
 
 EXTRACT_AFTER_ARGS+=	--exclude sha1.h --exclude 'getopt*'
 
-PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 PNG_CONFIGURE_ON=	--with-libpng=${LOCALBASE}
-PNG_CFLAGS=		-I${LOCALBASE}/include/libpng15
 
 .include <bsd.port.options.mk>
 

Added: head/graphics/jbig2dec/files/patch-libpng15
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/jbig2dec/files/patch-libpng15	Tue Dec 23 22:40:21 2014	(r375360)
@@ -0,0 +1,20 @@
+--- jbig2_image_png.c
++++ jbig2_image_png.c
+@@ -33,7 +33,7 @@
+ {
+     png_size_t check;
+ 
+-    check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
++    check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
+     if (check != length) {
+       png_error(png_ptr, "Write Error");
+     }
+@@ -43,7 +43,7 @@
+ jbig2_png_flush(png_structp png_ptr)
+ {
+     png_FILE_p io_ptr;
+-    io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
++    io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);
+     if (io_ptr != NULL)
+         fflush(io_ptr);
+ }