Removed obsolete patches

Updated ptex patch
BR libcineon-devel

diff --git a/OpenImageIO-libpng15.patch b/OpenImageIO-libpng15.patch
deleted file mode 100644 (file)
index cace48a..0000000
--- a/OpenImageIO-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- OpenImageIO-oiio-7d98ca6/src/ico.imageio/icooutput.cpp~    2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/ico.imageio/icooutput.cpp     2012-02-12 14:02:32.104659425 +0100
-@@ -31,6 +31,7 @@
- #include <cstdio>
- #include <cstdlib>
- #include <cmath>
-+#include <zlib.h>
- 
- #include "ico.h"
- #include "../png.imageio/png_pvt.h"

diff --git a/OpenImageIO-python.patch b/OpenImageIO-python.patch
deleted file mode 100644 (file)
index 0536120..0000000
--- a/OpenImageIO-python.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- OpenImageIO-oiio-7d98ca6/src/CMakeLists.txt.orig   2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/CMakeLists.txt        2011-11-17 21:14:23.986933229 +0100
-@@ -91,12 +91,12 @@
-
- # Exec Install Locations
- set (BINDIR   "${CMAKE_INSTALL_PREFIX}/bin")
--set (LIBDIR   "${CMAKE_INSTALL_PREFIX}/lib")
--set (PYLIBDIR "${CMAKE_INSTALL_PREFIX}/python")
-+set (LIBDIR   "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-+set (PYLIBDIR CACHE STRING "${CMAKE_INSTALL_PREFIX}/python")
- if (EXEC_INSTALL_PREFIX)
-     set (BINDIR   "${EXEC_INSTALL_PREFIX}/bin")
--    set (LIBDIR   "${EXEC_INSTALL_PREFIX}/lib")
--    set (PYLIBDIR "${EXEC_INSTALL_PREFIX}/python")
-+    set (LIBDIR   "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-+    set (PYLIBDIR CACHE STRING "${EXEC_INSTALL_PREFIX}/python")
- endif ()
- 
- set (CMAKE_INSTALL_RPATH "${LIBDIR}")

diff --git a/OpenImageIO-soname.patch b/OpenImageIO-soname.patch
deleted file mode 100644 (file)
index 48d68e9..0000000
--- a/OpenImageIO-soname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- OpenImageIO-oiio-7d98ca6/src/libOpenImageIO/CMakeLists.txt.orig    2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/libOpenImageIO/CMakeLists.txt 2011-11-17 19:32:41.350062223 +0100
-@@ -173,16 +173,15 @@
-                                ${HDF5_LIBRARIES}
-                           )
-     link_openexr (OpenImageIO)
-+else ()
-+    target_link_libraries (OpenImageIO dl)
- endif ()
- 
--if (SOVERSION)
--message(STATUS "Setting SOVERSION to: ${SOVERSION}")
- set_target_properties(OpenImageIO
-                          PROPERTIES
-                          VERSION ${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}
--                         SOVERSION ${SOVERSION}
-+                       SOVERSION ${OIIO_VERSION_MAJOR}
-                      )
--endif ()
- 
- oiio_install_targets (OpenImageIO)
- 

diff --git a/OpenImageIO-system-ptex.patch b/OpenImageIO-system-ptex.patch
index 559aaa69a643c44e8aaaae660846253acaef34e2..d5edf2b1875932d49909544906a9f1beac3ed3a5 100644 (file)
--- a/OpenImageIO-system-ptex.patch
+++ b/OpenImageIO-system-ptex.patch
@@ -12,7 +12,7 @@
 -                 ptex/PtexTriangleKernel.cpp
 -                 ptex/PtexUtils.cpp
 -                 ptex/PtexWriter.cpp
--                 )
+-                 LINK_LIBRARIES ${ZLIB_LIBRARIES} )
 +      LINK_LIBRARIES Ptex)
  
 --- OpenImageIO-oiio-7d98ca6/src/ptex.imageio/ptexoutput.cpp.orig      2011-11-05 08:35:00.000000000 +0100

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 98231e6903a720229ba873dbd7e4916cae460995..7b8eb43536fbaffe74f72029a6f4b7fd04cff001 100644 (file)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -13,14 +13,11 @@ License:    BSD
 Group:         Libraries
 Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}#/%{name}-%{version}.tar.gz
 # Source0-md5: 5a24c19c38d48b3e90cf94258fc0256b
-Patch0:                %{name}-soname.patch
-Patch1:                %{name}-python.patch
 Patch2:                %{name}-hdf.patch
 Patch3:                %{name}-system-squish.patch
 Patch4:                %{name}-system-ptex.patch
 Patch5:                %{name}-system-dpx.patch
 Patch6:                %{name}-system-libcineon.patch
-Patch7:                %{name}-libpng15.patch
 URL:           https://sites.google.com/site/openimageio/home
 BuildRequires: Field3D-devel
 BuildRequires: OpenEXR-devel >= 1.6.1
@@ -37,6 +34,7 @@ BuildRequires:        glew-devel >= 1.5.1
 BuildRequires: hdf5-devel
 BuildRequires: ilmbase-devel >= 1.0.1
 BuildRequires: jasper-devel
+BuildRequires: libcineon-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
@@ -248,14 +246,11 @@ Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
 %setup -q -n OpenImageIO-oiio-0cae52b
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %{__rm} -r src/dds.imageio/squish src/ptex.imageio/ptex