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

ilmbase: provide lib:s without version suffix.

Browse Source 
* Style fixes for ilmbase and openexr.
This commit is contained in:
Kacper Kasper
2017-12-17 14:56:06 +01:00
parent ecc2899115
commit 633986446a
4 changed files with 53 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
media-libs/ilmbase/ilmbase-2.2.0.recipe
View File

@@ -1,18 +1,16 @@
DESCRIPTION="
IlmBase provides base libraries for OpenEXR. It contains five \
modules. Half encapsulates 16-bit floating-point format. IlmThread \
is thread abstraction library which currently supports pthreads and \
Windows threads. Imath implements 2D and 3D vectors, 3x3 and 4x4 \
matrices, quaternions and other useful math functions. Iex is an \
exception-handling library. There is also IexMath module.
"
SUMMARY="OpenEXR ILM Base libraries"
DESCRIPTION="IlmBase provides base libraries for OpenEXR. It contains five \
modules. Half encapsulates 16-bit floating-point format. IlmThread is thread \
abstraction library which currently supports pthreads and Windows threads. \
Imath implements 2D and 3D vectors, 3x3 and 4x4 matrices, quaternions and \
other useful math functions. Iex is an exception-handling library. There is \
also IexMath module."
HOMEPAGE="http://www.openexr.com/"
LICENSE="BSD (3-clause)"
COPYRIGHT="2002-2014 Industrial Light & Magic"
SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVersion.tar.gz"
CHECKSUM_SHA256="ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7"
REVISION="5"
REVISION="6"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -24,15 +22,35 @@ fi
PROVIDES="
ilmbase$secondaryArchSuffix = $portVersion
lib:libhalf$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libiex$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libiex_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libiexmath$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libiexmath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libilmthread$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libilmthread_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libimath$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libimath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
ilmbase${secondaryArchSuffix}_devel = $portVersion
devel:libhalf$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libiex_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libiexmath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libilmthread_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libimath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libiex$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libiexmath$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libilmthread$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libimath$secondaryArchSuffix = 12.0.0 compat >= 12
"
REQUIRES_devel="
ilmbase$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
@@ -49,6 +67,9 @@ BUILD_PREREQUIRES="
BUILD()
{
./bootstrap
if [ $effectiveTargetArchitecture = "x86_gcc2" ]; then
export CXXFLAGS="-Dios_base=ios"
fi
runConfigure ./configure
make
}
@@ -74,21 +95,3 @@ TEST()
{
make check
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
ilmbase${secondaryArchSuffix}_devel = $portVersion
devel:libhalf$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libiex_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libiexmath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libilmthread_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libimath_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libiex$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libiexMath$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libilmthread$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libimath$secondaryArchSuffix = 12.0.0 compat >= 12
"
REQUIRES_devel="
ilmbase$secondaryArchSuffix == $portVersion base
"

34
media-libs/ilmbase/patches/ilmbase-2.2.0.patchset
View File

@@ -1,4 +1,4 @@
From 253c255d474d66d6a7c6807ce0deb4ada9022659 Mon Sep 17 00:00:00 2001
From f698920dbb4857505d1943fbef3cc9f3d05a2bae Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 16 Dec 2017 10:52:53 +0100
Subject: gcc2 support
@@ -16,18 +16,9 @@ index ce64b50..8deed8b 100644
return 0;
}
diff --git a/Half/toFloat.cpp b/Half/toFloat.cpp
index 001bc51..fd50b84 100644
index 001bc51..ef2d87f 100644
--- a/Half/toFloat.cpp
+++ b/Half/toFloat.cpp
@@ -135,7 +135,7 @@ int
main ()
{
cout.precision (9);
- cout.setf (ios_base::hex, ios_base::basefield);
+ cout.setf (ios::hex, ios::basefield);
cout << "//\n"
"// This is an automatically generated file.\n"
@@ -160,5 +160,6 @@ main ()
}
@@ -62,27 +53,6 @@ index df2a3e5..c6ae73b 100644
void setFpExceptionHandler (FpExceptionHandler handler);
diff --git a/Imath/ImathMatrix.h b/Imath/ImathMatrix.h
index 3e96c2f..533ad26 100644
--- a/Imath/ImathMatrix.h
+++ b/Imath/ImathMatrix.h
@@ -3242,6 +3242,8 @@ Matrix44<T>::shear (const Shear6<S> &h)
// Implementation of stream output
//--------------------------------
+#define ios_base ios
+
template <class T>
std::ostream &
operator << (std::ostream &s, const Matrix33<T> &m)
@@ -3320,6 +3322,7 @@ operator << (std::ostream &s, const Matrix44<T> &m)
return s;
}
+#undef ios_base
//---------------------------------------------------------------
// Implementation of vector-times-matrix multiplication operators
diff --git a/Imath/ImathVec.h b/Imath/ImathVec.h
index fb859eb..5fa0e91 100644
--- a/Imath/ImathVec.h