svn commit: r486959 - in head/graphics/openimageio: . files
Antoine Brodin
antoine at FreeBSD.org
Sat Dec 8 16:08:08 UTC 2018
Author: antoine
Date: Sat Dec 8 16:08:06 2018
New Revision: 486959
URL: https://svnweb.freebsd.org/changeset/ports/486959
Log:
Revert r486952, slave port was not tested
With hat: portmgr
Added:
head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp
- copied unchanged from r486951, head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp
Deleted:
head/graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake
head/graphics/openimageio/files/patch-src_python_CMakeLists.txt
Modified:
head/graphics/openimageio/Makefile
head/graphics/openimageio/distinfo
head/graphics/openimageio/pkg-plist
Modified: head/graphics/openimageio/Makefile
==============================================================================
--- head/graphics/openimageio/Makefile Sat Dec 8 16:03:25 2018 (r486958)
+++ head/graphics/openimageio/Makefile Sat Dec 8 16:08:06 2018 (r486959)
@@ -2,8 +2,9 @@
# $FreeBSD$
PORTNAME= openimageio
-PORTVERSION= 1.8.17
+PORTVERSION= 1.7.17
DISTVERSIONPREFIX= Release-
+PORTREVISION= 15
CATEGORIES?= graphics multimedia
MAINTAINER?= FreeBSD at Shaneware.biz
@@ -11,9 +12,6 @@ COMMENT?= OpenImageIO graphics library
LICENSE= BSD3CLAUSE
-# fbm also installs bin/idiff
-CONFLICTS= fbm-[0-9]*
-
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libImath.so:graphics/ilmbase \
libIlmImf.so:graphics/openexr \
@@ -25,85 +23,106 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
# fbm also installs bin/idiff
CONFLICTS= fbm-[0-9]*
-USES= cmake:outsource jpeg compiler:c++11-lib
-CMAKE_ARGS= USE_CPP:STRING=11
-CMAKE_OFF= BUILDSTATIC LINKSTATIC NOTHREADS STOP_ON_WARNING USE_OPENSSL
USE_GITHUB= yes
GH_ACCOUNT= OpenImageIO
GH_PROJECT= oiio
+USES= cmake:outsource jpeg compiler:c++11-lib
+CMAKE_ARGS= -DBUILDSTATIC:BOOL=OFF \
+ -DLINKSTATIC:BOOL=OFF \
+ -DNOTHREADS:BOOL=OFF \
+ -DSTOP_ON_WARNING:BOOL=OFF \
+ -DUSE_OPENSSL:BOOL=OFF
+
OPTIONS_DEFINE= DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO OPENCV \
OPENJPEG RAW TEST
OPTIONS_DEFAULT= FREETYPE GIF OCIO OPENJPEG
OPTIONS_SUB= yes
-DOCS_CMAKE_BOOL= INSTALL_DOCS
-DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
-
FFMPEG_DESC= Use FFmpeg to support extra file types
-FFMPEG_CMAKE_BOOL= USE_FFMPEG
+IMAGEVIEWER_DESC= Build image viewer (requires Qt)
+OCIO_DESC= Color management support
+
+DOCS_CMAKE_ON= -DINSTALL_DOCS:BOOL=ON
+DOCS_CMAKE_OFF= -DINSTALL_DOCS:BOOL=OFF
+
+FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON
+FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF
FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg
-FREETYPE_CMAKE_BOOL= USE_FREETYPE
-FREETYPE_CMAKE_ON= -DFONTS_INSTALL_DIR:STRING=share/fonts/oiio_dev
+FREETYPE_CMAKE_ON= -DUSE_FREETYPE:BOOL=ON
+FREETYPE_CMAKE_OFF= -DUSE_FREETYPE:BOOL=OFF
FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
-GIF_CMAKE_BOOL= USE_GIF
+GIF_CMAKE_ON= -DUSE_GIF:BOOL=ON
+GIF_CMAKE_OFF= -DUSE_GIF:BOOL=OFF
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
-IMAGEVIEWER_DESC= Build image viewer (requires Qt)
-IMAGEVIEWER_USES= qt:5
-IMAGEVIEWER_CMAKE_BOOL= USE_QT USE_OPENGL
+IMAGEVIEWER_USES= qt:4
+IMAGEVIEWER_CMAKE_ON= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
+IMAGEVIEWER_CMAKE_OFF= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
IMAGEVIEWER_USE= GL=gl,glu,glew \
- QT=buildtools,core,gui,opengl,qmake_build,widgets
+ QT=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
-OCIO_DESC= Color management support
-OCIO_CMAKE_BOOL= USE_OCIO
+OCIO_CMAKE_ON= -DUSE_OCIO:BOOL=ON
+OCIO_CMAKE_OFF= -DUSE_OCIO:BOOL=OFF
OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio
-OPENCV_CMAKE_BOOL= USE_OPENCV
+OPENCV_CMAKE_ON= -DUSE_OPENCV:BOOL=ON
+OPENCV_CMAKE_OFF= -DUSE_OPENCV:BOOL=OFF
OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \
libopencv_core.so:graphics/opencv-core \
libopenjpeg.so:graphics/openjpeg15
-OPENJPEG_CMAKE_BOOL= USE_OPENJPEG
+OPENJPEG_CMAKE_ON= -DUSE_OPENJPEG:BOOL=ON
+OPENJPEG_CMAKE_OFF= -DUSE_OPENJPEG:BOOL=OFF
OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
-RAW_CMAKE_BOOL= USE_LIBRAW
+RAW_CMAKE_ON= -DUSE_LIBRAW:BOOL=ON
+RAW_CMAKE_OFF= -DUSE_LIBRAW:BOOL=OFF
RAW_LIB_DEPENDS= libraw_r.so:graphics/libraw
-TEST_CMAKE_BOOL= OIIO_BUILD_TESTS
+TEST_CMAKE_ON= -DOIIO_BUILD_TESTS:BOOL=ON
+TEST_CMAKE_OFF= -DOIIO_BUILD_TESTS:BOOL=OFF
PLIST_SUB+= LIBVERS=${PORTVERSION}
.include <bsd.port.options.mk>
-.if ${SLAVE_PORT} == yes
+.if ${SLAVE_PORT} == no
+USE_LDCONFIG= yes
+CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \
+ -DOIIO_BUILD_TOOLS:BOOL=ON
+.else
LIB_DEPENDS+= libOpenImageIO.so:graphics/openimageio \
${PY_BOOST}
PLIST= ${PKGDIR}/pkg-plist-pybind
USES+= python
USE_PYTHON= flavors
-CMAKE_ON+= USE_PYTHON
-CMAKE_OFF+= OIIO_BUILD_TOOLS USE_FFMPEG
-CMAKE_ARGS+= -DPYTHON_VERSION:STRING=${PYTHON_VER}
+CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \
+ -DOIIO_BUILD_TOOLS:BOOL=OFF -DUSE_FFMPEG:BOOL=OFF
+.endif
-do-install:
- ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
- ${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
-.else # SLAVE_PORT == no
-USE_LDCONFIG= yes
-CMAKE_ON+= DOIIO_BUILD_TOOLS
-CMAKE_OFF+= USE_PYTHON
+.if ${PORT_OPTIONS:MIMAGEVIEWER}
+DEPRECATED= Qt4 has been EOL since december 2015
+EXPIRATION_DATE= 2019-03-15
+.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|share/doc/OpenImageIO|${DOCSDIR}|g' \
+ ${WRKSRC}/CMakeLists.txt
+ ${REINPLACE_CMD} -e '/find_/s/ boost_python[[:>:]]/ ${PY_BOOST_LIB}/' \
+ ${WRKSRC}/src/cmake/externalpackages.cmake
+
post-install:
- ${LN} -sf libOpenImageIO.so.1.8 \
+.if ${SLAVE_PORT} == no
+ ${LN} -sf libOpenImageIO.so.1.7 \
${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
- ${LN} -sf libOpenImageIO_Util.so.1.8 \
+ ${LN} -sf libOpenImageIO_Util.so.1.7 \
${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
+.endif
do-test-TEST-on:
@cd ${BUILD_WRKSRC} && ${MAKE_CMD} ARGS=-V test
-.endif
.include <bsd.port.mk>
Modified: head/graphics/openimageio/distinfo
==============================================================================
--- head/graphics/openimageio/distinfo Sat Dec 8 16:03:25 2018 (r486958)
+++ head/graphics/openimageio/distinfo Sat Dec 8 16:08:06 2018 (r486959)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543804503
-SHA256 (OpenImageIO-oiio-Release-1.8.17_GH0.tar.gz) = a019086c05a6150d445a2240bab1723dff540dde5f5c327c36a97f0b5ae0e157
-SIZE (OpenImageIO-oiio-Release-1.8.17_GH0.tar.gz) = 27835527
+TIMESTAMP = 1504403179
+SHA256 (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 669c59d06399dd882c3e2469bb3a4b33d537db150f6fe056495c3429b5c3838f
+SIZE (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 27164765
Copied: head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp (from r486951, head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp Sat Dec 8 16:08:06 2018 (r486959, copy of r486951, head/graphics/openimageio/files/patch-src_ffmpeg.imageio_ffmpeginput.cpp)
@@ -0,0 +1,20 @@
+https://github.com/OpenImageIO/oiio/commit/810a0235837d
+
+--- src/ffmpeg.imageio/ffmpeginput.cpp.orig 2017-08-31 04:36:04 UTC
++++ src/ffmpeg.imageio/ffmpeginput.cpp
+@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFram
+ }
+ #endif
+
++
++// Changes for ffmpeg 4.0
++#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
++
++#if USE_FFMPEG_4_0
++# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
++#endif
++
++
+ #include <boost/thread/once.hpp>
+
+ #include "OpenImageIO/imageio.h"
Modified: head/graphics/openimageio/pkg-plist
==============================================================================
--- head/graphics/openimageio/pkg-plist Sat Dec 8 16:03:25 2018 (r486958)
+++ head/graphics/openimageio/pkg-plist Sat Dec 8 16:08:06 2018 (r486959)
@@ -8,8 +8,8 @@ bin/oiiotool
include/OpenImageIO/argparse.h
include/OpenImageIO/array_view.h
include/OpenImageIO/atomic.h
-include/OpenImageIO/benchmark.h
include/OpenImageIO/color.h
+include/OpenImageIO/coordinate.h
include/OpenImageIO/dassert.h
include/OpenImageIO/deepdata.h
include/OpenImageIO/errorhandler.h
@@ -18,7 +18,6 @@ include/OpenImageIO/filesystem.h
include/OpenImageIO/filter.h
include/OpenImageIO/fmath.h
include/OpenImageIO/fstream_mingw.h
-include/OpenImageIO/function_view.h
include/OpenImageIO/hash.h
include/OpenImageIO/image_view.h
include/OpenImageIO/imagebuf.h
@@ -30,7 +29,6 @@ include/OpenImageIO/missing_math.h
include/OpenImageIO/oiioversion.h
include/OpenImageIO/optparser.h
include/OpenImageIO/osdep.h
-include/OpenImageIO/parallel.h
include/OpenImageIO/paramlist.h
include/OpenImageIO/platform.h
include/OpenImageIO/plugin.h
@@ -40,7 +38,6 @@ include/OpenImageIO/pugixml.hpp
include/OpenImageIO/refcnt.h
include/OpenImageIO/SHA1.h
include/OpenImageIO/simd.h
-include/OpenImageIO/span.h
include/OpenImageIO/strided_ptr.h
include/OpenImageIO/string_view.h
include/OpenImageIO/strutil.h
@@ -57,19 +54,19 @@ include/OpenImageIO/varyingref.h
include/OpenImageIO/version.h
lib/libOpenImageIO.so
lib/libOpenImageIO.so.1
-lib/libOpenImageIO.so.1.8
+lib/libOpenImageIO.so.1.7
lib/libOpenImageIO.so.%%LIBVERS%%
lib/libOpenImageIO_Util.so
lib/libOpenImageIO_Util.so.1
-lib/libOpenImageIO_Util.so.1.8
+lib/libOpenImageIO_Util.so.1.7
lib/libOpenImageIO_Util.so.%%LIBVERS%%
-%%FREETYPE%%share/fonts/OpenImageIO/DroidSans-Bold.ttf
-%%FREETYPE%%share/fonts/OpenImageIO/DroidSans.ttf
-%%FREETYPE%%share/fonts/OpenImageIO/DroidSansMono.ttf
-%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Bold.ttf
-%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-BoldItalic.ttf
-%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Italic.ttf
-%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif.ttf
+%%FREETYPE%%share/fonts/oiio/DroidSans-Bold.ttf
+%%FREETYPE%%share/fonts/oiio/DroidSans.ttf
+%%FREETYPE%%share/fonts/oiio/DroidSansMono.ttf
+%%FREETYPE%%share/fonts/oiio/DroidSerif-Bold.ttf
+%%FREETYPE%%share/fonts/oiio/DroidSerif-BoldItalic.ttf
+%%FREETYPE%%share/fonts/oiio/DroidSerif-Italic.ttf
+%%FREETYPE%%share/fonts/oiio/DroidSerif.ttf
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
More information about the svn-ports-all
mailing list