haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +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

40
media-libs/openexr/openexr-2.2.0.recipe
View File

@@ -1,15 +1,14 @@
SUMMARY="A high dynamic-range (HDR) image file format"
DESCRIPTION="OpenEXR is a high dynamic-range (HDR) image file format developed \
by Industrial Light & Magic for use in computer imaging \
applications. OpenEXR is used by ILM on all motion pictures \
currently in production. The first movies to employ OpenEXR were \
Harry Potter and the Sorcerers Stone, Men in Black II, Gangs of \
New York, and Signs. Since then, OpenEXR has become ILM's main \
image file format."
by Industrial Light & Magic for use in computer imaging applications. OpenEXR \
is used by ILM on all motion pictures currently in production. The first \
movies to employ OpenEXR were Harry Potter and the Sorcerers Stone, Men in \
Black II, Gangs of New York, and Signs. Since then, OpenEXR has become ILM's \
main image file format."
HOMEPAGE="http://www.openexr.com/"
COPYRIGHT="2002-2014 Industrial Light & Magic"
LICENSE="BSD (3-clause)"
REVISION="5"
REVISION="6"
SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-$portVersion.tar.gz"
CHECKSUM_SHA256="36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231"
@@ -43,6 +42,18 @@ REQUIRES="
lib:libimath_2_2$secondaryArchSuffix == 12.0.0
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
openexr${secondaryArchSuffix}_devel = $portVersion
devel:libilmimf$secondaryArchSuffix = 22.0.0 compat >= 22
devel:libilmimf_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
devel:libilmimfutil$secondaryArchSuffix = 22.0.0 compat >= 22
devel:libilmimfutil_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
"
REQUIRES_devel="
openexr$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
ilmbase${secondaryArchSuffix}_devel == $portVersion
@@ -75,7 +86,7 @@ ${pathSecondaryArchSuffix}/pkgconfig/IlmBase.pc | sed s/IlmBase\.pc//g)
./bootstrap
if [ $effectiveTargetArchitecture = "x86_gcc2" ]; then
export CXXFLAGS="-ftemplate-depth-30"
export CXXFLAGS="-Dios_base=ios -ftemplate-depth-30"
fi
runConfigure ./configure
make $jobArgs
@@ -113,16 +124,3 @@ TEST()
{
make check
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
openexr${secondaryArchSuffix}_devel = $portVersion
devel:libilmimf$secondaryArchSuffix = $portVersion
devel:libilmimf_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libilmimfutil$secondaryArchSuffix = $portVersion
devel:libilmimfutil_2_2$secondaryArchSuffix = 12.0.0 compat >= 12
"
REQUIRES_devel="
openexr$secondaryArchSuffix == $portVersion base
"

30
media-libs/openexr/patches/openexr-2.2.0.patchset
View File

@@ -1,4 +1,4 @@
From e8e55e976474b2816574ac1734e6f1b2c80033dd Mon Sep 17 00:00:00 2001
From 2ce1404cb25e6a8dc1b02c7f1dfaf26725edfadf Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 16 Dec 2017 12:02:34 +0100
Subject: gcc2 support
@@ -175,34 +175,6 @@ index d6b55f3..212e623 100644
template <size_t N>
void checkIsNullTerminated (const char (&str)[N], const char *what)
{
diff --git a/IlmImf/ImfStdIO.cpp b/IlmImf/ImfStdIO.cpp
index 1839a94..dfe518e 100644
--- a/IlmImf/ImfStdIO.cpp
+++ b/IlmImf/ImfStdIO.cpp
@@ -95,7 +95,11 @@ checkError (ostream &os)
StdIFStream::StdIFStream (const char fileName[]):
OPENEXR_IMF_INTERNAL_NAMESPACE::IStream (fileName),
+#ifdef HAVE_IOS_BASE
_is (new ifstream (fileName, ios_base::binary)),
+#else
+ _is (new ifstream (fileName, ios::binary)),
+#endif
_deleteStream (true)
{
if (!*_is)
@@ -158,7 +162,11 @@ StdIFStream::clear ()
StdOFStream::StdOFStream (const char fileName[]):
OPENEXR_IMF_INTERNAL_NAMESPACE::OStream (fileName),
+#ifdef HAVE_IOS_BASE
_os (new ofstream (fileName, ios_base::binary)),
+#else
+ _os (new ofstream (fileName, ios::binary)),
+#endif
_deleteStream (true)
{
if (!*_os)
diff --git a/IlmImf/ImfStringVectorAttribute.cpp b/IlmImf/ImfStringVectorAttribute.cpp
index 88fdf8e..bc4f15b 100644
--- a/IlmImf/ImfStringVectorAttribute.cpp