* [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/, app-misc/spacenavd/files/
@ 2020-04-16 20:39 Sebastian Pipping
0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2020-04-16 20:39 UTC (permalink / raw
To: gentoo-commits
commit: fdbe3e4f916c311f2639946101716b35e18fd697
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 20:35:54 2020 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 20:39:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbe3e4f
app-misc/spacenavd: Fix USE=-X and deps for 0.7.1
Closes: https://bugs.gentoo.org/717690
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
.../spacenavd/files/spacenavd-0.7.1-no-x11.patch | 36 ++++++++++++++++++++++
app-misc/spacenavd/spacenavd-0.7.1.ebuild | 11 ++++++-
2 files changed, 46 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..71b9e26cd03
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch
@@ -0,0 +1,36 @@
+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/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
index e4ff48d27d9..c36104bb835 100644
--- a/app-misc/spacenavd/spacenavd-0.7.1.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
@@ -14,9 +14,18 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="X"
-RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )"
+RDEPEND="X? (
+ x11-apps/xdpyinfo
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXi
+ )"
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"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/, app-misc/spacenavd/files/
@ 2020-12-01 14:57 Sebastian Pipping
0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2020-12-01 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 26495d73d0c146733900ff66be3031fe364ad194
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 1 14:54:57 2020 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 14:55:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26495d73
app-misc/spacenavd: 0.8
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.0, Repoman-2.3.23
app-misc/spacenavd/Manifest | 1 +
.../spacenavd/files/spacenavd-0.8-version.patch | 29 ++++++++
app-misc/spacenavd/spacenavd-0.8.ebuild | 87 ++++++++++++++++++++++
3 files changed, 117 insertions(+)
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 365f025594d..c87f44b46fc 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -1 +1,2 @@
DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
+DIST spacenavd-0.8.tar.gz 47515 BLAKE2B 5ab3432220ae44222b72b3fe18df096322031e0e2643798f494a87287e89607370cd15da919eececc714aacee1b75708a365feac5a182c901d63bdf4fa9f52c1 SHA512 8bb0dd2a95c602d23c84750e55ee649e7999bce43607cd09559f36a782780ceb15769bc0ed8e35b56f7c4b0724574830c2c06d4d8853b6f997ed8bba04441a05
diff --git a/app-misc/spacenavd/files/spacenavd-0.8-version.patch b/app-misc/spacenavd/files/spacenavd-0.8-version.patch
new file mode 100644
index 00000000000..d4113d38399
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.8-version.patch
@@ -0,0 +1,29 @@
+From 22056e975ebc0ff9e02c8ba2ffc61f65f272a567 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 1 Dec 2020 15:49:19 +0100
+Subject: [PATCH] Fix version to be 0.8
+
+---
+ configure | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index 98040a1..e39be6b 100755
+--- a/configure
++++ b/configure
+@@ -40,11 +40,7 @@ DBG=yes
+ X11=yes
+ HOTPLUG=yes
+ XINPUT=yes
+-VER=`git describe --tags 2>/dev/null`
+-
+-if [ -z "$VER" ]; then
+- VER=`git rev-parse --short HEAD`
+-fi
++VER=0.8
+
+ echo "configuring spacenavd - $VER"
+
+--
+2.27.0
+
diff --git a/app-misc/spacenavd/spacenavd-0.8.ebuild b/app-misc/spacenavd/spacenavd-0.8.ebuild
new file mode 100644
index 00000000000..242921ea9c4
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="X? (
+ x11-apps/xdpyinfo
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXi
+ )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ # https://github.com/FreeSpacenav/spacenavd/issues/29
+ "${FILESDIR}"/${P}-version.patch
+)
+
+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
+
+ # 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() {
+ 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
+ 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."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/, app-misc/spacenavd/files/
@ 2022-11-28 20:37 Sebastian Pipping
0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2022-11-28 20:37 UTC (permalink / raw
To: gentoo-commits
commit: f955153cce2b5490e510effa7b56f60bbbe3055b
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 20:27:11 2022 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 20:37:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f955153c
app-misc/spacenavd: Drop old
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
app-misc/spacenavd/Manifest | 2 -
.../spacenavd/files/spacenavd-0.7.1-no-x11.patch | 36 ---------
app-misc/spacenavd/spacenavd-0.7.1.ebuild | 86 ---------------------
app-misc/spacenavd/spacenavd-1.0-r1.ebuild | 84 ---------------------
app-misc/spacenavd/spacenavd-1.0-r2.ebuild | 88 ----------------------
app-misc/spacenavd/spacenavd-1.0.ebuild | 83 --------------------
6 files changed, 379 deletions(-)
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 94180792275c..a3619fa8ed68 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -1,4 +1,2 @@
-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.0.tar.gz 59903 BLAKE2B c6280f3b4aee86bc41df393659bcd3d9734e1eae000aab6fed5414278322db5f9d3ba01cdabf53f69f25c3ff1bfbe0a197154d15015a1ac1d98cd78fbeeed30b SHA512 a9f243adc4285a9d9200fdf622e1dab87bee908a3e3ef896533405bd497d065a578cfbf8b507cd0c25a5db349ba1c3624c98a363477ecc989594bfb6c8529fa2
DIST spacenavd-1.1.tar.gz 63642 BLAKE2B 09758883de240e291ffa5784622e79b6ecde46af0f5abcfff8e3692b3428b1aa7e64735a6bc24b84264a4682cc4db623cc38e2f874e346d76d661823b302da37 SHA512 954f6c8d429a2381cbc4ff4387e0e58be444959f1920601e07053e9068b7bdb0c70daefd03fff270560954f4b8c28e6a1b1164106867de969057909372f84168
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/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
deleted file mode 100644
index 47b74b2d0260..000000000000
--- a/app-misc/spacenavd/spacenavd-0.7.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~arm64 ppc64 x86"
-IUSE="X"
-
-RDEPEND="X? (
- x11-apps/xdpyinfo
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXi
- )"
-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"
- 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
-
- # 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() {
- 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
- 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."
-}
diff --git a/app-misc/spacenavd/spacenavd-1.0-r1.ebuild b/app-misc/spacenavd/spacenavd-1.0-r1.ebuild
deleted file mode 100644
index 34eaefe072cb..000000000000
--- a/app-misc/spacenavd/spacenavd-1.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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
-
- # 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."
-}
diff --git a/app-misc/spacenavd/spacenavd-1.0-r2.ebuild b/app-misc/spacenavd/spacenavd-1.0-r2.ebuild
deleted file mode 100644
index b389c8cc7dc5..000000000000
--- a/app-misc/spacenavd/spacenavd-1.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-
- # 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
-}
diff --git a/app-misc/spacenavd/spacenavd-1.0.ebuild b/app-misc/spacenavd/spacenavd-1.0.ebuild
deleted file mode 100644
index b7aa0b95561a..000000000000
--- a/app-misc/spacenavd/spacenavd-1.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-
- # 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() {
- 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
- 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."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/, app-misc/spacenavd/files/
@ 2024-10-26 19:35 Sebastian Pipping
0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2024-10-26 19:35 UTC (permalink / raw
To: gentoo-commits
commit: bc8c6d180f898686f92d03a2f6ba41ea4346d890
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 19:32:22 2024 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 19:32:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8c6d18
app-misc/spacenavd: Apply upstream patch for musl libc
Closes: https://bugs.gentoo.org/942292
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
app-misc/spacenavd/files/spacenavd-1.3-musl.patch | 27 +++++++
app-misc/spacenavd/spacenavd-1.3-r1.ebuild | 94 +++++++++++++++++++++++
2 files changed, 121 insertions(+)
diff --git a/app-misc/spacenavd/files/spacenavd-1.3-musl.patch b/app-misc/spacenavd/files/spacenavd-1.3-musl.patch
new file mode 100644
index 000000000000..0b6a521cf68e
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-1.3-musl.patch
@@ -0,0 +1,27 @@
+From c6f8a6bf4aa5024c0317f4bb215f828e4219d61f Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sun, 16 Jun 2024 20:10:26 +0300
+Subject: [PATCH] fix typo in conditional include stopping stdint.h from being
+ included
+
+fixes gitub issue #105
+---
+ src/proto.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/proto.h b/src/proto.h
+index a852f7f..8c983ab 100644
+--- a/src/proto.h
++++ b/src/proto.h
+@@ -3,9 +3,9 @@
+
+ #include "config.h"
+
+-#ifdef HAVE_STDINT_H_
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+-#elif defined(HAVE_INTTYPES_H_)
++#elif defined(HAVE_INTTYPES_H)
+ #include <inttypes.h>
+ #endif
+
diff --git a/app-misc/spacenavd/spacenavd-1.3-r1.ebuild b/app-misc/spacenavd/spacenavd-1.3-r1.ebuild
new file mode 100644
index 000000000000..b9aac3ac6fa1
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-1.3-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 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}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-musl.patch
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-26 19:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-01 14:57 [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/, app-misc/spacenavd/files/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2024-10-26 19:35 Sebastian Pipping
2022-11-28 20:37 Sebastian Pipping
2020-04-16 20:39 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox