diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2012-06-09 13:08:32 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2012-06-09 13:08:32 +0000 |
| commit | eada5a6c8fe83a7c992092125630c71bd5039e4e (patch) | |
| tree | 7799c941e957d7dc10bb4d283c5bc97ecce1a3da | |
| parent | - mark BROKEN (diff) | |
- Unbreak with base gcc 4.2.1
- Handle both fftw dependencies at once
- No PORTREVISION bump, users with broken build never got this update
- Take maintainership due to vd@'s ENOTIME
Approved by: vd (maintainer, via email)
Notes
Notes:
svn path=/head/; revision=298854
| -rw-r--r-- | graphics/vigra/Makefile | 5 | ||||
| -rw-r--r-- | graphics/vigra/files/patch-include__vigra__mathutil.hxx | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 415953f0aca1..3014da0ec664 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -15,7 +15,7 @@ CATEGORIES= graphics MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= vd@FreeBSD.org +MAINTAINER= fluffy@FreeBSD.org COMMENT= VIGRA stands for "Vision with Generic Algorithms" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -52,9 +52,6 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .if !defined(WITHOUT_VIGRA_FFTW) LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 -.endif - -.if !defined(WITHOUT_VIGRA_FFTWF) LIB_DEPENDS+= fftw3f:${PORTSDIR}/math/fftw3-float .endif diff --git a/graphics/vigra/files/patch-include__vigra__mathutil.hxx b/graphics/vigra/files/patch-include__vigra__mathutil.hxx index 7e2b1bf613a6..6bdb3286b93e 100644 --- a/graphics/vigra/files/patch-include__vigra__mathutil.hxx +++ b/graphics/vigra/files/patch-include__vigra__mathutil.hxx @@ -5,7 +5,7 @@ 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) || defined(__clang__) ++#if defined(_MSC_VER) && _MSC_VER < 1600 || defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 3) || defined(__clang__) VIGRA_DEFINE_MISSING_ABS(signed long long) #endif |