[packages/OpenImageIO] - up to 1.7.11 - removed obsolete patches
baggins
baggins at pld-linux.org
Sun Feb 26 14:42:34 CET 2017
commit ae460afe120ba230fd26e2de48740dadaeedc219
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Feb 26 14:42:20 2017 +0100
- up to 1.7.11
- removed obsolete patches
OpenImageIO-link.patch | 14 ++++++------
OpenImageIO-system-dpx.patch | 5 +++--
OpenImageIO-system-ptex.patch | 39 ---------------------------------
OpenImageIO-werror.patch | 23 -------------------
OpenImageIO.spec | 42 ++++++++++++-----------------------
ffmpeg3.patch | 29 ------------------------
fix-types.patch | 51 -------------------------------------------
opencv3.patch | 28 ------------------------
system-pugixml.patch | 22 -------------------
9 files changed, 24 insertions(+), 229 deletions(-)
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 2b56416..b67cf05 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -16,22 +16,16 @@
Summary: Library for reading and writing images
Summary(pl.UTF-8): Biblioteka do odczytu i zapisu obrazów
Name: OpenImageIO
-Version: 1.6.8
-Release: 7
+Version: 1.7.11
+Release: 1
License: BSD
Group: Libraries
-Source0: https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 1f614ff6129c60bfcadbb4cefe86325d
+Source0: https://github.com/OpenImageIO/oiio/archive/Release-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: f7c90f9a8c37d981d5da50baf3750aa1
Patch0: %{name}-link.patch
Patch1: %{name}-system-squish.patch
-Patch2: %{name}-system-ptex.patch
-Patch3: %{name}-system-dpx.patch
-Patch4: %{name}-system-libcineon.patch
-Patch5: %{name}-werror.patch
-Patch6: system-pugixml.patch
-Patch7: fix-types.patch
-Patch8: ffmpeg3.patch
-Patch9: opencv3.patch
+Patch2: %{name}-system-dpx.patch
+Patch3: %{name}-system-libcineon.patch
URL: https://sites.google.com/site/openimageio/home
BuildRequires: Field3D-devel
%{?with_ocio:BuildRequires: OpenColorIO-devel}
@@ -59,7 +53,7 @@ BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: libwebp-devel
BuildRequires: openjpeg-devel
-BuildRequires: ptex-devel >= 2
+BuildRequires: ptex-devel >= 2.1
BuildRequires: pugixml-devel
BuildRequires: python-devel >= 1:2.6
BuildRequires: squish-devel >= 1.10
@@ -344,19 +338,13 @@ Python binding for OpenImageIO library.
Wiązanie Pythona do biblioteki OpenImageIO.
%prep
-%setup -q -n %{name}-oiio-4070df8
+%setup -q -n %{name}-oiio-6950fb8
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-
-%{__rm} -r src/dds.imageio/squish src/ptex.imageio/ptex
+
+%{__rm} -r src/dds.imageio/squish
# when using system pugixml, don't use hacked headers
%{__rm} src/include/OpenImageIO/pugi*.{c,h}pp
@@ -388,8 +376,7 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
# name clash with iv
-%{__mv} -f $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
-%{__mv} -f $RPM_BUILD_ROOT%{_mandir}/man1/{iv,oiiv}.1
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
# installed as %doc
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/OpenImageIO
@@ -402,7 +389,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGES CREDITS LICENSE README.rst
+%doc CHANGES.md CREDITS.md LICENSE README.md
%attr(755,root,root) %{_bindir}/iconvert
%attr(755,root,root) %{_bindir}/idiff
%attr(755,root,root) %{_bindir}/igrep
@@ -410,9 +397,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/maketx
%attr(755,root,root) %{_bindir}/oiiotool
%attr(755,root,root) %{_libdir}/libOpenImageIO.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.6
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.7
%attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO_Util.so.1.6
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO_Util.so.1.7
%attr(755,root,root) %{_libdir}/bmp.imageio.so
%attr(755,root,root) %{_libdir}/fits.imageio.so
%attr(755,root,root) %{_libdir}/hdr.imageio.so
@@ -508,7 +495,6 @@ rm -rf $RPM_BUILD_ROOT
%files iv
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/oiiv
-%{_mandir}/man1/oiiv.1*
%files -n python-OpenImageIO
%defattr(644,root,root,755)
diff --git a/OpenImageIO-link.patch b/OpenImageIO-link.patch
index 567757f..3ec38f1 100644
--- a/OpenImageIO-link.patch
+++ b/OpenImageIO-link.patch
@@ -1,14 +1,14 @@
--- OpenImageIO-oiio-f4d79c0/src/libOpenImageIO/CMakeLists.txt.orig 2013-07-14 16:40:55.296275085 +0200
+++ OpenImageIO-oiio-f4d79c0/src/libOpenImageIO/CMakeLists.txt 2013-07-14 17:08:13.526206338 +0200
-@@ -210,7 +210,7 @@
- endif ()
+@@ -110,7 +110,7 @@
target_link_libraries (OpenImageIO
- ${VISIBILITY_COMMAND} ${VISIBILITY_MAP_COMMAND}
-- ${Boost_LIBRARIES})
-+ ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+ ${VISIBILITY_COMMAND} ${VISIBILITY_MAP_COMMAND}
+ ${format_plugin_libs} # Add all the target link libraries from the plugins
+- ${Boost_LIBRARIES})
++ ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+
- # Link against system TBB library if specified
- if (USE_TBB AND USE_EXTERNAL_TBB)
+ # Include OpenColorIO if using it
--- OpenImageIO-oiio-4070df8/src/libutil/CMakeLists.txt~ 2015-12-19 07:44:03.000000000 +0100
+++ OpenImageIO-oiio-4070df8/src/libutil/CMakeLists.txt 2015-12-26 10:54:02.944577313 +0100
@@ -11,7 +11,7 @@
diff --git a/OpenImageIO-system-dpx.patch b/OpenImageIO-system-dpx.patch
index adb3f85..822f2f6 100644
--- a/OpenImageIO-system-dpx.patch
+++ b/OpenImageIO-system-dpx.patch
@@ -1,10 +1,11 @@
--- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/CMakeLists.txt.orig 2011-11-05 08:35:00.000000000 +0100
+++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/CMakeLists.txt 2011-11-26 09:02:29.701499722 +0100
-@@ -1,4 +1,3 @@
+@@ -1,5 +1,3 @@
add_oiio_plugin (dpxinput.cpp dpxoutput.cpp
- libdpx/DPX.cpp libdpx/OutStream.cpp libdpx/RunLengthEncoding.cpp
- libdpx/Codec.cpp libdpx/Reader.cpp libdpx/Writer.cpp libdpx/DPXHeader.cpp
-- libdpx/ElementReadStream.cpp libdpx/InStream.cpp libdpx/DPXColorConverter.cpp)
+- libdpx/ElementReadStream.cpp libdpx/InStream.cpp libdpx/DPXColorConverter.cpp
+- LINK_LIBRARIES ${OPENEXR_LIBRARIES})
+ libdpx/DPXColorConverter.cpp
+ LINK_LIBRARIES dpx)
--- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxinput.cpp.orig 2011-11-05 08:35:00.000000000 +0100
diff --git a/OpenImageIO-system-ptex.patch b/OpenImageIO-system-ptex.patch
deleted file mode 100644
index d5edf2b..0000000
--- a/OpenImageIO-system-ptex.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- OpenImageIO-oiio-7d98ca6/src/ptex.imageio/CMakeLists.txt.orig 2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/ptex.imageio/CMakeLists.txt 2011-11-19 14:09:32.265198985 +0100
-@@ -1,13 +1,3 @@
- add_oiio_plugin (ptexinput.cpp ptexoutput.cpp
-- ptex/PtexCache.cpp
-- ptex/PtexFilters.cpp
-- ptex/PtexHalf.cpp
-- ptex/PtexReader.cpp
-- ptex/PtexSeparableFilter.cpp
-- ptex/PtexSeparableKernel.cpp
-- ptex/PtexTriangleFilter.cpp
-- 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
-+++ OpenImageIO-oiio-7d98ca6/src/ptex.imageio/ptexoutput.cpp 2011-11-19 14:19:10.445218345 +0100
-@@ -28,7 +28,7 @@
- (This is the Modified BSD License)
- */
-
--#include "ptex/PtexWriter.h"
-+#include <Ptexture.h>
-
- #include "typedesc.h"
- #include "imageio.h"
---- OpenImageIO-oiio-7d98ca6/src/ptex.imageio/ptexinput.cpp.orig 2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/ptex.imageio/ptexinput.cpp 2011-11-19 14:19:35.705219191 +0100
-@@ -28,7 +28,7 @@
- (This is the Modified BSD License)
- */
-
--#include "ptex/Ptexture.h"
-+#include <Ptexture.h>
-
- #include "dassert.h"
- #include "typedesc.h"
diff --git a/OpenImageIO-werror.patch b/OpenImageIO-werror.patch
deleted file mode 100644
index b36ef28..0000000
--- a/OpenImageIO-werror.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 @@
- m_spec.attribute ("dpx:FilmEdgeCode", buf);
-
- tmpstr.clear ();
-- switch (m_dpx.header.Signal ()) {
-+ switch ((int)m_dpx.header.Signal ()) {
- case dpx::kUndefined:
- tmpstr = "Undefined";
- break;
-
---- OpenImageIO-oiio-4070df8/src/libtexture/texturesys.cpp~ 2015-12-19 07:44:03.000000000 +0100
-+++ OpenImageIO-oiio-4070df8/src/libtexture/texturesys.cpp 2015-12-26 10:38:06.735886871 +0100
-@@ -2038,7 +2038,7 @@
- int pixelsize = tile->pixelsize();
- int offset = pixelsize * (tile_t * spec.tile_width + tile_s);
- offset += (firstchannel - id.chbegin()) * channelsize;
-- DASSERT ((size_t)offset < spec.tile_width*spec.tile_height*spec.tile_depth*pixelsize);
-+ DASSERT ((size_t)offset < (size_t)spec.tile_width*spec.tile_height*spec.tile_depth*pixelsize);
- if (pixeltype == TypeDesc::UINT8)
- texel_simd[j][i] = uchar2float4 ((const unsigned char *)(tile->bytedata() + offset));
- else if (pixeltype == TypeDesc::UINT16)
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
deleted file mode 100644
index 0ae1314..0000000
--- a/ffmpeg3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- OpenImageIO-oiio-4070df8/src/ffmpeg.imageio/ffmpeginput.cpp~ 2015-12-19 07:44:03.000000000 +0100
-+++ OpenImageIO-oiio-4070df8/src/ffmpeg.imageio/ffmpeginput.cpp 2016-03-21 10:21:22.218287557 +0100
-@@ -236,7 +236,7 @@
- m_frame = av_frame_alloc();
- m_rgb_frame = av_frame_alloc();
- m_rgb_buffer.resize(
-- avpicture_get_size (PIX_FMT_RGB24,
-+ avpicture_get_size (AV_PIX_FMT_RGB24,
- m_codec_context->width,
- m_codec_context->height),
- 0
-@@ -264,7 +264,7 @@
- pixFormat,
- m_codec_context->width,
- m_codec_context->height,
-- PIX_FMT_RGB24,
-+ AV_PIX_FMT_RGB24,
- SWS_AREA,
- NULL,
- NULL,
-@@ -361,7 +361,7 @@
- (
- reinterpret_cast<AVPicture*>(m_rgb_frame),
- &m_rgb_buffer[0],
-- PIX_FMT_RGB24,
-+ AV_PIX_FMT_RGB24,
- m_codec_context->width,
- m_codec_context->height
- );
diff --git a/fix-types.patch b/fix-types.patch
deleted file mode 100644
index 35e205c..0000000
--- a/fix-types.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- OpenImageIO-oiio-4070df8/src/include/OpenImageIO/SHA1.h.orig 2015-12-26 10:27:30.663439300 +0100
-+++ OpenImageIO-oiio-4070df8/src/include/OpenImageIO/SHA1.h 2015-12-26 10:32:29.409487767 +0100
-@@ -103,6 +103,8 @@
- #include <stdlib.h>
- #endif
-
-+#include <cinttypes>
-+
- // You can define the endian mode in your files without modifying the SHA-1
- // source files. Just #define SHA1_LITTLE_ENDIAN or #define SHA1_BIG_ENDIAN
- // in your files, before including the SHA1.h header file. If you don't
-@@ -156,7 +158,7 @@
- #ifdef _MSC_VER // Compiling with Microsoft compiler
- #define UINT_8 unsigned __int8
- #else // !_MSC_VER
--#define UINT_8 unsigned char
-+#define UINT_8 uint8_t
- #endif // _MSC_VER
- #endif
-
-@@ -164,11 +166,7 @@
- #ifdef _MSC_VER // Compiling with Microsoft compiler
- #define UINT_32 unsigned __int32
- #else // !_MSC_VER
--#if (ULONG_MAX == 0xFFFFFFFF)
--#define UINT_32 unsigned long
--#else
--#define UINT_32 unsigned int
--#endif
-+#define UINT_32 uint32_t
- #endif // _MSC_VER
- #endif // UINT_32
-
-@@ -176,7 +174,7 @@
- #ifdef _MSC_VER // Compiling with Microsoft compiler
- #define INT_64 __int64
- #else // !_MSC_VER
--#define INT_64 long long
-+#define INT_64 int64_t
- #endif // _MSC_VER
- #endif // INT_64
-
-@@ -184,7 +182,7 @@
- #ifdef _MSC_VER // Compiling with Microsoft compiler
- #define UINT_64 unsigned __int64
- #else // !_MSC_VER
--#define UINT_64 unsigned long long
-+#define UINT_64 uint64_t
- #endif // _MSC_VER
- #endif // UINT_64
-
diff --git a/opencv3.patch b/opencv3.patch
deleted file mode 100644
index 7811795..0000000
--- a/opencv3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- OpenImageIO-oiio-4070df8/src/cmake/externalpackages.cmake~ 2015-12-19 07:44:03.000000000 +0100
-+++ OpenImageIO-oiio-4070df8/src/cmake/externalpackages.cmake 2016-03-21 11:06:58.754135430 +0100
-@@ -504,6 +504,14 @@
- /usr/local/lib
- /opt/local/lib
- )
-+ find_library (OpenCV_LIBS_videoio
-+ NAMES opencv_videoio
-+ PATHS "${THIRD_PARTY_TOOLS_HOME}/lib/"
-+ "${PROJECT_SOURCE_DIR}/lib"
-+ "${OpenCV_HOME}/lib"
-+ /usr/local/lib
-+ /opt/local/lib
-+ )
- set (OpenCV_LIBS "${OpenCV_LIBS} ${OpenCV_LIBS_highgui}")
- if (OpenCV_INCLUDE_DIR AND OpenCV_LIBS)
- set (OpenCV_FOUND TRUE)
---- OpenImageIO-oiio-4070df8/src/libOpenImageIO/CMakeLists.txt~ 2016-03-21 11:03:35.000000000 +0100
-+++ OpenImageIO-oiio-4070df8/src/libOpenImageIO/CMakeLists.txt 2016-03-21 11:08:09.865289491 +0100
-@@ -255,7 +255,7 @@
- # Include OpenCV if using it
- if (OpenCV_FOUND)
- include_directories (${OpenCV_INCLUDE_DIR})
-- target_link_libraries (OpenImageIO opencv_core opencv_highgui)
-+ target_link_libraries (OpenImageIO opencv_core opencv_highgui opencv_videoio)
- endif ()
-
- # Include OpenSSL if using it
diff --git a/system-pugixml.patch b/system-pugixml.patch
deleted file mode 100644
index f422b6e..0000000
--- a/system-pugixml.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- OpenImageIO-oiio-4070df8/src/libOpenImageIO/formatspec.cpp~ 2015-12-19 07:44:03.000000000 +0100
-+++ OpenImageIO-oiio-4070df8/src/libOpenImageIO/formatspec.cpp 2015-12-26 10:06:44.635447040 +0100
-@@ -42,7 +42,7 @@
- #include "OpenImageIO/fmath.h"
- #include "OpenImageIO/imageio.h"
- #include "imageio_pvt.h"
--#include "OpenImageIO/pugixml.hpp"
-+#include <pugixml.hpp>
-
-
- OIIO_NAMESPACE_BEGIN
---- OpenImageIO-oiio-4070df8/src/libOpenImageIO/xmp.cpp~ 2015-12-19 07:44:03.000000000 +0100
-+++ OpenImageIO-oiio-4070df8/src/libOpenImageIO/xmp.cpp 2015-12-26 10:07:06.745648169 +0100
-@@ -37,7 +37,7 @@
- #include "OpenImageIO/strutil.h"
- #include "OpenImageIO/fmath.h"
- #include "OpenImageIO/imageio.h"
--#include "OpenImageIO/pugixml.hpp"
-+#include <pugixml.hpp>
-
- #define DEBUG_XMP_READ 0
- #define DEBUG_XMP_WRITE 0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OpenImageIO.git/commitdiff/ae460afe120ba230fd26e2de48740dadaeedc219
More information about the pld-cvs-commit
mailing list