From owner-svn-ports-all@freebsd.org Thu May 14 14:16:12 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 EAC282F31CA; Thu, 14 May 2020 14:16:12 +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) server-signature RSA-PSS (4096 bits) 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 49ND9S5yvpz4NJG; Thu, 14 May 2020 14:16:12 +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 C3B86C418; Thu, 14 May 2020 14:16:12 +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 04EEGCCJ049207; Thu, 14 May 2020 14:16:12 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04EEGCmQ049206; Thu, 14 May 2020 14:16:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005141416.04EEGCmQ049206@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 14 May 2020 14:16:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535235 - in head/devel/vulkan-tools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/devel/vulkan-tools: . files X-SVN-Commit-Revision: 535235 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, 14 May 2020 14:16:13 -0000 Author: jbeich Date: Thu May 14 14:16:11 2020 New Revision: 535235 URL: https://svnweb.freebsd.org/changeset/ports/535235 Log: devel/vulkan-tools: enable Wayland support vkcube still defaults to X11 because (unlike vulkaninfo) it cannot support more than 1 WSI at the same time. PR: 246199 Reported by: salvadore Approved by: Greg V (maintainer) Differential Revision: https://reviews.freebsd.org/D24833 Modified: head/devel/vulkan-tools/Makefile (contents, props changed) head/devel/vulkan-tools/files/patch-cube_CMakeLists.txt (contents, props changed) Modified: head/devel/vulkan-tools/Makefile ============================================================================== --- head/devel/vulkan-tools/Makefile Thu May 14 13:42:09 2020 (r535234) +++ head/devel/vulkan-tools/Makefile Thu May 14 14:16:11 2020 (r535235) @@ -3,7 +3,7 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= sdk- DISTVERSION= 1.1.108.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology @@ -15,15 +15,47 @@ BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:de glslangValidator:devel/glslang LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader -USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build xorg -USE_XORG= x11 xcb xrandr sm ice xext +USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools -CMAKE_OFF= BUILD_TESTS BUILD_ICD \ - BUILD_WSI_WAYLAND_SUPPORT +CMAKE_OFF= BUILD_TESTS BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR=${LOCALBASE} + +OPTIONS_DEFINE= WAYLAND XCB XLIB +OPTIONS_DEFAULT= WAYLAND XCB XLIB + +WAYLAND_DESC= Build Wayland WSI (Window System Integration) support +XCB_DESC= Build XCB WSI (Window System Integration) support +XLIB_DESC= Build Xlib WSI (Window System Integration) support + +WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland +WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT +WAYLAND_CMAKE_ON= -DCUBE_WSI_SELECTION:STRING="WAYLAND" + +XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT +XLIB_LIB_DEPENDS= libX11.so:x11/libX11 \ + libXext.so:x11/libXext \ + libICE.so:x11/libICE \ + libSM.so:x11/libSM + +XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT +XCB_LIB_DEPENDS= libxcb.so:x11/libxcb + +.include + +.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= fails to build +.endif .include Modified: head/devel/vulkan-tools/files/patch-cube_CMakeLists.txt ============================================================================== --- head/devel/vulkan-tools/files/patch-cube_CMakeLists.txt Thu May 14 13:42:09 2020 (r535234) +++ head/devel/vulkan-tools/files/patch-cube_CMakeLists.txt Thu May 14 14:16:11 2020 (r535235) @@ -13,3 +13,11 @@ endif() if(BUILD_WSI_WAYLAND_SUPPORT) +@@ -174,6 +176,7 @@ elseif(NOT WIN32) + cube.vert.inc + cube.frag.inc) + target_link_libraries(vkcube Vulkan::Vulkan) ++ include(CheckLibraryExists) + CHECK_LIBRARY_EXISTS("rt" clock_gettime "" NEED_RT) + if (NEED_RT) + target_link_libraries(vkcube rt)