From 6d56ee3689f89cdfe1c5b98b7094b7622f07c329 Mon Sep 17 00:00:00 2001 From: obache Date: Sun, 26 Feb 2012 08:38:21 +0000 Subject: At least, gcc-4.1.3 does not have abs(signed long long). PR 45922. --- graphics/vigra/distinfo | 4 ++-- graphics/vigra/patches/patch-include-vigra-mathutil.hxx | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'graphics/vigra') diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo index d2295f088a7..4cfb369f573 100644 --- a/graphics/vigra/distinfo +++ b/graphics/vigra/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2011/12/15 18:48:02 marino Exp $ +$NetBSD: distinfo,v 1.9 2012/02/26 08:38:21 obache Exp $ SHA1 (vigra-1.8.0-src.tar.gz) = 09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2 RMD160 (vigra-1.8.0-src.tar.gz) = 99d781da6e0ca94ce3404e1bcb3adeb9e43a2017 Size (vigra-1.8.0-src.tar.gz) = 29814914 bytes -SHA1 (patch-include-vigra-mathutil.hxx) = d6c6f12f073c9659781eef5fb032c31676c1381d +SHA1 (patch-include-vigra-mathutil.hxx) = ccbf0061582f09493169f686d504e4c5a5b1924d diff --git a/graphics/vigra/patches/patch-include-vigra-mathutil.hxx b/graphics/vigra/patches/patch-include-vigra-mathutil.hxx index ac0360951f5..2ef1fe24c2f 100644 --- a/graphics/vigra/patches/patch-include-vigra-mathutil.hxx +++ b/graphics/vigra/patches/patch-include-vigra-mathutil.hxx @@ -1,7 +1,19 @@ -$NetBSD: patch-include-vigra-mathutil.hxx,v 1.2 2011/12/15 18:48:02 marino Exp $ +$NetBSD: patch-include-vigra-mathutil.hxx,v 1.3 2012/02/26 08:38:21 obache Exp $ ---- include/vigra/mathutil.hxx.orig 2011-12-15 07:07:07.573857000 +0000 +* missing abs(signed long long) in old GCC. +* Fix ambiguous math functions for DragonFly. + +--- include/vigra/mathutil.hxx.orig 2011-09-20 18:38:36.000000000 +0000 +++ include/vigra/mathutil.hxx +@@ -149,7 +149,7 @@ VIGRA_DEFINE_UNSIGNED_ABS(unsigned long + VIGRA_DEFINE_MISSING_ABS(signed char) + VIGRA_DEFINE_MISSING_ABS(signed short) + +-#if defined(_MSC_VER) && _MSC_VER < 1600 ++#if defined(_MSC_VER) && _MSC_VER < 1600 || defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 2) + VIGRA_DEFINE_MISSING_ABS(signed long long) + #endif + @@ -553,7 +553,12 @@ VIGRA_DEFINE_NORM(int) VIGRA_DEFINE_NORM(unsigned int) VIGRA_DEFINE_NORM(long) -- cgit v1.2.3