gentoo resync : 30.05.2020

5 files changed, 76 insertions, 6 deletions

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index f4dbcc7fe462..9cfcfe52fabc 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,9 +2,10 @@ DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809
 DIST vulkan-loader-1.2.133.tar.gz 1401215 BLAKE2B 4a52e2735ed584f96f563dd23761c25169158a12488f50267375cb85dec411fed61f3ac0f090d77a650e9d055e384562d4fd644571b20e45ff0c316547b88647 SHA512 ba486cd0b20d1936a8a7e97509bdaa5e1c42f024428d6f710af80152d55f486c76db072ae44add089ff20eef21a768073904236e6d29d46dd1475d77d26f9907
 DIST vulkan-loader-1.2.135.tar.gz 1405922 BLAKE2B 02d984f758da0c57fbabf18b042da73a2e44d8990e74da9959eddabfb6190732f72ffbe91ccad9c54daf76535ad1b5d7a24244db5e6a0a32a2f1be0ca9dae683 SHA512 cd0092761fed30c830872ee7d5b923996047ac5fcd4e3ba7f5e5f02f36c31a17f93a4acf2b2a5f42e3b956a9769427730b6974f745697a2c871e1582afec7284
 DIST vulkan-loader-1.2.137.tar.gz 1407611 BLAKE2B 32762198b4a71d14c9f487c28a728067a81c8607df2174688cbe3dc575fc5655e22ff7840b516d7dc5d1eaf291d098c26d927ebfa9c80e49e702735af98bca02 SHA512 8ada45a79fed7c99bb7b35d8d2f15a69086aca30a1175469a6a2be31a418828abd16d1695ce36c0df305a6d0395e65008115a82aede8b31313edd745314b4796
+EBUILD vulkan-loader-1.1.125-r1.ebuild 1801 BLAKE2B fd54a22c96c7a4e7c300d0e1c0a550fe0efef2be29fcaf5aa2b0c4f5488ea723e628b9e155bac6c95cac219bcd7b2ef176e44a7f0b7260f687f237314fca7509 SHA512 dfdb4a2b512e61e1d4aee6290d401e5081b53311452b0e265ac659c43fc84b7b443b71a80c95473658c85ce93d6924a2f3da0d40b086eedcd4eaf54c682a88ef
 EBUILD vulkan-loader-1.1.125.ebuild 1800 BLAKE2B 16285fe9cd9fff1e3e2ff741fb6755aa383cf6519adef4fb9e9ab0ee093b3a0e73212d16c94c6e366ef34cbcaa6aa6394288b6a180a605e5998b80628129f00f SHA512 0f6f1e42cde2d1f53e32d4b217986fc1e50e8c5286d58891181392ff1b85c59f6d6556519e1b82fca00e43433b7b85054f76c8805fffd211af45acbd920e0f9c
-EBUILD vulkan-loader-1.2.133.ebuild 1698 BLAKE2B 3632bd3bf1f2068c1a56c3aa4cb624713035d991a1ecab697fa2c72d98ce9edd2fcf6c6b485f887b21f12c439c47223224016f172b0321a7e9b0f0c1ff5d3e52 SHA512 2ead18fc2b3afece6e66147f8c7b0f43c2b2ba30963d678e4a1c5d8277f7861c0cd4d27d9707c68a02b1b228c76d13f0879a242d63fb1a7ca1bcd07371cfcd05
-EBUILD vulkan-loader-1.2.135.ebuild 1700 BLAKE2B 99e462a8779ae8e88b78cdd8f0b79ea6249869c6f6a47d4d5f67658e17dcbe734b2f85ca864256715612dc658da8b1fdea62bee82f94831bba5227bc71b8c796 SHA512 71a07781d148b5eb100e5b60969f6a885147f353eb7790ffd12ae91765853d82eeda4cb6c268d63611c8f50dee72d3858a90c5e8519bd993dd2a2262e09c2d70
-EBUILD vulkan-loader-1.2.137.ebuild 1700 BLAKE2B df062c73b1bdac83fa37d69405e357b45a9d5284773e790772758234f2214b7d78c06d7109e8f951366f0ca908afee15403bc2f5afa586069a27ccfb96683b93 SHA512 17481c79255973bd98a61eb7eabf4566f7290afa4fbccde06fcc31d53349172ee32bf2c82b17829f1ab722141cd4a4eb5ce1d4e0a86311d91e50133dfae81a9f
+EBUILD vulkan-loader-1.2.133.ebuild 1697 BLAKE2B f4bf1eed24c38ce0021f600991c0ca54030ddf15be2e324c891b5c1b1f3aee3d66f5c3f6777a12af98a577f7e85da5b027cf1a02bb8b85686bd82729a897315b SHA512 ad844080c6a0d96dddabf970462248850d6c0aa4f97e0b88751fe537f8616d54e7f21619b55b0118c33103eecfafd39554bace0f2c37f539b56f01071b01637e
+EBUILD vulkan-loader-1.2.135.ebuild 1699 BLAKE2B f4ecffc6d5076ac5f2b14ab560710b64b72ad91b1f90222132cbb9caed631a30012de6969f990f8d121753e34c090558d09dd0ad860981ef144724ccbe3955c4 SHA512 f0968104aca0b72e3a12e5268518904fcf7c46c8def6549a3145becc5d76e0dbdbbb0321e2dcb47c73f27e5d7c2ab4805aab4036eeee67b1debb32f2694e7c15
+EBUILD vulkan-loader-1.2.137.ebuild 1699 BLAKE2B 17fd74e931fc376c6f10468990e647ba337fbdcd0ca7425be2b5668ae0b5ac364237abe0dcd5efa90ff859821f0dcb80a49098ada6ba7329454c44bd4920a907 SHA512 a5c8989d7365431805da588a317b5accca8f782fcb614b48c2717281ac520ba2749f627bd9a821f2346df08f943326949954fd8a21b4f14c0494127ffdca1650
 EBUILD vulkan-loader-9999.ebuild 1698 BLAKE2B 3632bd3bf1f2068c1a56c3aa4cb624713035d991a1ecab697fa2c72d98ce9edd2fcf6c6b485f887b21f12c439c47223224016f172b0321a7e9b0f0c1ff5d3e52 SHA512 2ead18fc2b3afece6e66147f8c7b0f43c2b2ba30963d678e4a1c5d8277f7861c0cd4d27d9707c68a02b1b228c76d13f0879a242d63fb1a7ca1bcd07371cfcd05
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
new file mode 100644
index 000000000000..703cf7774d17
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
+		MY_PV=v${PV}
+		MY_P=Vulkan-Loader-${PV}
+	else
+		MY_PV=${SNAPSHOT_COMMIT}
+		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
+	fi
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-funcs python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+DEPEND="${PYTHON_DEPS}
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_TESTS=False
+		-DBUILD_LOADER=True
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
index 60deb31aa071..33cdb2c53840 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
index 313f090553bb..45a674083b07 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.2.136
+	~dev-util/vulkan-headers-1.2.136
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
index d47301d0d52a..0c346926f2c6 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/vulkan-headers-1.2.137
+	~dev-util/vulkan-headers-1.2.137
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]