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/
Date: Wed, 27 Feb 2019 00:45:11
Message-Id: 1551228289.2723658eef767bf02cb68f3873e63aac643ed6f2.sarnex@gentoo
1 commit: 2723658eef767bf02cb68f3873e63aac643ed6f2
2 Author: Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
3 AuthorDate: Tue Feb 26 20:30:39 2019 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 27 00:44:49 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2723658e
7
8 media-libs/vulkan-layers: Install headers into /usr/include/vulkan
9
10 This is required to allow the new mesa vulkan-overlay-layer to build
11 correctly
12
13 Closes: https://github.com/gentoo/gentoo/pull/11166
14
15 Signed-off-by: Mike Lothian <mike <AT> fireburn.co.uk>
16 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
17
18 .../{vulkan-layers-1.1.82.0.ebuild => vulkan-layers-1.1.82.0-r1.ebuild} | 2 +-
19 .../{vulkan-layers-1.1.92.0.ebuild => vulkan-layers-1.1.92.0-r1.ebuild} | 2 +-
20 media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 +-
21 3 files changed, 3 insertions(+), 3 deletions(-)
22
23 diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
24 similarity index 96%
25 rename from media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
26 rename to media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
27 index da4914c98bf..c196972139d 100644
28 --- a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
29 +++ b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
30 @@ -47,7 +47,7 @@ multilib_src_configure() {
31 -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
32 -DBUILD_TESTS=False
33 -DGLSLANG_INSTALL_DIR="/usr"
34 - -DVULKAN_HEADERS_INSTALL_DIR="/usr"
35 + -DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
36 )
37 cmake-utils_src_configure
38 }
39
40 diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
41 similarity index 96%
42 rename from media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
43 rename to media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
44 index 648e31fd810..c37c62f8b84 100644
45 --- a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
46 +++ b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
47 @@ -42,7 +42,7 @@ multilib_src_configure() {
48 -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
49 -DBUILD_TESTS=False
50 -DGLSLANG_INSTALL_DIR="/usr"
51 - -DVULKAN_HEADERS_INSTALL_DIR="/usr"
52 + -DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
53 )
54 cmake-utils_src_configure
55 }
56
57 diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
58 index a01cafe630d..0797840f189 100644
59 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
60 +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
61 @@ -42,7 +42,7 @@ multilib_src_configure() {
62 -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
63 -DBUILD_TESTS=False
64 -DGLSLANG_INSTALL_DIR="/usr"
65 - -DVULKAN_HEADERS_INSTALL_DIR="/usr"
66 + -DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
67 )
68 cmake-utils_src_configure
69 }