From owner-svn-ports-all@FreeBSD.ORG Fri Oct 5 04:14:40 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E733E1065670; Fri, 5 Oct 2012 04:14:40 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CFE968FC14; Fri, 5 Oct 2012 04:14:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q954EeGn084936; Fri, 5 Oct 2012 04:14:40 GMT (envelope-from mi@svn.freebsd.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q954Eeh1084930; Fri, 5 Oct 2012 04:14:40 GMT (envelope-from mi@svn.freebsd.org) Message-Id: <201210050414.q954Eeh1084930@svn.freebsd.org> From: Mikhail Teterin Date: Fri, 5 Oct 2012 04:14:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305294 - in head/graphics/libfpx: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2012 04:14:41 -0000 Author: mi Date: Fri Oct 5 04:14:40 2012 New Revision: 305294 URL: http://svn.freebsd.org/changeset/ports/305294 Log: Upgrade from 1.2.x to 1.3.1-1 now that the upstream finally contains new code (rather than simply updates to auto- configuration glue): Notified by: Steve Wills via PR: ports/171812 The changes are minor, thus shared-library bump. Fix several of the warnings, which GNU compiler missed, but clang uncovered (which broke the build because of -Werror): Notified by: Andreas Nilsson, Thomas Zander Added: head/graphics/libfpx/files/patch-fpxlib (contents, props changed) head/graphics/libfpx/files/patch-ph_image (contents, props changed) Modified: head/graphics/libfpx/Makefile (contents, props changed) head/graphics/libfpx/distinfo (contents, props changed) Directory Properties: head/graphics/libfpx/files/Makefile.bsd (props changed) Modified: head/graphics/libfpx/Makefile ============================================================================== --- head/graphics/libfpx/Makefile Fri Oct 5 04:12:04 2012 (r305293) +++ head/graphics/libfpx/Makefile Fri Oct 5 04:14:40 2012 (r305294) @@ -6,28 +6,34 @@ # PORTNAME= libfpx -PORTVERSION= 1.2.0.12 -PORTREVISION= 2 +DISTVERSION= 1.3.1-1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= ehaupt - -PATCHFILES= fpx.mega-patch.2007-11-01.bz2 -PATCH_SITES= http://aldan.algebra.com/~mi/ +MASTER_SITES= http://imagemagick.mirrorcatalogs.com/delegates/ \ + http://www.imagemagick.org/download/delegates/ \ + ftp://mirror.aarnet.edu.au/pub/imagemagick/delegates/ \ + ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/delegates/ \ + http://servingzone.com/mirrors/ImageMagick/delegates/ \ + http://mirror.checkdomain.de/imagemagick/delegates/ \ + ftp://mirror.checkdomain.de/imagemagick/delegates/ \ + http://image_magick.veidrodis.com/image_magick/delegates/ MAINTAINER= mi@aldan.algebra.com COMMENT= Library routines for working with Flashpix images -USE_BZIP2= yes - -post-patch: - ${RM} ${WRKSRC}/ri_image/wchar.c ${WRKSRC}/fpx/fpxlib.h +USE_XZ= yes -PLIST_FILES=lib/libfpx.so.2 lib/libfpx.so lib/libfpx.a include/fpxlib.h +PLIST_FILES= lib/libfpx.so.2 lib/libfpx.so lib/libfpx.a include/fpxlib.h USE_LDCONFIG= yes MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_JOBS_SAFE= yes +post-patch: + ${SED} -i '' -e '/^#include "fpxlib-config.h"/d' \ + ${WRKSRC}/basics/filename.cpp \ + ${WRKSRC}/oless/h/owchar.h \ + ${WRKSRC}/ole/gen_guid.cpp \ + ${WRKSRC}/fpxlib.h + .include # We want the port's Makefile to build compiler-flags from scratch Modified: head/graphics/libfpx/distinfo ============================================================================== --- head/graphics/libfpx/distinfo Fri Oct 5 04:12:04 2012 (r305293) +++ head/graphics/libfpx/distinfo Fri Oct 5 04:14:40 2012 (r305294) @@ -1,4 +1,2 @@ -SHA256 (libfpx-1.2.0.12.tar.bz2) = c9b5ec94c255cbfebcefa6a045f5c7ca3c8ab9de2ad17b88ba4bfce924b91a97 -SIZE (libfpx-1.2.0.12.tar.bz2) = 2301747 -SHA256 (fpx.mega-patch.2007-11-01.bz2) = 1b71d5178c2b85d673e5fece161834d27942c829918ff2c04840f07ffecfab6d -SIZE (fpx.mega-patch.2007-11-01.bz2) = 122232 +SHA256 (libfpx-1.3.1-1.tar.xz) = d27700c9215ed0fda0878bda098ed5f19ecb436f76f4a1895cca5e4835c253a1 +SIZE (libfpx-1.3.1-1.tar.xz) = 1899164 Added: head/graphics/libfpx/files/patch-fpxlib ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libfpx/files/patch-fpxlib Fri Oct 5 04:14:40 2012 (r305294) @@ -0,0 +1,63 @@ +ReadPage() must've been returning int at some point. It is returning +FPXStatus for, at least, 5 years now, but gcc never warned about us +checking invalid values. Thanks to clang for finding this redundancy. +--- fpx/fpxlib.cpp 2007-11-02 03:10:05.000000000 -0400 ++++ fpx/fpxlib.cpp 2012-10-04 22:49:40.000000000 -0400 +@@ -825,5 +825,5 @@ + FPXImageDesc* renderingBuffer) + { +- FPXStatus status = FPX_OK; ++ FPXStatus status; + if (!thePage) + status = FPX_INVALID_FPX_HANDLE; +@@ -839,18 +839,7 @@ + else { + GtheSystemToolkit->SetUsedColorSpace(image.GetBaselineColorSpace()); +- switch (thePage->ReadPage (image.Get32BitsBuffer())) { +- case -2 : +- status = FPX_FILE_READ_ERROR; +- break; +- case -3 : +- status = FPX_LOW_MEMORY_ERROR; +- break; +- case 0: +- image.UpdateDescriptor(); +- break; +- default: +- { +- } +- } ++ status = thePage->ReadPage(image.Get32BitsBuffer()); ++ if (status == FPX_OK) ++ image.UpdateDescriptor(); + } + } +@@ -863,5 +852,5 @@ + FPXImageDesc* renderingBuffer) + { +- FPXStatus status = FPX_OK; ++ FPXStatus status; + if (!thePage) + status = FPX_INVALID_FPX_HANDLE; +@@ -877,18 +866,7 @@ + else { + GtheSystemToolkit->SetUsedColorSpace(line.GetBaselineColorSpace()); +- switch (thePage->ReadPageLine (lineNumber, line.Get32BitsBuffer())) { +- case -2 : +- status = FPX_FILE_READ_ERROR; +- break; +- case -3 : +- status = FPX_LOW_MEMORY_ERROR; +- break; +- case 0: +- line.UpdateDescriptor(); +- break; +- default: +- { +- } +- } ++ status = thePage->ReadPageLine (lineNumber, line.Get32BitsBuffer()); ++ if (status == FPX_OK) ++ line.UpdateDescriptor(); + } + } Added: head/graphics/libfpx/files/patch-ph_image ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libfpx/files/patch-ph_image Fri Oct 5 04:14:40 2012 (r305294) @@ -0,0 +1,18 @@ +--- ri_image/ph_image.h 2007-11-02 03:10:05.000000000 -0400 ++++ ri_image/ph_image.h 2012-10-04 22:38:52.000000000 -0400 +@@ -173,5 +173,5 @@ + virtual FPXStatus CreateInitResolutionLevelList(); // Make a sub image list in read or write mode + virtual FPXStatus CreateEmptyResolutionLevelList(); // Make a sub image list in create mode +- virtual PResolutionLevel* CreateEmptyResolutionLevel(int width, int height, long* quelImage); // Make a sub image in create mode ++ virtual PResolutionLevel* CreateEmptyResolutionLevel(int width, int height, int* quelImage); // Make a sub image in create mode + virtual PResolutionLevel* CreateInitResolutionLevel(int* offset, long id); // Make a sub image in read or write mode + +--- ri_image/ph_image.cpp 2007-11-02 03:10:05.000000000 -0400 ++++ ri_image/ph_image.cpp 2012-10-04 22:38:31.000000000 -0400 +@@ -1127,5 +1127,5 @@ + // ---------------------------------------------------------------------------- + // Make a sub resolution level in create mode +-PResolutionLevel* PHierarchicalImage::CreateEmptyResolutionLevel(int , int , long int*) ++PResolutionLevel* PHierarchicalImage::CreateEmptyResolutionLevel(int , int , int*) + { + return NULL;