From owner-svn-ports-head@FreeBSD.ORG Tue Dec 23 22:40:23 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E3434C3; Tue, 23 Dec 2014 22:40:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30A6F1D9D; Tue, 23 Dec 2014 22:40:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBNMeNKR089097; Tue, 23 Dec 2014 22:40:23 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBNMeMRQ089095; Tue, 23 Dec 2014 22:40:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201412232240.sBNMeMRQ089095@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 23 Dec 2014 22:40:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375360 - in head/graphics/jbig2dec: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Dec 2014 22:40:23 -0000 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 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); + }