- up to 1.2.3

diff --git a/OpenImageIO-build.patch b/OpenImageIO-build.patch
new file mode 100644 (file)
index 0000000..85117da
--- /dev/null
+++ b/OpenImageIO-build.patch
@@ -0,0 +1,9 @@
+--- OpenImageIO-oiio-bcdad81/src/field3d.imageio/CMakeLists.txt~       2013-11-01 18:03:46.000000000 +0100
++++ OpenImageIO-oiio-bcdad81/src/field3d.imageio/CMakeLists.txt        2013-11-05 21:12:41.033996632 +0100
+@@ -1,5 +1,5 @@
+ if (USE_FIELD3D)
+-  if (FIELD3D_FOUND and HDF5_FOUND)
++  if (FIELD3D_FOUND AND HDF5_FOUND)
+     include_directories (${FIELD3D_INCLUDES})
+     add_oiio_plugin (field3dinput.cpp field3doutput.cpp
+                      LINK_LIBRARIES ${FIELD3D_LIBRARY}

diff --git a/OpenImageIO-hdf.patch b/OpenImageIO-hdf.patch
deleted file mode 100644 (file)
index 39f760e..0000000
--- a/OpenImageIO-hdf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Field3D uses only C interface of hdf5
---- OpenImageIO-oiio-f4d79c0/src/cmake/externalpackages.cmake.orig     2013-07-14 17:08:40.729538530 +0200
-+++ OpenImageIO-oiio-f4d79c0/src/cmake/externalpackages.cmake  2013-07-14 17:09:33.429536318 +0200
-@@ -284,7 +284,7 @@
-         # N.B. For a custom version, the caller had better set up the
-         # variables HDF5_INCLUDE_DIRS and HDF5_LIBRARIES.
-     else ()
--        find_package (HDF5 COMPONENTS CXX)
-+        find_package (HDF5)
-     endif ()
-     if (VERBOSE)
-         message (STATUS "HDF5_FOUND=${HDF5_FOUND}")

diff --git a/OpenImageIO-werror.patch b/OpenImageIO-werror.patch
index e67153f6ca149bbc1c8aa61307e756de1ea664e1..6888edfdaac4ca30beac8638ed8ce35a7f3d6863 100644 (file)
--- a/OpenImageIO-werror.patch
+++ b/OpenImageIO-werror.patch
@@ -1,16 +1,3 @@
---- OpenImageIO-oiio-f4d79c0/src/libOpenImageIO/fmath_test.cpp.orig    2013-07-08 21:47:25.000000000 +0200
-+++ OpenImageIO-oiio-f4d79c0/src/libOpenImageIO/fmath_test.cpp 2013-07-14 17:32:19.946145637 +0200
-@@ -72,8 +72,8 @@
-     OIIO_CHECK_EQUAL ((bit_range_convert<2,20>(3)), 1048575);
-     OIIO_CHECK_EQUAL ((bit_range_convert<20,2>(1048575)), 3);
-     OIIO_CHECK_EQUAL ((bit_range_convert<20,21>(1048575)), 2097151);
--    OIIO_CHECK_EQUAL ((bit_range_convert<32,32>(4294967295)), 4294967295);
--    OIIO_CHECK_EQUAL ((bit_range_convert<32,16>(4294967295)), 65535);
-+    OIIO_CHECK_EQUAL ((bit_range_convert<32,32>(4294967295U)), 4294967295U);
-+    OIIO_CHECK_EQUAL ((bit_range_convert<32,16>(4294967295U)), 65535);
- // These are not expected to work, since bit_range_convert only takes a
- // regular 'unsigned int' as parameter.  If we need >32 bit conversion,
- // we need to add a uint64_t version of bit_range_convert.
 --- OpenImageIO-oiio-f4d79c0/src/dpx.imageio/dpxinput.cpp.orig 2013-07-14 17:33:27.426142801 +0200
 +++ OpenImageIO-oiio-f4d79c0/src/dpx.imageio/dpxinput.cpp      2013-07-14 18:10:42.519382338 +0200
 @@ -467,7 +467,7 @@

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 0e88575fba4707b7b3e931fa0cfc2a38814e5805..72fae374a7f7890f47f20cec1badc3746e37ce36 100644 (file)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -8,14 +8,15 @@
 Summary:       Library for reading and writing images
 Summary(pl.UTF-8):     Biblioteka do odczytu i zapisu obrazów
 Name:          OpenImageIO
-Version:       1.2.0
-Release:       2
+Version:       1.2.3
+Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 8738dd9b24fc4f0cb3eebb094347104a
+# Source0-md5: 20066ae0e9026717242f64f107f7ee8e
 Patch0:                %{name}-link.patch
-Patch2:                %{name}-hdf.patch
+
+Patch2:                %{name}-build.patch
 Patch3:                %{name}-system-squish.patch
 Patch4:                %{name}-system-ptex.patch
 Patch5:                %{name}-system-dpx.patch
@@ -292,8 +293,9 @@ Python binding for OpenImageIO library.
 Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
-%setup -q -n OpenImageIO-oiio-f4d79c0
+%setup -q -n OpenImageIO-oiio-bcdad81
 %patch0 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1