From 62835581f11a53cd1e93743081cca2f8bcfa20bc Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 18 Apr 2020 17:45:45 -0400 Subject: [PATCH] openexr: Clean up, drop ilmbase. * Use upstream version of 2.2.1 that also contains ilmbase. * Rename openexr24 to openexr. --- media-libs/ilmbase/ilmbase-2.1.0.recipe | 86 ----------- media-libs/ilmbase/ilmbase-2.2.1.recipe | 99 ------------ .../ilmbase/patches/ilmbase-2.1.0.patch | 13 -- .../ilmbase/patches/ilmbase-2.2.1.patchset | 137 ----------------- media-libs/openexr/openexr-2.1.0.recipe | 117 -------------- media-libs/openexr/openexr-2.2.1.recipe | 70 ++++++--- ...xr24-2.4.1.recipe => openexr-2.4.1.recipe} | 17 ++- .../openexr/patches/openexr-2.1.0.patch | 13 -- .../openexr/patches/openexr-2.2.1.patchset | 144 ++++++++++++++++++ 9 files changed, 201 insertions(+), 495 deletions(-) delete mode 100644 media-libs/ilmbase/ilmbase-2.1.0.recipe delete mode 100644 media-libs/ilmbase/ilmbase-2.2.1.recipe delete mode 100644 media-libs/ilmbase/patches/ilmbase-2.1.0.patch delete mode 100644 media-libs/ilmbase/patches/ilmbase-2.2.1.patchset delete mode 100644 media-libs/openexr/openexr-2.1.0.recipe rename media-libs/openexr/{openexr24-2.4.1.recipe => openexr-2.4.1.recipe} (92%) delete mode 100644 media-libs/openexr/patches/openexr-2.1.0.patch diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe deleted file mode 100644 index a25873783..000000000 --- a/media-libs/ilmbase/ilmbase-2.1.0.recipe +++ /dev/null @@ -1,86 +0,0 @@ -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/" -COPYRIGHT="2002-2013 Industrial Light & Magic" -LICENSE="BSD (3-clause)" -REVISION="3" -SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVersion.tar.gz" -CHECKSUM_SHA256="1e841ad89c5761940b07a125e6909ad22fe9fe0f99eadef45e0cca4efc6819b4" -PATCHES="ilmbase-2.1.0.patch" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - ilmbase$secondaryArchSuffix = $portVersion - lib:libHalf$secondaryArchSuffix = $portVersion - lib:libIex_2_1$secondaryArchSuffix = $portVersion - lib:libIexMath_2_1$secondaryArchSuffix = $portVersion - lib:libilmbase$secondaryArchSuffix = $portVersion - lib:libIlmThread_2_1$secondaryArchSuffix = $portVersion - lib:libImath_2_1$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - ilmbase${secondaryArchSuffix}_devel = $portVersion - devel:libHalf$secondaryArchSuffix = $portVersion - devel:libIex$secondaryArchSuffix = $portVersion - devel:libIex_2_1$secondaryArchSuffix = $portVersion - devel:libIexMath$secondaryArchSuffix = $portVersion - devel:libIexMath_2_1$secondaryArchSuffix = $portVersion - devel:libilmbase$secondaryArchSuffix = $portVersion - devel:libIlmThread$secondaryArchSuffix = $portVersion - devel:libIlmThread_2_1$secondaryArchSuffix = $portVersion - devel:libImath$secondaryArchSuffix = $portVersion - devel:libImath_2_1$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - ilmbase$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:which - " - -BUILD() -{ - ./bootstrap - runConfigure ./configure - make -} - -INSTALL() -{ - make install - - # remove libtool library files - rm $libDir/lib*.la - - # prepare development lib links - prepareInstalledDevelLibs libHalf libIex libIexMath libIlmThread \ - libImath libIex-2_1 libIexMath-2_1 libIlmThread-2_1 libImath-2_1 - - fixPkgconfig - - # devel package - packageEntries devel $developDir -} diff --git a/media-libs/ilmbase/ilmbase-2.2.1.recipe b/media-libs/ilmbase/ilmbase-2.2.1.recipe deleted file mode 100644 index ea45a6218..000000000 --- a/media-libs/ilmbase/ilmbase-2.2.1.recipe +++ /dev/null @@ -1,99 +0,0 @@ -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/" -COPYRIGHT="2002-2017 Industrial Light & Magic" -LICENSE="BSD (3-clause)" -REVISION="2" -SOURCE_URI="https://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVersion.tar.gz" -CHECKSUM_SHA256="cac206e63be68136ef556c2b555df659f45098c159ce24804e9d5e9e0286609e" -if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then - PATCHES="ilmbase-$portVersion.patchset" -fi - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -libVersion="23.0.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - ilmbase$secondaryArchSuffix = $portVersion - lib:libhalf$secondaryArchSuffix = $libVersionCompat - lib:libiex$secondaryArchSuffix = $libVersionCompat - lib:libiex_2_2$secondaryArchSuffix = $libVersionCompat - lib:libiexmath$secondaryArchSuffix = $libVersionCompat - lib:libiexmath_2_2$secondaryArchSuffix = $libVersionCompat - lib:libilmthread$secondaryArchSuffix = $libVersionCompat - lib:libilmthread_2_2$secondaryArchSuffix = $libVersionCompat - lib:libimath$secondaryArchSuffix = $libVersionCompat - lib:libimath_2_2$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - ilmbase${secondaryArchSuffix}_devel = $portVersion - devel:libhalf$secondaryArchSuffix = $libVersionCompat - devel:libiex$secondaryArchSuffix = $libVersionCompat - devel:libiex_2_2$secondaryArchSuffix = $libVersionCompat - devel:libiexmath$secondaryArchSuffix = $libVersionCompat - devel:libiexmath_2_2$secondaryArchSuffix = $libVersionCompat - devel:libilmthread$secondaryArchSuffix = $libVersionCompat - devel:libilmthread_2_2$secondaryArchSuffix = $libVersionCompat - devel:libimath$secondaryArchSuffix = $libVersionCompat - devel:libimath_2_2$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - ilmbase$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:which - " - -BUILD() -{ - ./bootstrap - if [ $effectiveTargetArchitecture = "x86_gcc2" ]; then - export CXXFLAGS="-Dios_base=ios" - fi - runConfigure ./configure - make -} - -INSTALL() -{ - make install - - # remove libtool library files - rm $libDir/lib*.la - - # prepare development lib links - prepareInstalledDevelLibs libHalf libIex libIexMath libIlmThread \ - libImath libIex-2_2 libIexMath-2_2 libIlmThread-2_2 libImath-2_2 - - fixPkgconfig - - # devel package - packageEntries devel $developDir -} - -TEST() -{ - make check -} diff --git a/media-libs/ilmbase/patches/ilmbase-2.1.0.patch b/media-libs/ilmbase/patches/ilmbase-2.1.0.patch deleted file mode 100644 index 83627aede..000000000 --- a/media-libs/ilmbase/patches/ilmbase-2.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 743fc1f..30ca197 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,7 +10,7 @@ AC_SUBST(ILMBASE_VERSION_API, ${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}) - - AC_CANONICAL_HOST - AC_CONFIG_SRCDIR(ImathTest/main.cpp) --AM_CONFIG_HEADER(config/IlmBaseConfig.h) -+AC_CONFIG_HEADER(config/IlmBaseConfig.h) - AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better - AM_MAINTAINER_MODE - diff --git a/media-libs/ilmbase/patches/ilmbase-2.2.1.patchset b/media-libs/ilmbase/patches/ilmbase-2.2.1.patchset deleted file mode 100644 index c22877208..000000000 --- a/media-libs/ilmbase/patches/ilmbase-2.2.1.patchset +++ /dev/null @@ -1,137 +0,0 @@ -From f698920dbb4857505d1943fbef3cc9f3d05a2bae Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 16 Dec 2017 10:52:53 +0100 -Subject: gcc2 support - - -diff --git a/Half/eLut.cpp b/Half/eLut.cpp -index ce64b50..8deed8b 100644 ---- a/Half/eLut.cpp -+++ b/Half/eLut.cpp -@@ -110,5 +110,6 @@ main () - } - - cout << "};\n"; -+ cout.flush(); - return 0; - } -diff --git a/Half/toFloat.cpp b/Half/toFloat.cpp -index 001bc51..ef2d87f 100644 ---- a/Half/toFloat.cpp -+++ b/Half/toFloat.cpp -@@ -160,5 +160,6 @@ main () - } - - cout << "};\n"; -+ cout.flush(); - return 0; - } -diff --git a/Iex/IexBaseExc.cpp b/Iex/IexBaseExc.cpp -index 3b2e197..2fcf602 100644 ---- a/Iex/IexBaseExc.cpp -+++ b/Iex/IexBaseExc.cpp -@@ -151,6 +151,6 @@ iex_debugTrap() - { - // how to in Linux? - if (0 != ::getenv("IEXDEBUGTHROW")) -- __builtin_trap(); -+ abort(); - } - #endif -diff --git a/IexMath/IexMathFpu.h b/IexMath/IexMathFpu.h -index df2a3e5..c6ae73b 100644 ---- a/IexMath/IexMathFpu.h -+++ b/IexMath/IexMathFpu.h -@@ -69,7 +69,9 @@ int fpExceptions (); - // that will be called when SIGFPE occurs. - //------------------------------------------ - --extern "C" typedef void (* FpExceptionHandler) (int type, const char explanation[]); -+extern "C" { -+ typedef void (* FpExceptionHandler) (int type, const char explanation[]); -+} - - void setFpExceptionHandler (FpExceptionHandler handler); - -diff --git a/Imath/ImathVec.h b/Imath/ImathVec.h -index fb859eb..5fa0e91 100644 ---- a/Imath/ImathVec.h -+++ b/Imath/ImathVec.h -@@ -126,9 +126,6 @@ template class Vec2 - template - bool operator == (const Vec2 &v) const; - -- template -- bool operator != (const Vec2 &v) const; -- - - //----------------------------------------------------------------------- - // Compare two vectors and test if they are "approximately equal": -@@ -339,9 +336,6 @@ template class Vec3 - template - bool operator == (const Vec3 &v) const; - -- template -- bool operator != (const Vec3 &v) const; -- - //----------------------------------------------------------------------- - // Compare two vectors and test if they are "approximately equal": - // -@@ -524,9 +518,6 @@ template class Vec4 - template - bool operator == (const Vec4 &v) const; - -- template -- bool operator != (const Vec4 &v) const; -- - - //----------------------------------------------------------------------- - // Compare two vectors and test if they are "approximately equal": -@@ -969,14 +960,6 @@ Vec2::operator == (const Vec2 &v) const - return x == v.x && y == v.y; - } - --template --template --inline bool --Vec2::operator != (const Vec2 &v) const --{ -- return x != v.x || y != v.y; --} -- - template - bool - Vec2::equalWithAbsError (const Vec2 &v, T e) const -@@ -1432,14 +1415,6 @@ Vec3::operator == (const Vec3 &v) const - return x == v.x && y == v.y && z == v.z; - } - --template --template --inline bool --Vec3::operator != (const Vec3 &v) const --{ -- return x != v.x || y != v.y || z != v.z; --} -- - template - bool - Vec3::equalWithAbsError (const Vec3 &v, T e) const -@@ -1853,14 +1828,6 @@ Vec4::operator == (const Vec4 &v) const - return x == v.x && y == v.y && z == v.z && w == v.w; - } - --template --template --inline bool --Vec4::operator != (const Vec4 &v) const --{ -- return x != v.x || y != v.y || z != v.z || w != v.w; --} -- - template - bool - Vec4::equalWithAbsError (const Vec4 &v, T e) const --- -2.15.0 - diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe deleted file mode 100644 index de0f79490..000000000 --- a/media-libs/openexr/openexr-2.1.0.recipe +++ /dev/null @@ -1,117 +0,0 @@ -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." -HOMEPAGE="http://www.openexr.com/" -COPYRIGHT="2002-2013 Industrial Light & Magic" -LICENSE="BSD (3-clause)" -REVISION="3" -SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-$portVersion.tar.gz" -CHECKSUM_SHA256="54486b454073c1dcb5ae9892cf0f730ffefe62f38176325281505093fd218a14" -PATCHES="openexr-$portVersion.patch" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - openexr$secondaryArchSuffix = $portVersion - cmd:exrenvmap$secondaryArchSuffix = $portVersion - cmd:exrheader$secondaryArchSuffix = $portVersion - cmd:exrmakepreview$secondaryArchSuffix = $portVersion - cmd:exrmaketiled$secondaryArchSuffix = $portVersion - cmd:exrmultipart$secondaryArchSuffix = $portVersion - cmd:exrmultiview$secondaryArchSuffix = $portVersion - cmd:exrstdattr$secondaryArchSuffix = $portVersion - lib:libIlmImf$secondaryArchSuffix = $portVersion - lib:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libHalf$secondaryArchSuffix == $portVersion - lib:libIex_2_1$secondaryArchSuffix == $portVersion - lib:libIexMath_2_1$secondaryArchSuffix == $portVersion - lib:libilmbase$secondaryArchSuffix == $portVersion - lib:libIlmThread_2_1$secondaryArchSuffix == $portVersion - lib:libImath_2_1$secondaryArchSuffix == $portVersion - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - openexr${secondaryArchSuffix}_devel = $portVersion - devel:libIlmImf$secondaryArchSuffix = $portVersion - devel:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - openexr$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - ilmbase${secondaryArchSuffix}_devel == $portVersion - devel:libHalf$secondaryArchSuffix == $portVersion - devel:libIex$secondaryArchSuffix == $portVersion - devel:libIex_2_1$secondaryArchSuffix == $portVersion - devel:libIexMath$secondaryArchSuffix == $portVersion - devel:libIexMath_2_1$secondaryArchSuffix == $portVersion - devel:libilmbase$secondaryArchSuffix == $portVersion - devel:libIlmThread$secondaryArchSuffix == $portVersion - devel:libIlmThread_2_1$secondaryArchSuffix == $portVersion - devel:libImath$secondaryArchSuffix == $portVersion - devel:libImath_2_1$secondaryArchSuffix == $portVersion - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - ilmbase$secondaryArchSuffix == $portVersion - cmd:aclocal - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:which - " - -BUILD() -{ - pathSecondaryArchSuffix=$(echo ${secondaryArchSuffix} | sed s/^_//g) - IlmBasePkgconfig=$(find /packages/ilmbase${secondaryArchSuffix}_devel-\ -${portVersion}-*/ilmbase${secondaryArchSuffix}/develop/lib/\ -${pathSecondaryArchSuffix}/pkgconfig/IlmBase.pc | sed s/IlmBase\.pc//g) - export PKG_CONFIG_PATH+=:$IlmBasePkgconfig - - ./bootstrap - runConfigure ./configure - make -} - -INSTALL() -{ - make install - - # remove libtool library files - rm $libDir/libIlmImf*.la - - # prepare development documentation - mkdir -p $developDocDir - mv $dataDir/doc $developDocDir - - # prepare autom4te script - mkdir -p $developDir - mv $dataDir/aclocal $developDir - - #clear empty directory - rmdir $dataDir - - # prepare development lib links - prepareInstalledDevelLibs libIlmImf-Imf_2_1 libIlmImf - - fixPkgconfig - - # devel package - packageEntries devel $developDir -} diff --git a/media-libs/openexr/openexr-2.2.1.recipe b/media-libs/openexr/openexr-2.2.1.recipe index 67d8d28f8..234be6b07 100644 --- a/media-libs/openexr/openexr-2.2.1.recipe +++ b/media-libs/openexr/openexr-2.2.1.recipe @@ -8,9 +8,9 @@ main image file format." HOMEPAGE="https://www.openexr.com/" COPYRIGHT="2002-2017 Industrial Light & Magic" LICENSE="BSD (3-clause)" -REVISION="2" -SOURCE_URI="https://download.savannah.nongnu.org/releases/openexr/openexr-$portVersion.tar.gz" -CHECKSUM_SHA256="8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd" +REVISION="3" +SOURCE_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="63ebc7677d63ad59f1ec205d149dff1da31e7e3c8e78e944458b1d371c7e2f3c" if [ $effectiveTargetArchitecture = "x86_gcc2" ]; then PATCHES="openexr-$portVersion.patchset" @@ -31,6 +31,17 @@ PROVIDES=" cmd:exrmultipart$secondaryArchSuffix = $portVersion cmd:exrmultiview$secondaryArchSuffix = $portVersion cmd:exrstdattr$secondaryArchSuffix = $portVersion + + lib:libhalf$secondaryArchSuffix = $libVersionCompat + lib:libiex$secondaryArchSuffix = $libVersionCompat + lib:libiex_2_2$secondaryArchSuffix = $libVersionCompat + lib:libiexmath$secondaryArchSuffix = $libVersionCompat + lib:libiexmath_2_2$secondaryArchSuffix = $libVersionCompat + lib:libilmthread$secondaryArchSuffix = $libVersionCompat + lib:libilmthread_2_2$secondaryArchSuffix = $libVersionCompat + lib:libimath$secondaryArchSuffix = $libVersionCompat + lib:libimath_2_2$secondaryArchSuffix = $libVersionCompat + lib:libilmimf$secondaryArchSuffix = $libVersionCompat lib:libilmimf_2_2$secondaryArchSuffix = $libVersionCompat lib:libilmimfutil$secondaryArchSuffix = $libVersionCompat @@ -38,16 +49,25 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libhalf$secondaryArchSuffix - lib:libiex_2_2$secondaryArchSuffix - lib:libiexmath_2_2$secondaryArchSuffix - lib:libilmthread_2_2$secondaryArchSuffix - lib:libimath_2_2$secondaryArchSuffix lib:libz$secondaryArchSuffix " +CONFLICTS=" + ilmbase$secondaryArchSuffix + " PROVIDES_devel=" openexr${secondaryArchSuffix}_devel = $portVersion + + devel:libhalf$secondaryArchSuffix = $libVersionCompat + devel:libiex$secondaryArchSuffix = $libVersionCompat + devel:libiex_2_2$secondaryArchSuffix = $libVersionCompat + devel:libiexmath$secondaryArchSuffix = $libVersionCompat + devel:libiexmath_2_2$secondaryArchSuffix = $libVersionCompat + devel:libilmthread$secondaryArchSuffix = $libVersionCompat + devel:libilmthread_2_2$secondaryArchSuffix = $libVersionCompat + devel:libimath$secondaryArchSuffix = $libVersionCompat + devel:libimath_2_2$secondaryArchSuffix = $libVersionCompat + devel:libilmimf$secondaryArchSuffix = $libVersionCompat devel:libilmimf_2_2$secondaryArchSuffix = $libVersionCompat devel:libilmimfutil$secondaryArchSuffix = $libVersionCompat @@ -59,11 +79,6 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libhalf$secondaryArchSuffix - devel:libiex$secondaryArchSuffix - devel:libiexMath$secondaryArchSuffix - devel:libilmthread$secondaryArchSuffix - devel:libimath$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -79,26 +94,33 @@ BUILD_PREREQUIRES=" BUILD() { - pathSecondaryArchSuffix=$(echo ${secondaryArchSuffix} | sed s/^_//g) - IlmBasePkgconfig=$(find /packages/ilmbase${secondaryArchSuffix}_devel-\ -${portVersion}-*/ilmbase${secondaryArchSuffix}/develop/lib/\ -${pathSecondaryArchSuffix}/pkgconfig/IlmBase.pc | sed s/IlmBase\.pc//g) - export PKG_CONFIG_PATH+=:$IlmBasePkgconfig - - ./bootstrap if [ $effectiveTargetArchitecture = "x86_gcc2" ]; then export CXXFLAGS="-Dios_base=ios -ftemplate-depth-30" fi + + cd IlmBase + ./bootstrap + runConfigure ./configure + make $jobArgs + make install + export PKG_CONFIG_PATH+=:$libDir/pkgconfig/ + + cd ../OpenEXR + ./bootstrap runConfigure ./configure make $jobArgs } INSTALL() { + cd IlmBase + make install + + cd ../OpenEXR make install # remove libtool library files - rm $libDir/libIlmImf*.la + rm $libDir/lib*.la # prepare development documentation mkdir -p $developDocDir @@ -108,12 +130,14 @@ INSTALL() mkdir -p $developDir mv $dataDir/aclocal $developDir - #clear empty directory + # clear empty directory rmdir $dataDir # prepare development lib links prepareInstalledDevelLibs libIlmImf-2_2 libIlmImf \ - libIlmImfUtil-2_2 libIlmImfUtil + libIlmImfUtil-2_2 libIlmImfUtil \ + libHalf libIex libIexMath libIlmThread \ + libImath libIex-2_2 libIexMath-2_2 libIlmThread-2_2 libImath-2_2 fixPkgconfig diff --git a/media-libs/openexr/openexr24-2.4.1.recipe b/media-libs/openexr/openexr-2.4.1.recipe similarity index 92% rename from media-libs/openexr/openexr24-2.4.1.recipe rename to media-libs/openexr/openexr-2.4.1.recipe index 819d8be7b..d2ef8e8ee 100644 --- a/media-libs/openexr/openexr24-2.4.1.recipe +++ b/media-libs/openexr/openexr-2.4.1.recipe @@ -9,7 +9,7 @@ HOMEPAGE="https://www.openexr.com/" COPYRIGHT="2002-2017 Industrial Light & Magic" LICENSE="BSD (3-clause)" REVISION="1" -SOURCE_URI="https://github.com/openexr/openexr/archive/v$portVersion.tar.gz" +SOURCE_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1" SOURCE_FILENAME="openexr-$portVersion.tar.gz" SOURCE_DIR="openexr-$portVersion" @@ -22,7 +22,7 @@ libVersion="24.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - openexr24$secondaryArchSuffix = $portVersion + openexr$secondaryArchSuffix = $portVersion cmd:exr2aces$secondaryArchSuffix = $portVersion cmd:exrenvmap$secondaryArchSuffix = $portVersion cmd:exrheader$secondaryArchSuffix = $portVersion @@ -43,9 +43,12 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " +CONFLICTS=" + ilmbase$secondaryArchSuffix + " PROVIDES_devel=" - openexr24${secondaryArchSuffix}_devel = $portVersion + openexr${secondaryArchSuffix}_devel = $portVersion devel:libhalf_2_4$secondaryArchSuffix = $libVersionCompat devel:libiex_2_4$secondaryArchSuffix = $libVersionCompat devel:libiexmath_2_4$secondaryArchSuffix = $libVersionCompat @@ -62,7 +65,7 @@ PROVIDES_devel=" devel:libimath$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - openexr24$secondaryArchSuffix == $portVersion base + openexr$secondaryArchSuffix == $portVersion base " CONFLICTS_devel=" openexr${secondaryArchSuffix}_devel @@ -97,7 +100,7 @@ INSTALL() #clear empty directory rmdir $prefix/share - + mkdir -p $(dirname $includeDir) mv $prefix/include $includeDir if [ -n "$secondaryArchSuffix" ]; then @@ -107,12 +110,12 @@ INSTALL() mv $prefix/lib2 $libDir mv $prefix/bin2 $binDir fi - + # prepare development lib links prepareInstalledDevelLibs \ libHalf-2_4 libIlmImf-2_4 \ libImath-2_4 libIex-2_4 libIexMath-2_4 \ - libIlmImfUtil-2_4 libIlmThread-2_4 + libIlmImfUtil-2_4 libIlmThread-2_4 fixPkgconfig mv $libDir/lib{Half,Iex,Imath,IexMath,IlmImf,IlmImfUtil,IlmThread}.* \ diff --git a/media-libs/openexr/patches/openexr-2.1.0.patch b/media-libs/openexr/patches/openexr-2.1.0.patch deleted file mode 100644 index b192a850e..000000000 --- a/media-libs/openexr/patches/openexr-2.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 23e9e5f..90570d4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) - - AC_CANONICAL_HOST - AC_CONFIG_SRCDIR(IlmImfTest/main.cpp) --AM_CONFIG_HEADER(config/OpenEXRConfig.h) -+AC_CONFIG_HEADER(config/OpenEXRConfig.h) - AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better - AM_MAINTAINER_MODE - diff --git a/media-libs/openexr/patches/openexr-2.2.1.patchset b/media-libs/openexr/patches/openexr-2.2.1.patchset index fe0ee1f75..540765ad0 100644 --- a/media-libs/openexr/patches/openexr-2.2.1.patchset +++ b/media-libs/openexr/patches/openexr-2.2.1.patchset @@ -265,3 +265,147 @@ index 19567eb..92b9c86 100644 -- 2.15.0 + +From 57d8ac08eaf7c547d927ddd1344a908b2f1ea80c Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Sat, 16 Dec 2017 10:52:53 +0100 +Subject: [PATCH] gcc2 support + +--- + IlmBase/Half/eLut.cpp | 1 + + IlmBase/Half/toFloat.cpp | 1 + + IlmBase/Iex/IexBaseExc.cpp | 2 +- + IlmBase/IexMath/IexMathFpu.h | 4 +++- + IlmBase/Imath/ImathVec.h | 33 --------------------------------- + 5 files changed, 6 insertions(+), 35 deletions(-) + +diff --git a/IlmBase/Half/eLut.cpp b/IlmBase/Half/eLut.cpp +index ce64b50..8deed8b 100644 +--- a/IlmBase/Half/eLut.cpp ++++ b/IlmBase/Half/eLut.cpp +@@ -110,5 +110,6 @@ main () + } + + cout << "};\n"; ++ cout.flush(); + return 0; + } +diff --git a/IlmBase/Half/toFloat.cpp b/IlmBase/Half/toFloat.cpp +index 001bc51..ef2d87f 100644 +--- a/IlmBase/Half/toFloat.cpp ++++ b/IlmBase/Half/toFloat.cpp +@@ -160,5 +160,6 @@ main () + } + + cout << "};\n"; ++ cout.flush(); + return 0; + } +diff --git a/IlmBase/Iex/IexBaseExc.cpp b/IlmBase/Iex/IexBaseExc.cpp +index 3b2e197..2fcf602 100644 +--- a/IlmBase/Iex/IexBaseExc.cpp ++++ b/IlmBase/Iex/IexBaseExc.cpp +@@ -151,6 +151,6 @@ iex_debugTrap() + { + // how to in Linux? + if (0 != ::getenv("IEXDEBUGTHROW")) +- __builtin_trap(); ++ abort(); + } + #endif +diff --git a/IlmBase/IexMath/IexMathFpu.h b/IlmBase/IexMath/IexMathFpu.h +index df2a3e5..c6ae73b 100644 +--- a/IlmBase/IexMath/IexMathFpu.h ++++ b/IlmBase/IexMath/IexMathFpu.h +@@ -69,7 +69,9 @@ int fpExceptions (); + // that will be called when SIGFPE occurs. + //------------------------------------------ + +-extern "C" typedef void (* FpExceptionHandler) (int type, const char explanation[]); ++extern "C" { ++ typedef void (* FpExceptionHandler) (int type, const char explanation[]); ++} + + void setFpExceptionHandler (FpExceptionHandler handler); + +diff --git a/IlmBase/Imath/ImathVec.h b/IlmBase/Imath/ImathVec.h +index fb859eb..5fa0e91 100644 +--- a/IlmBase/Imath/ImathVec.h ++++ b/IlmBase/Imath/ImathVec.h +@@ -126,9 +126,6 @@ template class Vec2 + template + bool operator == (const Vec2 &v) const; + +- template +- bool operator != (const Vec2 &v) const; +- + + //----------------------------------------------------------------------- + // Compare two vectors and test if they are "approximately equal": +@@ -339,9 +336,6 @@ template class Vec3 + template + bool operator == (const Vec3 &v) const; + +- template +- bool operator != (const Vec3 &v) const; +- + //----------------------------------------------------------------------- + // Compare two vectors and test if they are "approximately equal": + // +@@ -524,9 +518,6 @@ template class Vec4 + template + bool operator == (const Vec4 &v) const; + +- template +- bool operator != (const Vec4 &v) const; +- + + //----------------------------------------------------------------------- + // Compare two vectors and test if they are "approximately equal": +@@ -969,14 +960,6 @@ Vec2::operator == (const Vec2 &v) const + return x == v.x && y == v.y; + } + +-template +-template +-inline bool +-Vec2::operator != (const Vec2 &v) const +-{ +- return x != v.x || y != v.y; +-} +- + template + bool + Vec2::equalWithAbsError (const Vec2 &v, T e) const +@@ -1432,14 +1415,6 @@ Vec3::operator == (const Vec3 &v) const + return x == v.x && y == v.y && z == v.z; + } + +-template +-template +-inline bool +-Vec3::operator != (const Vec3 &v) const +-{ +- return x != v.x || y != v.y || z != v.z; +-} +- + template + bool + Vec3::equalWithAbsError (const Vec3 &v, T e) const +@@ -1853,14 +1828,6 @@ Vec4::operator == (const Vec4 &v) const + return x == v.x && y == v.y && z == v.z && w == v.w; + } + +-template +-template +-inline bool +-Vec4::operator != (const Vec4 &v) const +-{ +- return x != v.x || y != v.y || z != v.z || w != v.w; +-} +- + template + bool + Vec4::equalWithAbsError (const Vec4 &v, T e) const +-- +2.24.1