public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/opencomposite/
@ 2024-06-10 11:54 Patrick Nicolas
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick Nicolas @ 2024-06-10 11:54 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/opencomposite/
@ 2024-06-11  6:50 Patrick Nicolas
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick Nicolas @ 2024-06-11  6:50 UTC (permalink / raw
  To: gentoo-commits

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"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/opencomposite/
@ 2024-06-12 12:58 Patrick Nicolas
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick Nicolas @ 2024-06-12 12:58 UTC (permalink / raw
  To: gentoo-commits

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"
 	)


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/opencomposite/
@ 2024-12-08 12:02 Patrick Nicolas
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick Nicolas @ 2024-12-08 12:02 UTC (permalink / raw
  To: gentoo-commits

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
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/opencomposite/
@ 2025-07-01 19:27 Patrick Nicolas
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick Nicolas @ 2025-07-01 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     b537ea5a5332596ede696abd3bcff5ff686489a1
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Tue Jul  1 19:24:03 2025 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Tue Jul  1 19:27:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b537ea5a

media-libs/opencomposite: Add missing glu dependency

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

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

diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-9999.ebuild
index 5af31d163e..503616143a 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-9999.ebuild
@@ -25,6 +25,7 @@ DEPEND="
 	media-libs/glm
 	media-libs/libglvnd[${MULTILIB_USEDEP},X]
 	media-libs/openxr-loader[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/opencomposite/
@ 2025-08-19 11:49 Patrick Nicolas
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick Nicolas @ 2025-08-19 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     325620a60cce2ea821d0e0223ea970c788a424e1
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Tue Aug 19 11:48:54 2025 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Tue Aug 19 11:48:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=325620a6

media-libs/opencomposite: add 0_pre20250819

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

 media-libs/opencomposite/Manifest                         |  2 ++
 ...ite-9999.ebuild => opencomposite-0_pre20250819.ebuild} | 15 +++++++++++++++
 media-libs/opencomposite/opencomposite-9999.ebuild        | 15 +++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/media-libs/opencomposite/Manifest b/media-libs/opencomposite/Manifest
new file mode 100644
index 0000000000..dc9ff30678
--- /dev/null
+++ b/media-libs/opencomposite/Manifest
@@ -0,0 +1,2 @@
+DIST OpenXR-SDK-91a8a8d9d70f4b469bca0726122c3b5a6096010e.tar.gz 740669 BLAKE2B 0a3ae5164707de4e663b19613716dcfff4fcb242803ed50f54fa54e852dc12f753e0f7a69844f2f17516b8e976b362ff821fb9dbbd3882732ba8610836874d21 SHA512 64d8e7a3071b890836b90e87967541428a6cf50b9767584d8177cbee5e95bf97008645704cf206f15de4113b72d3ead050f6e1799235af2039fcfc1c55d16944
+DIST opencomposite-0_pre20250819.tar.bz2 1182056 BLAKE2B c728cc88175301922ba7558f141a24d8f6a6ae9c858da36bbc91d9c8f698fedd5f37771b1e88efe904ceeb34145390b20ed741e233e59f97a71ef6fc36eeeb20 SHA512 978e3a55380f9ea13c1e3a5b5501f68d54d20f233ab40f6b06866fc21d186a013fb0779f3d24d45432fa3a7cda2656b5e2fa5d8dfc8112485af5893911c32bac

diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-0_pre20250819.ebuild
similarity index 73%
copy from media-libs/opencomposite/opencomposite-9999.ebuild
copy to media-libs/opencomposite/opencomposite-0_pre20250819.ebuild
index 503616143a..e1a0afe9cc 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-0_pre20250819.ebuild
@@ -14,6 +14,13 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="openxr"
 else
 	KEYWORDS="~amd64"
+	COMMIT=cff07db75c4823afe93ed7027b03d5f7bc86f164
+	OPENXR_COMMIT=91a8a8d9d70f4b469bca0726122c3b5a6096010e
+	SRC_URI="
+		https://gitlab.com/znixian/OpenOVR/-/archive/${COMMIT}/OpenOVR-${COMMIT}.tar.bz2 -> ${P}.tar.bz2
+		https://github.com/KhronosGroup/OpenXR-SDK/archive/${OPENXR_COMMIT}.tar.gz -> OpenXR-SDK-${OPENXR_COMMIT}.tar.gz
+	"
+	S="${WORKDIR}/OpenOVR-${COMMIT}"
 fi
 
 LICENSE="GPL-3 Apache-2.0 MIT"
@@ -29,6 +36,14 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+if [[ ${PV} != 9999 ]] ; then
+src_unpack()
+{
+	default_src_unpack
+	mv --no-target-directory "${WORKDIR}/OpenXR-SDK-${OPENXR_COMMIT}" "${S}/libs/openxr-sdk"
+}
+fi
+
 multilib_src_configure()
 {
 	# Installing to /usr would not work with Steam bacause pressure vessel

diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-9999.ebuild
index 503616143a..e1a0afe9cc 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-9999.ebuild
@@ -14,6 +14,13 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="openxr"
 else
 	KEYWORDS="~amd64"
+	COMMIT=cff07db75c4823afe93ed7027b03d5f7bc86f164
+	OPENXR_COMMIT=91a8a8d9d70f4b469bca0726122c3b5a6096010e
+	SRC_URI="
+		https://gitlab.com/znixian/OpenOVR/-/archive/${COMMIT}/OpenOVR-${COMMIT}.tar.bz2 -> ${P}.tar.bz2
+		https://github.com/KhronosGroup/OpenXR-SDK/archive/${OPENXR_COMMIT}.tar.gz -> OpenXR-SDK-${OPENXR_COMMIT}.tar.gz
+	"
+	S="${WORKDIR}/OpenOVR-${COMMIT}"
 fi
 
 LICENSE="GPL-3 Apache-2.0 MIT"
@@ -29,6 +36,14 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+if [[ ${PV} != 9999 ]] ; then
+src_unpack()
+{
+	default_src_unpack
+	mv --no-target-directory "${WORKDIR}/OpenXR-SDK-${OPENXR_COMMIT}" "${S}/libs/openxr-sdk"
+}
+fi
+
 multilib_src_configure()
 {
 	# Installing to /usr would not work with Steam bacause pressure vessel


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-libs/opencomposite/
@ 2025-08-19 12:51 Patrick Nicolas
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick Nicolas @ 2025-08-19 12:51 UTC (permalink / raw
  To: gentoo-commits

commit:     65173da4b5bac7f22fca0165e28935843f954bd4
Author:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Tue Aug 19 12:35:00 2025 +0000
Commit:     Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Tue Aug 19 12:50:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=65173da4

media-libs/opencomposite: add 1.0.1521 drop 0_pre20250819

closes: https://bugs.gentoo.org/961713

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

 media-libs/opencomposite/Manifest                                    | 2 +-
 ...ncomposite-0_pre20250819.ebuild => opencomposite-1.0.1521.ebuild} | 5 ++---
 media-libs/opencomposite/opencomposite-9999.ebuild                   | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/media-libs/opencomposite/Manifest b/media-libs/opencomposite/Manifest
index dc9ff30678..b45f89d60b 100644
--- a/media-libs/opencomposite/Manifest
+++ b/media-libs/opencomposite/Manifest
@@ -1,2 +1,2 @@
 DIST OpenXR-SDK-91a8a8d9d70f4b469bca0726122c3b5a6096010e.tar.gz 740669 BLAKE2B 0a3ae5164707de4e663b19613716dcfff4fcb242803ed50f54fa54e852dc12f753e0f7a69844f2f17516b8e976b362ff821fb9dbbd3882732ba8610836874d21 SHA512 64d8e7a3071b890836b90e87967541428a6cf50b9767584d8177cbee5e95bf97008645704cf206f15de4113b72d3ead050f6e1799235af2039fcfc1c55d16944
-DIST opencomposite-0_pre20250819.tar.bz2 1182056 BLAKE2B c728cc88175301922ba7558f141a24d8f6a6ae9c858da36bbc91d9c8f698fedd5f37771b1e88efe904ceeb34145390b20ed741e233e59f97a71ef6fc36eeeb20 SHA512 978e3a55380f9ea13c1e3a5b5501f68d54d20f233ab40f6b06866fc21d186a013fb0779f3d24d45432fa3a7cda2656b5e2fa5d8dfc8112485af5893911c32bac
+DIST opencomposite-1.0.1521.tar.bz2 1174816 BLAKE2B 6f29589c215591bbcd25264bfc46ce81deb7e231ced939a46530fc1eafcdfe61cff672396d092c9363f1c7f4efb7f0a25ef0cdf3377e9aded209fe5318ac7679 SHA512 c847eba0172143bcd7a64d59472071ff3e3e7c32d7600963608c9656d3ef5b157a8ab39c04b4854b80bffba9e04bc9657448e2a597f29773a8f1e3c9c6fdbfa0

diff --git a/media-libs/opencomposite/opencomposite-0_pre20250819.ebuild b/media-libs/opencomposite/opencomposite-1.0.1521.ebuild
similarity index 90%
rename from media-libs/opencomposite/opencomposite-0_pre20250819.ebuild
rename to media-libs/opencomposite/opencomposite-1.0.1521.ebuild
index e1a0afe9cc..c28f8017b1 100644
--- a/media-libs/opencomposite/opencomposite-0_pre20250819.ebuild
+++ b/media-libs/opencomposite/opencomposite-1.0.1521.ebuild
@@ -14,13 +14,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="openxr"
 else
 	KEYWORDS="~amd64"
-	COMMIT=cff07db75c4823afe93ed7027b03d5f7bc86f164
 	OPENXR_COMMIT=91a8a8d9d70f4b469bca0726122c3b5a6096010e
 	SRC_URI="
-		https://gitlab.com/znixian/OpenOVR/-/archive/${COMMIT}/OpenOVR-${COMMIT}.tar.bz2 -> ${P}.tar.bz2
+		https://gitlab.com/znixian/OpenOVR/-/archive/${PV}/OpenOVR-${PV}.tar.bz2 -> ${P}.tar.bz2
 		https://github.com/KhronosGroup/OpenXR-SDK/archive/${OPENXR_COMMIT}.tar.gz -> OpenXR-SDK-${OPENXR_COMMIT}.tar.gz
 	"
-	S="${WORKDIR}/OpenOVR-${COMMIT}"
+	S="${WORKDIR}/OpenOVR-${PV}"
 fi
 
 LICENSE="GPL-3 Apache-2.0 MIT"

diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-9999.ebuild
index e1a0afe9cc..c28f8017b1 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-9999.ebuild
@@ -14,13 +14,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="openxr"
 else
 	KEYWORDS="~amd64"
-	COMMIT=cff07db75c4823afe93ed7027b03d5f7bc86f164
 	OPENXR_COMMIT=91a8a8d9d70f4b469bca0726122c3b5a6096010e
 	SRC_URI="
-		https://gitlab.com/znixian/OpenOVR/-/archive/${COMMIT}/OpenOVR-${COMMIT}.tar.bz2 -> ${P}.tar.bz2
+		https://gitlab.com/znixian/OpenOVR/-/archive/${PV}/OpenOVR-${PV}.tar.bz2 -> ${P}.tar.bz2
 		https://github.com/KhronosGroup/OpenXR-SDK/archive/${OPENXR_COMMIT}.tar.gz -> OpenXR-SDK-${OPENXR_COMMIT}.tar.gz
 	"
-	S="${WORKDIR}/OpenOVR-${COMMIT}"
+	S="${WORKDIR}/OpenOVR-${PV}"
 fi
 
 LICENSE="GPL-3 Apache-2.0 MIT"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2025-08-19 12:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-12 12:58 [gentoo-commits] repo/proj/guru:dev commit in: media-libs/opencomposite/ Patrick Nicolas
  -- strict thread matches above, loose matches on Subject: below --
2025-08-19 12:51 Patrick Nicolas
2025-08-19 11:49 Patrick Nicolas
2025-07-01 19:27 Patrick Nicolas
2024-12-08 12:02 Patrick Nicolas
2024-06-11  6:50 Patrick Nicolas
2024-06-10 11:54 Patrick Nicolas

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