From f6942cfedbd9d7e70fdf948d9e66f8e2b20c2ee5 Mon Sep 17 00:00:00 2001 From: Joe Kappus Date: Mon, 10 Jun 2024 02:28:03 -0400 Subject: [PATCH 1/3] net-nntp/pan: correct test restriction, relax clang linking Am aware of https://wiki.gentoo.org/wiki/Project:Quality_Assurance/-Wl,-z,defs_and_-Wl,--no-allow-shlib-undefined Will try to get this properly fixed soon, workaround now for clang users. Bug: https://bugs.gentoo.org/933860 Signed-off-by: Joe Kappus --- net-nntp/pan/pan-0.159-r1.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net-nntp/pan/pan-0.159-r1.ebuild b/net-nntp/pan/pan-0.159-r1.ebuild index 0e4f95094e..fc1cbd5927 100644 --- a/net-nntp/pan/pan-0.159-r1.ebuild +++ b/net-nntp/pan/pan-0.159-r1.ebuild @@ -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..." } From 38d013a41d57fe09c01dc56f793a4523c8f0a867 Mon Sep 17 00:00:00 2001 From: Remigiusz Micielski Date: Mon, 10 Jun 2024 10:36:13 +0200 Subject: [PATCH 2/3] net-news/cliflux: add missing dependency on openssl Closes: https://bugs.gentoo.org/933085 Signed-off-by: Remigiusz Micielski --- net-news/cliflux/cliflux-1.4.1.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-news/cliflux/cliflux-1.4.1.ebuild b/net-news/cliflux/cliflux-1.4.1.ebuild index 13954abd02..3ed96bd177 100644 --- a/net-news/cliflux/cliflux-1.4.1.ebuild +++ b/net-news/cliflux/cliflux-1.4.1.ebuild @@ -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}" From 2b156da89fdf2447885882a7a90dd167394dfbd6 Mon Sep 17 00:00:00 2001 From: Patrick Nicolas Date: Mon, 10 Jun 2024 10:45:54 +0200 Subject: [PATCH 3/3] media-libs/opencomposite: new package, add 9999 Signed-off-by: Patrick Nicolas --- .../files/0001-Add-install-target.patch | 19 +++++++ .../opencomposite/files/openvrpaths.vrpath | 4 ++ media-libs/opencomposite/metadata.xml | 11 ++++ .../opencomposite/opencomposite-9999.ebuild | 57 +++++++++++++++++++ 4 files changed, 91 insertions(+) create mode 100644 media-libs/opencomposite/files/0001-Add-install-target.patch create mode 100644 media-libs/opencomposite/files/openvrpaths.vrpath create mode 100644 media-libs/opencomposite/metadata.xml create mode 100644 media-libs/opencomposite/opencomposite-9999.ebuild diff --git a/media-libs/opencomposite/files/0001-Add-install-target.patch b/media-libs/opencomposite/files/0001-Add-install-target.patch new file mode 100644 index 0000000000..d4f5d7b00e --- /dev/null +++ b/media-libs/opencomposite/files/0001-Add-install-target.patch @@ -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 + diff --git a/media-libs/opencomposite/files/openvrpaths.vrpath b/media-libs/opencomposite/files/openvrpaths.vrpath new file mode 100644 index 0000000000..89991d9bf3 --- /dev/null +++ b/media-libs/opencomposite/files/openvrpaths.vrpath @@ -0,0 +1,4 @@ +{ + "runtime" : ["/opt/OpenComposite"], + "version" : 1 +} diff --git a/media-libs/opencomposite/metadata.xml b/media-libs/opencomposite/metadata.xml new file mode 100644 index 0000000000..ecba23c2d4 --- /dev/null +++ b/media-libs/opencomposite/metadata.xml @@ -0,0 +1,11 @@ + + + + + patricknicolas@laposte.net + Patrick Nicolas + + + znixian/OpenOVR + + diff --git a/media-libs/opencomposite/opencomposite-9999.ebuild b/media-libs/opencomposite/opencomposite-9999.ebuild new file mode 100644 index 0000000000..0140cc7f58 --- /dev/null +++ b/media-libs/opencomposite/opencomposite-9999.ebuild @@ -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." +}