From owner-svn-ports-all@freebsd.org Mon Dec 16 16:44:58 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D89111C8945; Mon, 16 Dec 2019 16:44:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47c6ZL5Llyz41ZF; Mon, 16 Dec 2019 16:44:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2DC723B; Mon, 16 Dec 2019 16:44:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBGGiwAS024360; Mon, 16 Dec 2019 16:44:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBGGiwsB024358; Mon, 16 Dec 2019 16:44:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201912161644.xBGGiwsB024358@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 16 Dec 2019 16:44:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520270 - in head/graphics/waifu2x-converter-cpp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/waifu2x-converter-cpp: . files X-SVN-Commit-Revision: 520270 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2019 16:44:58 -0000 Author: jbeich Date: Mon Dec 16 16:44:57 2019 New Revision: 520270 URL: https://svnweb.freebsd.org/changeset/ports/520270 Log: graphics/waifu2x-converter-cpp: update to 5.3.3 - Switch to maintained upstream Changes: https://github.com/DeadSix27/waifu2x-converter-cpp/compare/tanakamura:5e5ac35...DeadSix27:v5.3.3 Changes: https://github.com/DeadSix27/waifu2x-converter-cpp/releases Deleted: head/graphics/waifu2x-converter-cpp/files/ Modified: head/graphics/waifu2x-converter-cpp/Makefile (contents, props changed) head/graphics/waifu2x-converter-cpp/distinfo (contents, props changed) head/graphics/waifu2x-converter-cpp/pkg-descr (contents, props changed) Modified: head/graphics/waifu2x-converter-cpp/Makefile ============================================================================== --- head/graphics/waifu2x-converter-cpp/Makefile Mon Dec 16 16:32:59 2019 (r520269) +++ head/graphics/waifu2x-converter-cpp/Makefile Mon Dec 16 16:44:57 2019 (r520270) @@ -1,50 +1,61 @@ # $FreeBSD$ PORTNAME= waifu2x-converter-cpp -DISTVERSION= 1.0.0-410 -DISTVERSIONSUFFIX= -g5e5ac35 -PORTREVISION= 9 +DISTVERSIONPREFIX= v +DISTVERSION= 5.3.3 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 858fed6eac1d.patch:-p1 # https://github.com/DeadSix27/waifu2x-converter-cpp/pull/215 +PATCHFILES+= df328119c4a3.patch:-p1 # https://github.com/DeadSix27/waifu2x-converter-cpp/pull/216 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Scale and denoise images using convolutional neural networks LICENSE= BSD2CLAUSE MIT LICENSE_COMB= multi -LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE +LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/include/picojson_LICENSE.txt LICENSE_FILE_MIT= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl -LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ +LIB_DEPENDS= libopencv_imgcodecs.so:graphics/opencv \ libopencv_imgproc.so:graphics/opencv-core +USES= cmake compiler:c++17-lang USE_GITHUB= yes -GH_ACCOUNT= tanakamura - -USES= cmake compiler:c++11-lib dos2unix -DOS2UNIX_GLOB= *.cpp *.hpp +USE_LDCONFIG= yes +GH_ACCOUNT= DeadSix27 CMAKE_ARGS= -DOPENCV_PREFIX:PATH="${LOCALBASE}" \ -DOpenCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libOpenCL.so" -CMAKE_ON= INSTALL_MODELS -LDFLAGS+= -Wl,--as-needed # avoid overlinking (opencv deps) +CMAKE_ON= INSTALL_MODELS ENABLE_TESTS TEST_TARGET= test -USE_LDCONFIG= yes PLIST_FILES= bin/${PORTNAME} \ include/w2xconv.h \ lib/libw2xc.so PORTDATA= * -PORTDOCS= * -OPTIONS_DEFINE= DOCS SIMD +.if exists(/usr/lib/libc++fs.a) +# XXX Remove after FreeBSD 11.3/12.1 EOL +CMAKE_ARGS+= -DFILE_SYSTEM_LIB:STRING=c++fs +.elif !exists(/usr/include/c++/v1/filesystem) && exists(/usr/lib/libc++experimental.a) +# XXX Remove after FreeBSD 12.0 EOL +CMAKE_ARGS+= -DFILE_SYSTEM_LIB:STRING=c++experimental +.endif + +OPTIONS_DEFINE= SIMD OPTIONS_DEFAULT=SIMD -DOCS_CMAKE_BOOL=INSTALL_DOCS -SIMD_CMAKE_OFF= -DARMOPT:BOOL=false -DX86OPT:BOOL=false +SIMD_CMAKE_OFF= -DARMOPT:BOOL=false -DPPCOPT:BOOL=false -DX86OPT:BOOL=false post-patch: @${REINPLACE_CMD} -e '/Darwin/,/FLAGS_RELEASE/d' \ -e 's,".*\(-m[^[:space:]]*\).*","\1",' \ - -e 's/$${TS}/${DISTVERSIONFULL}/' \ + -e "s/\$${TS}/`${AWK} '/TIMESTAMP/ { print \$$3 }' ${DISTINFO_FILE}`/" \ + -e '/find_program/s/git/&_disabled/' \ + -e '/GIT_BRANCH/s/null/master/' \ + -e '/GIT_COMMIT_HASH/s/000000/${DISTVERSIONSUFFIX:U&:S/^-g//}/' \ + -e '/GIT_TAG/s/v0\.0\.0/${DISTVERSIONFULL:C/-.*//}/' \ ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} 's,models_rgb,${WRKSRC}/&,' ${WRKSRC}/w32-apps/runtest.c .include Modified: head/graphics/waifu2x-converter-cpp/distinfo ============================================================================== --- head/graphics/waifu2x-converter-cpp/distinfo Mon Dec 16 16:32:59 2019 (r520269) +++ head/graphics/waifu2x-converter-cpp/distinfo Mon Dec 16 16:44:57 2019 (r520270) @@ -1,4 +1,7 @@ -SHA256 (waifu2x.1.gz) = bfad3e87e43f20573ab068c386e150f93fb4cc37400b8f4aaf4734c9afbd1489 -SIZE (waifu2x.1.gz) = 1242 -SHA256 (tanakamura-waifu2x-converter-cpp-1.0.0-410-g5e5ac35_GH0.tar.gz) = c2ebb418609f2f361ba499c12ebbd7e155f1b6ee05164df721405fae46fd5132 -SIZE (tanakamura-waifu2x-converter-cpp-1.0.0-410-g5e5ac35_GH0.tar.gz) = 14875981 +TIMESTAMP = 1575647090 +SHA256 (DeadSix27-waifu2x-converter-cpp-v5.3.3_GH0.tar.gz) = 036d82bb4ec2e4a098b084e5f82f21d3a274c6c16e60e7d5dd44478f2cb463ed +SIZE (DeadSix27-waifu2x-converter-cpp-v5.3.3_GH0.tar.gz) = 12531204 +SHA256 (858fed6eac1d.patch) = bc1e9c80fbf5b59a4e1630ddc561b839ce66315c4e0a8228b2fea765dce90a09 +SIZE (858fed6eac1d.patch) = 4160 +SHA256 (df328119c4a3.patch) = 353c87e6e1c3f1ca5dd6d09179add4812d95b63080fbe48e11db887a1a1a5792 +SIZE (df328119c4a3.patch) = 2865 Modified: head/graphics/waifu2x-converter-cpp/pkg-descr ============================================================================== --- head/graphics/waifu2x-converter-cpp/pkg-descr Mon Dec 16 16:32:59 2019 (r520269) +++ head/graphics/waifu2x-converter-cpp/pkg-descr Mon Dec 16 16:44:57 2019 (r520270) @@ -2,4 +2,4 @@ waifu2x achieves image superresolution for anime-style convolutional neural networks from Torch. waifu2x-converter-cpp reimplements its converter function in C++ using OpenCV. -WWW: https://github.com/tanakamura/waifu2x-converter-cpp +WWW: https://github.com/DeadSix27/waifu2x-converter-cpp