Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 072351A923B for ; Sun, 24 Jan 2021 18:57:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5AE7A84D67; Sun, 24 Jan 2021 18:57:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9731A84D51 for ; Sun, 24 Jan 2021 18:57:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id fkHNNsJQTVAE for ; Sun, 24 Jan 2021 18:57:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C73C484C86 for ; Sun, 24 Jan 2021 18:57:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BB49CFA9D; Sun, 24 Jan 2021 18:57:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1611514666194450" MIME-Version: 1.0 Date: Sun, 24 Jan 2021 18:57:46 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/graphics To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20210124185746.BB49CFA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1611514666194450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sun Jan 24 18:57:46 UTC 2021 Modified Files: pkgsrc/graphics: Makefile Added Files: pkgsrc/graphics/vulkan-headers: DESCR Makefile PLIST buildlink3.mk distinfo pkgsrc/graphics/vulkan-headers/patches: patch-CMakeLists.txt patch-include_vulkan_vulkan.hpp Log Message: Add vulkan-headers version 1.1.126.0 Headers for the Vulkan graphics API. To generate a diff of this commit: cvs rdiff -u -r1.916 -r1.917 pkgsrc/graphics/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/vulkan-headers/DESCR \ pkgsrc/graphics/vulkan-headers/Makefile \ pkgsrc/graphics/vulkan-headers/PLIST \ pkgsrc/graphics/vulkan-headers/buildlink3.mk \ pkgsrc/graphics/vulkan-headers/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/vulkan-headers/patches/patch-CMakeLists.txt \ pkgsrc/graphics/vulkan-headers/patches/patch-include_vulkan_vulkan.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1611514666194450 Content-Disposition: inline Content-Length: 6476 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/Makefile diff -u pkgsrc/graphics/Makefile:1.916 pkgsrc/graphics/Makefile:1.917 --- pkgsrc/graphics/Makefile:1.916 Fri Jan 1 17:19:09 2021 +++ pkgsrc/graphics/Makefile Sun Jan 24 18:57:46 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.916 2021/01/01 17:19:09 pin Exp $ +# $NetBSD: Makefile,v 1.917 2021/01/24 18:57:46 maya Exp $ # COMMENT= Graphics tools and libraries @@ -798,6 +798,7 @@ SUBDIR+= vp SUBDIR+= vtk SUBDIR+= vtk-data SUBDIR+= vtk-docs +SUBDIR+= vulkan-headers SUBDIR+= wcslib SUBDIR+= wld SUBDIR+= wm-icons Added files: Index: pkgsrc/graphics/vulkan-headers/DESCR diff -u /dev/null pkgsrc/graphics/vulkan-headers/DESCR:1.1 --- /dev/null Sun Jan 24 18:57:46 2021 +++ pkgsrc/graphics/vulkan-headers/DESCR Sun Jan 24 18:57:46 2021 @@ -0,0 +1 @@ +Headers for the Vulkan graphics API. Index: pkgsrc/graphics/vulkan-headers/Makefile diff -u /dev/null pkgsrc/graphics/vulkan-headers/Makefile:1.1 --- /dev/null Sun Jan 24 18:57:46 2021 +++ pkgsrc/graphics/vulkan-headers/Makefile Sun Jan 24 18:57:46 2021 @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.1 2021/01/24 18:57:46 maya Exp $ + +GITHUB_PROJECT= Vulkan-Headers +DISTNAME= sdk-1.1.126.0 +PKGNAME= ${GITHUB_PROJECT:tl}-${DISTNAME:S/sdk-//} +CATEGORIES= graphics +MASTER_SITES= ${MASTER_SITE_GITHUB:=KhronosGroup/} +DIST_SUBDIR= ${GITHUB_PROJECT} +GITHUB_TAG= ${DISTNAME} +EXTRACT_USING= bsdtar + +MAINTAINER= nros@NetBSD.org +HOMEPAGE= https://github.com/KhronosGroup/Vulkan-Headers/ +COMMENT= Headers for Vulkan Graphics API +LICENSE= apache-2.0 + +USE_CMAKE= yes + +REPLACE_PYTHON= registry/*.py + +.include "../../lang/python/application.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/graphics/vulkan-headers/PLIST diff -u /dev/null pkgsrc/graphics/vulkan-headers/PLIST:1.1 --- /dev/null Sun Jan 24 18:57:46 2021 +++ pkgsrc/graphics/vulkan-headers/PLIST Sun Jan 24 18:57:46 2021 @@ -0,0 +1,29 @@ +@comment $NetBSD: PLIST,v 1.1 2021/01/24 18:57:46 maya Exp $ +include/vulkan/vk_icd.h +include/vulkan/vk_layer.h +include/vulkan/vk_platform.h +include/vulkan/vk_sdk_platform.h +include/vulkan/vulkan.h +include/vulkan/vulkan.hpp +include/vulkan/vulkan_android.h +include/vulkan/vulkan_core.h +include/vulkan/vulkan_fuchsia.h +include/vulkan/vulkan_ggp.h +include/vulkan/vulkan_ios.h +include/vulkan/vulkan_macos.h +include/vulkan/vulkan_metal.h +include/vulkan/vulkan_vi.h +include/vulkan/vulkan_wayland.h +include/vulkan/vulkan_win32.h +include/vulkan/vulkan_xcb.h +include/vulkan/vulkan_xlib.h +include/vulkan/vulkan_xlib_xrandr.h +share/vulkan/registry/cgenerator.py +share/vulkan/registry/conventions.py +share/vulkan/registry/generator.py +share/vulkan/registry/genvk.py +share/vulkan/registry/reg.py +share/vulkan/registry/spec_tools/util.py +share/vulkan/registry/validusage.json +share/vulkan/registry/vk.xml +share/vulkan/registry/vkconventions.py Index: pkgsrc/graphics/vulkan-headers/buildlink3.mk diff -u /dev/null pkgsrc/graphics/vulkan-headers/buildlink3.mk:1.1 --- /dev/null Sun Jan 24 18:57:46 2021 +++ pkgsrc/graphics/vulkan-headers/buildlink3.mk Sun Jan 24 18:57:46 2021 @@ -0,0 +1,16 @@ +# $NetBSD: buildlink3.mk,v 1.1 2021/01/24 18:57:46 maya Exp $ + +BUILDLINK_TREE+= vulkan-headers + +.if !defined(VULKAN_HEADERS_BUILDLINK3_MK) +VULKAN_HEADERS_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.vulkan-headers+= vulkan-headers>=1.1.126.0 +BUILDLINK_PKGSRCDIR.vulkan-headers?= ../../graphics/vulkan-headers +.endif # VULKAN_HEADERS_BUILDLINK3_MK + +.include "../../x11/liboldXrandr/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libxcb/buildlink3.mk" + +BUILDLINK_TREE+= -vulkan-headers Index: pkgsrc/graphics/vulkan-headers/distinfo diff -u /dev/null pkgsrc/graphics/vulkan-headers/distinfo:1.1 --- /dev/null Sun Jan 24 18:57:46 2021 +++ pkgsrc/graphics/vulkan-headers/distinfo Sun Jan 24 18:57:46 2021 @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1 2021/01/24 18:57:46 maya Exp $ + +SHA1 (Vulkan-Headers/sdk-1.1.126.0.tar.gz) = a68e99a5eb1f6c4de97877718dba0fbeeccb07ff +RMD160 (Vulkan-Headers/sdk-1.1.126.0.tar.gz) = 9656c621304750488da54a1dd8ebc4953d35023c +SHA512 (Vulkan-Headers/sdk-1.1.126.0.tar.gz) = b050e0d17ad7b143c59a401a4a75ef97afdbc94f1cbfd4571ce1b83380927879cb05b7b62b81c7da8b501ebe0fbe70dc3acacaab3656da465b4bc06559266d3f +Size (Vulkan-Headers/sdk-1.1.126.0.tar.gz) = 665900 bytes +SHA1 (patch-CMakeLists.txt) = f7364dcc20799db2e9a5b3f7b14ecea2c1bceea5 +SHA1 (patch-include_vulkan_vulkan.hpp) = 3ba0c40361b4358a63036174373b787ec86cc9e7 Index: pkgsrc/graphics/vulkan-headers/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/graphics/vulkan-headers/patches/patch-CMakeLists.txt:1.1 --- /dev/null Sun Jan 24 18:57:46 2021 +++ pkgsrc/graphics/vulkan-headers/patches/patch-CMakeLists.txt Sun Jan 24 18:57:46 2021 @@ -0,0 +1,17 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2021/01/24 18:57:46 maya Exp $ + +* don't install pkgsrc generated files + +--- CMakeLists.txt.orig 2019-12-02 18:11:46.793667657 +0000 ++++ CMakeLists.txt +@@ -45,8 +45,8 @@ add_library(Vulkan-Registry INTERFACE) + target_include_directories(Vulkan-Registry INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/registry") + add_library(Vulkan::Registry ALIAS Vulkan-Registry) + +-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry" DESTINATION ${CMAKE_INSTALL_DATADIR}/vulkan) ++install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PATTERN "*.orig" EXCLUDE) ++install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry" DESTINATION ${CMAKE_INSTALL_DATADIR}/vulkan PATTERN "*.orig" EXCLUDE) + + # uninstall target + if(NOT TARGET uninstall) Index: pkgsrc/graphics/vulkan-headers/patches/patch-include_vulkan_vulkan.hpp diff -u /dev/null pkgsrc/graphics/vulkan-headers/patches/patch-include_vulkan_vulkan.hpp:1.1 --- /dev/null Sun Jan 24 18:57:46 2021 +++ pkgsrc/graphics/vulkan-headers/patches/patch-include_vulkan_vulkan.hpp Sun Jan 24 18:57:46 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-include_vulkan_vulkan.hpp,v 1.1 2021/01/24 18:57:46 maya Exp $ + +* add NetBSD support +* +--- include/vulkan/vulkan.hpp.orig 2019-12-02 17:52:14.520273368 +0000 ++++ include/vulkan/vulkan.hpp +@@ -56,7 +56,7 @@ + # define VULKAN_HPP_ASSERT assert + #endif + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__NetBSD__) + # include + #endif + --_----------=_1611514666194450--