[mingw-OpenEXR] Update to 2.2.0
Sandro Mani
smani at fedoraproject.org
Wed Nov 26 09:52:03 UTC 2014
commit 912b6ed53300a1c3c2affb66f5923d93b4503a82
Author: Sandro Mani <manisandro at gmail.com>
Date: Wed Nov 26 10:51:58 2014 +0100
Update to 2.2.0
.gitignore | 1 +
mingw-OpenEXR.spec | 29 +++++++++++++-------
openexr-2.1.0-headers.patch | 22 ---------------
openexr-2.1.0_aligned-malloc.patch | 13 ---------
openexr-2.1.0_bb44ExpLogTable.patch | 13 ---------
openexr-2.1.0_cast.patch | 12 --------
openexr-2.2.0_aligned-malloc.patch | 13 +++++++++
openexr-2.2.0_autogen-headers.patch | 19 +++++++++++++
openexr-2.2.0_cast.patch | 12 ++++++++
openexr-2.2.0_headers.patch | 22 +++++++++++++++
...os.patch => openexr-2.2.0_obsolete-macros.patch | 8 +++---
sources | 2 +-
12 files changed, 91 insertions(+), 75 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 365a4ec..523733b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/openexr-2.1.0.tar.gz
+/openexr-2.2.0.tar.gz
diff --git a/mingw-OpenEXR.spec b/mingw-OpenEXR.spec
index 2eb6b12..6b9aaf6 100644
--- a/mingw-OpenEXR.spec
+++ b/mingw-OpenEXR.spec
@@ -3,8 +3,8 @@
%global pkgname OpenEXR
Name: mingw-%{pkgname}
-Version: 2.1.0
-Release: 3%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
Summary: MinGW Windows %{pkgname} library
License: BSD
@@ -12,15 +12,15 @@ URL: http://www.openexr.com/
BuildArch: noarch
Source0: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz
# install missing headers
-Patch0: openexr-2.1.0-headers.patch
-# don't autogenerate bb44ExpLogTable.h (would require wine BR)
-Patch1: openexr-2.1.0_bb44ExpLogTable.patch
+Patch0: openexr-2.2.0_headers.patch
+# don't autogenerate headers (would require wine BR)
+Patch1: openexr-2.2.0_autogen-headers.patch
# Use _aligned_malloc instead of posix_memalign
-Patch2: openexr-2.1.0_aligned-malloc.patch
+Patch2: openexr-2.2.0_aligned-malloc.patch
# Fix cast
-Patch3: openexr-2.1.0_cast.patch
+Patch3: openexr-2.2.0_cast.patch
# Replace obsolete macros in configure.ac
-Patch4: openexr_obsolete-macros.patch
+Patch4: openexr-2.2.0_obsolete-macros.patch
BuildRequires: autoconf automake libtool
@@ -115,36 +115,45 @@ rm -rf %{buildroot}%{mingw64_docdir}/%{pkgname}-%{version}
%files -n mingw32-%{pkgname}
%doc LICENSE
-%{mingw32_bindir}/libIlmImf-Imf_2_1-21.dll
+%{mingw32_bindir}/libIlmImf-2_2-22.dll
+%{mingw32_bindir}/libIlmImfUtil-2_2-22.dll
#dir %%{mingw32_includedir}/OpenEXR => It is owned by mingw32-ilmbase, which is a dependency
%{mingw32_includedir}/OpenEXR/*.h
%{mingw32_libdir}/libIlmImf.dll.a
+%{mingw32_libdir}/libIlmImfUtil.dll.a
%{mingw32_libdir}/pkgconfig/OpenEXR.pc
%{mingw32_datadir}/aclocal/openexr.m4
%files -n mingw32-%{pkgname}-static
%{mingw32_libdir}/libIlmImf.a
+%{mingw32_libdir}/libIlmImfUtil.a
%files -n mingw32-%{pkgname}-tools
%{mingw32_bindir}/*.exe
%files -n mingw64-%{pkgname}
%doc LICENSE
-%{mingw64_bindir}/libIlmImf-Imf_2_1-21.dll
+%{mingw64_bindir}/libIlmImf-2_2-22.dll
+%{mingw64_bindir}/libIlmImfUtil-2_2-22.dll
#dir %%{mingw64_includedir}/OpenEXR => It is owned by mingw32-ilmbase, which is a dependency
%{mingw64_includedir}/OpenEXR/*.h
%{mingw64_libdir}/libIlmImf.dll.a
+%{mingw64_libdir}/libIlmImfUtil.dll.a
%{mingw64_libdir}/pkgconfig/OpenEXR.pc
%{mingw64_datadir}/aclocal/openexr.m4
%files -n mingw64-%{pkgname}-static
%{mingw64_libdir}/libIlmImf.a
+%{mingw64_libdir}/libIlmImfUtil.a
%files -n mingw64-%{pkgname}-tools
%{mingw64_bindir}/*.exe
%changelog
+* Wed Nov 26 2014 Sandro Mani <manisandro at gmail.com> - 2.2.0-1
+- Update to 2.2.0
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/openexr-2.2.0_aligned-malloc.patch b/openexr-2.2.0_aligned-malloc.patch
new file mode 100644
index 0000000..d6a50d4
--- /dev/null
+++ b/openexr-2.2.0_aligned-malloc.patch
@@ -0,0 +1,13 @@
+diff -rupN openexr-2.2.0/IlmImf/ImfSystemSpecific.h openexr-2.2.0-new/IlmImf/ImfSystemSpecific.h
+--- openexr-2.2.0/IlmImf/ImfSystemSpecific.h 2014-08-10 06:23:57.000000000 +0200
++++ openexr-2.2.0-new/IlmImf/ImfSystemSpecific.h 2014-11-26 10:28:23.286780106 +0100
+@@ -62,8 +62,7 @@ static bool GLOBAL_SYSTEM_LITTLE_ENDIAN
+
+ static void* EXRAllocAligned(size_t size, size_t alignment)
+ {
+- void* ptr = 0;
+- posix_memalign(&ptr, alignment, size);
++ void* ptr = _aligned_malloc(alignment, size);
+ return ptr;
+ }
+
diff --git a/openexr-2.2.0_autogen-headers.patch b/openexr-2.2.0_autogen-headers.patch
new file mode 100644
index 0000000..0a57cf3
--- /dev/null
+++ b/openexr-2.2.0_autogen-headers.patch
@@ -0,0 +1,19 @@
+diff -rupN openexr-2.2.0/IlmImf/Makefile.am openexr-2.2.0-new/IlmImf/Makefile.am
+--- openexr-2.2.0/IlmImf/Makefile.am 2014-08-10 06:23:57.000000000 +0200
++++ openexr-2.2.0-new/IlmImf/Makefile.am 2014-11-26 09:57:44.976842092 +0100
+@@ -197,15 +197,7 @@ CLEANFILES = b44ExpLogTable b44ExpLogTab
+ b44ExpLogTable_SOURCES = b44ExpLogTable.cpp
+ b44ExpLogTable_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
+
+-b44ExpLogTable.h: b44ExpLogTable
+- ./b44ExpLogTable > b44ExpLogTable.h
+-
+ dwaLookups_SOURCES = dwaLookups.cpp
+ dwaLookups_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
+
+-dwaLookups.h: dwaLookups
+- ./dwaLookups > dwaLookups.h
+-
+-BUILT_SOURCES = b44ExpLogTable.h dwaLookups.h
+-
+ noinst_PROGRAMS = b44ExpLogTable dwaLookups
diff --git a/openexr-2.2.0_cast.patch b/openexr-2.2.0_cast.patch
new file mode 100644
index 0000000..78d233d
--- /dev/null
+++ b/openexr-2.2.0_cast.patch
@@ -0,0 +1,12 @@
+diff -rupN openexr-2.2.0/IlmImf/ImfOptimizedPixelReading.h openexr-2.2.0-new/IlmImf/ImfOptimizedPixelReading.h
+--- openexr-2.2.0/IlmImf/ImfOptimizedPixelReading.h 2014-08-10 06:23:56.000000000 +0200
++++ openexr-2.2.0-new/IlmImf/ImfOptimizedPixelReading.h 2014-11-26 10:29:04.280511600 +0100
+@@ -70,7 +70,7 @@ EXR_FORCEINLINE
+ bool
+ isPointerSSEAligned (const void* EXR_RESTRICT pPointer)
+ {
+- unsigned long trailingBits = ((unsigned long)pPointer) & 15;
++ intptr_t trailingBits = ((intptr_t)pPointer) & 15;
+ return trailingBits == 0;
+ }
+
diff --git a/openexr-2.2.0_headers.patch b/openexr-2.2.0_headers.patch
new file mode 100644
index 0000000..b9e50c4
--- /dev/null
+++ b/openexr-2.2.0_headers.patch
@@ -0,0 +1,22 @@
+diff -rupN openexr-2.2.0/IlmImf/Makefile.am openexr-2.2.0-new/IlmImf/Makefile.am
+--- openexr-2.2.0/IlmImf/Makefile.am 2014-08-10 06:23:57.000000000 +0200
++++ openexr-2.2.0-new/IlmImf/Makefile.am 2014-11-26 09:54:56.531687545 +0100
+@@ -110,6 +110,7 @@ libIlmImfinclude_HEADERS = ImfForward.h
+ ImfCRgbaFile.h ImfChannelList.h \
+ ImfChannelListAttribute.h \
+ ImfCompressionAttribute.h \
++ ImfDeepImageStateAttribute.h \
+ ImfDoubleAttribute.h ImfFloatAttribute.h \
+ ImfFrameBuffer.h ImfHeader.h ImfIO.h \
+ ImfInputFile.h ImfIntAttribute.h \
+diff -rupN openexr-2.2.0/IlmImf/Makefile.in openexr-2.2.0-new/IlmImf/Makefile.in
+--- openexr-2.2.0/IlmImf/Makefile.in 2014-08-10 06:48:23.000000000 +0200
++++ openexr-2.2.0-new/IlmImf/Makefile.in 2014-11-26 09:54:56.532687563 +0100
+@@ -383,6 +383,7 @@ libIlmImfinclude_HEADERS = ImfForward.h
+ ImfCRgbaFile.h ImfChannelList.h \
+ ImfChannelListAttribute.h \
+ ImfCompressionAttribute.h \
++ ImfDeepImageStateAttribute.h \
+ ImfDoubleAttribute.h ImfFloatAttribute.h \
+ ImfFrameBuffer.h ImfHeader.h ImfIO.h \
+ ImfInputFile.h ImfIntAttribute.h \
diff --git a/openexr_obsolete-macros.patch b/openexr-2.2.0_obsolete-macros.patch
similarity index 62%
rename from openexr_obsolete-macros.patch
rename to openexr-2.2.0_obsolete-macros.patch
index f7d9b23..f18d1bd 100644
--- a/openexr_obsolete-macros.patch
+++ b/openexr-2.2.0_obsolete-macros.patch
@@ -1,11 +1,11 @@
-diff -rupN openexr-2.1.0/configure.ac openexr-2.1.0-new/configure.ac
---- openexr-2.1.0/configure.ac 2013-11-12 00:09:52.000000000 +0100
-+++ openexr-2.1.0-new/configure.ac 2014-01-14 10:34:12.196172042 +0100
+diff -rupN openexr-2.2.0/configure.ac openexr-2.2.0-new/configure.ac
+--- openexr-2.2.0/configure.ac 2014-08-10 06:24:00.000000000 +0200
++++ openexr-2.2.0-new/configure.ac 2014-11-26 10:29:49.605322109 +0100
@@ -11,7 +11,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_
AC_CANONICAL_HOST
AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
--AM_CONFIG_HEADER(config/OpenEXRConfig.h)
+-AC_CONFIG_HEADER(config/OpenEXRConfig.h)
+AC_CONFIG_HEADERS(config/OpenEXRConfig.h)
AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
AM_MAINTAINER_MODE
diff --git a/sources b/sources
index 1bd0eee..16a3cbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-250553b2662529cb8cb7e932fa91a3d5 openexr-2.1.0.tar.gz
+b64e931c82aa3790329c21418373db4e openexr-2.2.0.tar.gz
More information about the scm-commits
mailing list