commit: af39507549a81bbb8066799edc73eb371231d2dc Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Mon Aug 18 23:52:38 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Mon Aug 18 23:53:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=af395075
media-libs/openxr-loader: bump EAPI 7->8 * Also removes obsolete blocker * Update no-op sed * Sync live ebuild Closes: https://bugs.gentoo.org/950637 Signed-off-by: David Roman <davidroman96 <AT> gmail.com> .../{openxr-loader-9999.ebuild => openxr-loader-1.1.45-r1.ebuild} | 7 +++---- media-libs/openxr-loader/openxr-loader-9999.ebuild | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/media-libs/openxr-loader/openxr-loader-9999.ebuild b/media-libs/openxr-loader/openxr-loader-1.1.45-r1.ebuild similarity index 87% copy from media-libs/openxr-loader/openxr-loader-9999.ebuild copy to media-libs/openxr-loader/openxr-loader-1.1.45-r1.ebuild index 133c2c3b59..c6e1bf5a6c 100644 --- a/media-libs/openxr-loader/openxr-loader-9999.ebuild +++ b/media-libs/openxr-loader/openxr-loader-1.1.45-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN=OpenXR-SDK inherit cmake-multilib @@ -25,12 +25,10 @@ LICENSE="Apache-2.0" IUSE="+wayland +X" REQUIRED_USE="|| ( wayland X )" -# dev-libs/jsoncpp-1.9.6: https://bugs.gentoo.org/940262 DEPEND=" media-libs/vulkan-loader[${MULTILIB_USEDEP}] media-libs/mesa[${MULTILIB_USEDEP}] dev-libs/jsoncpp:=[${MULTILIB_USEDEP}] - !=dev-libs/jsoncpp-1.9.6 wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] dev-libs/wayland-protocols @@ -46,7 +44,7 @@ RDEPEND="${DEPEND}" BDEPEND="wayland? ( dev-util/wayland-scanner )" src_prepare() { - sed -i 's;DESTINATION share/doc/openxr;DESTINATION ${CMAKE_INSTALL_DOCDIR};' CMakeLists.txt || die + sed -i 's;LICENSE_DEST share/doc/openxr;LICENSE_DEST ${CMAKE_INSTALL_DOCDIR};' CMakeLists.txt || die cmake_src_prepare } @@ -57,6 +55,7 @@ multilib_src_configure() { -DBUILD_WITH_XLIB_HEADERS=$(usex X) -DBUILD_WITH_XCB_HEADERS=$(usex X) -DBUILD_WITH_WAYLAND_HEADERS=$(usex wayland) + -DBUILD_WITH_SYSTEM_JSONCPP=YES -DPRESENTATION_BACKEND=$(usex X xlib wayland) ) diff --git a/media-libs/openxr-loader/openxr-loader-9999.ebuild b/media-libs/openxr-loader/openxr-loader-9999.ebuild index 133c2c3b59..c6e1bf5a6c 100644 --- a/media-libs/openxr-loader/openxr-loader-9999.ebuild +++ b/media-libs/openxr-loader/openxr-loader-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN=OpenXR-SDK inherit cmake-multilib @@ -25,12 +25,10 @@ LICENSE="Apache-2.0" IUSE="+wayland +X" REQUIRED_USE="|| ( wayland X )" -# dev-libs/jsoncpp-1.9.6: https://bugs.gentoo.org/940262 DEPEND=" media-libs/vulkan-loader[${MULTILIB_USEDEP}] media-libs/mesa[${MULTILIB_USEDEP}] dev-libs/jsoncpp:=[${MULTILIB_USEDEP}] - !=dev-libs/jsoncpp-1.9.6 wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] dev-libs/wayland-protocols @@ -46,7 +44,7 @@ RDEPEND="${DEPEND}" BDEPEND="wayland? ( dev-util/wayland-scanner )" src_prepare() { - sed -i 's;DESTINATION share/doc/openxr;DESTINATION ${CMAKE_INSTALL_DOCDIR};' CMakeLists.txt || die + sed -i 's;LICENSE_DEST share/doc/openxr;LICENSE_DEST ${CMAKE_INSTALL_DOCDIR};' CMakeLists.txt || die cmake_src_prepare } @@ -57,6 +55,7 @@ multilib_src_configure() { -DBUILD_WITH_XLIB_HEADERS=$(usex X) -DBUILD_WITH_XCB_HEADERS=$(usex X) -DBUILD_WITH_WAYLAND_HEADERS=$(usex wayland) + -DBUILD_WITH_SYSTEM_JSONCPP=YES -DPRESENTATION_BACKEND=$(usex X xlib wayland) )
