[gentoo-commits] repo/proj/guru:dev commit in: media-libs/openxr-loader/

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

From: "Haelwenn Monnier" <contact@hacktivis.me>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-libs/openxr-loader/
Date: Sat, 21 Sep 2024 21:51:28 +0000 (UTC)	[thread overview]
Message-ID: <1726955477.ada6fb671db4eef84218c5353cd8b308de2d9608.lanodan@gentoo> (raw)

commit:     ada6fb671db4eef84218c5353cd8b308de2d9608
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat Sep 21 21:50:45 2024 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> 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 <contact <AT> 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

next             reply	other threads:[~2024-09-21 21:51 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-21 21:51 Haelwenn Monnier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-20 12:40 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/openxr-loader/ Haelwenn Monnier
2025-08-18 23:54 David Roman
2025-08-18 23:54 David Roman
2025-08-18 23:54 David Roman
2025-02-17 11:40 Haelwenn Monnier
2025-02-17 11:40 Haelwenn Monnier
2024-12-08 12:01 Patrick Nicolas
2024-12-08 12:01 Patrick Nicolas
2024-09-26 15:35 Haelwenn Monnier
2024-09-24  3:42 Haelwenn Monnier
2023-11-23 18:50 Patrick Nicolas
2021-10-28 20:58 Haelwenn Monnier
2021-10-28 20:58 Haelwenn Monnier
2021-09-17  1:56 Haelwenn Monnier
2021-09-17  1:56 Haelwenn Monnier
2021-07-20 22:00 Haelwenn Monnier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:25e6cff8 dfblob:0aa0b6a2 dfblob:0fc7f81d dfblob:0a7f9f41
dfblob:0fc7f81d dfblob:0a7f9f41 )
 OR (
bs:"[gentoo-commits] repo/proj/guru:dev commit in: media-libs/openxr-loader/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1726955477.ada6fb671db4eef84218c5353cd8b308de2d9608.lanodan@gentoo \
    --to=contact@hacktivis.me \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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