Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-06-10 11:33:39 +00:00
6 changed files with 102 additions and 7 deletions

View File

@@ -0,0 +1,19 @@
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

View File

@@ -0,0 +1,4 @@
{
"runtime" : ["/opt/OpenComposite"],
"version" : 1
}

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patricknicolas@laposte.net</email>
<name>Patrick Nicolas</name>
</maintainer>
<upstream>
<remote-id type="gitlab">znixian/OpenOVR</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,57 @@
# Copyright 2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
DESCRIPTION="OpenVR over OpenXR compatibility layer"
HOMEPAGE="https://gitlab.com/znixian/OpenOVR"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/znixian/OpenOVR.git"
EGIT_BRANCH="openxr"
KEYWORDS=""
else
KEYWORDS="~amd64"
fi
LICENSE="GPL-3 Apache-2 MIT"
SLOT="0"
DEPEND=""
RDEPEND="${DEPEND}"
BDEPEND=""
PATCHES=(
"${FILESDIR}/0001-Add-install-target.patch"
)
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
# non-existing location.
#
# Pressure vessel would need to be fixed and patch the location
# as it does for vulkan and other similar configuration files.
local mycmakeargs=(
"-DCMAKE_INSTALL_PREFIX=/opt"
)
cmake_src_configure
}
src_install()
{
cmake_src_install
insinto /opt/OpenComposite
doins "${FILESDIR}/openvrpaths.vrpath"
}
pkg_postinst()
{
elog "For applications to use OpenComposite, symlink"
elog "~/.config/openvr/openvrpaths.vrpath to /opt/OpenComposite/openvrpaths.vrpath."
}

View File

@@ -213,3 +213,6 @@ LICENSE="MIT"
LICENSE+=" Apache-2.0 BSD MIT Unicode-DFS-2016"
SLOT="0"
KEYWORDS="~amd64"
DEPEND="dev-libs/openssl"
RDEPEND="${DEPEND}"

View File

@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake gnome2
inherit cmake gnome2 toolchain-funcs
DESCRIPTION="A newsreader for GNOME"
HOMEPAGE="https://gitlab.gnome.org/GNOME/pan/"
@@ -14,6 +14,8 @@ SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="dbus gnome-keyring libnotify spell ssl"
# currently broken due to cmake migration
RESTRICT="test"
DEPEND="
>=dev-libs/glib-2.26:2
@@ -42,6 +44,11 @@ BDEPEND="
src_prepare() {
cmake_src_prepare
# Relax linker restriction on clang. Not ideal, but it's this or block clang.
if tc-is-clang; then
append-ldflags "-Wl,--allow-shlib-undefined"
fi
}
src_configure() {
@@ -66,10 +73,4 @@ src_install() {
dolib.so "${BUILD_DIR}/pan/tasks/libtasks.so"
dolib.so "${BUILD_DIR}/pan/usenet-utils/libusenet-utils.so"
}
src_test() {
# not doing tests. Bug #933860
einfo "Skipping tests..."
}