From 20660b2ecfb448ae132eb331e550a96d1a2bacbd Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Wed, 16 Dec 2020 23:43:47 -0500 Subject: media-libs/vulkan-loader: Fix pkgconfig Fixes: https://bugs.gentoo.org/760420 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Nick Sarnie --- .../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.162.ebuild | 66 --------------------- 3 files changed, 111 insertions(+), 66 deletions(-) create mode 100644 media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch create mode 100644 media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.2.162.ebuild (limited to 'media-libs') 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 new file mode 100644 index 000000000000..f06f5cffdad3 --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch @@ -0,0 +1,43 @@ +From d0cfd15c09f1581278317a5c0ece8f213ba5578f Mon Sep 17 00:00:00 2001 +From: Nick Sarnie +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 +--- + 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 new file mode 100644 index 000000000000..1fb27663e902 --- /dev/null +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 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_{6,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.162.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162.ebuild deleted file mode 100644 index f3ce3e6251b5..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.162.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 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_{6,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" -} -- cgit v1.2.3-65-gdbad