svn commit: r539374 - head/graphics/waifu2x-ncnn-vulkan

[Jan Beich]

Author: jbeich
Date: Tue Jun 16 17:53:38 2020
New Revision: 539374
URL: https://svnweb.freebsd.org/changeset/ports/539374

Log:
  graphics/waifu2x-ncnn-vulkan: back to misc/ncnn (like before r537055)

Modified:
  head/graphics/waifu2x-ncnn-vulkan/Makefile   (contents, props changed)
  head/graphics/waifu2x-ncnn-vulkan/distinfo   (contents, props changed)

Modified: head/graphics/waifu2x-ncnn-vulkan/Makefile
==============================================================================
--- head/graphics/waifu2x-ncnn-vulkan/Makefile	Tue Jun 16 17:53:24 2020	(r539373)
+++ head/graphics/waifu2x-ncnn-vulkan/Makefile	Tue Jun 16 17:53:38 2020	(r539374)
@@ -2,6 +2,7 @@
 
 PORTNAME=	waifu2x-ncnn-vulkan
 DISTVERSION=	20200606
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -11,16 +12,17 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glslangValidator:devel/glslang \
-		vulkan-headers>0:devel/vulkan-headers
+		vulkan-headers>0:devel/vulkan-headers \
+		${LOCALBASE}/lib/libncnn.a:misc/ncnn
 LIB_DEPENDS=	libwebp.so:graphics/webp \
 		libvulkan.so:graphics/vulkan-loader
 
 USES=		cmake compiler:${OPENMP}c++11-lib localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	nihui
-GH_TUPLE=	KhronosGroup:glslang:8.13.3743-39-gd39b8afc:glslang/src/ncnn/glslang \
-		Tencent:ncnn:20200413-97-g13c59d9:ncnn/src/ncnn
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
+CFLAGS+=	-isystem${LOCALBASE}/include/ncnn
+LDFLAGS+=	-lglslang -lHLSL -lOSDependent -lOGLCompiler -lSPIRV -lpthread # from ncnn
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
@@ -29,8 +31,15 @@ PORTDATA=	*
 OPENMP=		gcc-
 .endif
 
+pre-configure:
+	@if ${GREP} -q 'NCNN_VULKAN 0' ${LOCALBASE}/include/ncnn/platform.h; then \
+		${ECHO_MSG} "${PKGBASE} requires ncnn built with VULKAN option enabled."; \
+		return 1; \
+	fi
+
 post-extract:
 	@${ECHO_CMD} >${WRKSRC}/src/libwebp/CMakeLists.txt
+	@${ECHO_CMD} >${WRKSRC}/src/ncnn/CMakeLists.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e '/PATHSTR/s,models-,${DATADIR}/&,' \

Modified: head/graphics/waifu2x-ncnn-vulkan/distinfo
==============================================================================
--- head/graphics/waifu2x-ncnn-vulkan/distinfo	Tue Jun 16 17:53:24 2020	(r539373)
+++ head/graphics/waifu2x-ncnn-vulkan/distinfo	Tue Jun 16 17:53:38 2020	(r539374)
@@ -1,7 +1,3 @@
 TIMESTAMP = 1591444867
 SHA256 (nihui-waifu2x-ncnn-vulkan-20200606_GH0.tar.gz) = 744a71279dd670eae432dad345302ef1e197cb6f64099a5a937ca545647d5afd
 SIZE (nihui-waifu2x-ncnn-vulkan-20200606_GH0.tar.gz) = 34067785
-SHA256 (KhronosGroup-glslang-8.13.3743-39-gd39b8afc_GH0.tar.gz) = 5785e8d5fc2f77a1b0643910480c76fc049bc3e7592c6cd9df7fc8c1864af344
-SIZE (KhronosGroup-glslang-8.13.3743-39-gd39b8afc_GH0.tar.gz) = 3203976
-SHA256 (Tencent-ncnn-20200413-97-g13c59d9_GH0.tar.gz) = b336a04546f148928b7507155c1e3db829a1ec93e062e2d44f158c685ccfae53
-SIZE (Tencent-ncnn-20200413-97-g13c59d9_GH0.tar.gz) = 10606993