From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Apr 2018 16:47:37 +0100 Subject: gentoo resync : 16.04.2018 --- media-libs/vulkan-loader/Manifest | 21 ++----- ...n-loader-1.0.54.0-remove-executable-stack.patch | 25 --------- ...nt-require-glslang-if-not-building-layers.patch | 45 +++++++++++++++ ...e-a-file-to-get-the-spirv-tools-commit-ID.patch | 42 ++++++++++++++ media-libs/vulkan-loader/metadata.xml | 1 + .../vulkan-loader/vulkan-loader-1.0.42.0.ebuild | 50 ----------------- .../vulkan-loader/vulkan-loader-1.0.42.2.ebuild | 50 ----------------- .../vulkan-loader/vulkan-loader-1.0.46.0.ebuild | 50 ----------------- .../vulkan-loader/vulkan-loader-1.0.51.0.ebuild | 50 ----------------- .../vulkan-loader/vulkan-loader-1.0.54.0.ebuild | 52 ------------------ .../vulkan-loader/vulkan-loader-1.0.61.1.ebuild | 50 ----------------- .../vulkan-loader/vulkan-loader-1.1.70.0.ebuild | 64 ++++++++++++++++++++++ media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 15 +++-- 13 files changed, 169 insertions(+), 346 deletions(-) delete mode 100644 media-libs/vulkan-loader/files/vulkan-loader-1.0.54.0-remove-executable-stack.patch create mode 100644 media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch create mode 100644 media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.0.42.0.ebuild delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.0.42.2.ebuild delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.0.51.0.ebuild delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.0.61.1.ebuild create mode 100644 media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild (limited to 'media-libs/vulkan-loader') diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index ee41d653b292..95c17f37d4bd 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,15 +1,6 @@ -AUX vulkan-loader-1.0.54.0-remove-executable-stack.patch 691 BLAKE2B 8bee7ed09784ac0528b91a3b52d99e51fd3b09be73a468276d491549987cbadc1d0a402b253055e95f3ba794e6d218f22f72c103944793606165ad32b64e15d7 SHA512 b19e8aee1bb1dcf081017d41a4ea228d98515bf403e84a3d81f9ff359014cf1aaf28a7f1d29bce3951000d49df2b260a2f4ff6c27f368ec12791dfad28a4257b -DIST vulkan-loader-1.0.42.0.tar.gz 3699030 BLAKE2B acf29a2379f37367b37f2d8278cf1b512fb016c05fb5f5ee0d5d4b9c995123310728a01d1f0e341686bc2041265a9d9f64c19be451e8e6e608b748ee4d3035af SHA512 2c35aecffc60992023184e499d036d99a3c39b3b3856341f341fc9c5b2b0c71cc49a4658634165f4d5218a7202f4c2ddfb95107ba95f2c8a9870e375cff7a15b -DIST vulkan-loader-1.0.42.2.tar.gz 3701608 BLAKE2B b6769a29c1a385ec564cdd897255a1055c583c95d9948ee8bd653606bcfb0d07dbf4abf10c3d2711059635a0d9d73edb82fda4f7aeb12107f0b2b705c809ade4 SHA512 6f591bcb69edde516cf170936e23a3f19f2f57a22b65d19683c10528ed6559501d3dae29ee1d3e820a81a5cd6e608f5710ba15f7c9bc050ea0eaceef2cf82d37 -DIST vulkan-loader-1.0.46.0.tar.gz 3732605 BLAKE2B 364f6a763d016bebb1100dc594a006da7b4a27147398ce9efdceac4ca7bc5ced235ab6bad978cfa9bca4489e6a069c145030b38354778dccbc8559babba1cbf5 SHA512 dc0728c00e017a2ed0b1e34a500a6335f6dee5dd77c7801d7d450c68c6e8c7cd5dec640be6dec1dea28941d927764a636b82a628e0260ca724163afa4152d8b6 -DIST vulkan-loader-1.0.51.0.tar.gz 3796337 BLAKE2B 9a418e6e4cfe1f19c8716788452f4ed219be14fcdadf3c5cb983d031f3a95a7f6322a94aced391711ba486274611ff5ea2ae87c2116a6c16b9aa0b2f97e10c72 SHA512 5d198fc9537c8fa3cbde19fc74f8d47595fabcb52c8db1c626fa157f171ed74ad202e086f7c9e94827c1ab682d03bae58af690c510c6705ca92db0548ee575f6 -DIST vulkan-loader-1.0.54.0.tar.gz 3842785 BLAKE2B 72b14546859f38f090554a9ff04dce91fb0764f5180ca22a3e863e992276c4c4e9a85ca946b18a0c54fed99b58a39b9c65a67c4302aa337e89a04d435a606df2 SHA512 f5478e1a7f966a2d09b97a3b47a04b4c9ccd68b88126fefcd6f97bfd0347c5a5bebf52e1cdfccc4863d22dd3b875e04cddf406e3e546eb3dc50d2ef61d85a21f -DIST vulkan-loader-1.0.61.1.tar.gz 3889453 BLAKE2B 0d5f1335e874294350e02063b11e5efb3d1f3bb69a7c970f2b6a6cbe9b78651c7810644d30b404016ed126ad63c4ab46b017c2ef033ba1c45046fd310218cd55 SHA512 e16599ca458dc1c636c80a03693edc4a24563e08768de95e7711cd7927d7cfdcd0ce14d16d938ca066bfe4ce8fe43836d2b61973bc2a7ba6ad14ab5f18166e0e -EBUILD vulkan-loader-1.0.42.0.ebuild 1277 BLAKE2B e50d6ff15c36cb302b8afe331d203c2bb05422437371546ee8949965f637901e3c1a0536191509ff45f65b76d6f34cf56a86d62c3d6b4e3a3b5e8d84b5afc7ab SHA512 0d027423b2419565ea3c3d27e76328ff44cd931ae7596b445fe509ce8f13319e1dc1b0e102f18d87d11a1795f5b8c44595d8c1ee54561c03b86a08246ed8b2d5 -EBUILD vulkan-loader-1.0.42.2.ebuild 1278 BLAKE2B 22ee349f9896e57a3fe4abdb46114000ec6e555b6daa88ebf9ff3cb933f76b3bade931006a3349322a0757fcca4812c0a225326c04c2c84173584971fb4eee7d SHA512 2fed44bc56f923aecb47ad0bdd576d1bf69bf0c764ff6d8ca54def5f39a58eafffc68bd880ffd769fe41e234633031c0675657fd56b0214812608b327664a46f -EBUILD vulkan-loader-1.0.46.0.ebuild 1277 BLAKE2B e50d6ff15c36cb302b8afe331d203c2bb05422437371546ee8949965f637901e3c1a0536191509ff45f65b76d6f34cf56a86d62c3d6b4e3a3b5e8d84b5afc7ab SHA512 0d027423b2419565ea3c3d27e76328ff44cd931ae7596b445fe509ce8f13319e1dc1b0e102f18d87d11a1795f5b8c44595d8c1ee54561c03b86a08246ed8b2d5 -EBUILD vulkan-loader-1.0.51.0.ebuild 1278 BLAKE2B 22ee349f9896e57a3fe4abdb46114000ec6e555b6daa88ebf9ff3cb933f76b3bade931006a3349322a0757fcca4812c0a225326c04c2c84173584971fb4eee7d SHA512 2fed44bc56f923aecb47ad0bdd576d1bf69bf0c764ff6d8ca54def5f39a58eafffc68bd880ffd769fe41e234633031c0675657fd56b0214812608b327664a46f -EBUILD vulkan-loader-1.0.54.0.ebuild 1340 BLAKE2B 45d4ca3d73be49bec8500a58775d5e2f42b850545a598c50a4058ac0d93ba132d38c0c58225a769aa593eeaac435757153a1be3a29de54c456d8b81dba33b859 SHA512 aab75dbf1d379074f5b856e38ec05b4dd2a8d05ccaf6a1a355c8efb58f95ec547aff6b57a1e5debd0dd6a8c22a45d606585bc68992671e53b6ba9fd2bb749180 -EBUILD vulkan-loader-1.0.61.1.ebuild 1280 BLAKE2B f24d954fddbf81b22366030b3fd7295557af6b337dfceaffca0275e63823c64daf442fdef54161dc4e89531aaff82ef649305fc1f7551b06bc221fb9285a723b SHA512 2302e7294eea97962b6943648c9caefd45ad49f6fe19dae50215ad444eb4da2059afeefb09c40d8facf23fb4bd037b822d6a20d843c3e6114dda68b56dd3216e -EBUILD vulkan-loader-9999.ebuild 1391 BLAKE2B 115450cc2c2efe654742c1f2ee0c7d8c52897a79fca17153f8cc9981cf0baed0a752581e7ed59fa97154fe8e4d111d2528b3025426677662d107d9ced180052f SHA512 90198fde245c90f95ddc4f11f40cd64207ac67cbc9ac097f1ff6b32c11c3374aee112fcbe4eadecfed1639d7ddfc819ae7be9952d548974d89663b8f8471b8c1 -MISC metadata.xml 421 BLAKE2B cf66b02385608d94378b1c5ea66886849f73efdcb86ce0584c9998308dff6f050109e9bc4fbd04da7c2df72191825fa8ba5e04adc97170fbb0420ad2fc2936a4 SHA512 800852fbb61d7e27456cfe8c31c969e89bf9de3ef82c64e6b48a972dbc1591401fd1af16f46a473af8c83a7dd76635d3c228cba44ea7c632cca57e5963de7a93 +AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918 +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 +EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681 +EBUILD vulkan-loader-9999.ebuild 1649 BLAKE2B cbd06a6d61272d7b4c5a72cd78386bc133c8789c7f0b98af3bdec194262837412398eb4bdff8441d3b05b96f5aae1fa06b62df672e2e892e6490edb8366ba408 SHA512 550bab7fd8d6de1d2c1ddf8071edfa63d69ae89e462ecf2d806ed330cd9b4f2d12708374b87557bfef9b38bd5af5f5698fb753cf74c9e7a9e7f64857491a5b8d +MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574 diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.0.54.0-remove-executable-stack.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.0.54.0-remove-executable-stack.patch deleted file mode 100644 index 36b50b91e73e..000000000000 --- a/media-libs/vulkan-loader/files/vulkan-loader-1.0.54.0-remove-executable-stack.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3152f2a5056077d3e1061ac61e3ef7888ff96dc7 Mon Sep 17 00:00:00 2001 -From: Lenny Komow -Date: Thu, 20 Jul 2017 16:07:14 -0600 -Subject: [PATCH] loader: Remove executable stack from libvulkan.so - -Change-Id: Id77d5560479cbbc6f5453a6362c5a20dd721fdd0 ---- - loader/unknown_ext_chain_gas.asm | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/loader/unknown_ext_chain_gas.asm b/loader/unknown_ext_chain_gas.asm -index e463f45be..798760bd8 100644 ---- a/loader/unknown_ext_chain_gas.asm -+++ b/loader/unknown_ext_chain_gas.asm -@@ -108,6 +108,10 @@ vkdev_ext\num: - - .endif - -+#if defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ - .data - - termin_error_string: diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch new file mode 100644 index 000000000000..3c5a30b10a00 --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch @@ -0,0 +1,45 @@ +From 4efbd5c81cfb9071757e446d57957aa81e9d9374 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Thu, 15 Mar 2018 22:25:19 +0000 +Subject: [PATCH] build: Don't require glslang if not building layers + +--- + CMakeLists.txt | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 713a9cdfd3..c9f73ce965 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -350,6 +350,10 @@ macro(run_external_revision_generate source_dir symbol_name output) + endmacro() + + # Custom target for generated vulkan helper file dependencies ++set(generate_helper_files_DEPENDS) ++if(BUILD_LAYERS) ++ LIST(APPEND generate_helper_files_DEPENDS spirv_tools_commit_id.h) ++endif() + add_custom_target(generate_helper_files DEPENDS + vk_enum_string_helper.h + vk_safe_struct.h +@@ -359,7 +363,7 @@ add_custom_target(generate_helper_files DEPENDS + vk_dispatch_table_helper.h + vk_extension_helper.h + vk_typemap_helper.h +- spirv_tools_commit_id.h ++ ${generate_helper_files_DEPENDS} + ) + set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER}) + +@@ -372,7 +376,9 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h) + run_vk_xml_generate(helper_file_generator.py vk_object_types.h) + run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) + run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) +-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) ++if(BUILD_LAYERS) ++ run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) ++endif() + + + + diff --git a/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch b/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch new file mode 100644 index 000000000000..066f126e437d --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch @@ -0,0 +1,42 @@ +From 58299a001068a28f5d5f6985c2066b7c4caa7b18 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +Date: Fri, 23 Mar 2018 20:23:54 -0400 +Subject: [PATCH] Use a file to get the spirv-tools commit ID + +Signed-off-by: Nick Sarnie +--- + CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9f73ce9..c3e200b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -349,6 +349,14 @@ macro(run_external_revision_generate source_dir symbol_name output) + ) + endmacro() + ++macro(run_external_revision_generate_spirv_tools source_dir symbol_name output) ++ add_custom_command(OUTPUT ${output} ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/spirv-tools-commit.h -s ${symbol_name} -o ${output} ++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/spirv-tools-commit.h ++ ) ++endmacro() ++ ++ + # Custom target for generated vulkan helper file dependencies + set(generate_helper_files_DEPENDS) + if(BUILD_LAYERS) +@@ -377,7 +385,7 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h) + run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) + run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) + if(BUILD_LAYERS) +- run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) ++ run_external_revision_generate_spirv_tools(/usr/include/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) + endif() + + +-- +2.16.3 + + diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml index 9e5a300d8633..5896567b6cb5 100644 --- a/media-libs/vulkan-loader/metadata.xml +++ b/media-libs/vulkan-loader/metadata.xml @@ -10,5 +10,6 @@ Build vulkan demos and vulkaninfo + Build the vulkan layers diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.42.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.42.0.ebuild deleted file mode 100644 index 56caaa6fd6ed..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.42.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.42.2.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.42.2.ebuild deleted file mode 100644 index 4ab7f86d5494..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.42.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild deleted file mode 100644 index 56caaa6fd6ed..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.51.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.51.0.ebuild deleted file mode 100644 index 4ab7f86d5494..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.51.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild deleted file mode 100644 index 6ad40bf0e05b..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -PATCHES=( "${FILESDIR}"/${P}-remove-executable-stack.patch ) - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.61.1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.61.1.ebuild deleted file mode 100644 index c4fe082f0783..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.61.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild new file mode 100644 index 000000000000..4bed360605f5 --- /dev/null +++ b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" +fi + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="demos layers wayland X" +REQUIRED_USE="demos? ( X )" + +RDEPEND="" +DEPEND="${PYTHON_DEPS} + demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) + layers? ( + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + ) + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch" + "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" + ) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_TESTS=False + -DBUILD_LAYERS=$(usex layers) + -DBUILD_DEMOS=$(usex demos) + -DBUILD_VKJSON=False + -DBUILD_LOADER=True + -DBUILD_WSI_MIR_SUPPORT=False + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + ) + cmake-utils_src_configure +} + +multilib_src_install() { + keepdir /etc/vulkan/icd.d + + cmake-utils_src_install +} diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index 67822d5a388d..b83dbcb76bcd 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,22 +20,29 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" LICENSE="Apache-2.0" SLOT="0" -IUSE="demos wayland X" +IUSE="demos layers wayland X" +REQUIRED_USE="demos? ( X )" RDEPEND="" DEPEND="${PYTHON_DEPS} demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) + layers? ( + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + ) wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] )" +PATCHES=( "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" ) + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True -DBUILD_TESTS=False - -DBUILD_LAYERS=False + -DBUILD_LAYERS=$(usex layers) -DBUILD_DEMOS=$(usex demos) -DBUILD_VKJSON=False -DBUILD_LOADER=True @@ -50,5 +57,5 @@ multilib_src_configure() { multilib_src_install() { keepdir /etc/vulkan/icd.d - default + cmake-utils_src_install } -- cgit v1.2.3