From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F043215802F for ; Thu, 23 Feb 2023 13:35:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDCD1E07B3; Thu, 23 Feb 2023 13:35:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDA88E07B3 for ; Thu, 23 Feb 2023 13:35:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EFEC335CCD for ; Thu, 23 Feb 2023 13:35:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E97968B7 for ; Thu, 23 Feb 2023 13:35:00 +0000 (UTC) From: "Denis Reva" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Denis Reva" Message-ID: <1677159297.b14378ae99003b9aeb5724fa8032aa64ac53e029.RarogCmex@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/DirectXShaderCompiler/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212.ebuild dev-util/DirectXShaderCompiler/Manifest dev-util/DirectXShaderCompiler/metadata.xml X-VCS-Directories: dev-util/DirectXShaderCompiler/ X-VCS-Committer: RarogCmex X-VCS-Committer-Name: Denis Reva X-VCS-Revision: b14378ae99003b9aeb5724fa8032aa64ac53e029 X-VCS-Branch: dev Date: Thu, 23 Feb 2023 13:35:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d738c87a-8aba-439d-b4ed-306660e3faf5 X-Archives-Hash: dc7780cc8bbfd9c2669aa10cfba9960a commit: b14378ae99003b9aeb5724fa8032aa64ac53e029 Author: Denis Reva gmail com> AuthorDate: Thu Feb 23 13:34:49 2023 +0000 Commit: Denis Reva gmail com> CommitDate: Thu Feb 23 13:34:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b14378ae dev-util/DirectXShaderCompiler: Fixed new version of directx shader compiller Attempt of unbundling is unsuccessfull It seems sticked with bundled libraries Signed-off-by: Denis Reva gmail.com> .../DirectXShaderCompiler-1.7.2212.ebuild | 27 ++++++++++++++-------- dev-util/DirectXShaderCompiler/Manifest | 3 +++ dev-util/DirectXShaderCompiler/metadata.xml | 1 + 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212.ebuild index cf2cfa70e..66a2e0eab 100644 --- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212.ebuild +++ b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212.ebuild @@ -3,25 +3,29 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake check-reqs python-any-r1 DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang" HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler" -# ToDo: unbundle spirv headers/tools -SPIRV_HEADERS_COMMIT_MAGIC="0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" -SPIRV_TOOLS_COMMIT_MAGIC="71b2aee6c868a673ec82d1385f97593aa2881316" +# ToDo: unbundle spirv headers/tools and directx headers +SPIRV_HEADERS_COMMIT_MAGIC="d13b52222c39a7e9a401b44646f0ca3a640fbd47" +SPIRV_TOOLS_COMMIT_MAGIC="f36a8d47f738cc612c7dd89f145a15465ab437cd" +DIRECTX_HEADERS_COMMIT_MAGIC="980971e835876dc0cde415e8f9bc646e64667bf7" SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz" +https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz +https://github.com/microsoft/DirectX-Headers/archive/${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-directxheaders-${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" SLOT="0" -KEYWORDS="" -IUSE="" +KEYWORDS="~amd64 ~x86" -DEPEND="${PYTHON_DEPS} - dev-util/directx-headers" +DEPEND="${PYTHON_DEPS}" +# Todo: unbundle +# dev-util/directx-headers +# dev-util/spirv-headers +# dev-util/spirv-tools RDEPEND=" sys-libs/zlib:0= >=dev-libs/libffi-3.4.2-r1:0= @@ -35,9 +39,12 @@ CHECKREQS_DISK_BUILD="4G" CMAKE_EXTRA_CACHE_FILE="${S}/cmake/caches/PredefinedParams.cmake" src_prepare() { - rm -d "${S}"/external/SPIRV* + rm -d "${S}"/external/SPIRV* || die + rm -d "${S}"/external/DirectX* || die mv "${WORKDIR}/SPIRV-Headers-${SPIRV_HEADERS_COMMIT_MAGIC}" "${S}/external/SPIRV-Headers" || die "can't move headers" mv "${WORKDIR}/SPIRV-Tools-${SPIRV_TOOLS_COMMIT_MAGIC}" "${S}/external/SPIRV-Tools"|| die "can't move tools" + mv "${WORKDIR}/DirectX-Headers-${DIRECTX_HEADERS_COMMIT_MAGIC}" "${S}/external/DirectX-Headers"|| die "can't move DXH" + cmake_src_prepare } diff --git a/dev-util/DirectXShaderCompiler/Manifest b/dev-util/DirectXShaderCompiler/Manifest index 40023ce0d..698c475b5 100644 --- a/dev-util/DirectXShaderCompiler/Manifest +++ b/dev-util/DirectXShaderCompiler/Manifest @@ -1,4 +1,7 @@ DIST DirectXShaderCompiler-1.7.2207.tar.gz 23764105 BLAKE2B 4b3bab8a961cdec96fd31da85386cf61af304d5ed1f6dcb40530bb2b084bc454f42ecfcbf9bcb228ecd2870c13b7b211509e05e3b7ed08ee3c2ed264505d162d SHA512 4faa6b53f2f694c9593ebf4ac02ce771fe1cb1822595799dc3a6c85752de701afe546b5fbdfedcc0ba466b0081bc679fca1fd7fb5fc05167c7449fb378a1c651 DIST DirectXShaderCompiler-1.7.2212.tar.gz 23855402 BLAKE2B 0a6ffd8f9b4e716b5c5d8eb9708f79c95397f6c0d76e6b7769b5d47f1ea650941440f9eeb530654bdec84f02be8ed272278b19f00826f7d3d088d2d7170c7531 SHA512 54eb737c56948a46182158141ca8d0bd908a9fec122d93fcee53f8abfe707f0075de7ec6bd86ac5d58a3472110ba29f5849c9ad75f570c540c1a22c403ecb3b5 +DIST DirectXShaderCompiler-directxheaders-980971e835876dc0cde415e8f9bc646e64667bf7.tar.gz 326310 BLAKE2B 8ea4bbae290926c08d02d1a1262e813bb188c62a6deb81ed03954c500473581dc2430d09ca0742c42c5d8bfc2e232c999531ec5ad139aa791b7e8b06dfacd61d SHA512 a570068d3c25c68eba34a2653108e2019f888a7392a803f97da9a401713b14bf4235520f0adc37c2f6ffb27cfb118ca7bb0fc8e446b342a7393c9c64afd84ed8 DIST DirectXShaderCompiler-headers-0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c +DIST DirectXShaderCompiler-headers-d13b52222c39a7e9a401b44646f0ca3a640fbd47.tar.gz 446718 BLAKE2B 39162460b730cc495a1c2cdd2c9f8e173ad1f88c1f9f5070155347ff455275b33fb043f4ab85b47131cb5014a8adc07d3066f99fc5442ce661f0f388fb1396f0 SHA512 390078d26976e7e95fdda10816bff4946dbae8d7e92d8bdd88501725bf7683ba48b47ca5cbc5491e47539a39bfb9eb5c423e24f2f03dba2e4fe1923bf8e4dd9b DIST DirectXShaderCompiler-tools-71b2aee6c868a673ec82d1385f97593aa2881316.tar.gz 3042018 BLAKE2B e9d62559fc270c4140f2638a51b8d14120d84a868a35c488f30bff1b098a98fa1683e85b0778208de61a0b5c0b3f0996071e655a8fa64cc7c3c791527ff9441a SHA512 68f80e4a3395ba7c87ab08f515d265f0c106f39770e043cc8eba5e62f2762405e05e4b5b187e33702ce0a2204fc9d42cbf7ce27a6268daf59f4ab4c04b73d462 +DIST DirectXShaderCompiler-tools-f36a8d47f738cc612c7dd89f145a15465ab437cd.tar.gz 3092790 BLAKE2B 2e1978cb7d92f9556650696136f7e68f0aae46ebbca6caf9bd1d22ad42b5d2fad75dcc9aa2504e61e140e6c0a44e807d7aa94b28a25cd131a8fb239f6003bc21 SHA512 53c9c973f79fd321fa3a3d1f305e8674ccd7a02ceaf779aae7650c68b3d0d8d820fbe380b0450892402a1835f8205c8a7e6efb155929bce217d1b39bd4a34eef diff --git a/dev-util/DirectXShaderCompiler/metadata.xml b/dev-util/DirectXShaderCompiler/metadata.xml index eda7faf2f..fea7ce536 100644 --- a/dev-util/DirectXShaderCompiler/metadata.xml +++ b/dev-util/DirectXShaderCompiler/metadata.xml @@ -9,4 +9,5 @@ The DirectX Shader Compiler project includes a compiler and related tools used to compile High-Level Shader Language (HLSL) programs into DirectX Intermediate Language (DXIL) representation. Applications that make use of DirectX for graphics, games, and computation can use it to generate shader programs. + microsoft/DirectXShaderCompiler