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

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

[Patrick Nicolas]

commit:     7c38a3b29624f23ffb2fc840f3c46d73226045a4
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Mon Jun 10 11:52:48 2024 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Mon Jun 10 11:52:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c38a3b2

media-libs/opencomposite: fix LICENSE, dependencies

Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>

 media-libs/opencomposite/opencomposite-9999.ebuild | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-9999.ebuild
index 0140cc7f5..f17d70443 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-9999.ebuild
@@ -17,10 +17,15 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="GPL-3 Apache-2 MIT"
+LICENSE="GPL-3 Apache-2.0 MIT"
 SLOT="0"
 
-DEPEND=""
+DEPEND="
+	dev-lang/python
+	dev-util/vulkan-headers
+	media-libs/openxr-loader
+	virtual/opengl
+"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
@@ -38,6 +43,9 @@ src_configure()
 	# as it does for vulkan and other similar configuration files.
 	local mycmakeargs=(
 		"-DCMAKE_INSTALL_PREFIX=/opt"
+		"-DUSE_SYSTEM_OPENXR=ON"
+		# FIXME: fails because GLM_ENABLE_EXPERIMENTAL is unset
+		"-DUSE_SYSTEM_GLM=OFF"
 	)
 	cmake_src_configure
 }

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

[Patrick Nicolas]

commit:     0e0a94b9be564b2ee5577cb3ee13c22271ea11ff
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Tue Jun 11 06:46:18 2024 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Tue Jun 11 06:47:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e0a94b9

media-libs/opencomposite: update DEPEND

Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>

 media-libs/opencomposite/opencomposite-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-9999.ebuild
index f17d70443..66f558619 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-9999.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/znixian/OpenOVR.git"
 	EGIT_BRANCH="openxr"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64"
 fi
@@ -23,11 +22,10 @@ SLOT="0"
 DEPEND="
 	dev-lang/python
 	dev-util/vulkan-headers
+	media-libs/libglvnd[X]
 	media-libs/openxr-loader
-	virtual/opengl
 "
 RDEPEND="${DEPEND}"
-BDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}/0001-Add-install-target.patch"

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

[Patrick Nicolas]

commit:     faeed594b8af5551d56e62f6fce184b8c907ea43
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Wed Jun 12 12:56:09 2024 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Wed Jun 12 12:56:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=faeed594

media-libs/opencomposite: use bundled OpenXR loader

Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>

 media-libs/opencomposite/opencomposite-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-9999.ebuild
index 66f558619..f8852cca4 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-9999.ebuild
@@ -41,7 +41,8 @@ src_configure()
 	# as it does for vulkan and other similar configuration files.
 	local mycmakeargs=(
 		"-DCMAKE_INSTALL_PREFIX=/opt"
-		"-DUSE_SYSTEM_OPENXR=ON"
+		# Required for Proton: https://gitlab.com/znixian/OpenOVR/-/issues/416
+		"-DUSE_SYSTEM_OPENXR=OFF"
 		# FIXME: fails because GLM_ENABLE_EXPERIMENTAL is unset
 		"-DUSE_SYSTEM_GLM=OFF"
 	)

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

[Patrick Nicolas]

commit:     16ebc41d48220d951a6958da2d64749c00686472
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Sun Dec  8 12:02:09 2024 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Sun Dec  8 12:02:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=16ebc41d

media-libs/opencomposite: add multilib

Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>

 media-libs/opencomposite/opencomposite-9999.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-9999.ebuild
index 6fea9cf32..5af31d163 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib
 
 DESCRIPTION="OpenVR over OpenXR compatibility layer"
 HOMEPAGE="https://gitlab.com/znixian/OpenOVR"
@@ -23,12 +23,12 @@ DEPEND="
 	dev-lang/python
 	dev-util/vulkan-headers
 	media-libs/glm
-	media-libs/libglvnd[X]
-	media-libs/openxr-loader
+	media-libs/libglvnd[${MULTILIB_USEDEP},X]
+	media-libs/openxr-loader[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
-src_configure()
+multilib_src_configure()
 {
 	# Installing to /usr would not work with Steam bacause pressure vessel
 	# sandbox mounts /usr as /run/host/usr and openvr path would point to a
@@ -45,7 +45,7 @@ src_configure()
 	cmake_src_configure
 }
 
-src_install()
+multilib_src_install()
 {
 	cmake_src_install