diff --git a/.gitignore b/.gitignore index c23a518..70a81cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /openexr-1.7.1.tar.gz -/openexr-2.0.1.tar.gz +/openexr-2.1.0.tar.gz diff --git a/OpenEXR.spec b/OpenEXR.spec index daf9197..8f0851c 100644 --- a/OpenEXR.spec +++ b/OpenEXR.spec @@ -1,15 +1,15 @@ Name: OpenEXR Summary: A high dynamic-range (HDR) image file format -Version: 2.0.1 -Release: 3%{?dist} +Version: 2.1.0 +Release: 1%{?dist} License: BSD URL: http://www.openexr.com/ Source0: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz # fix tests for big endian arches # https://github.com/openexr/openexr/issues/81 -Patch0: openexr-2.0.1-bigendian.patch +Patch0: openexr-2.1.0-bigendian.patch Obsoletes: openexr < %{version}-%{release} Provides: openexr = %{version}-%{release} @@ -76,7 +76,7 @@ make check ||: %files libs %doc AUTHORS ChangeLog LICENSE NEWS README -%{_libdir}/libIlmImf-Imf_2_0.so.20* +%{_libdir}/libIlmImf-Imf_2_1.so.21* %files devel #omit for now, they're mostly useless, and include multilib conflicts (#342781) @@ -88,6 +88,9 @@ make check ||: %changelog +* Wed Nov 27 2013 Rex Dieter 2.1.0-1 +- 2.1.0 + * Wed Nov 20 2013 Dan HorĂ¡k 2.0.1-3 - remove testing residue from optflags diff --git a/openexr-2.0.1-bigendian.patch b/openexr-2.0.1-bigendian.patch deleted file mode 100644 index 1031140..0000000 --- a/openexr-2.0.1-bigendian.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up openexr-2.0.1/IlmImfTest/testFutureProofing.cpp.bigendian openexr-2.0.1/IlmImfTest/testFutureProofing.cpp ---- openexr-2.0.1/IlmImfTest/testFutureProofing.cpp.bigendian 2013-07-12 02:09:04.000000000 +0200 -+++ openexr-2.0.1/IlmImfTest/testFutureProofing.cpp 2013-11-20 15:30:03.000000000 +0100 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include "tmpDir.h" - #include "testFutureProofing.h" -@@ -64,6 +65,7 @@ - #include - #include - #include -+#include - - using namespace OPENEXR_IMF_NAMESPACE; - using namespace std; -@@ -1171,6 +1173,12 @@ void modifyType(bool modify_version) - - //length of attribute - fread(&length,4,1,f); -+ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN) -+ { -+ int tmp = bswap_32(length); -+ length = tmp; -+ } -+ - if(!modify_version && attrib_name=="type") - { - // modify the type of part 1 to be 'X' -diff -up openexr-2.0.1/IlmImfTest/testMultiPartFileMixingBasic.cpp.bigendian openexr-2.0.1/IlmImfTest/testMultiPartFileMixingBasic.cpp ---- openexr-2.0.1/IlmImfTest/testMultiPartFileMixingBasic.cpp.bigendian 2013-06-18 21:51:40.000000000 +0200 -+++ openexr-2.0.1/IlmImfTest/testMultiPartFileMixingBasic.cpp 2013-11-20 15:30:14.000000000 +0100 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include "tmpDir.h" - #include "testMultiPartFileMixingBasic.h" -@@ -59,6 +60,7 @@ - #include - #include - #include -+#include - - using namespace OPENEXR_IMF_NAMESPACE; - using namespace std; -@@ -1377,6 +1379,11 @@ void killOffsetTables() - - //length of attribute - fread(&length,4,1,f); -+ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN) -+ { -+ int tmp = bswap_32(length); -+ length = tmp; -+ } - - //value of attribute - for(int i=0;i + #include + #include ++#include + + #include "tmpDir.h" + #include "testFutureProofing.h" +@@ -64,6 +65,7 @@ + #include + #include + #include ++#include + + namespace IMF = OPENEXR_IMF_NAMESPACE; + using namespace IMF; +@@ -1234,6 +1236,12 @@ modifyType (bool modify_version) + + //length of attribute + fread(&length,4,1,f); ++ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN) ++ { ++ int tmp = bswap_32(length); ++ length = tmp; ++ } ++ + if(!modify_version && attrib_name=="type") + { + // modify the type of part 1 to be 'X' +diff -up openexr-2.1.0/IlmImfTest/testMultiPartFileMixingBasic.cpp.bigendian openexr-2.1.0/IlmImfTest/testMultiPartFileMixingBasic.cpp +--- openexr-2.1.0/IlmImfTest/testMultiPartFileMixingBasic.cpp.bigendian 2013-11-11 17:09:52.000000000 -0600 ++++ openexr-2.1.0/IlmImfTest/testMultiPartFileMixingBasic.cpp 2013-11-27 08:44:19.370775892 -0600 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #include "tmpDir.h" + #include "testMultiPartFileMixingBasic.h" +@@ -59,6 +60,7 @@ + #include + #include + #include ++#include + + namespace IMF = OPENEXR_IMF_NAMESPACE; + using namespace IMF; +@@ -1383,6 +1385,11 @@ killOffsetTables (const std::string & fn + + //length of attribute + fread(&length,4,1,f); ++ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN) ++ { ++ int tmp = bswap_32(length); ++ length = tmp; ++ } + + //value of attribute + for(int i=0;i