From owner-svn-ports-all@freebsd.org Thu Jun 11 19:13:42 2020 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 0372A33E364; Thu, 11 Jun 2020 19:13:42 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49jYRn6JLFz4GkD; Thu, 11 Jun 2020 19:13:41 +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 D3B1A1D22C; Thu, 11 Jun 2020 19:13:41 +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 05BJDfPu097097; Thu, 11 Jun 2020 19:13:41 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BJDfoA097096; Thu, 11 Jun 2020 19:13:41 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006111913.05BJDfoA097096@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 11 Jun 2020 19:13:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538529 - head/devel/vulkan-tools X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/devel/vulkan-tools X-SVN-Commit-Revision: 538529 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.33 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: Thu, 11 Jun 2020 19:13:42 -0000 Author: jbeich Date: Thu Jun 11 19:13:41 2020 New Revision: 538529 URL: https://svnweb.freebsd.org/changeset/ports/538529 Log: devel/vulkan-tools: install vkcube for each backend PR: 246199 Approved by: Greg V (maintainer) Differential Revision: https://reviews.freebsd.org/D25224 Modified: head/devel/vulkan-tools/Makefile (contents, props changed) head/devel/vulkan-tools/pkg-plist (contents, props changed) Modified: head/devel/vulkan-tools/Makefile ============================================================================== --- head/devel/vulkan-tools/Makefile Thu Jun 11 19:08:08 2020 (r538528) +++ head/devel/vulkan-tools/Makefile Thu Jun 11 19:13:41 2020 (r538529) @@ -3,6 +3,7 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= sdk- DISTVERSION= 1.2.135.0 +PORTREVISION= 1 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology @@ -20,11 +21,13 @@ USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools -CMAKE_OFF= BUILD_ICD +CMAKE_OFF= BUILD_CUBE BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE} OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT= WAYLAND XCB XLIB +OPTIONS_SLAVE= DISPLAY +OPTIONS_SUB= yes WAYLAND_DESC= Build Wayland WSI (Window System Integration) support XCB_DESC= Build XCB WSI (Window System Integration) support @@ -43,17 +46,27 @@ XLIB_LIB_DEPENDS= libX11.so:x11/libX11 \ libICE.so:x11/libICE \ libSM.so:x11/libSM -.include +# https://github.com/KhronosGroup/Vulkan-Headers/issues/122 +display-build: .IGNORE +display-install: .IGNORE -.if ${PORT_OPTIONS:MXCB} -CMAKE_ARGS+= -DCUBE_WSI_SELECTION:STRING="XCB" -.elif ${PORT_OPTIONS:MXLIB} -CMAKE_ARGS+= -DCUBE_WSI_SELECTION:STRING="XLIB" -.elif ${PORT_OPTIONS:MWAYLAND} -CMAKE_ARGS+= -DCUBE_WSI_SELECTION:STRING="WAYLAND" -.else -CMAKE_ARGS+= -DCUBE_WSI_SELECTION:STRING="DISPLAY" -BROKEN= https://github.com/KhronosGroup/Vulkan-Headers/issues/122 -.endif +# https://github.com/KhronosGroup/Vulkan-Tools/issues/307 +.for _wsi in display wayland xcb xlib +do-configure-${_wsi:tu}-on: ${_wsi}-configure +${_wsi}-configure: + @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} \ + -DBUILD_CUBE:BOOL=ON -DBUILD_VULKANINFO:BOOL=OFF \ + -DCUBE_WSI_SELECTION:STRING=${_wsi:tu} \ + -B${CONFIGURE_WRKSRC}-${_wsi} +do-build-${_wsi:tu}-on: ${_wsi}-build +${_wsi}-build: + @${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --build ${BUILD_WRKSRC}-${_wsi} +do-install-${_wsi:tu}-on: ${_wsi}-install +${_wsi}-install: +. for _file in vkcube vkcubepp + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}-${_wsi}/cube/${_file} \ + ${STAGEDIR}${PREFIX}/bin/${_file}-${_wsi} +. endfor +.endfor .include Modified: head/devel/vulkan-tools/pkg-plist ============================================================================== --- head/devel/vulkan-tools/pkg-plist Thu Jun 11 19:08:08 2020 (r538528) +++ head/devel/vulkan-tools/pkg-plist Thu Jun 11 19:13:41 2020 (r538529) @@ -1,3 +1,8 @@ -bin/vkcube -bin/vkcubepp +%%DISPLAY%%bin/vkcube-display +%%WAYLAND%%bin/vkcube-wayland +%%XCB%%bin/vkcube-xcb +%%XLIB%%bin/vkcube-xlib +%%WAYLAND%%bin/vkcubepp-wayland +%%XCB%%bin/vkcubepp-xcb +%%XLIB%%bin/vkcubepp-xlib bin/vulkaninfo