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-loader/, media-libs/vulkan-loader/files/
Date: Thu, 31 May 2018 22:46:57
Message-Id: 1527806792.5a7c07e8ab6ce3fb005430154351a75a7498aa89.sarnex@gentoo
1 commit: 5a7c07e8ab6ce3fb005430154351a75a7498aa89
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 31 22:44:45 2018 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Thu May 31 22:46:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7c07e8
7
8 media-libs/vulkan-loader: Drop unnecessary patch from 9999
9
10 Fixed upstream
11
12 Package-Manager: Portage-2.3.40, Repoman-2.3.9
13
14 ...loader-9999-Do-not-install-vulkan-headers.patch | 24 ----------------------
15 media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 1 -
16 2 files changed, 25 deletions(-)
17
18 diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch
19 deleted file mode 100644
20 index b0cc73c4486..00000000000
21 --- a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch
22 +++ /dev/null
23 @@ -1,24 +0,0 @@
24 -From d3d9f1b73732d4f9d4d33bc7fa782cadbc10d80f Mon Sep 17 00:00:00 2001
25 -From: Nick Sarnie <sarnex@g.o>
26 -Date: Mon, 21 May 2018 22:34:25 -0400
27 -Subject: [PATCH] Do not install vulkan headers
28 -
29 -Signed-off-by: Nick Sarnie <sarnex@g.o>
30 ----
31 - CMakeLists.txt | 1 -
32 - 1 file changed, 1 deletion(-)
33 -
34 -diff --git a/CMakeLists.txt b/CMakeLists.txt
35 -index 627de6f70..65f5ea0d7 100644
36 ---- a/CMakeLists.txt
37 -+++ b/CMakeLists.txt
38 -@@ -170,7 +170,6 @@ if(NOT WIN32)
39 - endif()
40 - endif()
41 -
42 --install(DIRECTORY "${HEADERS_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
43 - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
44 -
45 - # uninstall target
46 ---
47 -2.17.0
48
49 diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
50 index 33afbd7d834..e265bfcef23 100644
51 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
52 +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
53 @@ -33,7 +33,6 @@ DEPEND="${PYTHON_DEPS}
54 )"
55
56 PATCHES=(
57 - "${FILESDIR}/${P}-Do-not-install-vulkan-headers.patch"
58 "${FILESDIR}/${P}-Use-usr-for-vulkan-headers.patch"
59 )