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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E911C139360 for ; Sat, 7 Aug 2021 15:04:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37E2EE08ED; Sat, 7 Aug 2021 15:04:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EA22E08ED for ; Sat, 7 Aug 2021 15:04:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E625533BECE for ; Sat, 7 Aug 2021 15:04:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 879B77BD for ; Sat, 7 Aug 2021 15:04:12 +0000 (UTC) From: "Nick Sarnie" 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" Message-ID: <1628348638.d52e6e589ebd7b0f5abc4b700c95a99b67a32776.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.182-r1.ebuild media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuildu 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: d52e6e589ebd7b0f5abc4b700c95a99b67a32776 X-VCS-Branch: master Date: Sat, 7 Aug 2021 15:04:12 +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: 14ee8858-d8df-4bd5-a1ba-17d176d404e9 X-Archives-Hash: 34b9a02a506411cd08bde08d536063d2 commit: d52e6e589ebd7b0f5abc4b700c95a99b67a32776 Author: Nick Sarnie gentoo org> AuthorDate: Sat Aug 7 15:01:48 2021 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sat Aug 7 15:03:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52e6e58 media-libs/vulkan-layers: Make sure NDEBUG is set Closes: https://bugs.gentoo.org/796662 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Nick Sarnie gentoo.org> ...n-layers-9999.ebuild => vulkan-layers-1.2.182-r1.ebuild} | 13 +++++++++---- ...kan-layers-9999.ebuild => vulkan-layers-1.2.182.ebuildu} | 6 ++++-- media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 13 +++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild similarity index 86% copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild copy to media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild index 581d5596cdd..7e1ddb7b15e 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild @@ -4,8 +4,9 @@ EAPI=7 MY_PN=Vulkan-ValidationLayers -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9} ) +CMAKE_ECLASS="cmake-utils" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -39,6 +40,10 @@ DEPEND="${RDEPEND} ) " +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON @@ -51,5 +56,5 @@ multilib_src_configure() { -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" ) - cmake_src_configure + cmake-utils_src_configure } diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuildu similarity index 91% copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild copy to media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuildu index 581d5596cdd..4cccb1b6e68 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuildu @@ -5,7 +5,8 @@ EAPI=7 MY_PN=Vulkan-ValidationLayers CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) +CMAKE_BUILD_TYPE="Release" inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -40,6 +41,7 @@ DEPEND="${RDEPEND} " multilib_src_configure() { + CMAKE_BUILD_TYPE="Release" local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON -DBUILD_LAYER_SUPPORT_FILES=ON diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 581d5596cdd..7e1ddb7b15e 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -4,8 +4,9 @@ EAPI=7 MY_PN=Vulkan-ValidationLayers -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9} ) +CMAKE_ECLASS="cmake-utils" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -39,6 +40,10 @@ DEPEND="${RDEPEND} ) " +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON @@ -51,5 +56,5 @@ multilib_src_configure() { -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" ) - cmake_src_configure + cmake-utils_src_configure }