- Update to 1.1.6
PR: 176241 Submitted by: maintainer
This commit is contained in:
parent
e2e9452303
commit
a4b6ae2319
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=312564
5 changed files with 19 additions and 44 deletions
|
@ -2,10 +2,9 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME?= openimageio
|
PORTNAME?= openimageio
|
||||||
PORTVERSION= 1.1.2
|
PORTVERSION= 1.1.6
|
||||||
PORTREVISION?= 2
|
PORTREVISION?= 0
|
||||||
CATEGORIES?= graphics multimedia
|
CATEGORIES?= graphics multimedia
|
||||||
MASTER_SITES= https://github.com/OpenImageIO/oiio/tarball/
|
|
||||||
|
|
||||||
MAINTAINER= FreeBSD@Shaneware.biz
|
MAINTAINER= FreeBSD@Shaneware.biz
|
||||||
COMMENT= OpenImageIO graphics library
|
COMMENT= OpenImageIO graphics library
|
||||||
|
@ -14,7 +13,7 @@ LICENSE?= BSD
|
||||||
|
|
||||||
LIB_DEPENDS?= IlmImf:${PORTSDIR}/graphics/OpenEXR \
|
LIB_DEPENDS?= IlmImf:${PORTSDIR}/graphics/OpenEXR \
|
||||||
boost_thread:${PORTSDIR}/devel/boost-libs \
|
boost_thread:${PORTSDIR}/devel/boost-libs \
|
||||||
hdf5:${PORTSDIR}/science/hdf5 \
|
hdf5:${PORTSDIR}/science/hdf5-18 \
|
||||||
opencv_legacy:${PORTSDIR}/graphics/opencv \
|
opencv_legacy:${PORTSDIR}/graphics/opencv \
|
||||||
openjpeg:${PORTSDIR}/graphics/openjpeg \
|
openjpeg:${PORTSDIR}/graphics/openjpeg \
|
||||||
webp:${PORTSDIR}/graphics/webp
|
webp:${PORTSDIR}/graphics/webp
|
||||||
|
@ -23,7 +22,8 @@ USE_GITHUB= yes
|
||||||
GH_ACCOUNT= OpenImageIO
|
GH_ACCOUNT= OpenImageIO
|
||||||
GH_PROJECT= oiio
|
GH_PROJECT= oiio
|
||||||
GH_TAGNAME= Release-${PORTVERSION}
|
GH_TAGNAME= Release-${PORTVERSION}
|
||||||
GH_COMMIT= db9df57
|
GH_COMMIT= 5fcd523
|
||||||
|
WRKSRC= ${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src
|
||||||
|
|
||||||
# fbm also installs bin/idiff
|
# fbm also installs bin/idiff
|
||||||
CONFLICTS= fbm-[0-9]*
|
CONFLICTS= fbm-[0-9]*
|
||||||
|
@ -37,7 +37,6 @@ CMAKE_ARGS?= -DBUILDSTATIC:BOOL=OFF \
|
||||||
-DUSE_TBB:BOOL=OFF
|
-DUSE_TBB:BOOL=OFF
|
||||||
|
|
||||||
USE_LDCONFIG= yes
|
USE_LDCONFIG= yes
|
||||||
WRKSRC= ${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src
|
|
||||||
MAKE_JOBS_SAFE= yes
|
MAKE_JOBS_SAFE= yes
|
||||||
|
|
||||||
.if defined(OIIO_PYBIND)
|
.if defined(OIIO_PYBIND)
|
||||||
|
@ -85,11 +84,6 @@ CMAKE_ARGS+= -DUSE_OCIO:BOOL=OFF
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
|
|
||||||
.if ${ARCH} == "i386"
|
|
||||||
# for gcc atomics we need to have an arch > i486
|
|
||||||
CFLAGS+= -march=i586
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${OSVERSION} < 800000
|
.if ${OSVERSION} < 800000
|
||||||
IGNORE= requires FreeBSD 8.0 or higher
|
IGNORE= requires FreeBSD 8.0 or higher
|
||||||
.endif
|
.endif
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
SHA256 (openimageio-1.1.2.tar.gz) = 8c41094ce6a842bb85ba1523f3dd368afe742b1207a012f3459b7ee6c2bc4d46
|
SHA256 (openimageio-1.1.6.tar.gz) = a4d8bf7cedade3b3177bc5f46c3f0bb45de9ba32720d273d6334c03c3dfa2815
|
||||||
SIZE (openimageio-1.1.2.tar.gz) = 8217176
|
SIZE (openimageio-1.1.6.tar.gz) = 8300662
|
||||||
|
|
11
graphics/openimageio/files/patch-include__fmath.h
Normal file
11
graphics/openimageio/files/patch-include__fmath.h
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- include/fmath.h.orig 2013-01-21 11:39:43.845857535 +1030
|
||||||
|
+++ include/fmath.h 2013-01-21 11:39:52.142857433 +1030
|
||||||
|
@@ -972,7 +972,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
// Functions missing from FreeBSD
|
||||||
|
-#if (defined(__FreeBSD__) && (__FreeBSD_version < 803000))
|
||||||
|
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 802502))
|
||||||
|
|
||||||
|
inline float
|
||||||
|
log2f (float val) {
|
|
@ -1,30 +0,0 @@
|
||||||
--- ./include/thread.h.orig 2012-11-10 05:51:18.000000000 +1030
|
|
||||||
+++ ./include/thread.h 2012-11-11 17:25:34.547296939 +1030
|
|
||||||
@@ -70,9 +70,14 @@
|
|
||||||
#pragma GCC diagnostic error "-Wunused-variable"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
|
|
||||||
+#define USE_GCC_ATOMICS 1
|
|
||||||
+#undef USE_TBB
|
|
||||||
+#else
|
|
||||||
#ifndef USE_TBB
|
|
||||||
# define USE_TBB 0
|
|
||||||
#endif
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
// Include files we need for atomic counters.
|
|
||||||
// Some day, we hope this is all replaced by use of std::atomic<>.
|
|
||||||
@@ -97,12 +102,6 @@
|
|
||||||
# include <libkern/OSAtomic.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
|
|
||||||
-#if !defined(__FreeBSD__) || defined(__x86_64__)
|
|
||||||
-#define USE_GCC_ATOMICS
|
|
||||||
-#endif
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
OIIO_NAMESPACE_ENTER
|
|
||||||
{
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ include/OpenImageIO/version.h
|
||||||
lib/libOpenImageIO.so
|
lib/libOpenImageIO.so
|
||||||
lib/libOpenImageIO.so.1
|
lib/libOpenImageIO.so.1
|
||||||
lib/libOpenImageIO.so.1.1
|
lib/libOpenImageIO.so.1.1
|
||||||
lib/libOpenImageIO.so.1.1.2
|
lib/libOpenImageIO.so.1.1.6
|
||||||
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
|
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
|
||||||
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
|
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
|
||||||
%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
|
%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
|
||||||
|
|
Loading…
Reference in a new issue