Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 May 2020 07:14:43 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r537055 - head/graphics/waifu2x-ncnn-vulkan
Message-ID:  <202005300714.04U7EhrU044871@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat May 30 07:14:42 2020
New Revision: 537055
URL: https://svnweb.freebsd.org/changeset/ports/537055

Log:
  graphics/waifu2x-ncnn-vulkan: update to 20200530
  
  Changes:	https://github.com/nihui/waifu2x-ncnn-vulkan/compare/20200414...20200530
  Reported by:	GitHub (watch releases)

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	Sat May 30 07:14:17 2020	(r537054)
+++ head/graphics/waifu2x-ncnn-vulkan/Makefile	Sat May 30 07:14:42 2020	(r537055)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	waifu2x-ncnn-vulkan
-DISTVERSION=	20200414
+DISTVERSION=	20200530
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -11,15 +11,16 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glslangValidator:devel/glslang \
-		${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
-		${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader \
-		${LOCALBASE}/lib/libncnn.a:misc/ncnn
+		vulkan-headers>0:devel/vulkan-headers
+LIB_DEPENDS=	libwebpdecoder.so:graphics/webp \
+		libvulkan.so:graphics/vulkan-loader
 
-USES=		cmake compiler:${OPENMP}c++11-lib
+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-74-g15111fa:ncnn/src/ncnn
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
-LDFLAGS+=	-lpthread # XXX Convert ncnn to shared library
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
@@ -28,11 +29,8 @@ PORTDATA=	*
 OPENMP=		gcc-
 .endif
 
-pre-configure:
-	@if ${GREP} -q 'NCNN_VULKAN.*0' ${LOCALBASE}/include/ncnn/platform.h; then \
-		${ECHO_MSG} "${PKGNAME}: Needs ncnn built with VULKAN enabled."; \
-		return 1; \
-	fi
+post-extract:
+	@${ECHO_CMD} >${WRKSRC}/src/libwebp/CMakeLists.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e '/PATHSTR/s,models-,${DATADIR}/&,' \

Modified: head/graphics/waifu2x-ncnn-vulkan/distinfo
==============================================================================
--- head/graphics/waifu2x-ncnn-vulkan/distinfo	Sat May 30 07:14:17 2020	(r537054)
+++ head/graphics/waifu2x-ncnn-vulkan/distinfo	Sat May 30 07:14:42 2020	(r537055)
@@ -1,3 +1,7 @@
-TIMESTAMP = 1586670901
-SHA256 (nihui-waifu2x-ncnn-vulkan-20200414_GH0.tar.gz) = e3230db5eb17d0a5712dfbdddd0507c895360c05c2b56cd6d47d231e2200add3
-SIZE (nihui-waifu2x-ncnn-vulkan-20200414_GH0.tar.gz) = 34063752
+TIMESTAMP = 1590813748
+SHA256 (nihui-waifu2x-ncnn-vulkan-20200530_GH0.tar.gz) = 31e8e60970d8f779fbb1ac35ca3daccc131aeb2a2439d538cfa1d4f0df535744
+SIZE (nihui-waifu2x-ncnn-vulkan-20200530_GH0.tar.gz) = 34067139
+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-74-g15111fa_GH0.tar.gz) = 278b6e45f2dee97c98fa695fff9bbedaec0d32999778a0565ab50c8777443767
+SIZE (Tencent-ncnn-20200413-74-g15111fa_GH0.tar.gz) = 10597245



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005300714.04U7EhrU044871>