- up to 2.0.7
authorJan Rękorajski <baggins@pld-linux.org>
Sun, 21 Apr 2019 11:21:30 +0000 (13:21 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Sun, 21 Apr 2019 11:21:30 +0000 (13:21 +0200)
OpenImageIO-link.patch
OpenImageIO-system-dpx.patch [deleted file]
OpenImageIO-system-libcineon.patch
OpenImageIO-system-squish.patch
OpenImageIO.spec
ffmpeg4.patch [deleted file]
no-clang-format.patch [new file with mode: 0644]

index 3ec38f1b619528d3205c431da20cd954a1a482b8..c03daf5e177c04fb48bde0c795477eed34c10e3f 100644 (file)
@@ -1,22 +1,10 @@
---- 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
-@@ -110,7 +110,7 @@
- target_link_libraries (OpenImageIO
-                        ${VISIBILITY_COMMAND} ${VISIBILITY_MAP_COMMAND}
-                        ${format_plugin_libs} # Add all the target link libraries from the plugins
--                       ${Boost_LIBRARIES})
-+                       ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
- # 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 @@
- endif ()
- target_link_libraries (OpenImageIO_Util
-                            ${VISIBILITY_COMMAND} ${VISIBILITY_MAP_COMMAND}
--                           ${Boost_LIBRARIES})
-+                         ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
- if (WIN32)
+@@ -16,6 +16,7 @@
      target_link_libraries (OpenImageIO_Util psapi.lib)
  endif ()
+ target_link_libraries (OpenImageIO_Util ${ILMBASE_LIBRARIES})
++target_link_libraries (OpenImageIO_Util ${CMAKE_DL_LIBS})
+ if (VERBOSE)
+     message(STATUS "Setting SOVERSION to: ${SOVERSION}")
diff --git a/OpenImageIO-system-dpx.patch b/OpenImageIO-system-dpx.patch
deleted file mode 100644 (file)
index 822f2f6..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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,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
--  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
-+++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxinput.cpp      2011-11-26 09:03:24.121501545 +0100
-@@ -28,7 +28,7 @@
-   (This is the Modified BSD License)
- */
--#include "libdpx/DPX.h"
-+#include <DPX.h>
- #include "libdpx/DPXColorConverter.h"
- #include "typedesc.h"
-@@ -499,7 +499,7 @@
-         case dpx::k1125LineProgressive169AR:
-             tmpstr = "YCbCr 1125p, 16:9 (SMPTE 274M)";
-             break;
--        case dpx::k255:
-+        case 255:
-             // don't set the attribute at all
-             break;
-         default:
---- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxoutput.cpp.orig        2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxoutput.cpp     2011-11-26 09:03:35.934835274 +0100
-@@ -33,7 +33,7 @@
- #include <cmath>
- #include <boost/algorithm/string.hpp>
--#include "libdpx/DPX.h"
-+#include <DPX.h>
- #include "libdpx/DPXColorConverter.h"
- #include "typedesc.h"
---- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/libdpx/DPXColorConverter.h.orig   2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/libdpx/DPXColorConverter.h        2011-11-26 09:05:17.444838673 +0100
-@@ -37,7 +37,7 @@
- #define _DPX_COLORCONVERTER_H 1
--#include "DPX.h"
-+#include <DPX.h>
- namespace dpx
index 5ff85a18c3072e3f9f197b82da07c1e19f14e72b..87e2ee2d0057bcd44015fccda5e217968063f57d 100644 (file)
@@ -1,7 +1,7 @@
 --- OpenImageIO-oiio-7d98ca6/src/cineon.imageio/CMakeLists.txt.orig    2011-11-05 08:35:00.000000000 +0100
 +++ OpenImageIO-oiio-7d98ca6/src/cineon.imageio/CMakeLists.txt 2011-11-26 09:06:45.788174965 +0100
 @@ -1,4 +1,2 @@
- add_oiio_plugin (cineoninput.cpp cineonoutput.cpp
+ add_oiio_plugin (cineoninput.cpp
 -  libcineon/Cineon.cpp libcineon/OutStream.cpp libcineon/Codec.cpp libcineon/Reader.cpp
 -  libcineon/Writer.cpp libcineon/CineonHeader.cpp libcineon/ElementReadStream.cpp
 -  libcineon/InStream.cpp)
  
  #include "dassert.h"
  #include "typedesc.h"
---- OpenImageIO-oiio-7d98ca6/src/cineon.imageio/cineonoutput.cpp.orig  2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/cineon.imageio/cineonoutput.cpp       2011-11-26 09:07:19.938176107 +0100
-@@ -28,7 +28,7 @@
-   (This is the Modified BSD License)
- */
--#include "libcineon/Cineon.h"
-+#include <Cineon.h>
- #include "typedesc.h"
- #include "imageio.h"
index 41b482799452ad6436e4d27c1882cc6555e781da..ad7612149c0d7c557327a10707dcf9d5b2671c7e 100644 (file)
@@ -1,11 +1,11 @@
 --- OpenImageIO-oiio-7d98ca6/src/dds.imageio/CMakeLists.txt.orig       2011-11-05 08:35:00.000000000 +0100
 +++ OpenImageIO-oiio-7d98ca6/src/dds.imageio/CMakeLists.txt    2011-11-18 21:22:02.993174921 +0100
 @@ -1,4 +1,1 @@
--add_oiio_plugin (ddsinput.cpp ddsoutput.cpp squish/alpha.cpp squish/clusterfit.cpp
+-add_oiio_plugin (ddsinput.cpp squish/alpha.cpp squish/clusterfit.cpp
 -                 squish/colourblock.cpp squish/colourfit.cpp squish/colourset.cpp
 -                 squish/maths.cpp squish/rangefit.cpp squish/singlecolourfit.cpp
 -                 squish/squish.cpp)
-+add_oiio_plugin (ddsinput.cpp ddsoutput.cpp LINK_LIBRARIES squish)
++add_oiio_plugin (ddsinput.cpp LINK_LIBRARIES squish)
 --- OpenImageIO-oiio-7d98ca6/src/dds.imageio/ddsinput.cpp.orig 2011-11-05 08:35:00.000000000 +0100
 +++ OpenImageIO-oiio-7d98ca6/src/dds.imageio/ddsinput.cpp      2011-11-18 21:30:04.823191054 +0100
 @@ -39,7 +39,7 @@
index 501338c3ce0c68c10fe6b415290f4fcc1482667b..42ad50229079540a579aee254b696d22ee51cd57 100644 (file)
 Summary:       Library for reading and writing images
 Summary(pl.UTF-8):     Biblioteka do odczytu i zapisu obrazów
 Name:          OpenImageIO
-Version:       1.7.11
-Release:       6
+Version:       2.0.7
+Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: bd9338d99dff81f238e17d78c333a85e
+# Source0-md5: 3d722173d84cc705f4aead0679fa2393
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-system-squish.patch
-Patch2:                %{name}-system-dpx.patch
-Patch3:                %{name}-system-libcineon.patch
-Patch4:                ffmpeg4.patch
+Patch2:                %{name}-system-libcineon.patch
+Patch3:                no-clang-format.patch
 URL:           https://sites.google.com/site/openimageio/home
 BuildRequires: Field3D-devel
 %{?with_ocio:BuildRequires:    OpenColorIO-devel}
@@ -39,7 +38,6 @@ BuildRequires:        QtOpenGL-devel
 BuildRequires: boost-devel >= 1.35
 BuildRequires: boost-python-devel >= 1.35
 BuildRequires: cmake >= 2.6
-BuildRequires: dpx-devel
 BuildRequires: ffmpeg-devel
 BuildRequires: giflib-devel
 BuildRequires: glew-devel >= 1.5.1
@@ -53,10 +51,12 @@ BuildRequires:      libraw-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libwebp-devel
-BuildRequires: openjpeg-devel
+BuildRequires: openjpeg2-devel
 BuildRequires: ptex-devel >= 2.1
 BuildRequires: pugixml-devel
 BuildRequires: python-devel >= 1:2.6
+BuildRequires: python-pybind11
+BuildRequires: robin-map-devel
 BuildRequires: squish-devel >= 1.10
 %{?with_tbb:BuildRequires:     tbb-devel}
 BuildRequires: txt2man
@@ -339,12 +339,11 @@ Python binding for OpenImageIO library.
 Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
-%setup -q -n %{name}-oiio-6950fb8
+%setup -q -n %{name}-oiio-7f79c70
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %{__rm} -r src/dds.imageio/squish
 # when using system pugixml, don't use hacked headers
@@ -353,19 +352,20 @@ Wiązanie Pythona do biblioteki OpenImageIO.
 %build
 install -d build
 cd build
-CXXFLAGS="%{rpmcxxflags} -std=c++11" \
 %cmake ../ \
 %ifarch i386 i486
        -DNOTHREADS=1 \
 %endif
        -DEMBEDPLUGINS=OFF \
-       -DOPENJPEG_INCLUDE_DIR=%{_includedir}/openjpeg-1.5 \
+       -DOPENJPEG_INCLUDE_DIR=%{_includedir}/openjpeg-2.3 \
        -DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} \
        -DLIB_INSTALL_DIR:PATH=%{_libdir} \
        -DPYLIB_INSTALL_DIR=%{py_sitedir} \
        -DPYTHON_VERSION=%{py_ver} \
        -DUSE_EXTERNAL_PUGIXML=ON \
        -DSTOP_ON_WARNING=OFF \
+       -DPYBIND11_HOME:PATH=%{py_incdir} \
+       -DCMAKE_INSTALL_MANDIR=%{_mandir}/man1 \
        %{!?with_ocio:-DUSE_OCIO=OFF} \
        %{!?with_tbb:-DUSE_TBB=OFF}
 
@@ -379,9 +379,10 @@ rm -rf $RPM_BUILD_ROOT
 
 # name clash with iv
 %{__mv} $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{iv,oiiv}.1
 
 # installed as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/OpenImageIO
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -391,7 +392,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.md CREDITS.md LICENSE README.md
+%doc CHANGES.md CREDITS.md LICENSE.md README.md
 %attr(755,root,root) %{_bindir}/iconvert
 %attr(755,root,root) %{_bindir}/idiff
 %attr(755,root,root) %{_bindir}/igrep
@@ -399,9 +400,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.7
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.2.0
 %attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO_Util.so.1.7
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO_Util.so.2.0
 %attr(755,root,root) %{_libdir}/bmp.imageio.so
 %attr(755,root,root) %{_libdir}/fits.imageio.so
 %attr(755,root,root) %{_libdir}/hdr.imageio.so
@@ -413,6 +414,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/softimage.imageio.so
 %attr(755,root,root) %{_libdir}/targa.imageio.so
 %attr(755,root,root) %{_libdir}/zfile.imageio.so
+%attr(755,root,root) %{_libdir}/dicom.imageio.so
+%attr(755,root,root) %{_libdir}/null.imageio.so
 %{_mandir}/man1/iconvert.1*
 %{_mandir}/man1/idiff.1*
 %{_mandir}/man1/igrep.1*
@@ -425,6 +428,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so
 %attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so
 %{_includedir}/OpenImageIO
+%{_pkgconfigdir}/OpenImageIO.pc
+%{_datadir}/cmake/Modules/FindOpenImageIO.cmake
 
 %files plugin-cineon
 %defattr(644,root,root,755)
@@ -497,6 +502,7 @@ 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/ffmpeg4.patch b/ffmpeg4.patch
deleted file mode 100644 (file)
index c9412e9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- OpenImageIO-oiio-6950fb8/src/ffmpeg.imageio/ffmpeginput.cpp~       2017-02-01 00:23:29.000000000 +0100
-+++ OpenImageIO-oiio-6950fb8/src/ffmpeg.imageio/ffmpeginput.cpp        2018-04-29 01:14:22.655631461 +0200
-@@ -330,7 +330,7 @@
-         !strcmp (m_codec_context->codec->name, "dvvideo")) {
-         m_offset_time = false;
-     }
--    m_codec_cap_delay = (bool) (m_codec_context->codec->capabilities & CODEC_CAP_DELAY);
-+    m_codec_cap_delay = (bool) (m_codec_context->codec->capabilities & AV_CODEC_CAP_DELAY);
-     AVStream *stream = m_format_context->streams[m_video_stream];
-     if (stream->r_frame_rate.num != 0 && stream->r_frame_rate.den != 0) {
diff --git a/no-clang-format.patch b/no-clang-format.patch
new file mode 100644 (file)
index 0000000..a1fcc50
--- /dev/null
@@ -0,0 +1,35 @@
+--- OpenImageIO-oiio-7f79c70/src/cmake/compiler.cmake~ 2019-04-01 07:28:42.000000000 +0200
++++ OpenImageIO-oiio-7f79c70/src/cmake/compiler.cmake  2019-04-21 11:32:25.692670361 +0200
+@@ -338,32 +338,6 @@
+     # Hint: run with CLANG_TIDY_ARGS=-list-checks to list all the checks
+ endif ()
+-# clang-format
+-find_program (CLANG_FORMAT_EXE
+-              NAMES clang-format bin/clang-format
+-              HINTS ${CLANG_FORMAT_EXE_HINT} ENV CLANG_FORMAT_EXE_HINT
+-                    ENV LLVM_DIRECTORY
+-              NO_DEFAULT_PATH
+-              DOC "Path to clang-format executable")
+-find_program (CLANG_FORMAT_EXE NAMES clang-format bin/clang-format)
+-if (CLANG_FORMAT_EXE)
+-    message (STATUS "clang-format found: ${CLANG_FORMAT_EXE}")
+-    # Start with the list of files to include when formatting...
+-    file (GLOB_RECURSE FILES_TO_FORMAT ${CLANG_FORMAT_INCLUDES})
+-    # ... then process any list of excludes we are given
+-    foreach (_pat ${CLANG_FORMAT_EXCLUDES})
+-        file (GLOB_RECURSE _excl ${_pat})
+-        list (REMOVE_ITEM FILES_TO_FORMAT ${_excl})
+-    endforeach ()
+-    #message (STATUS "clang-format file list: ${FILES_TO_FORMAT}")
+-    file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format
+-          DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+-    add_custom_target (clang-format
+-        COMMAND "${CLANG_FORMAT_EXE}" -i -style=file ${FILES_TO_FORMAT} )
+-else ()
+-    message (STATUS "clang-format not found.")
+-endif ()
+-
+ if (EXTRA_CPP_ARGS)
+     message (STATUS "Extra C++ args: ${EXTRA_CPP_ARGS}")
This page took 0.57011 seconds and 4 git commands to generate.