haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for fftw, tiff and vigra.

Browse Source 
* tiff can build on gcc2 now.
* Move vigra-config script to devel package.
* Fix policy violations.
This commit is contained in:
Kacper Kasper
2014-04-30 01:38:16 +02:00
parent 92edcf4217
commit dea6d55cdc
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
media-libs/tiff/tiff-4.0.2.recipe
View File

@@ -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

10
media-libs/vigra/vigra-1.10.0.recipe
View File

@@ -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="

9
sci-libs/fftw/fftw-3.3.4.recipe
View File

@@ -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