From nobody Wed Sep 06 13:54:48 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgkQJ5xL8z4sggF; Wed, 6 Sep 2023 13:54:48 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgkQJ5WVNz3f34; Wed, 6 Sep 2023 13:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694008488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hd0wT02LcXjhPkvZ2RFfGV/aVivI/yhgqc+Py0YKWvQ=; b=IIxSlnigsW+DpoNHCgu4E2QJDNIDctLxGfgMeotZZq5WNkiY8AP1+UFOT5J7WB9hUFCBnK y8MgNO2o8laasTlynRBxm4LeIBkiDhGrwOMrmnEUAkv4vslQdMX8U7loVQW4iUL0+WkVkh fd6EcYuN+w+me0tl+BHkCjp1qc4aQblTqlGmQfP+5+dDaP61DS+7JkdwaG3kfSAVfgi25p 3Pz+wCM/WhSH41Ez9FZo++oRLvp0+T4h87xRjQeNlf0S26O+AgpLze5Mw9h4vPFDyXzGsL azFP20Sh98IGb5uaPfxaWQKyatzcqYD5kEHwlmDnhKgUcgTE0+/qrKkqizba5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694008488; a=rsa-sha256; cv=none; b=eE81NBlp6kdO43pHaasYIOnrm734bE9zI17LwtYBWWVGDpqskTMac0JGwaZtfNcWUTJzi+ +y7bvWQvqg8gqWJUPAePU/DkvCTLl8ICAnUBM8hJ9Ih9bM+chJTxZ24Wtg1pXVbtFZWro9 xRb4FDvUUx299vLOBR+J0+aPVi9wDjKO3fn9aX0/uVNyscANoBX/LsNUyuvaxUVMRVPRmu 9J0q3JMgZgachBd6qnsNWBGqu0NbDKqGJ9MmzJ1o1egCIAYIFX7pMGRuh7I6k9zxeFCPM0 h4joDp8m6O9imL0D5T5dbg2JYRzlfdhdZV/bkugCklP4UiMzeu1hbnLxanRZxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694008488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hd0wT02LcXjhPkvZ2RFfGV/aVivI/yhgqc+Py0YKWvQ=; b=iRHWYJ8VCh3Lkpjr5etrWUXIk65Cl55cM/e6FWP/8Zon8gySgFOIRjVKJ/qReC36Nhgl7T pDokIOvale20eDLnVRW0Wk78faqLBWkdluFcE4bojQzTH7eipWwRpi29LpOKu+4Zp7NN4H 52gxc3E87wsPExcuy/Oz8uKt3IDs3IyPrShKZXGWjYRFbWMwak5lQaCvuYPY1w5wcHaXU2 xT3lEQT/HQEf82OJM1/im3d5l4sz7cxFWsjTCB2jJqcnD2Bc2VupPxYqQxDKiEDgU0RnWd W6NUQ8l2ZmwpF8p4R5ALS8Y/b4Peed+PUlGpeEIDfjPqUvmfS1NquZfM/V9tYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RgkQJ4bJkz47C; Wed, 6 Sep 2023 13:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Dsm6w019247; Wed, 6 Sep 2023 13:54:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386DsmcZ019244; Wed, 6 Sep 2023 13:54:48 GMT (envelope-from git) Date: Wed, 6 Sep 2023 13:54:48 GMT Message-Id: <202309061354.386DsmcZ019244@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: eebb2e837cbe - main - graphics/vulkan-validation-layers: simplify bundled SPIRV-Headers workaround List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eebb2e837cbe6de185bdb6b32c0755b9d2fce4e1 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=eebb2e837cbe6de185bdb6b32c0755b9d2fce4e1 commit eebb2e837cbe6de185bdb6b32c0755b9d2fce4e1 Author: Jan Beich AuthorDate: 2023-09-06 13:20:28 +0000 Commit: Jan Beich CommitDate: 2023-09-06 13:44:22 +0000 graphics/vulkan-validation-layers: simplify bundled SPIRV-Headers workaround --- graphics/vulkan-validation-layers/Makefile | 3 +-- .../files/patch-layers_CMakeLists.txt | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 284d42f2b3af..2b076c628940 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -18,10 +18,9 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/layers/SPIRV-Headers CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES -CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB diff --git a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt index c96d097f56a7..56dc12c99336 100644 --- a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt +++ b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt @@ -10,17 +10,16 @@ CMake Error at layers/CMakeLists.txt:114 (find_package): "SPIRV-Headers" provides a separate development package or SDK, be sure it has been installed. ---- layers/CMakeLists.txt.orig 2023-01-20 04:42:25 UTC +--- layers/CMakeLists.txt.orig 2023-08-29 03:23:36 UTC +++ layers/CMakeLists.txt -@@ -111,7 +111,12 @@ add_library(VVL-SPIRV-LIBS INTERFACE) +@@ -152,7 +152,10 @@ add_library(VVL-SPIRV-LIBS INTERFACE) # Represents all SPIRV libraries we need add_library(VVL-SPIRV-LIBS INTERFACE) -+if (SPIRV_HEADERS_INSTALL_DIR) -+add_library(SPIRV-Headers::SPIRV-Headers INTERFACE IMPORTED) -+target_include_directories(SPIRV-Headers::SPIRV-Headers INTERFACE ${SPIRV_HEADERS_INSTALL_DIR}/include) -+else() - find_package(SPIRV-Headers REQUIRED CONFIG QUIET) +-find_package(SPIRV-Headers REQUIRED CONFIG QUIET) ++find_package(SPIRV-Headers CONFIG QUIET) ++if (NOT TARGET SPIRV-Headers::SPIRV-Headers) ++ add_subdirectory(SPIRV-Headers EXCLUDE_FROM_ALL SYSTEM) +endif() target_link_libraries(VVL-SPIRV-LIBS INTERFACE SPIRV-Headers::SPIRV-Headers)