From owner-svn-ports-head@FreeBSD.ORG Wed Dec 24 16:04:24 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31919D9F; Wed, 24 Dec 2014 16:04:24 +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 12F9E2555; Wed, 24 Dec 2014 16:04:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBOG4NYD005996; Wed, 24 Dec 2014 16:04:23 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBOG4NkH005994; Wed, 24 Dec 2014 16:04:23 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412241604.sBOG4NkH005994@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 24 Dec 2014 16:04:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375469 - in head/graphics/autotrace: . 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: Wed, 24 Dec 2014 16:04:24 -0000 Author: antoine Date: Wed Dec 24 16:04:22 2014 New Revision: 375469 URL: https://svnweb.freebsd.org/changeset/ports/375469 QAT: https://qat.redports.org/buildarchive/r375469/ Log: Properly support png 1.5 Obtained from: pkgsrc Modified: head/graphics/autotrace/Makefile head/graphics/autotrace/files/patch-input-png.c Modified: head/graphics/autotrace/Makefile ============================================================================== --- head/graphics/autotrace/Makefile Wed Dec 24 15:31:57 2014 (r375468) +++ head/graphics/autotrace/Makefile Wed Dec 24 16:04:22 2014 (r375469) @@ -13,7 +13,7 @@ COMMENT= Convert bitmap to vector graphi LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png USES= pathfix pkgconfig libtool GNU_CONFIGURE= yes Modified: head/graphics/autotrace/files/patch-input-png.c ============================================================================== --- head/graphics/autotrace/files/patch-input-png.c Wed Dec 24 15:31:57 2014 (r375468) +++ head/graphics/autotrace/files/patch-input-png.c Wed Dec 24 16:04:22 2014 (r375469) @@ -1,10 +1,95 @@ ---- input-png.c.orig 2002-10-10 22:44:14.000000000 +0200 -+++ input-png.c 2012-04-29 12:34:51.000000000 +0200 -@@ -30,6 +30,7 @@ - #include "message.h" - #include "xstd.h" - #include -+#include - #include "input-png.h" +$NetBSD: patch-input-png.c,v 1.1 2011/02/07 00:37:54 wiz Exp $ + +Fix build with png-1.5. + +--- input-png.c.orig 2002-10-10 20:44:14.000000000 +0000 ++++ input-png.c +@@ -42,17 +42,17 @@ static png_bytep * read_png(png_structp - static volatile char rcsid[]="$Id: input-png.c,v 1.16 2002/10/05 19:38:25 masata-y Exp $"; + static void handle_warning(png_structp png, const at_string message) { + LOG1("PNG warning: %s", message); +- at_exception_warning((at_exception_type *)png->error_ptr, ++ at_exception_warning((at_exception_type *)png_get_error_ptr(png), + message); +- /* at_exception_fatal((at_exception_type *)at_png->error_ptr, ++ /* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png), + "PNG warning"); */ + } + + static void handle_error(png_structp png, const at_string message) { + LOG1("PNG error: %s", message); +- at_exception_fatal((at_exception_type *)png->error_ptr, ++ at_exception_fatal((at_exception_type *)png_get_error_ptr(png), + message); +- /* at_exception_fatal((at_exception_type *)at_png->error_ptr, ++ /* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png), + "PNG error"); */ + + } +@@ -106,7 +106,8 @@ static int load_image(at_bitmap_type *im + png_init_io(png, stream); + CHECK_ERROR(); + +- rows = read_png(png, info, opts); ++ png_read_png(png, info, PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND, 0); ++ rows = png_get_rows(png, info); + + width = (unsigned short)png_get_image_width(png, info); + height = (unsigned short)png_get_image_height(png, info); +@@ -145,56 +146,3 @@ at_bitmap_type input_png_reader(at_strin + + return image; + } +- +-static png_bytep * +-read_png(png_structp png_ptr, png_infop info_ptr, at_input_opts_type * opts) +-{ +- int row; +- png_color_16p original_bg; +- png_color_16 my_bg; +- +- png_read_info(png_ptr, info_ptr); +- +- png_set_strip_16(png_ptr); +- png_set_packing(png_ptr); +- if ((png_ptr->bit_depth < 8) || +- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) || +- (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))) +- png_set_expand(png_ptr); +- +- if (png_get_bKGD(png_ptr, info_ptr, &original_bg)) { +- /* Fill transparent region with ... */ +- my_bg.index = 0; +- +- if (opts && opts->background_color) { +- my_bg.red = 256 * opts->background_color->r; +- my_bg.green = 256 * opts->background_color->g; +- my_bg.blue = 256 * opts->background_color->b; +- my_bg.gray = 256* ((opts->background_color->r +- + opts->background_color->g +- + opts->background_color->b) / 3); +- } else +- /* else, use white */ +- my_bg.red = my_bg.green = my_bg.blue = my_bg.gray = 0xFFFF; +- +- png_set_background(png_ptr, &my_bg, +- PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); +- } else +- png_set_strip_alpha(png_ptr); +- png_read_update_info(png_ptr, info_ptr); +- +- +- info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr, +- info_ptr->height * sizeof(png_bytep)); +-#ifdef PNG_FREE_ME_SUPPORTED +- info_ptr->free_me |= PNG_FREE_ROWS; +-#endif +- for (row = 0; row < (int)info_ptr->height; row++) +- info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr, +- png_get_rowbytes(png_ptr, info_ptr)); +- +- png_read_image(png_ptr, info_ptr->row_pointers); +- info_ptr->valid |= PNG_INFO_IDAT; +- png_read_end(png_ptr, info_ptr); +- return png_get_rows(png_ptr, info_ptr); +-}