commit: 98c281ad296c905cec6aaf1227b5bda7ebfbc6f3
Author: Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Wed Sep 18 18:43:33 2024 +0000
Commit: Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
CommitDate: Wed Sep 18 18:52:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=98c281ad
media-libs/opencomposite: drop patches, unbundle glm
Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>
.../opencomposite/files/0001-Add-install-target.patch | 19 -------------------
media-libs/opencomposite/opencomposite-9999.ebuild | 8 ++------
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/media-libs/opencomposite/files/0001-Add-install-target.patch
b/media-libs/opencomposite/files/0001-Add-install-target.patch
deleted file mode 100644
index d4f5d7b00..000000000
--- a/media-libs/opencomposite/files/0001-Add-install-target.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5956a67..3f0fda1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -528,3 +528,11 @@ set_target_properties(OCOVR PROPERTIES
- get_target_property(output_dir OCOVR LIBRARY_OUTPUT_DIRECTORY)
- add_custom_command(TARGET OCOVR
- PRE_LINK COMMAND ${CMAKE_COMMAND} -E make_directory ${output_dir})
-+
-+# Installation
-+include(GNUInstallDirs)
-+install(TARGETS OCOVR
-+ LIBRARY
-+ DESTINATION "${PROJECT_NAME}/${VRCLIENT_DIR}"
-+ COMPONENT Runtime
-+)
---
-2.45.2
-
diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild
b/media-libs/opencomposite/opencomposite-9999.ebuild
index f8852cca4..6fea9cf32 100644
--- a/media-libs/opencomposite/opencomposite-9999.ebuild
+++ b/media-libs/opencomposite/opencomposite-9999.ebuild
@@ -22,15 +22,12 @@ SLOT="0"
DEPEND="
dev-lang/python
dev-util/vulkan-headers
+ media-libs/glm
media-libs/libglvnd[X]
media-libs/openxr-loader
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/0001-Add-install-target.patch"
-)
-
src_configure()
{
# Installing to /usr would not work with Steam bacause pressure vessel
@@ -43,8 +40,7 @@ src_configure()
"-DCMAKE_INSTALL_PREFIX=/opt"
# 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"
+ "-DUSE_SYSTEM_GLM=ON"
)
cmake_src_configure
}
