Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Oct 2019 00:48:10 +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: r514864 - in head: graphics/waifu2x-ncnn-vulkan science/ncnn
Message-ID:  <201910200048.x9K0mAlW084274@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Oct 20 00:48:10 2019
New Revision: 514864
URL: https://svnweb.freebsd.org/changeset/ports/514864

Log:
  science/ncnn: enable Vulkan support
  
  Required by graphics/waifu2x-ncnn-vulkan
  
  PR:		241114
  Approved by:	yuri (maintainer)

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

Modified: head/graphics/waifu2x-ncnn-vulkan/Makefile
==============================================================================
--- head/graphics/waifu2x-ncnn-vulkan/Makefile	Sun Oct 20 00:41:22 2019	(r514863)
+++ head/graphics/waifu2x-ncnn-vulkan/Makefile	Sun Oct 20 00:48:10 2019	(r514864)
@@ -11,8 +11,6 @@ COMMENT=	Scale and denoise images using convolutional 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241114
-
 BUILD_DEPENDS=	glslangValidator:devel/glslang \
 		${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
 		${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader \

Modified: head/science/ncnn/Makefile
==============================================================================
--- head/science/ncnn/Makefile	Sun Oct 20 00:41:22 2019	(r514863)
+++ head/science/ncnn/Makefile	Sun Oct 20 00:48:10 2019	(r514864)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ncnn
 DISTVERSION=	20190908
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,5 +14,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 USES=		cmake compiler:c11
 USE_GITHUB=	yes
 GH_ACCOUNT=	Tencent
+
+OPTIONS_DEFINE=	VULKAN
+OPTIONS_DEFAULT=VULKAN
+
+VULKAN_DESC=	Vulkan compute support
+VULKAN_BUILD_DEPENDS=	glslangValidator:devel/glslang \
+	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \
+	${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
+VULKAN_CMAKE_BOOL=	NCNN_VULKAN
 
 .include <bsd.port.mk>



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