[Midnightbsd-cvs] mports [18068] trunk/graphics/jbig2dec: jbig2dec - fix build with new png

[laffer1 at midnightbsd.org]

Revision: 18068
          http://svnweb.midnightbsd.org/mports/?rev=18068
Author:   laffer1
Date:     2015-03-07 16:25:52 -0500 (Sat, 07 Mar 2015)
Log Message:
-----------
jbig2dec - fix build with new png

Modified Paths:
--------------
    trunk/graphics/jbig2dec/Makefile
    trunk/graphics/jbig2dec/pkg-plist

Added Paths:
-----------
    trunk/graphics/jbig2dec/files/patch-libpng15

Removed Paths:
-------------
    trunk/graphics/jbig2dec/files/patch-jbig2_image_png.c

Modified: trunk/graphics/jbig2dec/Makefile
===================================================================
--- trunk/graphics/jbig2dec/Makefile	2015-03-07 21:24:22 UTC (rev 18067)
+++ trunk/graphics/jbig2dec/Makefile	2015-03-07 21:25:52 UTC (rev 18068)
@@ -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 @@
 
 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.mport.options.mk>
 

Deleted: trunk/graphics/jbig2dec/files/patch-jbig2_image_png.c
===================================================================
--- trunk/graphics/jbig2dec/files/patch-jbig2_image_png.c	2015-03-07 21:24:22 UTC (rev 18067)
+++ trunk/graphics/jbig2dec/files/patch-jbig2_image_png.c	2015-03-07 21:25:52 UTC (rev 18068)
@@ -1,10 +0,0 @@
---- jbig2_image_png.c.orig	2009-07-16 06:44:49.000000000 +0200
-+++ jbig2_image_png.c	2012-04-24 21:54:55.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <png.h>
-+#include <pngpriv.h>
- 
- #include "jbig2.h"
- #include "jbig2_priv.h"

Added: trunk/graphics/jbig2dec/files/patch-libpng15
===================================================================
--- trunk/graphics/jbig2dec/files/patch-libpng15	                        (rev 0)
+++ trunk/graphics/jbig2dec/files/patch-libpng15	2015-03-07 21:25:52 UTC (rev 18068)
@@ -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);
+ }


Property changes on: trunk/graphics/jbig2dec/files/patch-libpng15
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/jbig2dec/pkg-plist
===================================================================
--- trunk/graphics/jbig2dec/pkg-plist	2015-03-07 21:24:22 UTC (rev 18067)
+++ trunk/graphics/jbig2dec/pkg-plist	2015-03-07 21:25:52 UTC (rev 18068)
@@ -3,4 +3,5 @@
 lib/libjbig2dec.a
 lib/libjbig2dec.so
 lib/libjbig2dec.so.0
+lib/libjbig2dec.so.0.0.0
 man/man1/jbig2dec.1.gz