Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Feb 2022 00:27:24 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7dda6e28e548 - main - graphics/oidn: Update 1.4.1 -> 1.4.3
Message-ID:  <202202170027.21H0ROeN074367@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7dda6e28e548bf94d97a97f21702aa5b039ecd27

commit 7dda6e28e548bf94d97a97f21702aa5b039ecd27
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-02-16 23:35:36 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-02-17 00:27:20 +0000

    graphics/oidn: Update 1.4.1 -> 1.4.3
    
    Reported by:    portscout
---
 graphics/oidn/Makefile                             | 24 +++++++++++++---------
 graphics/oidn/distinfo                             | 10 ++++-----
 .../patch-mkl-dnn_src_common_memory__debug.cpp     | 11 ----------
 .../oidn/files/patch-mkl-dnn_src_common_utils.cpp  | 11 ----------
 4 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile
index fa6dec2ee17d..e31b482cd840 100644
--- a/graphics/oidn/Makefile
+++ b/graphics/oidn/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	oidn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.1
-PORTREVISION=	3
+DISTVERSION=	1.4.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://freebsd.org/:weights # bogus URL to make the framework happy, the fetch uses Git URL below
 DISTFILES=	${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}:weights
@@ -20,25 +19,30 @@ FETCH_DEPENDS=	git:devel/git \
 BUILD_DEPENDS=	ispc>=1.14.1:devel/ispc
 LIB_DEPENDS=	libtbb.so:devel/onetbb
 
-USES=		cmake:noninja compiler:c++11-lang python:build
+USES=		cmake:noninja compiler:c++14-lang python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageDenoise
-GH_TUPLE=	OpenImageDenoise:mkl-dnn:eb3e967:m/mkl-dnn
+GH_TUPLE=	OpenImageDenoise:mkl-dnn:f53274c:m/mkl-dnn
 
 CMAKE_ARGS=	-DTBB_ROOT:STRING=${LOCALBASE} -DTBB_INCLUDE_DIR:STRING=${LOCALBASE}/include -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD}
 
 PLIST_SUB=	VER="${PORTVERSION}"
 
-OPTIONS_DEFINE=		APPS DOCS
-OPTIONS_DEFAULT=	APPS
-OPTIONS_SUB=		yes
+OPTIONS_DEFINE=			APPS DOCS OPENIMAGEIO
+OPTIONS_DEFAULT=		APPS OPENIMAGEIO
+OPTIONS_SUB=			yes
 
-APPS_DESC=		Build example and test apps
-APPS_CMAKE_BOOL=	OIDN_APPS
+APPS_DESC=			Build example and test apps
+APPS_CMAKE_BOOL=		OIDN_APPS
 
-DOCSDIR=	share/doc/${GH_ACCOUNT}
+DOCSDIR=			share/doc/${GH_ACCOUNT}
+
+OPENIMAGEIO_DESC=		Build with OpenImageIO for image formats support
+OPENIMAGEIO_CMAKE_BOOL=		OIDN_APPS_OPENIMAGEIO
+OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
+OPENIMAGEIO_IMPLIES=		APPS # OpenImageIO is only used by apps and examples
 
 WEIGHTS_GIT_URL=	https://github.com/OpenImageDenoise/oidn-weights.git
 WEIGHTS_GIT_HASH=	a34b7641349c5a79e46a617d61709c35df5d6c28
diff --git a/graphics/oidn/distinfo b/graphics/oidn/distinfo
index 42253c8ee62f..20404abed134 100644
--- a/graphics/oidn/distinfo
+++ b/graphics/oidn/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1624456807
+TIMESTAMP = 1645045861
 SHA256 (oidn-weights-a34b7641349c5a79e46a617d61709c35df5d6c28.tar.gz) = e52c689a0fdcade16936d2b417590dbc565340bc641e3e2f858e02492dbe3ee6
 SIZE (oidn-weights-a34b7641349c5a79e46a617d61709c35df5d6c28.tar.gz) = 41124636
-SHA256 (OpenImageDenoise-oidn-v1.4.1_GH0.tar.gz) = db022565ffe46266188992e1db68d11c94f799c37e25996f5aee44bebffcf079
-SIZE (OpenImageDenoise-oidn-v1.4.1_GH0.tar.gz) = 3422102
-SHA256 (OpenImageDenoise-mkl-dnn-eb3e967_GH0.tar.gz) = 5a46df10204a61daab19e8d1c01a074c1c2e98d7bb5303b13a4c7c592cc77b4f
-SIZE (OpenImageDenoise-mkl-dnn-eb3e967_GH0.tar.gz) = 5795997
+SHA256 (OpenImageDenoise-oidn-v1.4.3_GH0.tar.gz) = 37941f260af212183579efb6b1e07e4075e3ab9cbd63120afd007e62367efef6
+SIZE (OpenImageDenoise-oidn-v1.4.3_GH0.tar.gz) = 3433667
+SHA256 (OpenImageDenoise-mkl-dnn-f53274c_GH0.tar.gz) = 735ba210cfbca8c893dd97ef6b79c1b73a3d6289d99cdb5ede663f630ee4efc9
+SIZE (OpenImageDenoise-mkl-dnn-f53274c_GH0.tar.gz) = 9535954
diff --git a/graphics/oidn/files/patch-mkl-dnn_src_common_memory__debug.cpp b/graphics/oidn/files/patch-mkl-dnn_src_common_memory__debug.cpp
deleted file mode 100644
index 734d73a50cc3..000000000000
--- a/graphics/oidn/files/patch-mkl-dnn_src_common_memory__debug.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mkl-dnn/src/common/memory_debug.cpp.orig	2020-09-12 19:21:13 UTC
-+++ mkl-dnn/src/common/memory_debug.cpp
-@@ -21,7 +21,7 @@
- #include <windows.h>
- #endif
- 
--#if defined __linux__ || defined __APPLE__
-+#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__
- #include <unistd.h>
- #include <sys/mman.h>
- #endif
diff --git a/graphics/oidn/files/patch-mkl-dnn_src_common_utils.cpp b/graphics/oidn/files/patch-mkl-dnn_src_common_utils.cpp
deleted file mode 100644
index cde778689969..000000000000
--- a/graphics/oidn/files/patch-mkl-dnn_src_common_utils.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mkl-dnn/src/common/utils.cpp.orig	2020-09-12 19:26:27 UTC
-+++ mkl-dnn/src/common/utils.cpp
-@@ -19,7 +19,7 @@
- #include <windows.h>
- #endif
- 
--#if defined __linux__ || defined __APPLE__
-+#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__
- #include <unistd.h>
- #endif
- 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202170027.21H0ROeN074367>