commit: 20660b2ecfb448ae132eb331e550a96d1a2bacbd Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Thu Dec 17 04:43:47 2020 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Thu Dec 17 04:45:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20660b2e
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 <sarnex <AT> gentoo.org> .../vulkan-loader-1.2.162-Fix-pkgconfig.patch | 43 ++++++++++++++++++++++ ....162.ebuild => vulkan-loader-1.2.162-r1.ebuild} | 2 + 2 files changed, 45 insertions(+) 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 00000000000..f06f5cffdad --- /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 <[email protected]> +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 <[email protected]> +--- + 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.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild similarity index 96% rename from media-libs/vulkan-loader/vulkan-loader-1.2.162.ebuild rename to media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild index f3ce3e6251b..1fb27663e90 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.162.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild @@ -36,6 +36,8 @@ DEPEND="${PYTHON_DEPS} " 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
