diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile index dbf907abd3cd..750edabc3e22 100644 --- a/graphics/oidn/Makefile +++ b/graphics/oidn/Makefile @@ -1,68 +1,67 @@ PORTNAME= oidn DISTVERSIONPREFIX= v -DISTVERSION= 1.3.0 -PORTREVISION= 2 +DISTVERSION= 1.4.1 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 MAINTAINER= yuri@FreeBSD.org COMMENT= Intel(R) Open Image Denoise library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= Intel(R) MKL-DNN supports x86 64 bit platforms only (oidn contains a custom version of mkl-dnn, see math/mkl-dnn), and ISPC has a limited availability FETCH_DEPENDS= git:devel/git \ git-lfs:devel/git-lfs BUILD_DEPENDS= ispc>=1.14.1:devel/ispc LIB_DEPENDS= libtbb.so:devel/onetbb USES= cmake:noninja compiler:c++11-lang python:build USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= OpenImageDenoise GH_TUPLE= OpenImageDenoise:mkl-dnn:eb3e967: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 APPS_DESC= Build example and test apps APPS_CMAKE_BOOL= OIDN_APPS DOCSDIR= share/doc/${GH_ACCOUNT} WEIGHTS_GIT_URL= https://github.com/OpenImageDenoise/oidn-weights.git -WEIGHTS_GIT_HASH= 59bad6bb6344f8fb8205772df3f795c2dc72e23b +WEIGHTS_GIT_HASH= a34b7641349c5a79e46a617d61709c35df5d6c28 pre-fetch: @if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}" ]; then \ ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \ cd ${DISTDIR}/${DIST_SUBDIR} && \ ${ECHO} "==> Fetching the oidn/weights subproject with large LFS files" && \ ( \ ${MKDIR} ${WRKDIR}; \ HOME=${WRKDIR}; \ git config --global filter.lfs.smudge "git-lfs smudge -- %f" && \ git clone -q ${WEIGHTS_GIT_URL} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && \ (cd ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && git reset -q --hard ${WEIGHTS_GIT_HASH} && ${RM} -r .git) && \ ${RM} -r ${WRKDIR} \ ) && \ ${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ ${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -print0 | LC_ALL=C ${SORT} -z | \ ${TAR} czf ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \ ${RM} -r ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}; \ fi post-extract: @cd ${WRKSRC} && ${RMDIR} weights && ${LN} -s ${WRKDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH} weights .include diff --git a/graphics/oidn/distinfo b/graphics/oidn/distinfo index 563a76c1b94f..42253c8ee62f 100644 --- a/graphics/oidn/distinfo +++ b/graphics/oidn/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1612495835 -SHA256 (oidn-weights-59bad6bb6344f8fb8205772df3f795c2dc72e23b.tar.gz) = 169e25c8a49e13ea5dd94d7bd97feb4bc45247f0532a86d2b46d6ac4fd15d3e1 -SIZE (oidn-weights-59bad6bb6344f8fb8205772df3f795c2dc72e23b.tar.gz) = 27410305 -SHA256 (OpenImageDenoise-oidn-v1.3.0_GH0.tar.gz) = a6b30d7aa3ea81490431dba823dab475daad73a7124940560624742126db7274 -SIZE (OpenImageDenoise-oidn-v1.3.0_GH0.tar.gz) = 3443375 +TIMESTAMP = 1624456807 +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 diff --git a/graphics/oidn/pkg-plist b/graphics/oidn/pkg-plist index 67ffbb024e97..440734b55f7d 100644 --- a/graphics/oidn/pkg-plist +++ b/graphics/oidn/pkg-plist @@ -1,12 +1,12 @@ %%APPS%%bin/oidnBenchmark %%APPS%%bin/oidnDenoise %%APPS%%bin/oidnTest include/OpenImageDenoise/config.h include/OpenImageDenoise/oidn.h include/OpenImageDenoise/oidn.hpp lib/cmake/OpenImageDenoise-%%VER%%/OpenImageDenoiseConfig-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenImageDenoise-%%VER%%/OpenImageDenoiseConfig.cmake lib/cmake/OpenImageDenoise-%%VER%%/OpenImageDenoiseConfigVersion.cmake lib/libOpenImageDenoise.so lib/libOpenImageDenoise.so.1 -lib/libOpenImageDenoise.so.1.3.0 +lib/libOpenImageDenoise.so.%%VER%%