diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:52:04 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:52:04 +0100 |
| commit | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /media-libs/vulkan-loader | |
| parent | 6612a728ea11526a849618ec515ad57131d64416 (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'media-libs/vulkan-loader')
4 files changed, 61 insertions, 4 deletions
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index 9ca81c798a52..519e56f451d6 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,9 +1,10 @@ AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918 +AUX vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch 2018 BLAKE2B 354a11d423eabf14ce340117adee3e61e9402997b1894e35661e9c5ef88e85dbe97d65579304359e8484302c69e1bbf0bef22bd98f50ffa74ce1fe6c0355f51e SHA512 91045102cd2b53f2469748b398667d27a23d0a8c56f2a82e454a5634b3a05152af370797eae1153317ec9cf0c854dc9c7547265adf162be2e51f6134fbfa7c58 AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297 DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26 DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48 EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1785 BLAKE2B b14e7913fb9590f0d4aff705ddd0e70120be563b7e37a33418807b58c99fbf2aef17598a60bb1a3d5b6155c797a69065cf34e42035ed34093d9f66d303c82d7b SHA512 3be5109ba59fa832a27b159354a07a115811f45949c74fde265c8753a3fdaa61ded474584fedd62b5c28e859b39796be1fa3e8021ca3e95b6800747596ddfbf0 -EBUILD vulkan-loader-1.1.77.0.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510 -EBUILD vulkan-loader-9999.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510 +EBUILD vulkan-loader-1.1.77.0.ebuild 1673 BLAKE2B df999944df1c2192ad1d523e4c1d5273333818ce12efabf5f4ed18c4e48ebc0c7c538e0708b6fea13b5fc95e7f5fb8c586737a645113049e083cf15606884965 SHA512 375e9482d951f3866ca079a7e4a5205ac71fbf3519a91a21b84dd749abea8a6e6b2441b0d0bccbc14f21e3d786aa0ddc6ffc383f63be2054e25e93847b6a4f78 +EBUILD vulkan-loader-9999.ebuild 1582 BLAKE2B 66c19b3c7d53aeb752606921a61504a4298d6d714c36b27d809aadda683552fd19ab7640578b0a62466dc50651e4f0fea205587d81bfb99e2d0e5e5f3ad13624 SHA512 ac1ee088a9887eb45b8d26106b0e55cf84d14260dc251ba84e1f05be22320745207b2ae1cf32107e99a9d9d2ea86a324a4b636af5e9a28b0190429c56705bf30 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574 diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch new file mode 100644 index 000000000000..21fe853ce4e1 --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch @@ -0,0 +1,54 @@ +From 700483f5d92de01c1c8f413f8a4172d96684e93e Mon Sep 17 00:00:00 2001 +From: Lenny Komow <lenny@lunarg.com> +Date: Mon, 25 Jun 2018 14:09:51 -0600 +Subject: [PATCH] loader: Rework include dependencies + +This change removes the assumption that vk_layer.h will include +vk_layer_dispatch_table.h, since it will be removed from vk_layer.h +in the near future. + +Change-Id: I3fed5efbc35781c96aa9d0977d046c8555e04a7c +--- + CMakeLists.txt | 2 -- + loader/loader.h | 1 + + scripts/dispatch_table_helper_generator.py | 1 + + 3 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b942bd47c..64f498945 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -201,8 +201,6 @@ if(NOT WIN32) + endif() + endif() + +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan") +- + # uninstall target + if(NOT TARGET uninstall) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" +diff --git a/loader/loader.h b/loader/loader.h +index 0af2abf27..c39c5385e 100644 +--- a/loader/loader.h ++++ b/loader/loader.h +@@ -34,6 +34,7 @@ + #include <vulkan/vk_layer.h> + #include <vulkan/vk_icd.h> + #include <assert.h> ++#include "vk_layer_dispatch_table.h" + #include "vk_loader_extensions.h" + + #if defined(__GNUC__) && __GNUC__ >= 4 +diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py +index fba25e55e..1e2412c0c 100644 +--- a/scripts/dispatch_table_helper_generator.py ++++ b/scripts/dispatch_table_helper_generator.py +@@ -113,6 +113,7 @@ def beginFile(self, genOpts): + preamble += '#include <vulkan/vulkan.h>\n' + preamble += '#include <vulkan/vk_layer.h>\n' + preamble += '#include <string.h>\n' ++ preamble += '#include "vk_layer_dispatch_table.h"\n' + + write(copyright, file=self.outFile) + write(preamble, file=self.outFile) + diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild index 4f7ccd73988b..28a5a5566365 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild @@ -26,13 +26,15 @@ IUSE="layers wayland X" PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" DEPEND="${PYTHON_DEPS} - dev-util/vulkan-headers + >=dev-util/vulkan-headers-1.1.77.0-r1 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] )" +PATCHES=( "${FILESDIR}"/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch ) + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index 4f7ccd73988b..0331bbbe2b69 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -26,7 +26,7 @@ IUSE="layers wayland X" PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" DEPEND="${PYTHON_DEPS} - dev-util/vulkan-headers + >=dev-util/vulkan-headers-1.1.77.0-r1 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] |