Index: head/graphics/oidn/Makefile =================================================================== --- head/graphics/oidn/Makefile (revision 564137) +++ head/graphics/oidn/Makefile (revision 564138) @@ -1,67 +1,69 @@ # $FreeBSD$ PORTNAME= oidn DISTVERSIONPREFIX= v -DISTVERSION= 1.2.4 +DISTVERSION= 1.3.0 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 -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 2651f56ea60cc72c533fcd090679200899c2f54f.patch:-p1 # patch adding #include - 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/tbb USES= cmake:noninja compiler:c++11-lang python:build +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= OpenImageDenoise -GH_TUPLE= \ - OpenImageDenoise:mkl-dnn:603620ba45185e7d91fe112b69287e7d86c64353:m/mkl-dnn -# OpenImageDenoise:oidn-weights:08092e46a1961b13b70e48ad80fa19b452bd4c01:w/weights # replaced with git clone in post-fetch because it needs git-lfs +GH_TUPLE= OpenImageDenoise:mkl-dnn:eb3e967:m/mkl-dnn -USE_LDCONFIG= yes +CMAKE_ARGS= -DTBB_ROOT:STRING=${LOCALBASE} -DTBB_INCLUDE_DIR:STRING=${LOCALBASE}/include -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} -OPTIONS_DEFINE= DOCS +PLIST_SUB= VER="${PORTVERSION}" -CMAKE_ARGS+= -DTBB_ROOT:STRING=${LOCALBASE} -DTBB_INCLUDE_DIR:STRING=${LOCALBASE}/include -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} +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= 08092e46a1961b13b70e48ad80fa19b452bd4c01 +WEIGHTS_GIT_HASH= 59bad6bb6344f8fb8205772df3f795c2dc72e23b 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 Index: head/graphics/oidn/distinfo =================================================================== --- head/graphics/oidn/distinfo (revision 564137) +++ head/graphics/oidn/distinfo (revision 564138) @@ -1,9 +1,7 @@ -TIMESTAMP = 1610667311 -SHA256 (oidn-weights-08092e46a1961b13b70e48ad80fa19b452bd4c01.tar.gz) = 51b6638f22b67581da7c2a877faa2f5d3062bb4e9b9214e5008cb25052748300 -SIZE (oidn-weights-08092e46a1961b13b70e48ad80fa19b452bd4c01.tar.gz) = 37029289 -SHA256 (OpenImageDenoise-oidn-v1.2.4_GH0.tar.gz) = f847c244417e68ba46149663055f163188cc2ec62308fe040ec943df184a2c40 -SIZE (OpenImageDenoise-oidn-v1.2.4_GH0.tar.gz) = 3412598 -SHA256 (OpenImageDenoise-mkl-dnn-603620ba45185e7d91fe112b69287e7d86c64353_GH0.tar.gz) = 582a5e07027e0bd2b078c11c667bcb9ab06cc955263b95e292c50088ba0ea6ad -SIZE (OpenImageDenoise-mkl-dnn-603620ba45185e7d91fe112b69287e7d86c64353_GH0.tar.gz) = 5800370 -SHA256 (2651f56ea60cc72c533fcd090679200899c2f54f.patch) = 864da149d3dacc684181bba71c7c6b65106137cf1794cd3151b2b9d7459acd38 -SIZE (2651f56ea60cc72c533fcd090679200899c2f54f.patch) = 899 +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 +SHA256 (OpenImageDenoise-mkl-dnn-eb3e967_GH0.tar.gz) = 5a46df10204a61daab19e8d1c01a074c1c2e98d7bb5303b13a4c7c592cc77b4f +SIZE (OpenImageDenoise-mkl-dnn-eb3e967_GH0.tar.gz) = 5795997 Index: head/graphics/oidn/pkg-plist =================================================================== --- head/graphics/oidn/pkg-plist (revision 564137) +++ head/graphics/oidn/pkg-plist (revision 564138) @@ -1,12 +1,12 @@ -bin/oidnBenchmark -bin/oidnDenoise -bin/oidnTest +%%APPS%%bin/oidnBenchmark +%%APPS%%bin/oidnDenoise +%%APPS%%bin/oidnTest include/OpenImageDenoise/config.h include/OpenImageDenoise/oidn.h include/OpenImageDenoise/oidn.hpp -lib/cmake/OpenImageDenoise/OpenImageDenoiseConfig-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/OpenImageDenoise/OpenImageDenoiseConfig.cmake -lib/cmake/OpenImageDenoise/OpenImageDenoiseConfigVersion.cmake +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.0 -lib/libOpenImageDenoise.so.1.2.4 +lib/libOpenImageDenoise.so.1 +lib/libOpenImageDenoise.so.1.3.0