Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
Date: Fri, 30 Dec 2022 01:30:24
Message-Id: 1672363804.f4a4dc629b10f2bf722ae8585c04173760bbcb76.sarnex@gentoo
1 commit: f4a4dc629b10f2bf722ae8585c04173760bbcb76
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 30 01:27:59 2022 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 30 01:30:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a4dc62
7
8 media-libs/vulkan-layers: Only build shared libs
9
10 Closes: https://bugs.gentoo.org/888831
11
12 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
13
14 .../vulkan-layers-1.3.236-Build-shared-libs.patch | 26 ++++++++++++++++++++++
15 ....236.ebuild => vulkan-layers-1.3.236-r1.ebuild} | 2 ++
16 media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 ++
17 3 files changed, 30 insertions(+)
18
19 diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
20 new file mode 100644
21 index 000000000000..18cedb517b09
22 --- /dev/null
23 +++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
24 @@ -0,0 +1,26 @@
25 +diff --git a/CMakeLists.txt b/CMakeLists.txt
26 +index f29022f96..cf34d8e21 100644
27 +--- a/CMakeLists.txt
28 ++++ b/CMakeLists.txt
29 +@@ -255,7 +255,7 @@ endif()
30 + # files directly in layers.
31 +
32 + add_library(VkLayer_utils
33 +- STATIC
34 ++ SHARED
35 + layers/vk_layer_config.cpp
36 + layers/vk_layer_extension_utils.cpp
37 + layers/vk_layer_utils.cpp
38 +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
39 +index 96d52b5f8..3f75aa3a8 100644
40 +--- a/layers/CMakeLists.txt
41 ++++ b/layers/CMakeLists.txt
42 +@@ -226,7 +226,7 @@ if (NOT BUILD_LAYERS)
43 + return()
44 + endif()
45 +
46 +-add_library(VkLayer_khronos_validation MODULE)
47 ++add_library(VkLayer_khronos_validation SHARED)
48 +
49 + target_sources(VkLayer_khronos_validation PRIVATE
50 + ${CHASSIS_LIBRARY_FILES}
51
52 diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
53 similarity index 96%
54 rename from media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
55 rename to media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
56 index 4651b8594c3a..03f4800769a6 100644
57 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
58 +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
59 @@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
60 )
61 "
62
63 +PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch"
64 +
65 multilib_src_configure() {
66 local mycmakeargs=(
67 -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
68
69 diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
70 index 6496c1088d7c..7d5abc1f9f75 100644
71 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
72 +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
73 @@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
74 )
75 "
76
77 +PATCHES="${FILESDIR}/${PN}-1.3.236-Build-shared-libs.patch"
78 +
79 multilib_src_configure() {
80 local mycmakeargs=(
81 -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"