[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2018-03-12 17:41 Matt Turner
  0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2018-03-12 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8bf0ace101e40ed165cb86bd0d1998da966a62bf
Author:     Nick Sarnie <commendsarnex <AT> gmail <DOT> com>
AuthorDate: Sat Nov 25 21:36:10 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 17:41:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf0ace1

media-libs/vulkan-loader: Add demos USE flag

USE=demos builds vulkaninfo and vulkan demos.

Bug: https://bugs.gentoo.org/619124
Closes: https://github.com/gentoo/gentoo/pull/6300
Signed-off-by: Nick Sarnie <commendsarnex <AT> gmail.com>

 .../vulkan-loader-9999-no-external-sources.patch   | 33 ++++++++++++++++++++++
 media-libs/vulkan-loader/metadata.xml              |  3 ++
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild |  7 +++--
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
new file mode 100644
index 00000000000..0100d1356c4
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
@@ -0,0 +1,33 @@
+From 641052deaaa6a570a6c284d5407ac1bbd60d3d53 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <commendsarnex@gmail.com>
+Date: Sun, 11 Mar 2018 11:18:25 -0400
+Subject: [PATCH] Do not require external sources to build
+
+Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
+---
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34e10dc3..5fb97b7c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -361,7 +361,6 @@ 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
+     )
+ set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER})
+ 
+@@ -376,7 +375,6 @@ 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)
+ 
+ 
+ 
+-- 
+2.16.2
+

diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml
index 1c806f32b43..9e5a300d863 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id>
 	</upstream>
+	<use>
+		<flag name="demos">Build vulkan demos and vulkaninfo</flag>
+	</use>
 </pkgmetadata>

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index c4fe082f078..cc127324a6b 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -7,6 +7,8 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
 	inherit git-r3
+
+	PATCHES=( "${FILESDIR}/${P}-no-external-sources.patch" )
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
@@ -20,10 +22,11 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="wayland X"
+IUSE="demos wayland X"
 
 RDEPEND=""
 DEPEND="${PYTHON_DEPS}
+	demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )"
 
@@ -32,7 +35,7 @@ multilib_src_configure() {
 		-DCMAKE_SKIP_RPATH=True
 		-DBUILD_TESTS=False
 		-DBUILD_LAYERS=False
-		-DBUILD_DEMOS=False
+		-DBUILD_DEMOS=$(usex demos)
 		-DBUILD_VKJSON=False
 		-DBUILD_LOADER=True
 		-DBUILD_WSI_MIR_SUPPORT=False


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2021-08-06 20:58 Matt Turner
  0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2021-08-06 20:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6d7bf944016a62322fbc97046b4b8b5b1f59c0db
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  6 20:55:59 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Aug  6 20:57:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7bf944

media-libs/vulkan-loader: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/vulkan-loader/Manifest                  |  3 -
 .../vulkan-loader-1.2.162-Fix-pkgconfig.patch      | 43 --------------
 .../vulkan-loader/vulkan-loader-1.2.162-r1.ebuild  | 68 ----------------------
 .../vulkan-loader/vulkan-loader-1.2.170.ebuild     | 66 ---------------------
 .../vulkan-loader/vulkan-loader-1.2.179.ebuild     | 65 ---------------------
 5 files changed, 245 deletions(-)

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index ae711923c85..d143d458d14 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1 @@
-DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
-DIST vulkan-loader-1.2.170.tar.gz 1422110 BLAKE2B 8903fceee3172970ee4e9c41df7c9ceb3c4d21d380061c9442cf6c3c07412e5568f7d4653591bf53128088b928d7db8050782e9a90441b66e12ba12135e5c242 SHA512 b9512c8b30b68799a6cc2905e7a5593a1c03214edae7a99fd7bc27b1761f17ef70a61f422fc318dd805ac089bbfc6cf18dfe69d1b8a91789a1774ee396058747
-DIST vulkan-loader-1.2.179.tar.gz 1430935 BLAKE2B b12fbbac071560ca0542c26cb72379104fdca1973306bf0ed0c1566a4bbc9daf22817f0e8e8389104072188705c8bf3dd6283fcfd396defe2834d2e1565e6be0 SHA512 3186f5d8f93b28a69e731da505ce4e8cd768c8935eda9e6765b834aaa137d249b5cb4c7d0fb1e1e713c3d02b3c9a71ad8554e2ea239dbd5e4def2b96331cd71d
 DIST vulkan-loader-1.2.182.tar.gz 1469024 BLAKE2B d180154bd0878c45327b1ad06a8efcc637b73fd75ad5ca349740d7f8d6944b2974828cb055a32150c4db4eb94f1b420d94852228d91e46bd8340229fa0ad30fd SHA512 06cf308caae1fd1992b279e8130b8f40bdcc7df44294c73e221d537950c689e552afeda4ae9406645b1d773693fa27c7727ab012daecbcff2793c4995c7f0db0

diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
deleted file mode 100644
index f06f5cffdad..00000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d0cfd15c09f1581278317a5c0ece8f213ba5578f Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Wed, 16 Dec 2020 23:38:00 -0500
-Subject: [PATCH] Revert "pkgconfig: Missing lib suffx on win32"
-
-This reverts commit 10c4ebadb9fc41e0abf5a32daa7263c6d1aff575.
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- loader/CMakeLists.txt | 3 ---
- loader/vulkan.pc.in   | 2 +-
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 659511855..f7b9916b2 100644
---- a/loader/CMakeLists.txt
-+++ b/loader/CMakeLists.txt
-@@ -326,9 +326,6 @@ if(PKG_CONFIG_FOUND)
-     foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
-         set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
-     endforeach()
--    if(WIN32)
--        set(LIB_SUFFIX "-1")
--    endif ()
-     configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
-     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
-diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
-index fc17cb1f3..f1588c412 100644
---- a/loader/vulkan.pc.in
-+++ b/loader/vulkan.pc.in
-@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- Name: @CMAKE_PROJECT_NAME@
- Description: Vulkan Loader
- Version: @VK_API_VERSION@
--Libs: -L${libdir} -lvulkan@LIB_SUFFIX@
-+Libs: -L${libdir} -lvulkan
- Libs.private: @PRIVATE_LIBS@
- Cflags: -I${includedir}
- 
--- 
-2.29.2
-

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
deleted file mode 100644
index ab38465a7c7..00000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-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}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-pkgconfig.patch" )
-
-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=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_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.170.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild
deleted file mode 100644
index d86459f8985..00000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-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}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${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=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_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.179.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
deleted file mode 100644
index 5eecd8d168e..00000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${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=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_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"
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2018-07-07 17:56 Nick Sarnie
  0 siblings, 0 replies; 10+ messages in thread
From: Nick Sarnie @ 2018-07-07 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     9f3d37f64f6bd0476404d702a92b035bfd75cff5
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 17:24:25 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 17:51:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3d37f6

media-libs/vulkan-loader: Backport upstream patch

Also update dep in 9999

Fixes: https://bugs.gentoo.org/658900

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 ...1.77.0-loader-Rework-include-dependencies.patch | 54 ++++++++++++++++++++++
 .../vulkan-loader/vulkan-loader-1.1.77.0.ebuild    |  4 +-
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild |  2 +-
 3 files changed, 58 insertions(+), 2 deletions(-)

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 00000000000..21fe853ce4e
--- /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 4f7ccd73988..28a5a556636 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 4f7ccd73988..0331bbbe2b6 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}]


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2018-05-31 22:46 Nick Sarnie
  0 siblings, 0 replies; 10+ messages in thread
From: Nick Sarnie @ 2018-05-31 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     5a7c07e8ab6ce3fb005430154351a75a7498aa89
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu May 31 22:44:45 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu May 31 22:46:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7c07e8

media-libs/vulkan-loader: Drop unnecessary patch from 9999

Fixed upstream

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...loader-9999-Do-not-install-vulkan-headers.patch | 24 ----------------------
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild |  1 -
 2 files changed, 25 deletions(-)

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
deleted file mode 100644
index b0cc73c4486..00000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d3d9f1b73732d4f9d4d33bc7fa782cadbc10d80f Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Mon, 21 May 2018 22:34:25 -0400
-Subject: [PATCH] Do not install vulkan headers
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 627de6f70..65f5ea0d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -170,7 +170,6 @@ if(NOT WIN32)
-     endif()
- endif()
- 
--install(DIRECTORY "${HEADERS_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
- 
- # uninstall target
--- 
-2.17.0

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 33afbd7d834..e265bfcef23 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -33,7 +33,6 @@ DEPEND="${PYTHON_DEPS}
 	)"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Do-not-install-vulkan-headers.patch"
 	"${FILESDIR}/${P}-Use-usr-for-vulkan-headers.patch"
 )
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2018-05-26 22:59 Nick Sarnie
  0 siblings, 0 replies; 10+ messages in thread
From: Nick Sarnie @ 2018-05-26 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     38d17659cf946552a99a071c7cb2fdffc0c5c681
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 22:43:30 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat May 26 22:58:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d17659

media-libs/vulkan-loader: Adapt 9999 to new packaging

Change EGIT_REPO_URI
Drop demos USE
Depend on media-libs/vulkan-layers for layers USE

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...loader-9999-Do-not-install-vulkan-headers.patch | 24 ++++++++++
 ...an-loader-9999-Use-usr-for-vulkan-headers.patch | 51 ++++++++++++++++++++++
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 30 +++++++------
 3 files changed, 91 insertions(+), 14 deletions(-)

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
new file mode 100644
index 00000000000..b0cc73c4486
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch
@@ -0,0 +1,24 @@
+From d3d9f1b73732d4f9d4d33bc7fa782cadbc10d80f Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Mon, 21 May 2018 22:34:25 -0400
+Subject: [PATCH] Do not install vulkan headers
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 627de6f70..65f5ea0d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -170,7 +170,6 @@ if(NOT WIN32)
+     endif()
+ endif()
+ 
+-install(DIRECTORY "${HEADERS_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
+ 
+ # uninstall target
+-- 
+2.17.0

diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch
new file mode 100644
index 00000000000..49dd54c83c8
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch
@@ -0,0 +1,51 @@
+From d9b3835e1ad455853e3a58ec0d2a0653e5952a21 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Mon, 26 May 2018 16:57:33 -0400
+Subject: [PATCH] Use /usr for vulkan-headers
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0b744a87..14034d33c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +68,7 @@ if(WIN32)
+ endif()
+ 
+ set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
+-set(HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
++set(HEADERS_DIR "/usr")
+ 
+ # Output warning if vulkan headers submodule contents are not present
+ if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h")
+@@ -131,8 +131,9 @@ set (PYTHON_CMD ${PYTHON_EXECUTABLE})
+ # Define macro used for building vkxml generated files
+ macro(run_vk_xml_generate dependency output)
+     add_custom_command(OUTPUT ${output}
+-    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/registry/vk.xml ${output}
+-    DEPENDS ${HEADERS_DIR}/registry/vk.xml ${HEADERS_DIR}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/registry/reg.py
++    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${output}
++    DEPENDS ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${HEADERS_DIR}/include/vulkan/registry/generator.py
++    ${SCRIPTS_DIR}/${dependency}  ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/include/vulkan/registry/reg.py
+     )
+ endmacro()
+ 
+diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
+index 0de555fae..dab543ed3 100644
+--- a/scripts/lvl_genvk.py
++++ b/scripts/lvl_genvk.py
+@@ -17,7 +17,7 @@
+ import argparse, cProfile, pdb, string, sys, time, os
+ 
+ scripts_dir = os.path.dirname(os.path.abspath(__file__))
+-registry_dir = os.path.join(scripts_dir, '../Vulkan-Headers/registry')
++registry_dir = os.path.join(scripts_dir, '/usr/include/vulkan/registry')
+ sys.path.insert(0, registry_dir)
+ 
+ from reg import *
+-- 
+2.17.0
+

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index b83dbcb76bc..ddfe098eb54 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -5,12 +5,13 @@ EAPI=6
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+	EGIT_SUBMODULES=()
 	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}"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Loader-sdk-${PV}"
 fi
 
 inherit python-any-r1 cmake-multilib
@@ -20,31 +21,27 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="demos layers wayland X"
-REQUIRED_USE="demos? ( X )"
+IUSE="layers wayland 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}]
-		)
+	dev-util/vulkan-headers
+	layers? ( media-libs/vulkan-layers:=[${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" )
+PATCHES=(
+	"${FILESDIR}/${P}-Do-not-install-vulkan-headers.patch"
+	"${FILESDIR}/${P}-Use-usr-for-vulkan-headers.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)
@@ -59,3 +56,8 @@ multilib_src_install() {
 
 	cmake-utils_src_install
 }
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the media-libs/vulkan-tools package"
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2018-04-22 23:03 Nick Sarnie
  0 siblings, 0 replies; 10+ messages in thread
From: Nick Sarnie @ 2018-04-22 23:03 UTC (permalink / raw
  To: gentoo-commits

commit:     89e57fb8b4db589e811846dd108f1076842b66bd
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 22:58:35 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 23:03:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e57fb8

media-libs/vulkan-loader: Fix the installation directory of the layers

Upstream installs them into ${prefix}/etc, but these are not configuration files. They should be in the data root directory.

This change is based on an idea from stephan wezel <s.wezel <AT> web.de>

Bug: https://bugs.gentoo.org/619124

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 ...ulkan-loader-Fix-layers-install-directory.patch | 26 ++++++++++++++++++++++
 ...999.ebuild => vulkan-loader-1.1.70.0-r1.ebuild} |  6 ++++-
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild |  5 ++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch b/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch
new file mode 100644
index 00000000000..193a8e55a46
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch
@@ -0,0 +1,26 @@
+From 4ae095d8d3e668311b3db3657af753dfb39a149c Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Sun, 22 Apr 2018 18:44:48 -0400
+Subject: [PATCH] Make the layers install into the data root directory
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ layers/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 9ade6a03..c1a3cedd 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -142,7 +142,7 @@ if(UNIX)
+                 VERBATIM
+                 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json
+                 )
+-            install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vulkan/explicit_layer.d)
++            install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vulkan/explicit_layer.d)
+         endforeach(config_file)
+     endif()
+ endif()
+-- 
+2.17.0
+

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
similarity index 88%
copy from media-libs/vulkan-loader/vulkan-loader-9999.ebuild
copy to media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
index b83dbcb76bc..980db94c32f 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
@@ -36,7 +36,11 @@ DEPEND="${PYTHON_DEPS}
 		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
 	)"
 
-PATCHES=( "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" )
+PATCHES=(
+		"${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch"
+		"${FILESDIR}/${PN}-Fix-layers-install-directory.patch"
+		"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+	)
 
 multilib_src_configure() {
 	local mycmakeargs=(

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index b83dbcb76bc..6d43117ed79 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -36,7 +36,10 @@ DEPEND="${PYTHON_DEPS}
 		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
 	)"
 
-PATCHES=( "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" )
+PATCHES=(
+		"${FILESDIR}/${PN}-Fix-layers-install-directory.patch"
+		"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+	)
 
 multilib_src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2018-04-16  0:26 Matt Turner
  0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2018-04-16  0:26 UTC (permalink / raw
  To: gentoo-commits

commit:     60e1ee0405610605c00c0640bb37d1a43b2358df
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 00:25:05 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 00:25:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60e1ee04

media-libs/vulkan-loader: Drop old versions

Intentionally dropping only stable versions.

 media-libs/vulkan-loader/Manifest                  |  6 ---
 ...n-loader-1.0.54.0-remove-executable-stack.patch | 25 -----------
 .../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 ---------------------
 8 files changed, 333 deletions(-)

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index c53ca107c93..0e4ad6f0f75 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,7 +1 @@
-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
 DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26

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 36b50b91e73..00000000000
--- 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 <lenny@lunarg.com>
-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/vulkan-loader-1.0.42.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.42.0.ebuild
deleted file mode 100644
index 56caaa6fd6e..00000000000
--- 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 4ab7f86d549..00000000000
--- 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 56caaa6fd6e..00000000000
--- 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 4ab7f86d549..00000000000
--- 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 6ad40bf0e05..00000000000
--- 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 c4fe082f078..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2018-04-14 19:50 Matt Turner
  0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2018-04-14 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     7b7094dde1494d5a38fdc6b8bdb207e8a2d8a0d3
Author:     Nick Sarnie <commendsarnex <AT> gmail <DOT> com>
AuthorDate: Sat Mar 24 01:57:37 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 19:50:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7094dd

media-libs/vulkan-loader: Add layers USE

Closes: https://bugs.gentoo.org/619124

 ...e-a-file-to-get-the-spirv-tools-commit-ID.patch | 42 ++++++++++++++++++++++
 media-libs/vulkan-loader/metadata.xml              |  1 +
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 12 +++++--
 3 files changed, 52 insertions(+), 3 deletions(-)

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 00000000000..066f126e437
--- /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 <commendsarnex@gmail.com>
+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 <commendsarnex@gmail.com>
+---
+ 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 9e5a300d863..5896567b6cb 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -10,5 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="demos">Build vulkan demos and vulkaninfo</flag>
+		<flag name="layers">Build the vulkan layers</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 67822d5a388..b3a7e0743f4 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,28 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="demos wayland X"
+IUSE="demos layers wayland 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


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2018-03-23 23:36 Matt Turner
  0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2018-03-23 23:36 UTC (permalink / raw
  To: gentoo-commits

commit:     e90994a1177a1bd1651e3a0f216319e1e80d0e66
Author:     Nick Sarnie <commendsarnex <AT> gmail <DOT> com>
AuthorDate: Wed Mar 21 23:01:33 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 23:36:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90994a1

media-libs/vulkan-loader: Remove now-unneeded patch from 9999

Not needed after upstream
https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/commit/4efbd5c81cfb9071757e446d57957aa81e9d9374
(Thanks Chewi!)

Signed-off-by: Nick Sarnie <commendsarnex <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/7544

 .../vulkan-loader-9999-no-external-sources.patch   | 33 ----------------------
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild |  2 --
 2 files changed, 35 deletions(-)

diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
deleted file mode 100644
index 0100d1356c4..00000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 641052deaaa6a570a6c284d5407ac1bbd60d3d53 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <commendsarnex@gmail.com>
-Date: Sun, 11 Mar 2018 11:18:25 -0400
-Subject: [PATCH] Do not require external sources to build
-
-Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 34e10dc3..5fb97b7c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -361,7 +361,6 @@ 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
-     )
- set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER})
- 
-@@ -376,7 +375,6 @@ 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)
- 
- 
- 
--- 
-2.16.2
-

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index bb9cb32772d..67822d5a388 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -7,8 +7,6 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
 	inherit git-r3
-
-	PATCHES=( "${FILESDIR}/${P}-no-external-sources.patch" )
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/
@ 2017-07-20 23:03 Matt Turner
  0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2017-07-20 23:03 UTC (permalink / raw
  To: gentoo-commits

commit:     45989621b436f179f3f433d32550930e60e43823
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 21:26:37 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 23:03:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45989621

media-libs/vulkan-loader: Version bump to 1.0.54.0

 media-libs/vulkan-loader/Manifest                  |  1 +
 ...n-loader-1.0.54.0-remove-executable-stack.patch | 25 ++++++++++
 .../vulkan-loader/vulkan-loader-1.0.54.0.ebuild    | 55 ++++++++++++++++++++++
 3 files changed, 81 insertions(+)

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index e64391b20e9..b07ac708606 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,3 +2,4 @@ DIST vulkan-loader-1.0.42.0.tar.gz 3699030 SHA256 305d3070f559a3f5ad332aff285a3e
 DIST vulkan-loader-1.0.42.2.tar.gz 3701608 SHA256 bc09a5e667c4a34c0a2969c8169e55bbabf9f57a76166ce43fd6e50c8e249725 SHA512 6f591bcb69edde516cf170936e23a3f19f2f57a22b65d19683c10528ed6559501d3dae29ee1d3e820a81a5cd6e608f5710ba15f7c9bc050ea0eaceef2cf82d37 WHIRLPOOL ab5b1cc3a65414c389ab216aba9bb12018969ec6559cfc381881137aa865d8cc79c06221f903f9a3db001fed75dbaea789bc7b17dacbab545ce8fa78f3e968a7
 DIST vulkan-loader-1.0.46.0.tar.gz 3732605 SHA256 439db567f03448f57d7899c4a78986669dc4d930af9699986a85bf2fc3d3acb8 SHA512 dc0728c00e017a2ed0b1e34a500a6335f6dee5dd77c7801d7d450c68c6e8c7cd5dec640be6dec1dea28941d927764a636b82a628e0260ca724163afa4152d8b6 WHIRLPOOL aa2424939b3a6c80909efd1f50d668c83aaf828ef490f13cd02391098e018e8ed33c6949ea47caaa4be0b258ba351447654c814c4bc2aa572e53ca582d7143a0
 DIST vulkan-loader-1.0.51.0.tar.gz 3796337 SHA256 20c07764e3f69d0d2158070a24faa6b8c5242af0bf8088ac538281c42c2ca119 SHA512 5d198fc9537c8fa3cbde19fc74f8d47595fabcb52c8db1c626fa157f171ed74ad202e086f7c9e94827c1ab682d03bae58af690c510c6705ca92db0548ee575f6 WHIRLPOOL ab49cc588efa97cb994d4f151c6328be385d6aaf3200547197306788823c7c908d850bbee396a5b201b79960ab1df5d341921c014032649b9b7b03081d8c8149
+DIST vulkan-loader-1.0.54.0.tar.gz 3842785 SHA256 f2556963f27309485c4d6bd9acece58d51df6a1b13699cc3a2c8d2579e6a3831 SHA512 f5478e1a7f966a2d09b97a3b47a04b4c9ccd68b88126fefcd6f97bfd0347c5a5bebf52e1cdfccc4863d22dd3b875e04cddf406e3e546eb3dc50d2ef61d85a21f WHIRLPOOL 32591f1e9b0e5d91f82dfd48fc676e51e6d3311d680efbc4e8390a6eeb0ebce82905a01eed9ae764ea432f440c9aeeb888d295366074fd57cc0e15b91ecba4a2

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
new file mode 100644
index 00000000000..36b50b91e73
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-1.0.54.0-remove-executable-stack.patch
@@ -0,0 +1,25 @@
+From 3152f2a5056077d3e1061ac61e3ef7888ff96dc7 Mon Sep 17 00:00:00 2001
+From: Lenny Komow <lenny@lunarg.com>
+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/vulkan-loader-1.0.54.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild
new file mode 100644
index 00000000000..152f97552fc
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild
@@ -0,0 +1,55 @@
+# 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}] )"
+
+src_prepare() {
+	default
+	eapply "${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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-08-06 20:58 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-12 17:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2021-08-06 20:58 Matt Turner
2018-07-07 17:56 Nick Sarnie
2018-05-31 22:46 Nick Sarnie
2018-05-26 22:59 Nick Sarnie
2018-04-22 23:03 Nick Sarnie
2018-04-16  0:26 Matt Turner
2018-04-14 19:50 Matt Turner
2018-03-23 23:36 Matt Turner
2017-07-20 23:03 Matt Turner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox