Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-misc/spacenavd
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc/spacenavd')
-rw-r--r--app-misc/spacenavd/Manifest3
-rw-r--r--app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch36
-rw-r--r--app-misc/spacenavd/metadata.xml3
-rw-r--r--app-misc/spacenavd/spacenavd-0.8.ebuild2
-rw-r--r--app-misc/spacenavd/spacenavd-1.1.ebuild (renamed from app-misc/spacenavd/spacenavd-0.7.1.ebuild)20
-rw-r--r--app-misc/spacenavd/spacenavd-1.2.ebuild90
6 files changed, 107 insertions, 47 deletions
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index c87f44b46fcb..a7da0bf60c28 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -1,2 +1,3 @@
-DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
DIST spacenavd-0.8.tar.gz 47515 BLAKE2B 5ab3432220ae44222b72b3fe18df096322031e0e2643798f494a87287e89607370cd15da919eececc714aacee1b75708a365feac5a182c901d63bdf4fa9f52c1 SHA512 8bb0dd2a95c602d23c84750e55ee649e7999bce43607cd09559f36a782780ceb15769bc0ed8e35b56f7c4b0724574830c2c06d4d8853b6f997ed8bba04441a05
+DIST spacenavd-1.1.tar.gz 63642 BLAKE2B 09758883de240e291ffa5784622e79b6ecde46af0f5abcfff8e3692b3428b1aa7e64735a6bc24b84264a4682cc4db623cc38e2f874e346d76d661823b302da37 SHA512 954f6c8d429a2381cbc4ff4387e0e58be444959f1920601e07053e9068b7bdb0c70daefd03fff270560954f4b8c28e6a1b1164106867de969057909372f84168
+DIST spacenavd-1.2.tar.gz 62837 BLAKE2B 3532a2f481c6f5997e30d18939bc22c1287af6aa4ac2dacc8a6c683c497aacf648a8ddde4ca84b1e3340cf5deb922667e92eb3613ac9eaae1baed42281488508 SHA512 26c24afdfda4d8767fc3f94b3ab1da825622249b55666f516aa52251cd756c23f4104f1e22f951dae49d4779dd5b85383d8c0b50b09318eee923f2c707136834
diff --git a/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch
deleted file mode 100644
index 71b9e26cd038..000000000000
--- a/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0e7ee937e01b764a6bde28875a3bf0169dbfafa6 Mon Sep 17 00:00:00 2001
-From: John Tsiombikas <nuclear@member.fsf.org>
-Date: Sat, 8 Feb 2020 05:23:02 +0200
-Subject: [PATCH] dev.c should conditionally include proto_x11.h, only if
- USE_X11 is defined. Closes github bug #22.
-
----
- src/dev.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/dev.c b/src/dev.c
-index 2074895..8a1b315 100644
---- a/src/dev.c
-+++ b/src/dev.c
-@@ -1,6 +1,6 @@
- /*
- spacenavd - a free software replacement driver for 6dof space-mice.
--Copyright (C) 2007-2019 John Tsiombikas <nuclear@member.fsf.org>
-+Copyright (C) 2007-2020 John Tsiombikas <nuclear@member.fsf.org>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -25,7 +25,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
- #include "dev_serial.h"
- #include "event.h" /* remove pending events upon device removal */
- #include "spnavd.h"
-+
-+#ifdef USE_X11
- #include "proto_x11.h"
-+#endif
-
- static struct device *add_device(void);
- static struct device *dev_path_in_use(char const * dev_path);
---
-2.26.1
-
diff --git a/app-misc/spacenavd/metadata.xml b/app-misc/spacenavd/metadata.xml
index 009a65b6700a..f6c756f67337 100644
--- a/app-misc/spacenavd/metadata.xml
+++ b/app-misc/spacenavd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sping@gentoo.org</email>
@@ -15,6 +15,7 @@
original protocol does.
</longdescription>
<upstream>
+ <remote-id type="github">FreeSpacenav/spacenavd</remote-id>
<remote-id type="sourceforge">spacenav</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-misc/spacenavd/spacenavd-0.8.ebuild b/app-misc/spacenavd/spacenavd-0.8.ebuild
index 3db32eb95977..acd942fe9884 100644
--- a/app-misc/spacenavd/spacenavd-0.8.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
IUSE="X"
RDEPEND="X? (
diff --git a/app-misc/spacenavd/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-1.1.ebuild
index 47b74b2d0260..c228ea72bd82 100644
--- a/app-misc/spacenavd/spacenavd-0.7.1.ebuild
+++ b/app-misc/spacenavd/spacenavd-1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic linux-info systemd toolchain-funcs udev
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="X"
RDEPEND="X? (
@@ -19,13 +19,10 @@ RDEPEND="X? (
x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXi
+ x11-libs/libXtst
)"
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}"/${P}-no-x11.patch # bug 717690
-)
-
pkg_setup() {
CONFIG_CHECK="~INPUT_EVDEV"
ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
@@ -49,6 +46,8 @@ src_install() {
# Config file
insinto /etc
newins "${S}/doc/example-spnavrc" spnavrc.sample
+ newins "${S}/doc/spnavrc_smouse_ent" spnavrc-space-mouse-enterprise.sample
+ newins "${S}/doc/spnavrc_spilot" spnavrc-space-pilot.sample
# Init script
newinitd "${FILESDIR}/spnavd" spacenavd
@@ -64,6 +63,8 @@ src_install() {
}
pkg_postinst() {
+ udev_reload
+
elog "To start the Spacenav daemon system-wide by default"
elog "you should add it to the default runlevel :"
elog "\`rc-update add spacenavd default\` (for openRC)"
@@ -76,7 +77,6 @@ pkg_postinst() {
elog "\`spnavd_ctl x11 start\`"
elog
fi
- elog
elog "If you want to auto-start the daemon when you plug in"
elog "a SpaceNavigator device, activate the related udev rule :"
elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
@@ -84,3 +84,7 @@ pkg_postinst() {
ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
ewarn "if using systemd."
}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/app-misc/spacenavd/spacenavd-1.2.ebuild b/app-misc/spacenavd/spacenavd-1.2.ebuild
new file mode 100644
index 000000000000..c228ea72bd82
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-1.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RDEPEND="X? (
+ x11-apps/xdpyinfo
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXtst
+ )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ CONFIG_CHECK="~INPUT_EVDEV"
+ ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+ check_extra_config
+}
+
+src_configure() {
+ append-cflags -fcommon # bug 708648
+ econf \
+ --disable-debug \
+ --enable-hotplug \
+ --disable-opt \
+ $(use_enable X x11)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ # Config file
+ insinto /etc
+ newins "${S}/doc/example-spnavrc" spnavrc.sample
+ newins "${S}/doc/spnavrc_smouse_ent" spnavrc-space-mouse-enterprise.sample
+ newins "${S}/doc/spnavrc_spilot" spnavrc-space-pilot.sample
+
+ # Init script
+ newinitd "${FILESDIR}/spnavd" spacenavd
+ systemd_dounit "${FILESDIR}/spacenavd.service"
+
+ # Install udev rule but leave activiation to the user
+ # since Xorg may be configured to grab the device already
+ udev_newrules "${FILESDIR}"/99-space-navigator.rules-r2 99-space-navigator.rules.ignored
+
+ # Daemon
+ dobin "${S}/spacenavd"
+ use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+ udev_reload
+
+ elog "To start the Spacenav daemon system-wide by default"
+ elog "you should add it to the default runlevel :"
+ elog "\`rc-update add spacenavd default\` (for openRC)"
+ elog "\`systemctl enable spacenavd\` (for systemd)"
+ elog
+ if use X; then
+ elog "To start generating Spacenav X events by default"
+ elog "you should add this command in your user startup"
+ elog "scripts such as .gnomerc or .xinitrc :"
+ elog "\`spnavd_ctl x11 start\`"
+ elog
+ fi
+ elog "If you want to auto-start the daemon when you plug in"
+ elog "a SpaceNavigator device, activate the related udev rule :"
+ elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+ ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+ ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+ ewarn "if using systemd."
+}
+
+pkg_postrm() {
+ udev_reload
+}