$ git diff --patch-with-stat --summary d747bad30159143bf13f28f760758e2981142678..73092ea57dc9a75fb5ed62f2fc32ca247311ebf0
.abf.yml | 2 +-
OpenImageIO.spec | 14 ++++----
oiio-2.3.18.0-detect-current-ffmpeg.patch | 12 +++++++
oiio-2.3.6-dont-confuse-cmake-depgen.patch | 14 --------
openimageio-2.3.10.1-ffmpeg-5.0.patch | 52 ------------------------------
5 files changed, 19 insertions(+), 75 deletions(-)
create mode 100644 oiio-2.3.18.0-detect-current-ffmpeg.patch
delete mode 100644 oiio-2.3.6-dont-confuse-cmake-depgen.patch
delete mode 100644 openimageio-2.3.10.1-ffmpeg-5.0.patch
diff --git a/.abf.yml b/.abf.yml
index cab578e..0a9c460 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
v0.6.3.tar.gz: d22eae761130b20beaae383bed60fdea97aaab04
- oiio-2.3.11.0.tar.gz: 79fb831f192ef3f13408958d56517f865286410d
+ oiio-2.4.7.1.tar.gz: cd45990a7873f5db7189ef1267762ef96b294750
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 789b58b..3e02063 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,14 +1,15 @@
%define _disable_ld_no_undefined 1
-%define major 2.3
-%define libname %mklibname %{name} %{major}
+%define major %(echo %{version} |cut -d. -f1-2)
+%define libname %mklibname %{name}
%define devname %mklibname %{name} -d
-%define utillibname %mklibname %{name}_Util %{major}
+%define utillibname %mklibname %{name}_Util
+%define __requires_exclude cmake.*IlmBase
%bcond_without full
Summary: Library for reading and writing images
Name: OpenImageIO
-Version: 2.3.11.0
+Version: 2.4.7.1
Release: 1
Group: System/Libraries
License: BSD
@@ -17,8 +18,6 @@ Source0: https://github.com/OpenImageIO/oiio/archive/v%{version}/oiio-%{version}
Source1: https://github.com/Tessil/robin-map/archive/refs/tags/v0.6.3.tar.gz
Patch0: oiio-2.2.8.0-missing-include.patch
Patch1: oiio-find-current-tbb.patch
-Patch2: oiio-2.3.6-dont-confuse-cmake-depgen.patch
-Patch3: openimageio-2.3.10.1-ffmpeg-5.0.patch
BuildRequires: cmake
BuildRequires: cmake(pybind11)
@@ -142,8 +141,7 @@ export CXX=g++
%files
%{_bindir}/*
%{_xfontdir}/%{name}
-#{python3_sitearch}/OpenImageIO.so
-%{python3_sitearch}/OpenImageIO.cpython-*-*-linux-gnu.so
+%{python3_sitearch}/OpenImageIO
%files -n %{libname}
%{_libdir}/libOpenImageIO.so.%{major}*
diff --git a/oiio-2.3.18.0-detect-current-ffmpeg.patch b/oiio-2.3.18.0-detect-current-ffmpeg.patch
new file mode 100644
index 0000000..78ba8fe
--- /dev/null
+++ b/oiio-2.3.18.0-detect-current-ffmpeg.patch
@@ -0,0 +1,12 @@
+diff -up oiio-2.3.18.0/src/cmake/modules/FindFFmpeg.cmake.omv~ oiio-2.3.18.0/src/cmake/modules/FindFFmpeg.cmake
+--- oiio-2.3.18.0/src/cmake/modules/FindFFmpeg.cmake.omv~ 2022-08-11 00:54:01.393181201 +0200
++++ oiio-2.3.18.0/src/cmake/modules/FindFFmpeg.cmake 2022-08-11 00:55:40.640489109 +0200
+@@ -59,7 +59,7 @@ else ()
+ endif ()
+
+ if (FFMPEG_INCLUDES)
+- file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
++ file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version_major.h" TMP
+ REGEX "^#define LIBAVCODEC_VERSION_MAJOR .*$")
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MAJOR ${TMP})
+ file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
diff --git a/oiio-2.3.6-dont-confuse-cmake-depgen.patch b/oiio-2.3.6-dont-confuse-cmake-depgen.patch
deleted file mode 100644
index fed78c2..0000000
--- a/oiio-2.3.6-dont-confuse-cmake-depgen.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up oiio-2.3.6.0-dev/src/cmake/Config.cmake.in.omv~ oiio-2.3.6.0-dev/src/cmake/Config.cmake.in
---- oiio-2.3.6.0-dev/src/cmake/Config.cmake.in.omv~ 2021-08-03 00:59:38.632772207 +0200
-+++ oiio-2.3.6.0-dev/src/cmake/Config.cmake.in 2021-08-03 01:00:01.934925571 +0200
-@@ -7,8 +7,8 @@ if (@OpenEXR_VERSION@ VERSION_GREATER_EQ
- find_dependency(Imath @Imath_VERSION@
- HINTS @Imath_DIR@)
- elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONFIG@)
-- find_dependency(IlmBase @OpenEXR_VERSION@
-- HINTS @IlmBase_DIR@ @OpenEXR_DIR@)
-+# find_dependency(IlmBase @OpenEXR_VERSION@
-+# HINTS @IlmBase_DIR@ @OpenEXR_DIR@)
- find_dependency(OpenEXR @OpenEXR_VERSION@
- HINTS @OpenEXR_DIR@)
- find_dependency(ZLIB @ZLIB_VERSION@) # Because OpenEXR doesn't do it
diff --git a/openimageio-2.3.10.1-ffmpeg-5.0.patch b/openimageio-2.3.10.1-ffmpeg-5.0.patch
deleted file mode 100644
index 8572c0d..0000000
--- a/openimageio-2.3.10.1-ffmpeg-5.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up oiio-2.3.10.1/src/ffmpeg.imageio/ffmpeginput.cpp.omv~ oiio-2.3.10.1/src/ffmpeg.imageio/ffmpeginput.cpp
---- oiio-2.3.10.1/src/ffmpeg.imageio/ffmpeginput.cpp.omv~ 2022-01-18 01:42:21.333038134 +0100
-+++ oiio-2.3.10.1/src/ffmpeg.imageio/ffmpeginput.cpp 2022-01-18 01:45:20.131690674 +0100
-@@ -32,7 +32,7 @@ extern "C" { // ffmpeg is a C api
-
-
- inline int
--avpicture_fill(AVPicture* picture, uint8_t* ptr, enum AVPixelFormat pix_fmt,
-+avpicture_fill(AVFrame* picture, uint8_t* ptr, enum AVPixelFormat pix_fmt,
- int width, int height)
- {
- AVFrame* frame = reinterpret_cast<AVFrame*>(picture);
-@@ -119,7 +119,7 @@ private:
- int64_t m_nsubimages;
- AVFormatContext* m_format_context;
- AVCodecContext* m_codec_context;
-- AVCodec* m_codec;
-+ const AVCodec* m_codec;
- AVFrame* m_frame;
- AVFrame* m_rgb_frame;
- size_t m_stride; // scanline width in bytes, a.k.a. scanline stride
-@@ -238,7 +238,6 @@ FFmpegInput::open(const std::string& nam
- }
-
- static std::once_flag init_flag;
-- std::call_once(init_flag, av_register_all);
- const char* file_name = name.c_str();
- av_log_set_level(AV_LOG_FATAL);
- if (avformat_open_input(&m_format_context, file_name, NULL, NULL) != 0) {
-@@ -608,11 +607,11 @@ FFmpegInput::read_frame(int frame)
- finished = receive_frame(m_codec_context, m_frame, &pkt);
-
- double pts = 0;
-- if (static_cast<int64_t>(m_frame->pkt_pts)
-+ if (static_cast<int64_t>(m_frame->pts)
- != int64_t(AV_NOPTS_VALUE)) {
- pts = av_q2d(
- m_format_context->streams[m_video_stream]->time_base)
-- * m_frame->pkt_pts;
-+ * m_frame->pts;
- }
-
- int current_frame = int((pts - m_start_time) * fps() + 0.5f); //???
-@@ -620,7 +619,7 @@ FFmpegInput::read_frame(int frame)
- m_last_search_pos = current_frame;
-
- if (current_frame == frame && finished) {
-- avpicture_fill(reinterpret_cast<AVPicture*>(m_rgb_frame),
-+ avpicture_fill(m_rgb_frame,
- &m_rgb_buffer[0], m_dst_pix_format,
- m_codec_context->width, m_codec_context->height);
- sws_scale(m_sws_rgb_context,