From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1347426-garchives=archives.gentoo.org@lists.gentoo.org>
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 A8226158086
for <garchives@archives.gentoo.org>; Thu, 9 Dec 2021 00:37:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DC4722BC05B;
Thu, 9 Dec 2021 00:37:03 +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 386342BC05A
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Dec 2021 00:37:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 76DD9342CA4
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Dec 2021 00:36:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D54D2219
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Dec 2021 00:36:57 +0000 (UTC)
From: "Nick Sarnie" <sarnex@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" <sarnex@gentoo.org>
Message-ID: <1639010081.98d377e7f4358ae609320367237e137da8355984.sarnex@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild media-libs/vulkan-layers/vulkan-layers-9999.ebuild
X-VCS-Directories: media-libs/vulkan-layers/
X-VCS-Committer: sarnex
X-VCS-Committer-Name: Nick Sarnie
X-VCS-Revision: 98d377e7f4358ae609320367237e137da8355984
X-VCS-Branch: master
Date: Thu, 9 Dec 2021 00:36:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 97789d48-53a8-4da3-b6c5-f48c61fb0a62
X-Archives-Hash: 1af62284000ae78e33cc11fe233403e9
commit: 98d377e7f4358ae609320367237e137da8355984
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 00:32:31 2021 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 00:34:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d377e7
media-libs/vulkan-layers: Fix header install path
Closes: https://bugs.gentoo.org/827494
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
.../{vulkan-layers-9999.ebuild => vulkan-layers-1.2.198-r1.ebuild} | 4 ++--
media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
similarity index 92%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
index ecfbe9b339e3..8620262391de 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
IUSE="wayland X"
BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
dev-cpp/robin-hood-hashing
@@ -50,7 +50,7 @@ multilib_src_configure() {
-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-DBUILD_TESTS=OFF
-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
- -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+ -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
)
cmake_src_configure
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index ecfbe9b339e3..5beaf4f6dc7a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -50,7 +50,7 @@ multilib_src_configure() {
-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-DBUILD_TESTS=OFF
-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
- -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+ -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
)
cmake_src_configure