Date: Wed, 14 Aug 2013 17:49:34 GMT From: Xin LI <delphij@freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Cc: mi@aldan.algebra.com Subject: ports/181302: [PATCH] Update graphics/libfpx to 1.3.1-2 Message-ID: <201308141749.r7EHnYZt058521@freefall.freebsd.org> Resent-Message-ID: <201308141750.r7EHo0jD058578@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181302 >Category: ports >Synopsis: [PATCH] Update graphics/libfpx to 1.3.1-2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 14 17:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 10.0-CURRENT amd64 >Organization: iXsystems, Inc. >Environment: System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r253323: Sat Jul 13 18:26:21 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64 >Description: This proposed patchset updates libfpx to 1.3.1-2 and make the installation to respect PREFIX settings. >How-To-Repeat: >Fix: --- libfpx.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 324742) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libfpx -DISTVERSION= 1.3.1-1 +DISTVERSION= 1.3.1-2 CATEGORIES= graphics MASTER_SITES= http://imagemagick.mirrorcatalogs.com/delegates/ \ http://www.imagemagick.org/download/delegates/ \ Index: distinfo =================================================================== --- distinfo (revision 324742) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (libfpx-1.3.1-1.tar.xz) = d27700c9215ed0fda0878bda098ed5f19ecb436f76f4a1895cca5e4835c253a1 -SIZE (libfpx-1.3.1-1.tar.xz) = 1899164 +SHA256 (libfpx-1.3.1-2.tar.xz) = 61c6332e8049460bebd9148589ffaad45a3849f0bf5f2dd8a79fefe9ac9ab0b0 +SIZE (libfpx-1.3.1-2.tar.xz) = 1892952 Index: files/Makefile.bsd =================================================================== --- files/Makefile.bsd (revision 324742) +++ files/Makefile.bsd (working copy) @@ -4,8 +4,8 @@ SHLIB_MINOR= 7 WARNS= 3 -LIBDIR = ${LOCALBASE}/lib -INCSDIR = ${LOCALBASE}/include +LIBDIR = ${PREFIX}/lib +INCSDIR = ${PREFIX}/include INCDIR = ${INCSDIR} # for pre-bsd.incs.mk API NO_PROFILE= Don't want it Index: files/patch-aa =================================================================== --- files/patch-aa (revision 324742) +++ files/patch-aa (working copy) @@ -1,10 +0,0 @@ ---- fpx/f_fpxvw.cpp 2005-02-25 21:23:05.000000000 -0500 -+++ fpx/f_fpxvw.cpp 2012-01-19 19:44:34.425688599 +0200 -@@ -613,6 +613,7 @@ HRESULT OleRegGetUserType(REFCLSID clsid - const OLECHAR *src=OLESTR("Flashpix Toolkit Application"); - OLECHAR *dest=*pszUserType; - while(*src) *dest++=*src++; -+ *dest=(OLECHAR)0; - - return S_OK; - } Index: files/patch-fpxlib =================================================================== --- files/patch-fpxlib (revision 324742) +++ files/patch-fpxlib (working copy) @@ -1,63 +0,0 @@ -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(); - } - } Index: files/patch-ph_image =================================================================== --- files/patch-ph_image (revision 324742) +++ files/patch-ph_image (working copy) @@ -1,18 +0,0 @@ ---- 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; --- libfpx.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308141749.r7EHnYZt058521>