From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1337439-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 ECBD6158087
for <garchives@archives.gentoo.org>; Sun, 7 Nov 2021 15:57:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 13B772BC016;
Sun, 7 Nov 2021 15:57:38 +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 9F8F62BC016
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Nov 2021 15:57:37 +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 4784A3430D3
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Nov 2021 15:57:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 579FF175
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Nov 2021 15:57:34 +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: <1636300633.86a8cd6ba02ee38117d18ceff837518c6c13a5dd.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.189-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: 86a8cd6ba02ee38117d18ceff837518c6c13a5dd
X-VCS-Branch: master
Date: Sun, 7 Nov 2021 15:57:34 +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: fbe994b4-feeb-48e7-884d-d894c0db9781
X-Archives-Hash: 822058cecef333449adc4a804c174592
commit: 86a8cd6ba02ee38117d18ceff837518c6c13a5dd
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 7 15:45:45 2021 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Nov 7 15:57:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a8cd6b
media-libs/vulkan-layers: Fix eclass
Closes: https://bugs.gentoo.org/822249
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
...kan-layers-9999.ebuild => vulkan-layers-1.2.189-r1.ebuild} | 11 ++++-------
media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 11 ++++-------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
similarity index 91%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
index f53561f9c1f..3e089306269 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
@@ -4,8 +4,7 @@
EAPI=7
MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_ECLASS="cmake"
PYTHON_COMPAT=( python3_{8,9} )
inherit cmake-multilib python-any-r1
@@ -40,12 +39,10 @@ DEPEND="${RDEPEND}
)
"
-src_prepare() {
- cmake-utils_src_prepare
-}
-
multilib_src_configure() {
local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-DCMAKE_SKIP_RPATH=ON
-DBUILD_LAYER_SUPPORT_FILES=ON
-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
@@ -56,5 +53,5 @@ multilib_src_configure() {
-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index f53561f9c1f..3e089306269 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -4,8 +4,7 @@
EAPI=7
MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_ECLASS="cmake"
PYTHON_COMPAT=( python3_{8,9} )
inherit cmake-multilib python-any-r1
@@ -40,12 +39,10 @@ DEPEND="${RDEPEND}
)
"
-src_prepare() {
- cmake-utils_src_prepare
-}
-
multilib_src_configure() {
local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-DCMAKE_SKIP_RPATH=ON
-DBUILD_LAYER_SUPPORT_FILES=ON
-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
@@ -56,5 +53,5 @@ multilib_src_configure() {
-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
)
- cmake-utils_src_configure
+ cmake_src_configure
}