On Sat, Oct 16, 2021 at 04:11:02PM -0400, Brad Smith wrote:
> Here is an update to openimageio 2.2.18.0.
An updated diff. Enable the HEIF support and fix the hardcoded library
version in the PLIST.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 Makefile
--- Makefile 31 Aug 2021 07:31:14 -0000 1.56
+++ Makefile 16 Oct 2021 22:59:25 -0000
@@ -11,12 +11,11 @@ COMMENT = library for reading and writi
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
GH_TAGNAME = Release-$V
-V = 2.2.15.1
+V = 2.2.18.0
DISTNAME = openimageio-${V}
-REVISION = 0
-SHARED_LIBS += OpenImageIO 10.2 # 2.2.15
-SHARED_LIBS += OpenImageIO_Util 6.1 # 2.2.15
+SHARED_LIBS += OpenImageIO 11.0 # 2.2.18
+SHARED_LIBS += OpenImageIO_Util 7.0 # 2.2.18
CATEGORIES = graphics devel
@@ -32,8 +31,8 @@ WANTLIB += GL GLU Iex-3_1 IlmThread-3_1
WANTLIB += Imath-3_1 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 png
-WANTLIB += pugixml raw_r swscale tiff webp webpdemux z
+WANTLIB += boost_thread-mt bz2 c freetype gif heif iconv jpeg m
+WANTLIB += openjp2 png pugixml raw_r swscale tiff webp webpdemux z
MODULES = devel/cmake \
lang/python \
@@ -56,6 +55,7 @@ LIB_DEPENDS = devel/boost \
graphics/openjp2 \
graphics/png \
graphics/tiff \
+ multimedia/libheif \
textproc/pugixml
CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
@@ -67,7 +67,6 @@ CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR
-DUSE_OPENCV=OFF \
-DUSE_OPENVDB=OFF \
-DUSE_HDF5=OFF \
- -DUSE_LIBHEIF=OFF \
-Dpybind11_DIR=${MODPY_SITEPKG}/pybind11/share/cmake/pybind11/
# Fix undefined reference to __atomic_*
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo 9 Jun 2021 23:33:20 -0000 1.14
+++ distinfo 16 Oct 2021 02:32:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (openimageio-2.2.15.1.tar.gz) =
8iLGtRpAqrvIDd9AVVNb6a8f+pB0UvptH/p2dIVKqxc=
-SIZE (openimageio-2.2.15.1.tar.gz) = 29237852
+SHA256 (openimageio-2.2.18.0.tar.gz) =
uN0Yn7yX8bFyUo4yTaqQT3ShZrrWLDLnFmymyGZzSik=
+SIZE (openimageio-2.2.18.0.tar.gz) = 29246567
Index: patches/patch-src_include_OpenImageIO_fmath_h
===================================================================
RCS file: patches/patch-src_include_OpenImageIO_fmath_h
diff -N patches/patch-src_include_OpenImageIO_fmath_h
--- patches/patch-src_include_OpenImageIO_fmath_h 31 Aug 2021 07:31:14
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_include_OpenImageIO_fmath_h,v 1.1 2021/08/31 07:31:14
ajacoutot Exp $
-
-From 05a5448c3ec8c75d7e859099315c452e39729a9b Mon Sep 17 00:00:00 2001
-From: Larry Gritz <[email protected]>
-Date: Tue, 8 Jun 2021 18:56:31 -0700
-Subject: [PATCH] Fix to accommodate changed preprocessor name in imath master.
(#2996)
-
-Index: src/include/OpenImageIO/fmath.h
---- src/include/OpenImageIO/fmath.h.orig
-+++ src/include/OpenImageIO/fmath.h
-@@ -949,7 +949,7 @@ inline void convert_type<uint16_t,float> (const uint16
- }
-
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- template<>
- inline void convert_type<half,float> (const half *src,
- float *dst, size_t n,
-@@ -1017,7 +1017,7 @@ convert_type<float,uint8_t> (const float *src, uint8_t
- }
-
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- template<>
- inline void
- convert_type<float,half> (const float *src, half *dst, size_t n,
Index: patches/patch-src_include_OpenImageIO_simd_h
===================================================================
RCS file: patches/patch-src_include_OpenImageIO_simd_h
diff -N patches/patch-src_include_OpenImageIO_simd_h
--- patches/patch-src_include_OpenImageIO_simd_h 31 Aug 2021 07:31:14
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,233 +0,0 @@
-$OpenBSD: patch-src_include_OpenImageIO_simd_h,v 1.3 2021/08/31 07:31:14
ajacoutot Exp $
-
-From 05a5448c3ec8c75d7e859099315c452e39729a9b Mon Sep 17 00:00:00 2001
-From: Larry Gritz <[email protected]>
-Date: Tue, 8 Jun 2021 18:56:31 -0700
-Subject: [PATCH] Fix to accommodate changed preprocessor name in imath master.
(#2996)
-
-Index: src/include/OpenImageIO/simd.h
---- src/include/OpenImageIO/simd.h.orig
-+++ src/include/OpenImageIO/simd.h
-@@ -1839,7 +1839,7 @@ class vfloat4 { (public)
- /// Construct from a pointer to 4 char values
- explicit vfloat4 (const char *vals) { load(vals); }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- /// Construct from a pointer to 4 half (16 bit float) values
- explicit vfloat4 (const half *vals) { load(vals); }
- #endif
-@@ -1914,17 +1914,17 @@ class vfloat4 { (public)
- /// Load from an array of 4 char values, convert to float
- void load (const char *values);
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- /// Load from an array of 4 half values, convert to float
- void load (const half *values);
--#endif /* _HALF_H_ */
-+#endif /* _HALF_H_ or _IMATH_H_ */
-
- void store (float *values) const;
-
- /// Store the first n values into memory
- void store (float *values, int n) const;
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- void store (half *values) const;
- #endif
-
-@@ -2177,7 +2177,7 @@ class vfloat3 : public vfloat4 { (public)
- /// Construct from a pointer to 4 char values
- explicit vfloat3 (const char *vals) { load(vals); }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- /// Construct from a pointer to 4 half (16 bit float) values
- explicit vfloat3 (const half *vals) { load(vals); }
- #endif
-@@ -2216,16 +2216,16 @@ class vfloat3 : public vfloat4 { (public)
- /// Load from an array of 4 char values, convert to float
- void load (const char *values);
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- /// Load from an array of 4 half values, convert to float
- void load (const half *values);
--#endif /* _HALF_H_ */
-+#endif /* _HALF_H_ or _IMATH_H_ */
-
- void store (float *values) const;
-
- void store (float *values, int n) const;
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- void store (half *values) const;
- #endif
-
-@@ -2475,7 +2475,7 @@ class vfloat8 { (public)
- /// Construct from a pointer to char values
- explicit vfloat8 (const char *vals) { load(vals); }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- /// Construct from a pointer to half (16 bit float) values
- explicit vfloat8 (const half *vals) { load(vals); }
- #endif
-@@ -2551,17 +2551,17 @@ class vfloat8 { (public)
- /// Load from an array of 8 char values, convert to float
- void load (const char *values);
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- /// Load from an array of 8 half values, convert to float
- void load (const half *values);
--#endif /* _HALF_H_ */
-+#endif /* _HALF_H_ or _IMATH_H_ */
-
- void store (float *values) const;
-
- /// Store the first n values into memory
- void store (float *values, int n) const;
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- void store (half *values) const;
- #endif
-
-@@ -2798,7 +2798,7 @@ class vfloat16 { (public)
- /// Construct from a pointer to char values
- explicit vfloat16 (const char *vals) { load(vals); }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- /// Construct from a pointer to half (16 bit float) values
- explicit vfloat16 (const half *vals) { load(vals); }
- #endif
-@@ -2876,17 +2876,17 @@ class vfloat16 { (public)
- /// Load from an array of 16 char values, convert to float
- void load (const char *values);
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- /// Load from an array of 16 half values, convert to float
- void load (const half *values);
--#endif /* _HALF_H_ */
-+#endif /* _HALF_H_ or _IMATH_H_ */
-
- void store (float *values) const;
-
- /// Store the first n values into memory
- void store (float *values, int n) const;
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- void store (half *values) const;
- #endif
-
-@@ -6677,7 +6677,7 @@ OIIO_FORCEINLINE void vfloat4::load (const char *value
- #endif
- }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- OIIO_FORCEINLINE void vfloat4::load (const half *values) {
- #if OIIO_F16C_ENABLED && OIIO_SIMD_SSE
- /* Enabled 16 bit float instructions! */
-@@ -6712,7 +6712,7 @@ OIIO_FORCEINLINE void vfloat4::load (const half *value
- SIMD_CONSTRUCT (values[i]);
- #endif
- }
--#endif /* _HALF_H_ */
-+#endif /* _HALF_H_ or _IMATH_H_ */
-
- OIIO_FORCEINLINE void vfloat4::store (float *values) const {
- #if OIIO_SIMD_SSE
-@@ -6784,7 +6784,7 @@ OIIO_FORCEINLINE void vfloat4::store (float *values, i
- #endif
- }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- OIIO_FORCEINLINE void vfloat4::store (half *values) const {
- #if OIIO_F16C_ENABLED && OIIO_SIMD_SSE
- __m128i h = _mm_cvtps_ph (m_simd, (_MM_FROUND_TO_NEAREST_INT
|_MM_FROUND_NO_EXC));
-@@ -7889,11 +7889,11 @@ OIIO_FORCEINLINE void vfloat3::load (const char *value
- vfloat4::load (float(values[0]), float(values[1]), float(values[2]));
- }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- OIIO_FORCEINLINE void vfloat3::load (const half *values) {
- vfloat4::load (float(values[0]), float(values[1]), float(values[2]));
- }
--#endif /* _HALF_H_ */
-+#endif /* _HALF_H_ or _IMATH_H_ */
-
- OIIO_FORCEINLINE void vfloat3::store (float *values) const {
- vfloat4::store (values, 3);
-@@ -7903,7 +7903,7 @@ OIIO_FORCEINLINE void vfloat3::store (float *values, i
- vfloat4::store (values, n);
- }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- OIIO_FORCEINLINE void vfloat3::store (half *values) const {
- SIMD_DO (values[i] = m_val[i]);
- }
-@@ -8589,7 +8589,7 @@ OIIO_FORCEINLINE void vfloat8::load (const char *value
- #endif
- }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- OIIO_FORCEINLINE void vfloat8::load (const half *values) {
- #if OIIO_SIMD_AVX && OIIO_F16C_ENABLED
- /* Enabled 16 bit float instructions! */
-@@ -8602,7 +8602,7 @@ OIIO_FORCEINLINE void vfloat8::load (const half *value
- SIMD_CONSTRUCT (values[i]);
- #endif
- }
--#endif /* _HALF_H_ */
-+#endif /* _HALF_H_ or _IMATH_H_ */
-
-
- OIIO_FORCEINLINE void vfloat8::store (float *values) const {
-@@ -8640,7 +8640,7 @@ OIIO_FORCEINLINE void vfloat8::store (float *values, i
- #endif
- }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- OIIO_FORCEINLINE void vfloat8::store (half *values) const {
- #if OIIO_SIMD_AVX && OIIO_F16C_ENABLED
- __m128i h = _mm256_cvtps_ph (m_simd, (_MM_FROUND_TO_NEAREST_INT
|_MM_FROUND_NO_EXC));
-@@ -9471,7 +9471,7 @@ OIIO_FORCEINLINE void vfloat16::load (const char *valu
- }
-
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- OIIO_FORCEINLINE void vfloat16::load (const half *values) {
- #if OIIO_SIMD_AVX >= 512
- /* Enabled 16 bit float instructions! */
-@@ -9482,7 +9482,7 @@ OIIO_FORCEINLINE void vfloat16::load (const half *valu
- m_8[1].load (values+8);
- #endif
- }
--#endif /* _HALF_H_ */
-+#endif /* _HALF_H_ or _IMATH_H_ */
-
-
-
-@@ -9519,7 +9519,7 @@ OIIO_FORCEINLINE void vfloat16::store (float *values,
- #endif
- }
-
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- OIIO_FORCEINLINE void vfloat16::store (half *values) const {
- #if OIIO_SIMD_AVX >= 512
- __m256i h = _mm512_cvtps_ph (m_simd, (_MM_FROUND_TO_NEAREST_INT
|_MM_FROUND_NO_EXC));
Index: patches/patch-src_include_OpenImageIO_typedesc_h
===================================================================
RCS file: patches/patch-src_include_OpenImageIO_typedesc_h
diff -N patches/patch-src_include_OpenImageIO_typedesc_h
--- patches/patch-src_include_OpenImageIO_typedesc_h 31 Aug 2021 07:31:14
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_include_OpenImageIO_typedesc_h,v 1.1 2021/08/31 07:31:14
ajacoutot Exp $
-
-From 05a5448c3ec8c75d7e859099315c452e39729a9b Mon Sep 17 00:00:00 2001
-From: Larry Gritz <[email protected]>
-Date: Tue, 8 Jun 2021 18:56:31 -0700
-Subject: [PATCH] Fix to accommodate changed preprocessor name in imath master.
(#2996)
-
-Index: src/include/OpenImageIO/typedesc.h
---- src/include/OpenImageIO/typedesc.h.orig
-+++ src/include/OpenImageIO/typedesc.h
-@@ -409,7 +409,7 @@ template<> struct BaseTypeFromC<unsigned int> { static
- template<> struct BaseTypeFromC<int> { static const TypeDesc::BASETYPE value
= TypeDesc::INT; };
- template<> struct BaseTypeFromC<unsigned long long> { static const
TypeDesc::BASETYPE value = TypeDesc::UINT64; };
- template<> struct BaseTypeFromC<long long> { static const TypeDesc::BASETYPE
value = TypeDesc::INT64; };
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- template<> struct BaseTypeFromC<half> { static const TypeDesc::BASETYPE value
= TypeDesc::HALF; };
- #endif
- template<> struct BaseTypeFromC<float> { static const TypeDesc::BASETYPE
value = TypeDesc::FLOAT; };
-@@ -460,7 +460,7 @@ template<> struct CType<(int)TypeDesc::UINT> { typedef
- template<> struct CType<(int)TypeDesc::INT> { typedef int type; };
- template<> struct CType<(int)TypeDesc::UINT64> { typedef unsigned long long
type; };
- template<> struct CType<(int)TypeDesc::INT64> { typedef long long type; };
--#ifdef _HALF_H_
-+#if defined(_HALF_H_) || defined(IMATH_HALF_H_)
- template<> struct CType<(int)TypeDesc::HALF> { typedef half type; };
- #endif
- template<> struct CType<(int)TypeDesc::FLOAT> { typedef float type; };
Index: patches/patch-src_libutil_sysutil_cpp
===================================================================
RCS file:
/home/cvs/ports/graphics/openimageio/patches/patch-src_libutil_sysutil_cpp,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-src_libutil_sysutil_cpp
--- patches/patch-src_libutil_sysutil_cpp 5 Jan 2021 20:53:18 -0000
1.8
+++ patches/patch-src_libutil_sysutil_cpp 16 Oct 2021 02:55:25 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_libutil_sysutil_cpp,v 1.8 2021/01/05 20:53:18 jca Exp $
Index: src/libutil/sysutil.cpp
---- src/libutil/sysutil.cpp.orig Tue Dec 1 12:39:14 2020
-+++ src/libutil/sysutil.cpp Thu Dec 3 16:36:05 2020
+--- src/libutil/sysutil.cpp.orig
++++ src/libutil/sysutil.cpp
@@ -31,6 +31,10 @@
# include <unistd.h>
#endif
@@ -14,7 +14,7 @@ Index: src/libutil/sysutil.cpp
#ifdef __APPLE__
# include <mach-o/dyld.h>
# include <mach/mach_init.h>
-@@ -129,7 +133,7 @@ Sysutil::memory_used(bool resident)
+@@ -130,7 +134,7 @@ Sysutil::memory_used(bool resident)
else
return 0;
Index: patches/patch-src_python_py_oiio_h
===================================================================
RCS file: patches/patch-src_python_py_oiio_h
diff -N patches/patch-src_python_py_oiio_h
--- patches/patch-src_python_py_oiio_h 31 Aug 2021 07:31:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_python_py_oiio_h,v 1.1 2021/08/31 07:31:14 ajacoutot Exp $
-
-From 05a5448c3ec8c75d7e859099315c452e39729a9b Mon Sep 17 00:00:00 2001
-From: Larry Gritz <[email protected]>
-Date: Tue, 8 Jun 2021 18:56:31 -0700
-Subject: [PATCH] Fix to accommodate changed preprocessor name in imath master.
(#2996)
-
-Index: src/python/py_oiio.h
---- src/python/py_oiio.h.orig
-+++ src/python/py_oiio.h
-@@ -597,9 +597,7 @@ case TypeDesc::TYPE:
- ParamValue_convert_dispatch(INT);
- // ParamValue_convert_dispatch(ULONGLONG);
- // ParamValue_convert_dispatch(LONGLONG);
--#ifdef _HALF_H_
- ParamValue_convert_dispatch(HALF);
--#endif
- ParamValue_convert_dispatch(FLOAT);
- ParamValue_convert_dispatch(DOUBLE);
- case TypeDesc::STRING:
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/openimageio/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 PLIST
--- pkg/PLIST 31 Aug 2021 07:31:14 -0000 1.16
+++ pkg/PLIST 16 Oct 2021 22:58:07 -0000
@@ -71,7 +71,7 @@ lib/cmake/OpenImageIO/OpenImageIOTargets
@lib lib/libOpenImageIO.so.${LIBOpenImageIO_VERSION}
@lib lib/libOpenImageIO_Util.so.${LIBOpenImageIO_Util_VERSION}
lib/pkgconfig/OpenImageIO.pc
-lib/python${MODPY_VERSION}/site-packages/OpenImageIO.${MODPY_PYC_MAGIC_TAG}so.10.2
+lib/python${MODPY_VERSION}/site-packages/OpenImageIO.${MODPY_PYC_MAGIC_TAG}so.${LIBOpenImageIO_VERSION}
@man man/man1/iconvert.1
@man man/man1/idiff.1
@man man/man1/igrep.1
