From owner-svn-ports-head@FreeBSD.ORG Sat Dec 20 20:23:36 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 33D2A3DE; Sat, 20 Dec 2014 20:23:36 +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 1524E126E; Sat, 20 Dec 2014 20:23:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBKKNZ7Y037584; Sat, 20 Dec 2014 20:23:35 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBKKNZEJ037581; Sat, 20 Dec 2014 20:23:35 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201412202023.sBKKNZEJ037581@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 20 Dec 2014 20:23:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375128 - head/graphics/ImageMagick/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: Sat, 20 Dec 2014 20:23:36 -0000 Author: kwm Date: Sat Dec 20 20:23:34 2014 New Revision: 375128 URL: https://svnweb.freebsd.org/changeset/ports/375128 QAT: https://qat.redports.org/buildarchive/r375128/ Log: Fix several clang 3.5.0 warnings in the IM code. PR: 196135 Submitted by: dim@ Added: head/graphics/ImageMagick/files/ head/graphics/ImageMagick/files/patch-magic__magick-type.h (contents, props changed) head/graphics/ImageMagick/files/patch-magic__method-attribute.h (contents, props changed) head/graphics/ImageMagick/files/patch-wand__method-attribute.h (contents, props changed) Added: head/graphics/ImageMagick/files/patch-magic__magick-type.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ImageMagick/files/patch-magic__magick-type.h Sat Dec 20 20:23:34 2014 (r375128) @@ -0,0 +1,58 @@ +--- magick/magick-type.h.orig 2014-08-08 16:27:39.000000000 +0200 ++++ magick/magick-type.h 2014-12-19 17:31:35.000000000 +0100 +@@ -45,12 +45,16 @@ extern "C" { + */ + #if MAGICKCORE_SIZEOF_FLOAT_T == 0 + typedef float MagickRealType; ++#define fabs fabsf + #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_FLOAT) + typedef float MagickRealType; ++#define fabs fabsf + #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_DOUBLE) + typedef double MagickRealType; ++#define fabs fabs + #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_LONG_DOUBLE) + typedef long double MagickRealType; ++#define fabs fabsl + #else + # error Your float_t type is neither a float, nor a double, nor a long double + #endif +@@ -74,12 +78,16 @@ typedef unsigned char Quantum; + */ + #if MAGICKCORE_SIZEOF_FLOAT_T == 0 + typedef float MagickRealType; ++#define fabs fabsf + #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_FLOAT) + typedef float MagickRealType; ++#define fabs fabsf + #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_DOUBLE) + typedef double MagickRealType; ++#define fabs fabs + #elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_LONG_DOUBLE) + typedef long double MagickRealType; ++#define fabs fabsl + #else + # error Your float_t type is neither a float, nor a double, nor a long double + #endif +@@ -103,10 +111,13 @@ typedef unsigned short Quantum; + */ + #if MAGICKCORE_SIZEOF_DOUBLE_T == 0 + typedef double MagickRealType; ++#define fabs fabs + #elif (MAGICKCORE_SIZEOF_DOUBLE_T == MAGICKCORE_SIZEOF_DOUBLE) + typedef double MagickRealType; ++#define fabs fabs + #elif (MAGICKCORE_SIZEOF_DOUBLE_T == MAGICKCORE_SIZEOF_LONG_DOUBLE) + typedef long double MagickRealType; ++#define fabs fabsl + #else + # error Your double_t type is neither a float, nor a double, nor a long double + #endif +@@ -131,6 +142,7 @@ typedef long double SignedQuantum; + typedef long double Quantum; + #define QuantumRange 18446744073709551615.0 + #define QuantumFormat "%g" ++#define fabs fabsl + #else + #if !defined(_CH_) + # error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64" Added: head/graphics/ImageMagick/files/patch-magic__method-attribute.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ImageMagick/files/patch-magic__method-attribute.h Sat Dec 20 20:23:34 2014 (r375128) @@ -0,0 +1,24 @@ +--- magick/method-attribute.h.orig 2014-03-21 19:28:48.000000000 +0100 ++++ magick/method-attribute.h 2014-12-19 17:09:11.000000000 +0100 +@@ -123,14 +123,18 @@ extern "C" { + # define magick_unreferenced(x) /* nothing */ + #endif + +-#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__) ++#if !defined(__clang__) && (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) + # define magick_alloc_size(x) __attribute__((__alloc_size__(x))) + # define magick_alloc_sizes(x,y) __attribute__((__alloc_size__(x,y))) +-# define magick_cold_spot __attribute__((__cold__)) +-# define magick_hot_spot __attribute__((__hot__)) + #else + # define magick_alloc_size(x) /* nothing */ + # define magick_alloc_sizes(x,y) /* nothing */ ++#endif ++ ++#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) ++# define magick_cold_spot __attribute__((__cold__)) ++# define magick_hot_spot __attribute__((__hot__)) ++#else + # define magick_cold_spot + # define magick_hot_spot + #endif Added: head/graphics/ImageMagick/files/patch-wand__method-attribute.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ImageMagick/files/patch-wand__method-attribute.h Sat Dec 20 20:23:34 2014 (r375128) @@ -0,0 +1,24 @@ +--- wand/method-attribute.h.orig 2014-06-18 15:21:47.000000000 +0200 ++++ wand/method-attribute.h 2014-12-19 17:09:14.000000000 +0100 +@@ -116,14 +116,18 @@ extern "C" { + # define wand_unreferenced(x) /* nothing */ + #endif + +-#if (defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) && !defined(__apple_build_version__) ++#if !defined(__clang__) && (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) + # define wand_alloc_size(x) __attribute__((__alloc_size__(x))) + # define wand_alloc_sizes(x,y) __attribute__((__alloc_size__(x,y))) +-# define wand_cold_spot __attribute__((__cold__)) +-# define wand_hot_spot __attribute__((__hot__)) + #else + # define wand_alloc_size(x) /* nothing */ + # define wand_alloc_sizes(x,y) /* nothing */ ++#endif ++ ++#if defined(__clang__) || (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) ++# define wand_cold_spot __attribute__((__cold__)) ++# define wand_hot_spot __attribute__((__hot__)) ++#else + # define wand_cold_spot + # define wand_hot_spot + #endif