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

4 files changed, 36 insertions, 33 deletions

diff --git a/graphics/waifu2x-converter-cpp/Makefile b/graphics/waifu2x-converter-cpp/Makefile
index 8603f638ea81..244155232790 100644
--- a/graphics/waifu2x-converter-cpp/Makefile
+++ b/graphics/waifu2x-converter-cpp/Makefile
@@ -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 <bsd.port.mk>
diff --git a/graphics/waifu2x-converter-cpp/distinfo b/graphics/waifu2x-converter-cpp/distinfo
index 808b29c3a0d4..e8da8a8a252d 100644
--- a/graphics/waifu2x-converter-cpp/distinfo
+++ b/graphics/waifu2x-converter-cpp/distinfo
@@ -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
diff --git a/graphics/waifu2x-converter-cpp/files/patch-CMakeLists.txt b/graphics/waifu2x-converter-cpp/files/patch-CMakeLists.txt
deleted file mode 100644
index 06c9d057e28a..000000000000
--- a/graphics/waifu2x-converter-cpp/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2018-05-02 21:05:51.508265000 +0000
-+++ CMakeLists.txt	2018-05-02 21:05:54.408309000 +0000
-@@ -22,7 +22,7 @@ else()
-   link_directories(${OPENCV_PREFIX}/lib)
- endif()
- 
--check_include_file_cxx("opencv2/opencv.hpp" HAVE_OPENCV)
-+check_include_file_cxx("opencv2/videoio.hpp" HAVE_OPENCV)
- find_library(IMGCODECS_LIBRARY NAMES opencv_imgcodecs opencv_highgui
-   HINTS ${OPENCV_PKG_INCLUDE_DIRS} ${OPENCV_PREFIX}/lib)
- 
diff --git a/graphics/waifu2x-converter-cpp/pkg-descr b/graphics/waifu2x-converter-cpp/pkg-descr
index 57af22eef547..c1ef56564f92 100644
--- a/graphics/waifu2x-converter-cpp/pkg-descr
+++ b/graphics/waifu2x-converter-cpp/pkg-descr
@@ -2,4 +2,4 @@ waifu2x achieves image superresolution for anime-style art using deep
 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