diff --git a/media-libs/ilmbase/ilmbase-2.2.0.recipe b/media-libs/ilmbase/ilmbase-2.2.0.recipe index 1bd56ac35..11f2f3a10 100644 --- a/media-libs/ilmbase/ilmbase-2.2.0.recipe +++ b/media-libs/ilmbase/ilmbase-2.2.0.recipe @@ -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 - " diff --git a/media-libs/ilmbase/patches/ilmbase-2.2.0.patchset b/media-libs/ilmbase/patches/ilmbase-2.2.0.patchset index 446cbf9bd..c22877208 100644 --- a/media-libs/ilmbase/patches/ilmbase-2.2.0.patchset +++ b/media-libs/ilmbase/patches/ilmbase-2.2.0.patchset @@ -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 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::shear (const Shear6 &h) - // Implementation of stream output - //-------------------------------- - -+#define ios_base ios -+ - template - std::ostream & - operator << (std::ostream &s, const Matrix33 &m) -@@ -3320,6 +3322,7 @@ operator << (std::ostream &s, const Matrix44 &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 diff --git a/media-libs/openexr/openexr-2.2.0.recipe b/media-libs/openexr/openexr-2.2.0.recipe index 76b558ea2..a3ae7155f 100644 --- a/media-libs/openexr/openexr-2.2.0.recipe +++ b/media-libs/openexr/openexr-2.2.0.recipe @@ -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 - " diff --git a/media-libs/openexr/patches/openexr-2.2.0.patchset b/media-libs/openexr/patches/openexr-2.2.0.patchset index 28a2849b2..fe0ee1f75 100644 --- a/media-libs/openexr/patches/openexr-2.2.0.patchset +++ b/media-libs/openexr/patches/openexr-2.2.0.patchset @@ -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 Date: Sat, 16 Dec 2017 12:02:34 +0100 Subject: gcc2 support @@ -175,34 +175,6 @@ index d6b55f3..212e623 100644 template 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