From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8415C158083 for ; Sat, 21 Sep 2024 21:51:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BB67E29A9; Sat, 21 Sep 2024 21:51:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 638BDE29A9 for ; Sat, 21 Sep 2024 21:51:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 213013430D0 for ; Sat, 21 Sep 2024 21:51:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 370F81869 for ; Sat, 21 Sep 2024 21:51:28 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1726955477.ada6fb671db4eef84218c5353cd8b308de2d9608.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-libs/openxr-loader/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-libs/openxr-loader/Manifest media-libs/openxr-loader/openxr-loader-1.0.31.ebuild media-libs/openxr-loader/openxr-loader-1.1.40.ebuild media-libs/openxr-loader/openxr-loader-9999.ebuild X-VCS-Directories: media-libs/openxr-loader/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: ada6fb671db4eef84218c5353cd8b308de2d9608 X-VCS-Branch: dev Date: Sat, 21 Sep 2024 21:51:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8de9c8a4-feed-4eda-9ad8-5a78c71ce893 X-Archives-Hash: 705e9b4343eb2c0e37957f9a9ed8caa2 commit: ada6fb671db4eef84218c5353cd8b308de2d9608 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Sep 21 21:50:45 2024 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Sep 21 21:51:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ada6fb67 media-libs/openxr-loader: drop 1.0.31, add 1.1.40 Closes: https://bugs.gentoo.org/887779 Closes: https://bugs.gentoo.org/932773 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> media-libs/openxr-loader/Manifest | 2 +- ...nxr-loader-1.0.31.ebuild => openxr-loader-1.1.40.ebuild} | 13 +++++++++++-- media-libs/openxr-loader/openxr-loader-9999.ebuild | 13 +++++++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/media-libs/openxr-loader/Manifest b/media-libs/openxr-loader/Manifest index 25e6cff8e..0aa0b6a29 100644 --- a/media-libs/openxr-loader/Manifest +++ b/media-libs/openxr-loader/Manifest @@ -1 +1 @@ -DIST openxr-loader-1.0.31.tar.gz 572848 BLAKE2B 60483a5f1dd90dade7dbcfe08e0b165066ba5a880fb7b661676fbd6d2bbbb1e3a2d619d26bbc55e1339652e237abe53081806c97ab373c36c1420e6f3642ffcf SHA512 6efc7596e707f95366dbcdbac9bd7d0c20735a2175b4edf56a9e8a112cf0ab8b664069fe942313164a37119032ddbf5671bc88ab5f276005dd36e4a4dabba1c7 +DIST openxr-loader-1.1.40.tar.gz 620341 BLAKE2B 75e0108c803501e3d34b7e494e08ddeffc64d311bfe28e271d23d1b9a621f86f6e296707a59edddf7ec6d0312c81cfce45a512d1c8d99448543878794298003e SHA512 1012dbb152a1b6343eb39c460d68daae87cff42ffaf15b9c4d7efc8abea77ecff45d593bdedb9767c772890022c45374b04e1167296f01c6507fd987a4c25fc2 diff --git a/media-libs/openxr-loader/openxr-loader-1.0.31.ebuild b/media-libs/openxr-loader/openxr-loader-1.1.40.ebuild similarity index 70% rename from media-libs/openxr-loader/openxr-loader-1.0.31.ebuild rename to media-libs/openxr-loader/openxr-loader-1.1.40.ebuild index 0fc7f81d5..0a7f9f419 100644 --- a/media-libs/openxr-loader/openxr-loader-1.0.31.ebuild +++ b/media-libs/openxr-loader/openxr-loader-1.1.40.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" SLOT="0" else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/${MY_PN}-release-${PV}" SLOT="0/${PV}" @@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/KhronosGroup/OpenXR-SDK" LICENSE="Apache-2.0" IUSE="+wayland +X" +REQUIRED_USE="|| ( wayland X )" DEPEND=" media-libs/vulkan-loader @@ -31,7 +32,6 @@ DEPEND=" wayland? ( dev-libs/wayland dev-libs/wayland-protocols - dev-util/wayland-scanner ) X? ( x11-libs/libxcb @@ -40,6 +40,14 @@ DEPEND=" x11-libs/libXxf86vm ) " +RDEPEND="${DEPEND}" +BDEPEND="wayland? ( dev-util/wayland-scanner )" + +src_prepare() { + sed -i 's;DESTINATION share/doc/openxr;DESTINATION ${CMAKE_INSTALL_DOCDIR};' CMakeLists.txt || die + + cmake_src_prepare +} src_configure() { local mycmakeargs=( @@ -47,6 +55,7 @@ src_configure() { -DBUILD_WITH_XLIB_HEADERS=$(usex X) -DBUILD_WITH_XCB_HEADERS=$(usex X) -DBUILD_WITH_WAYLAND_HEADERS=$(usex wayland) + -DPRESENTATION_BACKEND=$(usex X xlib wayland) ) cmake_src_configure diff --git a/media-libs/openxr-loader/openxr-loader-9999.ebuild b/media-libs/openxr-loader/openxr-loader-9999.ebuild index 0fc7f81d5..0a7f9f419 100644 --- a/media-libs/openxr-loader/openxr-loader-9999.ebuild +++ b/media-libs/openxr-loader/openxr-loader-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" SLOT="0" else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/${MY_PN}-release-${PV}" SLOT="0/${PV}" @@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/KhronosGroup/OpenXR-SDK" LICENSE="Apache-2.0" IUSE="+wayland +X" +REQUIRED_USE="|| ( wayland X )" DEPEND=" media-libs/vulkan-loader @@ -31,7 +32,6 @@ DEPEND=" wayland? ( dev-libs/wayland dev-libs/wayland-protocols - dev-util/wayland-scanner ) X? ( x11-libs/libxcb @@ -40,6 +40,14 @@ DEPEND=" x11-libs/libXxf86vm ) " +RDEPEND="${DEPEND}" +BDEPEND="wayland? ( dev-util/wayland-scanner )" + +src_prepare() { + sed -i 's;DESTINATION share/doc/openxr;DESTINATION ${CMAKE_INSTALL_DOCDIR};' CMakeLists.txt || die + + cmake_src_prepare +} src_configure() { local mycmakeargs=( @@ -47,6 +55,7 @@ src_configure() { -DBUILD_WITH_XLIB_HEADERS=$(usex X) -DBUILD_WITH_XCB_HEADERS=$(usex X) -DBUILD_WITH_WAYLAND_HEADERS=$(usex wayland) + -DPRESENTATION_BACKEND=$(usex X xlib wayland) ) cmake_src_configure