View | Details | Raw Unified | Return to bug 224382 | Differences between
and this patch

Collapse All | Expand All

(-)graphics/openimageio/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1504403179
1
TIMESTAMP = 1543804503
2
SHA256 (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 669c59d06399dd882c3e2469bb3a4b33d537db150f6fe056495c3429b5c3838f
2
SHA256 (OpenImageIO-oiio-Release-1.8.17_GH0.tar.gz) = a019086c05a6150d445a2240bab1723dff540dde5f5c327c36a97f0b5ae0e157
3
SIZE (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 27164765
3
SIZE (OpenImageIO-oiio-Release-1.8.17_GH0.tar.gz) = 27835527
(-)graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake (+11 lines)
Line 0 Link Here
1
--- src/cmake/modules/FindOpenCV.cmake.orig	2018-02-02 19:00:47 UTC
2
+++ src/cmake/modules/FindOpenCV.cmake
3
@@ -55,7 +55,7 @@ set (opencv_components opencv_imgproc op
4
 if (NOT ${OpenCV_VERSION} VERSION_LESS 3.0.0)
5
     set (opencv_components opencv_videoio ${opencv_components})
6
 else (NOT ${OpenCV_VERSION} VERSION_LESS 3.0.0)
7
-    set (opencv_components opencv_videoio ${opencv_components})
8
+    set (opencv_components opencv_highgui ${opencv_components})
9
 endif ()
10
 foreach (component ${opencv_components})
11
     find_library (${component}_lib
(-)graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp (-20 lines)
Lines 1-20 Link Here
1
https://github.com/OpenImageIO/oiio/commit/810a0235837d
2
3
--- src/ffmpeg.imageio/ffmpeginput.cpp.orig	2017-08-31 04:36:04 UTC
4
+++ src/ffmpeg.imageio/ffmpeginput.cpp
5
@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFram
6
 }
7
 #endif
8
 
9
+
10
+// Changes for ffmpeg 4.0
11
+#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
12
+
13
+#if USE_FFMPEG_4_0
14
+#  define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
15
+#endif
16
+
17
+
18
 #include <boost/thread/once.hpp>
19
 
20
 #include "OpenImageIO/imageio.h"
(-)graphics/openimageio/files/patch-src_python_CMakeLists.txt (+13 lines)
Line 0 Link Here
1
--- src/python/CMakeLists.txt.orig	2018-02-04 16:10:49 UTC
2
+++ src/python/CMakeLists.txt
3
@@ -16,8 +16,8 @@ find_package (PythonLibs ${PYTHON_VERSIO
4
 if (NOT BOOST_CUSTOM)
5
     # Finding the python component for boost is a little tricky, since it has
6
     # different names on different systems. Try the most common ones.
7
-    foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
8
-             python${PYTHON_VERSION_MAJOR}
9
+    foreach (_py_lib python-${PYTHON_VERSION_FOUND}
10
+             python${PYTHON_VERSION_MAJOR} python
11
              python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
12
         find_package (Boost QUIET COMPONENTS ${_py_lib})
13
         string (TOUPPER ${_py_lib} _py_lib_name)
(-)graphics/openimageio/Makefile (-57 / +41 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	openimageio
4
PORTNAME=	openimageio
5
PORTVERSION=	1.7.17
5
PORTVERSION=	1.8.17
6
DISTVERSIONPREFIX=	Release-
6
DISTVERSIONPREFIX=	Release-
7
PORTREVISION=	15
8
CATEGORIES?=	graphics multimedia
7
CATEGORIES?=	graphics multimedia
9
8
10
MAINTAINER?=	FreeBSD@Shaneware.biz
9
MAINTAINER?=	FreeBSD@Shaneware.biz
Lines 12-123 Link Here
12
11
13
LICENSE=	BSD3CLAUSE
12
LICENSE=	BSD3CLAUSE
14
13
15
LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
14
# fbm also installs bin/idiff
15
CONFLICTS=	fbm-[0-9]*
16
17
LIB_DEPENDS+=	libboost_thread.so:devel/boost-libs \
16
		libImath.so:graphics/ilmbase \
18
		libImath.so:graphics/ilmbase \
17
		libIlmImf.so:graphics/openexr \
19
		libIlmImf.so:graphics/openexr \
18
		libpng.so:graphics/png \
20
		libpng16.so:graphics/png \
19
		libtiff.so:graphics/tiff \
21
		libtiff.so:graphics/tiff \
20
		libwebp.so:graphics/webp \
22
		libwebp.so:graphics/webp \
21
		libhdf5.so:science/hdf5
23
		libhdf5.so:science/hdf5
22
24
USES=		cmake:outsource jpeg
23
# fbm also installs bin/idiff
25
CMAKE_ARGS=	USE_CPP:STRING=11
24
CONFLICTS=	fbm-[0-9]*
26
CMAKE_OFF=	BUILDSTATIC LINKSTATIC NOTHREADS STOP_ON_WARNING USE_OPENSSL
25
27
26
USE_GITHUB=	yes
28
USE_GITHUB=	yes
27
GH_ACCOUNT=	OpenImageIO
29
GH_ACCOUNT=	OpenImageIO
28
GH_PROJECT=	oiio
30
GH_PROJECT=	oiio
29
31
30
USES=		cmake:outsource jpeg compiler:c++11-lib
31
CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
32
		-DLINKSTATIC:BOOL=OFF \
33
		-DNOTHREADS:BOOL=OFF \
34
		-DSTOP_ON_WARNING:BOOL=OFF \
35
		-DUSE_OPENSSL:BOOL=OFF
36
37
OPTIONS_DEFINE=		DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO OPENCV \
32
OPTIONS_DEFINE=		DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO OPENCV \
38
			OPENJPEG RAW TEST
33
			OPENJPEG RAW TEST
39
OPTIONS_DEFAULT=	FREETYPE GIF OCIO OPENJPEG
34
OPTIONS_DEFAULT=	FREETYPE GIF OCIO OPENJPEG
40
OPTIONS_SUB=		yes
35
OPTIONS_SUB=		yes
41
36
42
FFMPEG_DESC=		Use FFmpeg to support extra file types
37
DOCS_CMAKE_BOOL=	INSTALL_DOCS
43
IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
38
DOCS_CMAKE_ON=		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
44
OCIO_DESC=		Color management support
45
39
46
DOCS_CMAKE_ON=		-DINSTALL_DOCS:BOOL=ON
40
FFMPEG_DESC=		Use FFmpeg to support extra file types
47
DOCS_CMAKE_OFF=		-DINSTALL_DOCS:BOOL=OFF
41
FFMPEG_CMAKE_BOOL=	USE_FFMPEG
48
49
FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=ON
50
FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
51
FFMPEG_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
42
FFMPEG_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
52
43
53
FREETYPE_CMAKE_ON=	-DUSE_FREETYPE:BOOL=ON
44
FREETYPE_CMAKE_BOOL=	USE_FREETYPE
54
FREETYPE_CMAKE_OFF=	-DUSE_FREETYPE:BOOL=OFF
45
FREETYPE_CMAKE_ON=	-DFONTS_INSTALL_DIR:STRING=share/fonts/oiio_dev
55
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
46
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
56
47
57
GIF_CMAKE_ON=		-DUSE_GIF:BOOL=ON
48
GIF_CMAKE_BOOL=		USE_GIF
58
GIF_CMAKE_OFF=		-DUSE_GIF:BOOL=OFF
59
GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
49
GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
60
50
61
IMAGEVIEWER_USES=	qt:4
51
IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
62
IMAGEVIEWER_CMAKE_ON=	-DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
52
IMAGEVIEWER_CMAKE_BOOL=	USE_QT USE_OPENGL
63
IMAGEVIEWER_CMAKE_OFF=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
53
IMAGEVIEWER_USES=	qt:5
64
IMAGEVIEWER_USE=	GL=gl,glu,glew \
54
IMAGEVIEWER_USE=	GL=gl,glu,glew \
65
			QT=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
55
			QT=buildtools,core,gui,opengl,qmake_build,widgets
66
56
67
OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
57
OCIO_DESC=		Color management support
68
OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
58
OCIO_CMAKE_BOOL=	USE_OCIO
69
OCIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio
59
OCIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio
70
60
71
OPENCV_CMAKE_ON=	-DUSE_OPENCV:BOOL=ON
61
OPENCV_CMAKE_BOOL=	USE_OPENCV
72
OPENCV_CMAKE_OFF=	-DUSE_OPENCV:BOOL=OFF
73
OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv \
62
OPENCV_LIB_DEPENDS=	libopencv_highgui.so:graphics/opencv \
74
			libopencv_core.so:graphics/opencv-core \
63
			libopencv_core.so:graphics/opencv-core \
75
			libopenjpeg.so:graphics/openjpeg15
64
			libopenjpeg.so:graphics/openjpeg15
76
65
77
OPENJPEG_CMAKE_ON=	-DUSE_OPENJPEG:BOOL=ON
66
OPENJPEG_CMAKE_BOOL=	USE_OPENJPEG
78
OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
79
OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
67
OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
80
68
81
RAW_CMAKE_ON=		-DUSE_LIBRAW:BOOL=ON
69
RAW_CMAKE_BOOL=		USE_LIBRAW
82
RAW_CMAKE_OFF=		-DUSE_LIBRAW:BOOL=OFF
83
RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
70
RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
84
71
85
TEST_CMAKE_ON=		-DOIIO_BUILD_TESTS:BOOL=ON
72
TEST_CMAKE_BOOL=	OIIO_BUILD_TESTS
86
TEST_CMAKE_OFF=		-DOIIO_BUILD_TESTS:BOOL=OFF
87
73
88
PLIST_SUB+=		LIBVERS=${PORTVERSION}
74
PLIST_SUB+=		LIBVERS=${PORTVERSION}
89
75
90
.include <bsd.port.options.mk>
76
.include <bsd.port.options.mk>
91
77
92
.if ${SLAVE_PORT} == no
78
.if ${SLAVE_PORT} == yes
93
USE_LDCONFIG=	yes
94
CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \
95
		-DOIIO_BUILD_TOOLS:BOOL=ON
96
.else
97
LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio \
79
LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio \
98
		${PY_BOOST}
80
		${PY_BOOST}
99
PLIST=		${PKGDIR}/pkg-plist-pybind
81
PLIST=		${PKGDIR}/pkg-plist-pybind
100
USES+=		python
82
USES+=		python
101
USE_PYTHON=	flavors
83
USE_PYTHON=	flavors
102
CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \
84
CMAKE_ON+=	USE_PYTHON
103
		-DOIIO_BUILD_TOOLS:BOOL=OFF -DUSE_FFMPEG:BOOL=OFF
85
CMAKE_OFF+=	OIIO_BUILD_TOOLS USE_FFMPEG
104
.endif
86
CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER}
87
88
do-install:
89
	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
90
	${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
105
91
106
post-patch:
92
.else # SLAVE_PORT == no
107
	@${REINPLACE_CMD} -e 's|share/doc/OpenImageIO|${DOCSDIR}|g' \
93
USE_LDCONFIG=	yes
108
		${WRKSRC}/CMakeLists.txt
94
CMAKE_ON+=	DOIIO_BUILD_TOOLS
109
	${REINPLACE_CMD} -e '/find_/s/ boost_python[[:>:]]/ ${PY_BOOST_LIB}/' \
95
CMAKE_OFF+=	USE_PYTHON
110
		${WRKSRC}/src/cmake/externalpackages.cmake
111
96
112
post-install:
97
post-install:
113
.if ${SLAVE_PORT} == no
98
	${LN} -sf libOpenImageIO.so.1.8 \
114
	${LN} -sf libOpenImageIO.so.1.7 \
115
		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
99
		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
116
	${LN} -sf libOpenImageIO_Util.so.1.7 \
100
	${LN} -sf libOpenImageIO_Util.so.1.8 \
117
		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
101
		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
118
.endif
119
102
120
do-test-TEST-on:
103
do-test-TEST-on:
121
	@cd ${BUILD_WRKSRC} && ${MAKE_CMD} ARGS=-V test
104
	@cd ${BUILD_WRKSRC} && ${MAKE_CMD} ARGS=-V test
105
.endif
122
106
123
.include <bsd.port.mk>
107
.include <bsd.port.mk>
(-)graphics/openimageio/pkg-plist (-10 / +13 lines)
Lines 8-15 Link Here
8
include/OpenImageIO/argparse.h
8
include/OpenImageIO/argparse.h
9
include/OpenImageIO/array_view.h
9
include/OpenImageIO/array_view.h
10
include/OpenImageIO/atomic.h
10
include/OpenImageIO/atomic.h
11
include/OpenImageIO/benchmark.h
11
include/OpenImageIO/color.h
12
include/OpenImageIO/color.h
12
include/OpenImageIO/coordinate.h
13
include/OpenImageIO/dassert.h
13
include/OpenImageIO/dassert.h
14
include/OpenImageIO/deepdata.h
14
include/OpenImageIO/deepdata.h
15
include/OpenImageIO/errorhandler.h
15
include/OpenImageIO/errorhandler.h
Lines 18-23 Link Here
18
include/OpenImageIO/filter.h
18
include/OpenImageIO/filter.h
19
include/OpenImageIO/fmath.h
19
include/OpenImageIO/fmath.h
20
include/OpenImageIO/fstream_mingw.h
20
include/OpenImageIO/fstream_mingw.h
21
include/OpenImageIO/function_view.h
21
include/OpenImageIO/hash.h
22
include/OpenImageIO/hash.h
22
include/OpenImageIO/image_view.h
23
include/OpenImageIO/image_view.h
23
include/OpenImageIO/imagebuf.h
24
include/OpenImageIO/imagebuf.h
Lines 29-34 Link Here
29
include/OpenImageIO/oiioversion.h
30
include/OpenImageIO/oiioversion.h
30
include/OpenImageIO/optparser.h
31
include/OpenImageIO/optparser.h
31
include/OpenImageIO/osdep.h
32
include/OpenImageIO/osdep.h
33
include/OpenImageIO/parallel.h
32
include/OpenImageIO/paramlist.h
34
include/OpenImageIO/paramlist.h
33
include/OpenImageIO/platform.h
35
include/OpenImageIO/platform.h
34
include/OpenImageIO/plugin.h
36
include/OpenImageIO/plugin.h
Lines 38-43 Link Here
38
include/OpenImageIO/refcnt.h
40
include/OpenImageIO/refcnt.h
39
include/OpenImageIO/SHA1.h
41
include/OpenImageIO/SHA1.h
40
include/OpenImageIO/simd.h
42
include/OpenImageIO/simd.h
43
include/OpenImageIO/span.h
41
include/OpenImageIO/strided_ptr.h
44
include/OpenImageIO/strided_ptr.h
42
include/OpenImageIO/string_view.h
45
include/OpenImageIO/string_view.h
43
include/OpenImageIO/strutil.h
46
include/OpenImageIO/strutil.h
Lines 54-72 Link Here
54
include/OpenImageIO/version.h
57
include/OpenImageIO/version.h
55
lib/libOpenImageIO.so
58
lib/libOpenImageIO.so
56
lib/libOpenImageIO.so.1
59
lib/libOpenImageIO.so.1
57
lib/libOpenImageIO.so.1.7
60
lib/libOpenImageIO.so.1.8
58
lib/libOpenImageIO.so.%%LIBVERS%%
61
lib/libOpenImageIO.so.%%LIBVERS%%
59
lib/libOpenImageIO_Util.so
62
lib/libOpenImageIO_Util.so
60
lib/libOpenImageIO_Util.so.1
63
lib/libOpenImageIO_Util.so.1
61
lib/libOpenImageIO_Util.so.1.7
64
lib/libOpenImageIO_Util.so.1.8
62
lib/libOpenImageIO_Util.so.%%LIBVERS%%
65
lib/libOpenImageIO_Util.so.%%LIBVERS%%
63
%%FREETYPE%%share/fonts/oiio/DroidSans-Bold.ttf
66
%%FREETYPE%%share/fonts/OpenImageIO/DroidSans-Bold.ttf
64
%%FREETYPE%%share/fonts/oiio/DroidSans.ttf
67
%%FREETYPE%%share/fonts/OpenImageIO/DroidSans.ttf
65
%%FREETYPE%%share/fonts/oiio/DroidSansMono.ttf
68
%%FREETYPE%%share/fonts/OpenImageIO/DroidSansMono.ttf
66
%%FREETYPE%%share/fonts/oiio/DroidSerif-Bold.ttf
69
%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Bold.ttf
67
%%FREETYPE%%share/fonts/oiio/DroidSerif-BoldItalic.ttf
70
%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-BoldItalic.ttf
68
%%FREETYPE%%share/fonts/oiio/DroidSerif-Italic.ttf
71
%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Italic.ttf
69
%%FREETYPE%%share/fonts/oiio/DroidSerif.ttf
72
%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif.ttf
70
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
73
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
71
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
74
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
72
%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
75
%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf

Return to bug 224382