Date: Fri, 14 Feb 2014 16:57:28 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344284 - in head/graphics/libfpx: . files Message-ID: <201402141657.s1EGvSEG034639@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Fri Feb 14 16:57:27 2014 New Revision: 344284 URL: http://svnweb.freebsd.org/changeset/ports/344284 QAT: https://qat.redports.org/buildarchive/r344284/ Log: Upgrade from 1.3.1-3 to 1.3.1-4. The only real change (outside of the auto* nonsense) is the restoration of the padding at the end of CDirEntry. Clang++ used to flag it as unused private field, which lead to its removal (incorrectly) -- and this new release from upstream restores the padding. It is still flagged by clang++ so a new patch attempts to suppress that. Added: head/graphics/libfpx/files/patch-unused-padding (contents, props changed) Deleted: head/graphics/libfpx/files/patch-c++ Modified: head/graphics/libfpx/Makefile head/graphics/libfpx/distinfo Modified: head/graphics/libfpx/Makefile ============================================================================== --- head/graphics/libfpx/Makefile Fri Feb 14 16:52:57 2014 (r344283) +++ head/graphics/libfpx/Makefile Fri Feb 14 16:57:27 2014 (r344284) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libfpx -DISTVERSION= 1.3.1-3 +DISTVERSION= 1.3.1-4 CATEGORIES= graphics MASTER_SITES= http://imagemagick.mirrorcatalogs.com/delegates/ \ http://www.imagemagick.org/download/delegates/ \ @@ -17,7 +17,6 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Library routines for working with Flashpix images USE_XZ= yes -MAKE_JOBS_UNSAFE=yes PLIST_FILES= lib/libfpx.so.2 lib/libfpx.so lib/libfpx.a include/fpxlib.h USE_LDCONFIG= yes Modified: head/graphics/libfpx/distinfo ============================================================================== --- head/graphics/libfpx/distinfo Fri Feb 14 16:52:57 2014 (r344283) +++ head/graphics/libfpx/distinfo Fri Feb 14 16:57:27 2014 (r344284) @@ -1,2 +1,2 @@ -SHA256 (libfpx-1.3.1-3.tar.xz) = cb82d8d90a0f195abcb6c0f1dc4cf181e9569f8f28d96969ed8378938641847a -SIZE (libfpx-1.3.1-3.tar.xz) = 1892860 +SHA256 (libfpx-1.3.1-4.tar.xz) = 638875039246e11a3646ca34c2c8f1f790c54aa00b878301bb127f30eeea7b5d +SIZE (libfpx-1.3.1-4.tar.xz) = 1896560 Added: head/graphics/libfpx/files/patch-unused-padding ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libfpx/files/patch-unused-padding Fri Feb 14 16:57:27 2014 (r344284) @@ -0,0 +1,15 @@ +The padding is important (earlier versions tried to remove it leading to peril), +but clang++ complains about it. Mark it as __unused to prevent that... +--- oless/h/dir.hxx 2014-02-12 08:14:24.000000000 -0500 ++++ oless/h/dir.hxx 2014-02-14 11:36:59.000000000 -0500 +@@ -142,5 +142,9 @@ + inline void SetBitFlags(BYTE bValue, BYTE bMask); + +- BYTE _bpad[CBDIRPAD]; // do not remove, bad things will happen! ++ BYTE _bpad[CBDIRPAD] // do not remove, bad things will happen! ++#ifdef __clang__ ++ __unused ++#endif ++ ; + }; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402141657.s1EGvSEG034639>