Update graphics/openimageio to 2.2.10.0
Build & run tested blender with it.
14 out of 54 tests fail.
Atleast 3 of them fail because of some
optional dependencies not being turned on.
Like OpenVDB,libheif and ptex.
Removed the USE_DICOM option since it
is optional now.
Any comments/OK's?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile 29 Nov 2020 20:05:50 -0000 1.48
+++ Makefile 3 Jan 2021 17:52:00 -0000
@@ -8,11 +8,12 @@ COMMENT = library for reading and writi
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
GH_TAGNAME = Release-$V
-V = 1.8.17
+V = 2.2.10.0
+ROBIN_VER = 0.6.2
DISTNAME = openimageio-${V}
-SHARED_LIBS += OpenImageIO 7.0 # 1.0
-SHARED_LIBS += OpenImageIO_Util 3.0 # 1.5
+SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
+SHARED_LIBS += OpenImageIO_Util 4.0 # 2.2.10
CATEGORIES = graphics devel
@@ -24,13 +25,18 @@ MAINTAINER = Pascal Stumpf <pascal@stum
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
-WANTLIB += boost_python${MODPY_MAJORMINOR}-mt
-WANTLIB += GL GLU Half-2_5 Iex-2_5 IlmImf-2_5 IlmThread-2_5
-WANTLIB += Imath-2_5 OpenColorIO Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
-WANTLIB += avcodec avformat avutil boost_atomic-mt boost_chrono-mt
-WANTLIB += boost_date_time-mt boost_filesystem-mt boost_system-mt
-WANTLIB += boost_thread-mt bz2 c freetype gif jpeg m openjp2
-WANTLIB += png pugixml raw_r swscale tiff webp z
+WANTLIB += GL GLU Half-2_5 Iex-2_5 IexMath-2_5 IlmImf-2_5
+WANTLIB += IlmThread-2_5 Imath-2_5 OpenColorIO Qt5Core Qt5Gui
+WANTLIB += Qt5OpenGL Qt5Widgets avcodec avformat avutil
+WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
+WANTLIB += boost_filesystem-mt boost_system-mt boost_thread-mt
+WANTLIB += bz2 c freetype gif intl jpeg m openjp2 png pugixml
+WANTLIB += raw_r swscale tiff util webp webpdemux z
+
+MASTER_SITES0 = https://github.com/Tessil/robin-map/
+
+DISTFILES = ${DISTNAME}.tar.gz \
+ robin-map-{archive/v}${ROBIN_VER}.tar.gz:0
MODULES = devel/cmake \
lang/python \
@@ -40,7 +46,9 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION
COMPILER = base-clang ports-gcc
-BUILD_DEPENDS = textproc/txt2man
+BUILD_DEPENDS = devel/fmt \
+ textproc/txt2man \
+ devel/py-pybind11${MODPY_FLAVOR}
LIB_DEPENDS = devel/boost \
graphics/ffmpeg \
@@ -50,21 +58,28 @@ LIB_DEPENDS = devel/boost \
graphics/opencolorio \
graphics/openexr \
graphics/openjp2 \
+ graphics/png \
graphics/tiff \
textproc/pugixml
CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
-DSTOP_ON_WARNING=OFF \
-DUSE_CCACHE=OFF \
- -DUSE_DICOM=OFF \
-DUSE_EXTERNAL_PUGIXML=ON \
- -DUSE_OPENCV=OFF
+ -DUSE_OPENCV=OFF \
+ -DUSE_HDF5=OFF \
+ -DUSE_LIBHEIF=OFF \
+ -Dpybind11_DIR=${MODPY_SITEPKG}/pybind11/share/cmake/pybind11/
# Fix undefined reference to __atomic_*
.if ${MACHINE_ARCH:Mhppa}
CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -latomic"
WANTLIB += atomic
.endif
+
+post-extract:
+ mkdir ${WRKSRC}/ext
+ cp -r ${WRKDIR}/robin-map-${ROBIN_VER} ${WRKSRC}/ext/robin-map
post-install:
find ${PREFIX} -name '*.orig' -delete
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 29 Nov 2020 20:05:50 -0000 1.9
+++ distinfo 3 Jan 2021 17:52:00 -0000
@@ -1,2 +1,4 @@
-SHA256 (openimageio-1.8.17.tar.gz) = oBkIbAWmFQ1EWiJAurFyPf9UDd5fXDJ8Nql/C1rg4Vc=
-SIZE (openimageio-1.8.17.tar.gz) = 27835527
+SHA256 (openimageio-2.2.10.0.tar.gz) = 28Dj6XGEl9n3HqAfsd6Lh0SXda2dvOpNJTjZxSu+HVo=
+SHA256 (robin-map-0.6.2.tar.gz) = wI7Esb8chesNZDIkSmqJhiIp2hy4NPP5D7qNw12MjvE=
+SIZE (openimageio-2.2.10.0.tar.gz) = 29215970
+SIZE (robin-map-0.6.2.tar.gz) = 63782
Index: patches/patch-src_cmake_platform_cmake
===================================================================
RCS file: patches/patch-src_cmake_platform_cmake
diff -N patches/patch-src_cmake_platform_cmake
--- patches/patch-src_cmake_platform_cmake 29 Nov 2020 20:05:50 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_cmake_platform_cmake,v 1.5 2020/11/29 20:05:50 sthen Exp $
-
-Index: src/cmake/platform.cmake
---- src/cmake/platform.cmake.orig
-+++ src/cmake/platform.cmake
-@@ -39,6 +39,10 @@ if (UNIX)
- else ()
- string (TOLOWER ${CMAKE_SYSTEM_NAME} platform)
- endif ()
-+ if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-+ message (STATUS "OpenBSD!")
-+ set (platform "openbsd")
-+ endif ()
- endif ()
-
- if (WIN32)
Index: patches/patch-src_doc_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_doc_CMakeLists_txt
diff -N patches/patch-src_doc_CMakeLists_txt
--- patches/patch-src_doc_CMakeLists_txt 19 Nov 2020 12:07:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_doc_CMakeLists_txt,v 1.1 2020/11/19 12:07:59 sthen Exp $
-
-check whether we're going to build iv, don't check if it's already installed.
-part of
-
-From 33f19f3da1e5e01aa63c711d2fd3ee7ff9310248 Mon Sep 17 00:00:00 2001
-From: Richard <hobbes1069@gmail.com>
-Date: Mon, 5 Mar 2018 11:38:29 -0600
-Subject: [PATCH] Make building and installing of documentation more packaging
- friendly. (#1890)
-
-Index: src/doc/CMakeLists.txt
---- src/doc/CMakeLists.txt.orig
-+++ src/doc/CMakeLists.txt
-@@ -19,8 +19,7 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
- message (STATUS "Unix man page documentation will be generated")
- set (cli_tools oiiotool iinfo maketx idiff igrep iconvert)
-
-- find_program (IV_FOUND iv)
-- if (IV_FOUND)
-+ if (TARGET iv)
- list (APPEND cli_tools iv)
- endif()
-
Index: patches/patch-src_ffmpeg_imageio_ffmpeginput_cpp
===================================================================
RCS file: patches/patch-src_ffmpeg_imageio_ffmpeginput_cpp
diff -N patches/patch-src_ffmpeg_imageio_ffmpeginput_cpp
--- patches/patch-src_ffmpeg_imageio_ffmpeginput_cpp 29 Nov 2020 20:05:50 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_ffmpeg_imageio_ffmpeginput_cpp,v 1.2 2020/11/29 20:05:50 sthen Exp $
-
-Update for newer FFmpeg API.
-
-Index: src/ffmpeg.imageio/ffmpeginput.cpp
---- src/ffmpeg.imageio/ffmpeginput.cpp.orig
-+++ src/ffmpeg.imageio/ffmpeginput.cpp
-@@ -338,7 +338,7 @@ FFmpegInput::open (const std::string &name, ImageSpec
- !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) {
Index: patches/patch-src_include_OpenImageIO_strutil_h
===================================================================
RCS file: /cvs/ports/graphics/openimageio/patches/patch-src_include_OpenImageIO_strutil_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_include_OpenImageIO_strutil_h
--- patches/patch-src_include_OpenImageIO_strutil_h 15 Aug 2020 20:31:04 -0000 1.2
+++ patches/patch-src_include_OpenImageIO_strutil_h 3 Jan 2021 17:52:00 -0000
@@ -3,13 +3,13 @@ $OpenBSD: patch-src_include_OpenImageIO_
Add missing header for ports-gcc
Index: src/include/OpenImageIO/strutil.h
---- src/include/OpenImageIO/strutil.h.orig
-+++ src/include/OpenImageIO/strutil.h
-@@ -42,6 +42,7 @@
- #define OPENIMAGEIO_STRUTIL_H
+--- src/include/OpenImageIO/strutil.h.orig Tue Dec 1 12:39:14 2020
++++ src/include/OpenImageIO/strutil.h Thu Dec 3 16:42:07 2020
+@@ -14,6 +14,7 @@
+
+ #pragma once
- #include <string>
+#include <cstdarg>
#include <cstdio>
- #include <vector>
#include <map>
+ #include <sstream>
Index: patches/patch-src_libtexture_texture_pvt_h
===================================================================
RCS file: /cvs/ports/graphics/openimageio/patches/patch-src_libtexture_texture_pvt_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_libtexture_texture_pvt_h
--- patches/patch-src_libtexture_texture_pvt_h 29 Nov 2020 20:05:50 -0000 1.3
+++ patches/patch-src_libtexture_texture_pvt_h 3 Jan 2021 17:52:00 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_libtexture_texture_pvt_h,v 1.3 2020/11/29 20:05:50 sthen Exp $
Index: src/libtexture/texture_pvt.h
---- src/libtexture/texture_pvt.h.orig
-+++ src/libtexture/texture_pvt.h
-@@ -32,6 +32,8 @@
+--- src/libtexture/texture_pvt.h.orig Tue Dec 1 12:39:14 2020
++++ src/libtexture/texture_pvt.h Thu Dec 3 16:36:05 2020
+@@ -6,6 +6,8 @@
/// \file
/// Non-public classes used internally by TextureSystemImpl.
Index: patches/patch-src_libutil_sysutil_cpp
===================================================================
RCS file: /cvs/ports/graphics/openimageio/patches/patch-src_libutil_sysutil_cpp,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_libutil_sysutil_cpp
--- patches/patch-src_libutil_sysutil_cpp 29 Nov 2020 20:05:50 -0000 1.7
+++ patches/patch-src_libutil_sysutil_cpp 3 Jan 2021 17:52:00 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-src_libutil_sysutil_cpp,v 1.7 2020/11/29 20:05:50 sthen Exp $
Index: src/libutil/sysutil.cpp
---- src/libutil/sysutil.cpp.orig
-+++ src/libutil/sysutil.cpp
-@@ -51,6 +51,10 @@
- # include <unistd.h>
+--- src/libutil/sysutil.cpp.orig Tue Dec 1 12:39:14 2020
++++ src/libutil/sysutil.cpp Thu Dec 3 16:36:05 2020
+@@ -31,6 +31,10 @@
+ # include <unistd.h>
No comments:
Post a Comment