Re: UPDATE: OpenImageIO 2.4 / Blender 3.3
On 2023-04-26 4:07 a.m., Stuart Henderson wrote:
On 2023/04/26 08:14, Stuart Henderson wrote:
On 2023/04/25 14:35, Rafael Sadowski wrote:
Compiles and runs without issues.
CC Maintainer
Let's try CC'ing at a different domain -
https://danwin1210.de/new-domain.php
Bounced on danwin1210.de, user unknown.
I am happy to go ahead and commit.
Please do.
If there's no response I think we can go ahead and commit (and let's
drop the maintainer lines if that's the case - the danwin1210.me domain
is gone).
On Tue Apr 25, 2023 at 04:22:27AM -0400, Brad Smith wrote:
Attached are updates to OpenImageIO 2.4 and Blender 3.3.
I tried initially sending the updates to the maintainer but his e-mail
server appears to be down.
It could definitely use some testing from someone familiar with Blender.
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 Makefile
--- Makefile13 Nov 2022 15:28:42 - 1.64
+++ Makefile19 Apr 2023 03:26:57 -
@@ -5,13 +5,12 @@ COMMENT = library for reading and writi
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
-GH_TAGNAME = Release-$V
-V =2.2.20.0
+GH_TAGNAME = v$V
+V =2.4.10.0
DISTNAME =openimageio-${V}
-REVISION = 2
-SHARED_LIBS += OpenImageIO 11.1 # 2.2.20
-SHARED_LIBS += OpenImageIO_Util7.0 # 2.2.20
+SHARED_LIBS += OpenImageIO 12.0 # 2.4.10
+SHARED_LIBS += OpenImageIO_Util8.0 # 2.4.10
CATEGORIES = graphics devel
@@ -22,17 +21,16 @@ MAINTAINER = Dimitri Karamazov
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += GL GLU Iex-3_1 IlmThread-3_1 Imath-3_1 OpenColorIO
-WANTLIB += OpenEXR-3_1 Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets avcodec
-WANTLIB += avformat avutil 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 heif jpeg m openjp2 png pugixml
-WANTLIB += raw_r swscale tiff webp webpdemux z
+WANTLIB += ${COMPILER_LIBCXX} GL GLU Iex-3_1 IlmThread-3_1 Imath-3_1
+WANTLIB += OpenColorIO OpenEXR-3_1 OpenEXRCore-3_1 Qt6Core Qt6Gui
+WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6Widgets avcodec avformat
+WANTLIB += avutil boost_atomic-mt boost_chrono-mt boost_filesystem-mt
+WANTLIB += boost_thread-mt bz2 c freetype gif heif jpeg m openjp2
+WANTLIB += png pugixml raw_r swscale tbb tiff webp webpdemux z
MODULES = devel/cmake \
lang/python \
- x11/qt5
+ x11/qt6
COMPILER = base-clang ports-gcc
@@ -42,6 +40,7 @@ BUILD_DEPENDS = devel/fmt \
textproc/txt2man
LIB_DEPENDS = devel/boost \
+ devel/tbb \
graphics/ffmpeg \
graphics/giflib \
graphics/jpeg \
@@ -56,6 +55,7 @@ LIB_DEPENDS = devel/boost \
textproc/pugixml
CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
+ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_LIBRARY_PATH="${WRKBUILD}/lib:${CMAKE_LIBRARY_PATH}" \
-DSTOP_ON_WARNING=OFF \
-DUSE_CCACHE=OFF \
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- distinfo2 Mar 2022 19:55:18 - 1.16
+++ distinfo17 Apr 2023 02:59:00 -
@@ -1,2 +1,2 @@
-SHA256 (openimageio-2.2.20.0.tar.gz) =
hZ85PkUz2rOwAdiBxB/U4KPqEU4VnwDXsqol+pjpf5k=
-SIZE (openimageio-2.2.20.0.tar.gz) = 29252912
+SHA256 (openimageio-2.4.10.0.tar.gz) =
WfUjoLmhAUmTvtz3dSmTr0OzSHYRZfUupuuEeH9XrtU=
+SIZE (openimageio-2.4.10.0.tar.gz) = 32155954
Index: patches/patch-src_libutil_strutil_cpp
===
RCS file: patches/patch-src_libutil_strutil_cpp
diff -N patches/patch-src_libutil_strutil_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_libutil_strutil_cpp 17 Apr 2023 03:38:22 -
@@ -0,0 +1,30 @@
+Index: src/libutil/strutil.cpp
+--- src/libutil/strutil.cpp.orig
src/libutil/strutil.cpp
+@@ -62,7 +62,7 @@ static std::mutex output_mutex;
+
+ // On systems that support it, get a location independent locale.
+ #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \
+-|| defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++|| defined(__FreeBSD_kernel__) || defined(__OpenBSD__) ||
defined(__GLIBC__)
+ static locale_t c_loc = newlocale(LC_ALL_MASK, "C", nullptr);
+ #elif defined(_WIN32)
+ static _locale_t c_loc = _create_locale(LC_ALL, "C");
+@@ -446,7 +446,7 @@ inline int
+
Re: UPDATE: OpenImageIO 2.4 / Blender 3.3
On 2023/04/26 08:14, Stuart Henderson wrote:
> On 2023/04/25 14:35, Rafael Sadowski wrote:
> > Compiles and runs without issues.
> >
> > CC Maintainer
>
> Let's try CC'ing at a different domain -
> https://danwin1210.de/new-domain.php
Bounced on danwin1210.de, user unknown.
I am happy to go ahead and commit.
> If there's no response I think we can go ahead and commit (and let's
> drop the maintainer lines if that's the case - the danwin1210.me domain
> is gone).
>
> > On Tue Apr 25, 2023 at 04:22:27AM -0400, Brad Smith wrote:
> > > Attached are updates to OpenImageIO 2.4 and Blender 3.3.
> > >
> > > I tried initially sending the updates to the maintainer but his e-mail
> > > server appears to be down.
> > >
> > > It could definitely use some testing from someone familiar with Blender.
> >
> > > Index: Makefile
> > > ===
> > > RCS file: /home/cvs/ports/graphics/openimageio/Makefile,v
> > > retrieving revision 1.64
> > > diff -u -p -u -p -r1.64 Makefile
> > > --- Makefile 13 Nov 2022 15:28:42 - 1.64
> > > +++ Makefile 19 Apr 2023 03:26:57 -
> > > @@ -5,13 +5,12 @@ COMMENT = library for reading and writi
> > >
> > > GH_ACCOUNT = OpenImageIO
> > > GH_PROJECT = oiio
> > > -GH_TAGNAME = Release-$V
> > > -V = 2.2.20.0
> > > +GH_TAGNAME = v$V
> > > +V = 2.4.10.0
> > > DISTNAME = openimageio-${V}
> > > -REVISION = 2
> > >
> > > -SHARED_LIBS += OpenImageIO 11.1 # 2.2.20
> > > -SHARED_LIBS += OpenImageIO_Util7.0 # 2.2.20
> > > +SHARED_LIBS += OpenImageIO 12.0 # 2.4.10
> > > +SHARED_LIBS += OpenImageIO_Util8.0 # 2.4.10
> > >
> > > CATEGORIES = graphics devel
> > >
> > > @@ -22,17 +21,16 @@ MAINTAINER = Dimitri Karamazov > > # BSD
> > > PERMIT_PACKAGE = Yes
> > >
> > > -WANTLIB += ${COMPILER_LIBCXX}
> > > -WANTLIB += GL GLU Iex-3_1 IlmThread-3_1 Imath-3_1 OpenColorIO
> > > -WANTLIB += OpenEXR-3_1 Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets avcodec
> > > -WANTLIB += avformat avutil 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 heif jpeg m openjp2 png pugixml
> > > -WANTLIB += raw_r swscale tiff webp webpdemux z
> > > +WANTLIB += ${COMPILER_LIBCXX} GL GLU Iex-3_1 IlmThread-3_1 Imath-3_1
> > > +WANTLIB += OpenColorIO OpenEXR-3_1 OpenEXRCore-3_1 Qt6Core Qt6Gui
> > > +WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6Widgets avcodec avformat
> > > +WANTLIB += avutil boost_atomic-mt boost_chrono-mt boost_filesystem-mt
> > > +WANTLIB += boost_thread-mt bz2 c freetype gif heif jpeg m openjp2
> > > +WANTLIB += png pugixml raw_r swscale tbb tiff webp webpdemux z
> > >
> > > MODULES =devel/cmake \
> > > lang/python \
> > > - x11/qt5
> > > + x11/qt6
> > >
> > > COMPILER = base-clang ports-gcc
> > >
> > > @@ -42,6 +40,7 @@ BUILD_DEPENDS = devel/fmt \
> > > textproc/txt2man
> > >
> > > LIB_DEPENDS =devel/boost \
> > > + devel/tbb \
> > > graphics/ffmpeg \
> > > graphics/giflib \
> > > graphics/jpeg \
> > > @@ -56,6 +55,7 @@ LIB_DEPENDS = devel/boost \
> > > textproc/pugixml
> > >
> > > CONFIGURE_ARGS +=-DCMAKE_INSTALL_MANDIR="man/man1" \
> > > + -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
> > >
> > > -DCMAKE_LIBRARY_PATH="${WRKBUILD}/lib:${CMAKE_LIBRARY_PATH}" \
> > > -DSTOP_ON_WARNING=OFF \
> > > -DUSE_CCACHE=OFF \
> > > Index: distinfo
> > > ===
> > > RCS file: /home/cvs/ports/graphics/openimageio/distinfo,v
> > > retrieving revision 1.16
> > > diff -u -p -u -p -r1.16 distinfo
> > > --- distinfo 2 Mar 2022 19:55:18 - 1.16
> > > +++ distinfo 17 Apr 2023 02:59:00 -
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (openimageio-2.2.20.0.tar.gz) =
> > > hZ85PkUz2rOwAdiBxB/U4KPqEU4VnwDXsqol+pjpf5k=
> > > -SIZE (openimageio-2.2.20.0.tar.gz) = 29252912
> > > +SHA256 (openimageio-2.4.10.0.tar.gz) =
> > > WfUjoLmhAUmTvtz3dSmTr0OzSHYRZfUupuuEeH9XrtU=
> > > +SIZE (openimageio-2.4.10.0.tar.gz) = 32155954
> > > Index: patches/patch-src_libutil_strutil_cpp
> > > ===
> > > RCS file: patches/patch-src_libutil_strutil_cpp
> > > diff -N patches/patch-src_libutil_strutil_cpp
> > > --- /dev/null 1 Jan 1970 00:00:00 -
> > > +++ patches/patch-src_libutil_strutil_cpp 17 Apr 2023 03:38:22 -
> > > @@ -0,0 +1,30 @@
> > > +Index: src/libutil/strutil.cpp
> > > +---
Re: UPDATE: OpenImageIO 2.4 / Blender 3.3
On 2023/04/25 14:35, Rafael Sadowski wrote:
> Compiles and runs without issues.
>
> CC Maintainer
Let's try CC'ing at a different domain -
https://danwin1210.de/new-domain.php
If there's no response I think we can go ahead and commit (and let's
drop the maintainer lines if that's the case - the danwin1210.me domain
is gone).
> On Tue Apr 25, 2023 at 04:22:27AM -0400, Brad Smith wrote:
> > Attached are updates to OpenImageIO 2.4 and Blender 3.3.
> >
> > I tried initially sending the updates to the maintainer but his e-mail
> > server appears to be down.
> >
> > It could definitely use some testing from someone familiar with Blender.
>
> > Index: Makefile
> > ===
> > RCS file: /home/cvs/ports/graphics/openimageio/Makefile,v
> > retrieving revision 1.64
> > diff -u -p -u -p -r1.64 Makefile
> > --- Makefile13 Nov 2022 15:28:42 - 1.64
> > +++ Makefile19 Apr 2023 03:26:57 -
> > @@ -5,13 +5,12 @@ COMMENT = library for reading and writi
> >
> > GH_ACCOUNT = OpenImageIO
> > GH_PROJECT = oiio
> > -GH_TAGNAME = Release-$V
> > -V =2.2.20.0
> > +GH_TAGNAME = v$V
> > +V =2.4.10.0
> > DISTNAME = openimageio-${V}
> > -REVISION = 2
> >
> > -SHARED_LIBS += OpenImageIO 11.1 # 2.2.20
> > -SHARED_LIBS += OpenImageIO_Util7.0 # 2.2.20
> > +SHARED_LIBS += OpenImageIO 12.0 # 2.4.10
> > +SHARED_LIBS += OpenImageIO_Util8.0 # 2.4.10
> >
> > CATEGORIES = graphics devel
> >
> > @@ -22,17 +21,16 @@ MAINTAINER =Dimitri Karamazov > # BSD
> > PERMIT_PACKAGE = Yes
> >
> > -WANTLIB += ${COMPILER_LIBCXX}
> > -WANTLIB += GL GLU Iex-3_1 IlmThread-3_1 Imath-3_1 OpenColorIO
> > -WANTLIB += OpenEXR-3_1 Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets avcodec
> > -WANTLIB += avformat avutil 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 heif jpeg m openjp2 png pugixml
> > -WANTLIB += raw_r swscale tiff webp webpdemux z
> > +WANTLIB += ${COMPILER_LIBCXX} GL GLU Iex-3_1 IlmThread-3_1 Imath-3_1
> > +WANTLIB += OpenColorIO OpenEXR-3_1 OpenEXRCore-3_1 Qt6Core Qt6Gui
> > +WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6Widgets avcodec avformat
> > +WANTLIB += avutil boost_atomic-mt boost_chrono-mt boost_filesystem-mt
> > +WANTLIB += boost_thread-mt bz2 c freetype gif heif jpeg m openjp2
> > +WANTLIB += png pugixml raw_r swscale tbb tiff webp webpdemux z
> >
> > MODULES = devel/cmake \
> > lang/python \
> > - x11/qt5
> > + x11/qt6
> >
> > COMPILER = base-clang ports-gcc
> >
> > @@ -42,6 +40,7 @@ BUILD_DEPENDS = devel/fmt \
> > textproc/txt2man
> >
> > LIB_DEPENDS = devel/boost \
> > + devel/tbb \
> > graphics/ffmpeg \
> > graphics/giflib \
> > graphics/jpeg \
> > @@ -56,6 +55,7 @@ LIB_DEPENDS = devel/boost \
> > textproc/pugixml
> >
> > CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
> > + -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
> >
> > -DCMAKE_LIBRARY_PATH="${WRKBUILD}/lib:${CMAKE_LIBRARY_PATH}" \
> > -DSTOP_ON_WARNING=OFF \
> > -DUSE_CCACHE=OFF \
> > Index: distinfo
> > ===
> > RCS file: /home/cvs/ports/graphics/openimageio/distinfo,v
> > retrieving revision 1.16
> > diff -u -p -u -p -r1.16 distinfo
> > --- distinfo2 Mar 2022 19:55:18 - 1.16
> > +++ distinfo17 Apr 2023 02:59:00 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (openimageio-2.2.20.0.tar.gz) =
> > hZ85PkUz2rOwAdiBxB/U4KPqEU4VnwDXsqol+pjpf5k=
> > -SIZE (openimageio-2.2.20.0.tar.gz) = 29252912
> > +SHA256 (openimageio-2.4.10.0.tar.gz) =
> > WfUjoLmhAUmTvtz3dSmTr0OzSHYRZfUupuuEeH9XrtU=
> > +SIZE (openimageio-2.4.10.0.tar.gz) = 32155954
> > Index: patches/patch-src_libutil_strutil_cpp
> > ===
> > RCS file: patches/patch-src_libutil_strutil_cpp
> > diff -N patches/patch-src_libutil_strutil_cpp
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_libutil_strutil_cpp 17 Apr 2023 03:38:22 -
> > @@ -0,0 +1,30 @@
> > +Index: src/libutil/strutil.cpp
> > +--- src/libutil/strutil.cpp.orig
> > src/libutil/strutil.cpp
> > +@@ -62,7 +62,7 @@ static std::mutex output_mutex;
> > +
> > + // On systems that support it, get a location independent locale.
> > + #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \
> > +-|| defined(__FreeBSD_kernel__)
Re: UPDATE: OpenImageIO 2.4 / Blender 3.3
Compiles and runs without issues.
CC Maintainer
On Tue Apr 25, 2023 at 04:22:27AM -0400, Brad Smith wrote:
> Attached are updates to OpenImageIO 2.4 and Blender 3.3.
>
> I tried initially sending the updates to the maintainer but his e-mail
> server appears to be down.
>
> It could definitely use some testing from someone familiar with Blender.
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/graphics/openimageio/Makefile,v
> retrieving revision 1.64
> diff -u -p -u -p -r1.64 Makefile
> --- Makefile 13 Nov 2022 15:28:42 - 1.64
> +++ Makefile 19 Apr 2023 03:26:57 -
> @@ -5,13 +5,12 @@ COMMENT = library for reading and writi
>
> GH_ACCOUNT = OpenImageIO
> GH_PROJECT = oiio
> -GH_TAGNAME = Release-$V
> -V = 2.2.20.0
> +GH_TAGNAME = v$V
> +V = 2.4.10.0
> DISTNAME = openimageio-${V}
> -REVISION = 2
>
> -SHARED_LIBS += OpenImageIO 11.1 # 2.2.20
> -SHARED_LIBS += OpenImageIO_Util7.0 # 2.2.20
> +SHARED_LIBS += OpenImageIO 12.0 # 2.4.10
> +SHARED_LIBS += OpenImageIO_Util8.0 # 2.4.10
>
> CATEGORIES = graphics devel
>
> @@ -22,17 +21,16 @@ MAINTAINER = Dimitri Karamazov # BSD
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX}
> -WANTLIB += GL GLU Iex-3_1 IlmThread-3_1 Imath-3_1 OpenColorIO
> -WANTLIB += OpenEXR-3_1 Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets avcodec
> -WANTLIB += avformat avutil 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 heif jpeg m openjp2 png pugixml
> -WANTLIB += raw_r swscale tiff webp webpdemux z
> +WANTLIB += ${COMPILER_LIBCXX} GL GLU Iex-3_1 IlmThread-3_1 Imath-3_1
> +WANTLIB += OpenColorIO OpenEXR-3_1 OpenEXRCore-3_1 Qt6Core Qt6Gui
> +WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6Widgets avcodec avformat
> +WANTLIB += avutil boost_atomic-mt boost_chrono-mt boost_filesystem-mt
> +WANTLIB += boost_thread-mt bz2 c freetype gif heif jpeg m openjp2
> +WANTLIB += png pugixml raw_r swscale tbb tiff webp webpdemux z
>
> MODULES =devel/cmake \
> lang/python \
> - x11/qt5
> + x11/qt6
>
> COMPILER = base-clang ports-gcc
>
> @@ -42,6 +40,7 @@ BUILD_DEPENDS = devel/fmt \
> textproc/txt2man
>
> LIB_DEPENDS =devel/boost \
> + devel/tbb \
> graphics/ffmpeg \
> graphics/giflib \
> graphics/jpeg \
> @@ -56,6 +55,7 @@ LIB_DEPENDS = devel/boost \
> textproc/pugixml
>
> CONFIGURE_ARGS +=-DCMAKE_INSTALL_MANDIR="man/man1" \
> + -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
>
> -DCMAKE_LIBRARY_PATH="${WRKBUILD}/lib:${CMAKE_LIBRARY_PATH}" \
> -DSTOP_ON_WARNING=OFF \
> -DUSE_CCACHE=OFF \
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/graphics/openimageio/distinfo,v
> retrieving revision 1.16
> diff -u -p -u -p -r1.16 distinfo
> --- distinfo 2 Mar 2022 19:55:18 - 1.16
> +++ distinfo 17 Apr 2023 02:59:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (openimageio-2.2.20.0.tar.gz) =
> hZ85PkUz2rOwAdiBxB/U4KPqEU4VnwDXsqol+pjpf5k=
> -SIZE (openimageio-2.2.20.0.tar.gz) = 29252912
> +SHA256 (openimageio-2.4.10.0.tar.gz) =
> WfUjoLmhAUmTvtz3dSmTr0OzSHYRZfUupuuEeH9XrtU=
> +SIZE (openimageio-2.4.10.0.tar.gz) = 32155954
> Index: patches/patch-src_libutil_strutil_cpp
> ===
> RCS file: patches/patch-src_libutil_strutil_cpp
> diff -N patches/patch-src_libutil_strutil_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_libutil_strutil_cpp 17 Apr 2023 03:38:22 -
> @@ -0,0 +1,30 @@
> +Index: src/libutil/strutil.cpp
> +--- src/libutil/strutil.cpp.orig
> src/libutil/strutil.cpp
> +@@ -62,7 +62,7 @@ static std::mutex output_mutex;
> +
> + // On systems that support it, get a location independent locale.
> + #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \
> +-|| defined(__FreeBSD_kernel__) || defined(__GLIBC__)
> ++|| defined(__FreeBSD_kernel__) || defined(__OpenBSD__) ||
> defined(__GLIBC__)
> + static locale_t c_loc = newlocale(LC_ALL_MASK, "C", nullptr);
> + #elif defined(_WIN32)
> + static _locale_t c_loc = _create_locale(LC_ALL, "C");
> +@@ -446,7 +446,7 @@ inline int
> + strcasecmp(const char* a, const char* b)
> + {
> + #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \
> +-|| defined(__FreeBSD_kernel__) || defined(__GLIBC__)
> ++||
UPDATE: OpenImageIO 2.4 / Blender 3.3
Attached are updates to OpenImageIO 2.4 and Blender 3.3.
I tried initially sending the updates to the maintainer but his e-mail
server appears to be down.
It could definitely use some testing from someone familiar with Blender.
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 Makefile
--- Makefile13 Nov 2022 15:28:42 - 1.64
+++ Makefile19 Apr 2023 03:26:57 -
@@ -5,13 +5,12 @@ COMMENT = library for reading and writi
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
-GH_TAGNAME = Release-$V
-V =2.2.20.0
+GH_TAGNAME = v$V
+V =2.4.10.0
DISTNAME = openimageio-${V}
-REVISION = 2
-SHARED_LIBS += OpenImageIO 11.1 # 2.2.20
-SHARED_LIBS += OpenImageIO_Util7.0 # 2.2.20
+SHARED_LIBS += OpenImageIO 12.0 # 2.4.10
+SHARED_LIBS += OpenImageIO_Util8.0 # 2.4.10
CATEGORIES = graphics devel
@@ -22,17 +21,16 @@ MAINTAINER =Dimitri Karamazov Index: Makefile
===
RCS file: /home/cvs/ports/graphics/blender/Makefile,v
retrieving revision 1.113
diff -u -p -u -p -r1.113 Makefile
--- Makefile23 Feb 2023 14:44:35 - 1.113
+++ Makefile25 Apr 2023 07:06:20 -
@@ -7,9 +7,7 @@ DPB_PROPERTIES = parallel
COMMENT = 3D creation software
-DISTNAME = blender-3.0.1
-REVISION = 1
-
+DISTNAME = blender-3.3.6
CATEGORIES = graphics
HOMEPAGE = https://www.blender.org/
@@ -20,15 +18,16 @@ MAINTAINER =Dimitri Karamazov https://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/
@@ -85,8 +84,6 @@ NO_TEST = Yes
CXXFLAGS +=-I${LOCALBASE}/include -I${X11BASE}/include
CFLAGS += -I${LOCALBASE}/include
-# Fix build with OpenEXR>=3 (Imath split)
-CXXFLAGS +=-I${LOCALBASE}/include/Imath
MODPY_ADJ_FILES = release/scripts/modules/bl_i18n_utils/merge_po.py \
release/scripts/modules/bl_i18n_utils/utils_rtl.py \
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/blender/distinfo,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 distinfo
--- distinfo5 Mar 2022 14:35:47 - 1.32
+++ distinfo19 Apr 2023 04:38:21 -
@@ -1,2 +1,2 @@
-SHA256 (blender-3.0.1.tar.xz) = GbsKliaeClxLXWK5g2ODYFRHHAlrg9l1VZiyWzR9dEE=
-SIZE (blender-3.0.1.tar.xz) = 40155604
+SHA256 (blender-3.3.6.tar.xz) = WnKbSVvA0Uou7LOCZcX4GwpIMdzzqR4DKWIm6PxV/jg=
+SIZE (blender-3.3.6.tar.xz) = 41912972
Index: patches/patch-build_files_cmake_Modules_FindOpenEXR_cmake
===
RCS file: patches/patch-build_files_cmake_Modules_FindOpenEXR_cmake
diff -N patches/patch-build_files_cmake_Modules_FindOpenEXR_cmake
--- patches/patch-build_files_cmake_Modules_FindOpenEXR_cmake 11 Mar 2022
19:22:08 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-Fix build with OpenEXR>=3
-
-Index: build_files/cmake/Modules/FindOpenEXR.cmake
build_files/cmake/Modules/FindOpenEXR.cmake.orig
-+++ build_files/cmake/Modules/FindOpenEXR.cmake
-@@ -34,9 +34,8 @@ ENDIF()
- SET(_openexr_libs_ver_init "2.0")
-
- SET(_openexr_FIND_COMPONENTS
-- Half
- Iex
-- IlmImf
-+ OpenEXR
- IlmThread
- Imath
- )
Index: patches/patch-intern_cycles_CMakeLists_txt
===
RCS file: patches/patch-intern_cycles_CMakeLists_txt
diff -N patches/patch-intern_cycles_CMakeLists_txt
--- patches/patch-intern_cycles_CMakeLists_txt 11 Mar 2022 19:22:08 -
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-Fix conflict with textproc/pugixml
-
-Index: intern/cycles/CMakeLists.txt
intern/cycles/CMakeLists.txt.orig Wed Nov 25 14:01:32 2020
-+++ intern/cycles/CMakeLists.txt Sat Nov 28 21:50:54 2020
-@@ -320,11 +320,16 @@ include_directories(
- SYSTEM
- ${BOOST_INCLUDE_DIR}
- ${OPENIMAGEIO_INCLUDE_DIRS}
-- ${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO
- ${OPENEXR_INCLUDE_DIR}
- ${OPENEXR_INCLUDE_DIRS}
- ${PUGIXML_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
-+)
-+
-+include_directories(
-+ BEFORE
-+ SYSTEM
-+ ${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO
- )
-
- if(CYCLES_STANDALONE_REPOSITORY)
Index: patches/patch-intern_cycles_util_aligned_malloc_cpp
===
RCS file:
/home/cvs/ports/graphics/blender/patches/patch-intern_cycles_util_aligned_malloc_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-intern_cycles_util_aligned_malloc_cpp
--- patches/patch-intern_cycles_util_aligned_malloc_cpp 11 Mar 2022 19:22:08
- 1.2
+++
