From dea6d55cdc37d46c6ea7a2cd18d1153d05ff6eef Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Wed, 30 Apr 2014 01:38:16 +0200
Subject: [PATCH] Fixes for fftw, tiff and vigra.

* tiff can build on gcc2 now.
* Move vigra-config script to devel package.
* Fix policy violations.
---
 media-libs/tiff/tiff-4.0.2.recipe    | 23 +++++++++++++++--------
 media-libs/vigra/vigra-1.10.0.recipe | 10 ++++++----
 sci-libs/fftw/fftw-3.3.4.recipe      |  9 +++++----
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/media-libs/tiff/tiff-4.0.2.recipe b/media-libs/tiff/tiff-4.0.2.recipe
index 699820927..215787964 100644
--- a/media-libs/tiff/tiff-4.0.2.recipe
+++ b/media-libs/tiff/tiff-4.0.2.recipe
@@ -12,15 +12,12 @@ LICENSE="MIT"
 COPYRIGHT="1988-1997 Sam Leffler
 	1991-1997 Silicon Graphics, Inc."
 
-REVISION="2"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="x86"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	tiff$secondaryArchSuffix = $portVersion
+	tiff$secondaryArchSuffix = $portVersion compat >= 4
 	lib:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5
 	lib:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5
 	"
@@ -46,6 +43,14 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+PATCH()
+{
+	if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
+		sed -i 's/ios::pos_type/streampos/g' libtiff/tif_stream.cxx
+		sed -i 's/ios::off_type/streamoff/g' libtiff/tif_stream.cxx
+	fi
+}
+
 BUILD()
 {
 	aclocal
@@ -86,7 +91,7 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	tiff${secondaryArchSuffix}_devel = $portVersion
+	tiff${secondaryArchSuffix}_devel = $portVersion compat >= 4
 	devel:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5
 	devel:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5
 	"
@@ -127,5 +132,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 	REQUIRES_tools="
 		haiku >= $haikuVersion
 		tiff == $portVersion base
+		lib:libjpeg
+		lib:libz
 		"
 fi
diff --git a/media-libs/vigra/vigra-1.10.0.recipe b/media-libs/vigra/vigra-1.10.0.recipe
index cece4c3cc..78ec8b860 100644
--- a/media-libs/vigra/vigra-1.10.0.recipe
+++ b/media-libs/vigra/vigra-1.10.0.recipe
@@ -7,17 +7,17 @@ LICENSE="MIT"
 COPYRIGHT="1998-2013 by Ullrich Koethe"
 HOMEPAGE="http://ukoethe.github.io/vigra/"
 SRC_URI="https://github.com/ukoethe/vigra/archive/Version-1-10-0.tar.gz"
+SRC_FILENAME="$portVersionedName.tar.gz"
 CHECKSUM_SHA256="406f6fcbcea2e92f681a7b844487c29049d338f5b2b25f8145e67bcb518c7ef8"
-REVISION="1"
+REVISION="2"
 
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2"
+SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
 
 SOURCE_DIR="vigra-Version-1-10-0"
 
 PROVIDES="
 	vigra$secondaryArchSuffix = $portVersion
-	cmd:vigra_config$secondaryArchSuffix
 	lib:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5
 "
 REQUIRES="
@@ -83,7 +83,7 @@ INSTALL()
 	sed -i "s#/include/#/$relativeIncludeDir/#g" \
 		$developLibDir/$portName/VigraConfig.cmake
 
-	packageEntries devel $developDir
+	packageEntries devel $developDir bin/vigra-config
 }
 
 TEST()
@@ -95,6 +95,8 @@ TEST()
 
 PROVIDES_devel="
 	vigra${secondaryArchSuffix}_devel = $portVersion
+	cmd:vigra_config$secondaryArchSuffix
+	cmd:python # vigra-config is python script
 	devel:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5
 	"
 REQUIRES_devel="
diff --git a/sci-libs/fftw/fftw-3.3.4.recipe b/sci-libs/fftw/fftw-3.3.4.recipe
index b204e5d57..dcefbe609 100644
--- a/sci-libs/fftw/fftw-3.3.4.recipe
+++ b/sci-libs/fftw/fftw-3.3.4.recipe
@@ -21,15 +21,15 @@ COPYRIGHT="
 	2003, 2007-2011 Matteo Frigo
 	2003, 2007-2011 Massachusetts Institute of Technology
 	"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libfftw$secondaryArchSuffix = $portVersion compat >= 3
 	lib:libfftw$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:fftw_wisdom
-	cmd:fftw_wisdom_to_conf
+	cmd:fftw_wisdom$secondaryArchSuffix
+	cmd:fftw_wisdom_to_conf$secondaryArchSuffix
 	"
 
 REQUIRES="
@@ -64,7 +64,8 @@ INSTALL()
 
 PROVIDES_devel="
 	libfftw${secondaryArchSuffix}_devel = $portVersion compat >= 3
-	devel:libfftw${secondaryArchSuffix} = $portVersion compat >= 3
+	devel:libfftw$secondaryArchSuffix = $portVersion compat >= 3
+	devel:libfftw3$secondaryArchSuffix = $portVersion compat >= 3
 	"
 REQUIRES_devel="
 	libfftw$secondaryArchSuffix == $portVersion base