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 6B1CB15802F for ; Wed, 29 Mar 2023 18:31:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B39122BC009; Wed, 29 Mar 2023 18:31:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87AC32BC009 for ; Wed, 29 Mar 2023 18:31:39 +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 BE44D335C3D for ; Wed, 29 Mar 2023 18:31:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21EC08E5 for ; Wed, 29 Mar 2023 18:31:37 +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: <1680114515.d0cffb70348274f15547d351e015f43cb71edcf9.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild media-libs/vulkan-layers/vulkan-layers-9999.ebuild X-VCS-Directories: media-libs/vulkan-layers/ media-libs/vulkan-layers/files/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: d0cffb70348274f15547d351e015f43cb71edcf9 X-VCS-Branch: master Date: Wed, 29 Mar 2023 18:31:37 +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: 9918f10e-2a54-49e4-93f3-49f02a728b4d X-Archives-Hash: 9d0603d40f759189b8d3a4560b5d20a8 commit: d0cffb70348274f15547d351e015f43cb71edcf9 Author: Nikita Romanyuk yahoo com> AuthorDate: Wed Mar 29 03:55:16 2023 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Wed Mar 29 18:28:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cffb70 media-libs/vulkan-layers: build utils as a static lib, then remove it Validation layers do not support being compiled as a shared library. It caused them to break, as I reported in bug #895348. vkLayer_utils.a is not required to be present in runtime, so we just delete it. Closes: https://bugs.gentoo.org/895348 Signed-off-by: Nikita Romanyuk yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/30382 Signed-off-by: Nick Sarnie gentoo.org> .../files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch | 13 +++++++++++++ ...n-layers-9999.ebuild => vulkan-layers-1.3.239-r2.ebuild} | 10 ++++++---- media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 8 +++++--- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch new file mode 100644 index 000000000000..58973fa70e0d --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch @@ -0,0 +1,13 @@ +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index 640ac8471..19caed0ed 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -158,7 +158,7 @@ else() + message(NOTICE "VulkanVL_generated_source target requires python 3") + endif() + +-add_library(VkLayer_khronos_validation MODULE) ++add_library(VkLayer_khronos_validation SHARED) + + target_sources(VkLayer_khronos_validation PRIVATE + generated/best_practices.cpp diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild similarity index 87% copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild copy to media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild index 3bdb7b185bb7..fa2ffd709370 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild @@ -24,7 +24,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="wayland X" -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-3.11.5 @@ -37,9 +37,7 @@ DEPEND="${RDEPEND} ) " -PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch -${FILESDIR}/${PN}-1.3.239-Export-symbols.patch -" +PATCHES="${FILESDIR}/${PF}-Build-shared-libs.patch" multilib_src_configure() { local mycmakeargs=( @@ -55,3 +53,7 @@ multilib_src_configure() { ) cmake_src_configure } + +multilib_src_install_all() { + find "${ED}" -type f -name \*.a -delete || die +} diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 3bdb7b185bb7..fad8788c59bc 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -37,9 +37,7 @@ DEPEND="${RDEPEND} ) " -PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch -${FILESDIR}/${PN}-1.3.239-Export-symbols.patch -" +PATCHES="${FILESDIR}/${PN}-1.3.239-r2-Build-shared-libs.patch" multilib_src_configure() { local mycmakeargs=( @@ -55,3 +53,7 @@ multilib_src_configure() { ) cmake_src_configure } + +multilib_src_install_all() { + find "${ED}" -type f -name \*.a -delete || die +}