[gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/files/, app-misc/spacenavd/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/files/, app-misc/spacenavd/
@ 2017-01-15 19:04 Sebastian Pipping
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2017-01-15 19:04 UTC (permalink / raw
  To: gentoo-commits

commit:     5fde9275e116ece5840b40688878ec7a588ea2ae
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 18:50:14 2017 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 19:04:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fde9275

app-misc/spacenavd: 0.6 (bug #605508)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-misc/spacenavd/Manifest                        |  1 +
 .../spacenavd/files/99-space-navigator.rules-r2    |  7 ++
 app-misc/spacenavd/spacenavd-0.6.ebuild            | 79 ++++++++++++++++++++++
 3 files changed, 87 insertions(+)

diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index f3abd1d..01cc793 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -1 +1,2 @@
 DIST spacenavd-0.5.tar.gz 41746 SHA256 0eecc5b5ad47ee6376d1521f2bc7c8f8fc02904cf3fede3f77e59f4795b592e3 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2 WHIRLPOOL e2cf70c7e9cc4b8e32b15ab79dae565c8c2a4bc32a6485a0a1857ea4d4667859ac0bb82e32cd54b722d51c34b9ea094fe8bcb1459a9f60077bde8a01207ab910
+DIST spacenavd-0.6.tar.gz 54730 SHA256 c2d203bf96c5a959590146a43fe5d6e5e8c5c38a8b2f55aa199d967d0d88d0ab SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200 WHIRLPOOL 2f7ff91302c9970d54c7983e7e3ee75d2254d2a8640d701e1449f9a31dfab0937c811491acfdf15356ebfe4914462468031090954c28ffab59a30068a60f19cf

diff --git a/app-misc/spacenavd/files/99-space-navigator.rules-r2 b/app-misc/spacenavd/files/99-space-navigator.rules-r2
new file mode 100644
index 00000000..cd50131
--- /dev/null
+++ b/app-misc/spacenavd/files/99-space-navigator.rules-r2
@@ -0,0 +1,7 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+# $Id$
+
+# Start daemon on insertion of a SpaceNavigator device
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space*", RUN+="/etc/init.d/spacenavd --quiet start"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="spacenavd.service"

diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
new file mode 100644
index 00000000..72aad34
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit 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="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xdpyinfo )"
+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() {
+	econf \
+		--disable-debug \
+		--enable-hotplug \
+		--disable-opt \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		add_cflags="${CFLAGS}" \
+		add_ldflags="${LDFLAGS}"
+}
+
+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/files/, app-misc/spacenavd/
@ 2020-01-31 23:43 Sebastian Pipping
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2020-01-31 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     d59da78d876aba0d7c867ed2083c51489ad80908
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 23:36:57 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 23:42:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59da78d

app-misc/spacenavd: Support GCC 10

Closes: https://bugs.gentoo.org/706966
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch | 24 ++++++++++++++++++++++
 app-misc/spacenavd/spacenavd-0.7.ebuild            |  4 ++++
 2 files changed, 28 insertions(+)

diff --git a/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch b/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch
new file mode 100644
index 00000000000..485aa6c5933
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch
@@ -0,0 +1,24 @@
+From 081182f1675bb69eec58d92698f1ba2f23466d3f Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sat, 1 Feb 2020 01:19:14 +0200
+Subject: [PATCH] GCC 10 changes the default from -fcommon to -fno-common, so
+ we need to set it explicitly now. Closes github bug #17.
+
+---
+ Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9eba102..abf62c9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,7 +7,8 @@ ctl = spnavd_ctl
+ 
+ CC = gcc
+ INSTALL = install
+-CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src -I/usr/local/include $(add_cflags)
++CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -fcommon \
++		 -I$(srcdir)/src -I/usr/local/include $(add_cflags)
+ LDFLAGS = -L/usr/local/lib $(xlib) $(add_ldflags)
+ 
+ $(bin): $(obj)

diff --git a/app-misc/spacenavd/spacenavd-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
index 05eb105d316..6a4e1d73add 100644
--- a/app-misc/spacenavd/spacenavd-0.7.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.ebuild
@@ -17,6 +17,10 @@ IUSE="X"
 RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc10.patch
+)
+
 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/files/, app-misc/spacenavd/
@ 2020-02-01 20:52 Sebastian Pipping
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2020-02-01 20:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d9784cad7cb1f6d63e15238c371b5aac9317a008
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 20:51:49 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 20:51:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9784cad

app-misc/spacenavd: Fix USE=-X for 0.7

Closes: https://bugs.gentoo.org/707732
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 .../spacenavd/files/spacenavd-0.7-no-x11.patch     | 24 ++++++++++++++++++++++
 app-misc/spacenavd/spacenavd-0.7.ebuild            |  1 +
 2 files changed, 25 insertions(+)

diff --git a/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
new file mode 100644
index 00000000000..8dbdb7df315
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
@@ -0,0 +1,24 @@
+From 3168b1dedf88c9026683ed43ea337814003d6802 Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sat, 1 Feb 2020 22:08:43 +0200
+Subject: [PATCH] add a USE_X11 ifdef around the call to drop_xinput in
+ src/dev.c to fix non-X11 build. This should fix github issue #19.
+
+---
+ src/dev.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/dev.c b/src/dev.c
+index 8b72932..2074895 100644
+--- a/src/dev.c
++++ b/src/dev.c
+@@ -88,7 +88,9 @@ int init_devices(void)
+ 		return -1;
+ 	}
+ 
++#ifdef USE_X11
+ 	drop_xinput();
++#endif
+ 	return 0;
+ }
+ 

diff --git a/app-misc/spacenavd/spacenavd-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
index 6a4e1d73add..4c5a57fdbfa 100644
--- a/app-misc/spacenavd/spacenavd-0.7.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.ebuild
@@ -19,6 +19,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-no-x11.patch
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/files/, app-misc/spacenavd/
@ 2020-05-22 16:46 Sebastian Pipping
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2020-05-22 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     f5219bca506396248dc876122340a83c7660083f
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 16:44:58 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri May 22 16:44:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5219bca

app-misc/spacenavd: Drop old

Bug: https://bugs.gentoo.org/724022
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22

 app-misc/spacenavd/Manifest                        |  3 -
 app-misc/spacenavd/files/99-space-navigator.rules  |  5 --
 .../spacenavd/files/99-space-navigator.rules-r1    |  6 --
 .../files/spacenavd-0.5-custom-flags.patch         | 67 -----------------
 .../spacenavd/files/spacenavd-0.5-destdir.patch    | 16 -----
 .../spacenavd/files/spacenavd-0.5-no-x11.patch     | 13 ----
 app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch | 24 -------
 .../spacenavd/files/spacenavd-0.7-no-x11.patch     | 24 -------
 app-misc/spacenavd/spacenavd-0.5-r5.ebuild         | 81 ---------------------
 app-misc/spacenavd/spacenavd-0.5-r6.ebuild         | 80 ---------------------
 app-misc/spacenavd/spacenavd-0.6.ebuild            | 84 ----------------------
 app-misc/spacenavd/spacenavd-0.7.ebuild            | 84 ----------------------
 12 files changed, 487 deletions(-)

diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 7629ef99799..365f025594d 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -1,4 +1 @@
-DIST spacenavd-0.5.tar.gz 41746 BLAKE2B bd97cb9ad1ce684cbe0f39e03db0fe0a9cead9aa4a8142546632397fa923fc1067e2d33ea0270625b5bb06bc784c75f0e9ae49cfba7194d23537a7427abe1e68 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
-DIST spacenavd-0.6.tar.gz 54730 BLAKE2B 5d158ebb190359c6e6c2a20093f824f176e028c0d375ab4aadc635f7b26884df2ae58585e82dc3978892d04d139cc6c4704fedc300508f9314478f19d4ee11b6 SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200
 DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
-DIST spacenavd-0.7.tar.gz 55634 BLAKE2B a4257bc48e4b7973413cfc74fb4157cc93d27dd8e4c45142bfa0d8b30b94e517cff1e003c9b7216b498539a529bcfe623a5dfec48644a34c1bd300eb07d297a7 SHA512 241ed0ecf78fe683ae1ccda1e69afcee82f6ad55439516a5e02d3ff7eea1a4c5903e778e41f3e0d8b6f5dcbb8fec572a52e0be108a081bccb5a279af2277b615

diff --git a/app-misc/spacenavd/files/99-space-navigator.rules b/app-misc/spacenavd/files/99-space-navigator.rules
deleted file mode 100644
index ef2640e6571..00000000000
--- a/app-misc/spacenavd/files/99-space-navigator.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
-
-# Start daemon on insertion of a SpaceNavigator device
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space Navigator", RUN+="/etc/init.d/spacenavd --quiet start"

diff --git a/app-misc/spacenavd/files/99-space-navigator.rules-r1 b/app-misc/spacenavd/files/99-space-navigator.rules-r1
deleted file mode 100644
index fa5dc93fcca..00000000000
--- a/app-misc/spacenavd/files/99-space-navigator.rules-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
-
-# Start daemon on insertion of a SpaceNavigator device
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space Navigator", RUN+="/etc/init.d/spacenavd --quiet start"
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="SpaceNavigator", TAG+="systemd", ENV{SYSTEMD_WANTS}+="spacenavd.service"

diff --git a/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch b/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch
deleted file mode 100644
index 3b834a43952..00000000000
--- a/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in
---- spacenavd-0.5.orig/Makefile.in	2012-01-31 22:22:20.460368687 +0100
-+++ spacenavd-0.5/Makefile.in	2012-01-31 22:23:18.170367675 +0100
-@@ -6,8 +6,8 @@ ctl = spnavd_ctl
- 
- CC = gcc
- INSTALL = install
--CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src
--LDFLAGS = $(xlib)
-+CFLAGS = $(opt) -fno-strict-aliasing -I$(srcdir)/src
-+LDFLAGS = $(ldopt) $(xlib)
- 
- $(bin): $(obj)
- 	$(CC) -o $@ $(obj) $(LDFLAGS)
-diff -Npur spacenavd-0.5.orig/configure spacenavd-0.5/configure
---- spacenavd-0.5.orig/configure	2012-01-31 22:22:20.460368687 +0100
-+++ spacenavd-0.5/configure	2012-01-31 22:22:49.257368187 +0100
-@@ -28,6 +28,7 @@ test_kver() {
- 
- PREFIX=/usr/local
- OPT=yes
-+LDOPT=yes
- DBG=yes
- X11=yes
- HOTPLUG=yes
-@@ -70,6 +71,11 @@ for arg; do
- 	--disable-opt)
- 		OPT=no;;
- 
-+	--enable-ldopt)
-+		LDOPT=yes;;
-+	--disable-ldopt)
-+		LDOPT=no;;
-+
- 	--enable-debug)
- 		DBG=yes;;
- 	--disable-debug)
-@@ -95,6 +101,8 @@ for arg; do
- 		echo '  --disable-hotplug: disable hotplug, fallback to polling for the device'
- 		echo '  --enable-opt: enable speed optimizations (default)'
- 		echo '  --disable-opt: disable speed optimizations'
-+		echo '  --enable-ldopt: enable link optimizations (default)'
-+		echo '  --disable-ldopt: disable link optimizations'
- 		echo '  --enable-debug: include debugging symbols (default)'
- 		echo '  --disable-debug: do not include debugging symbols'
- 		echo 'all invalid options are silently ignored'
-@@ -105,6 +113,7 @@ done
- 
- echo "  prefix: $PREFIX"
- echo "  optimize for speed: $OPT"
-+echo "  optimize link: $LDOPT"
- echo "  include debugging symbols: $DBG"
- echo "  x11 communication method: $X11"
- echo "  use hotplug: $HOTPLUG"
-@@ -128,7 +137,11 @@ if [ "$DBG" = 'yes' ]; then
- fi
- 
- if [ "$OPT" = 'yes' ]; then
--	echo 'opt = -O3' >>Makefile
-+	echo "opt = ${CFLAGS:--O3}" >>Makefile
-+fi
-+
-+if [ "$LDOPT" = 'yes' ]; then
-+	echo "ldopt = ${LDFLAGS}" >>Makefile
- fi
- 
- if [ "$X11" = 'yes' ]; then

diff --git a/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch b/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch
deleted file mode 100644
index 5b2372242e1..00000000000
--- a/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in
---- spacenavd-0.5.orig/Makefile.in	2011-11-16 21:43:53.210859753 +0100
-+++ spacenavd-0.5/Makefile.in	2011-11-16 21:45:36.386857932 +0100
-@@ -24,9 +24,9 @@ clean:
- 
- .PHONY: install
- install: $(bin)
--	$(INSTALL) -d $(PREFIX)/bin
--	$(INSTALL) -m 755 $(bin) $(PREFIX)/bin/$(bin)
--	$(INSTALL) -m 755 $(srcdir)/$(ctl) $(PREFIX)/bin/$(ctl)
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
-+	$(INSTALL) -m 755 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
-+	$(INSTALL) -m 755 $(srcdir)/$(ctl) $(DESTDIR)$(PREFIX)/bin/$(ctl)
- 	cd $(srcdir) && ./setup_init --no-install
- 
- #	[ -d /etc/hal/fdi/policy ] && \

diff --git a/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
deleted file mode 100644
index bbdd7d6196e..00000000000
--- a/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Npur spacenavd-0.5.old/src/event.c spacenavd-0.5/src/event.c
---- src/event.c	2012-03-21 22:15:37.093401293 +0100
-+++ src/event.c	2012-03-21 22:14:10.734401301 +0100
-@@ -20,7 +20,9 @@ along with this program.  If not, see <h
- #include <stdlib.h>
- #include "event.h"
- #include "client.h"
-+#ifdef USE_X11
- #include "proto_x11.h"
-+#endif
- #include "proto_unix.h"
- #include "spnavd.h"
- 

diff --git a/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch b/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch
deleted file mode 100644
index 485aa6c5933..00000000000
--- a/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 081182f1675bb69eec58d92698f1ba2f23466d3f Mon Sep 17 00:00:00 2001
-From: John Tsiombikas <nuclear@member.fsf.org>
-Date: Sat, 1 Feb 2020 01:19:14 +0200
-Subject: [PATCH] GCC 10 changes the default from -fcommon to -fno-common, so
- we need to set it explicitly now. Closes github bug #17.
-
----
- Makefile.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 9eba102..abf62c9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,7 +7,8 @@ ctl = spnavd_ctl
- 
- CC = gcc
- INSTALL = install
--CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src -I/usr/local/include $(add_cflags)
-+CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -fcommon \
-+		 -I$(srcdir)/src -I/usr/local/include $(add_cflags)
- LDFLAGS = -L/usr/local/lib $(xlib) $(add_ldflags)
- 
- $(bin): $(obj)

diff --git a/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
deleted file mode 100644
index 8dbdb7df315..00000000000
--- a/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3168b1dedf88c9026683ed43ea337814003d6802 Mon Sep 17 00:00:00 2001
-From: John Tsiombikas <nuclear@member.fsf.org>
-Date: Sat, 1 Feb 2020 22:08:43 +0200
-Subject: [PATCH] add a USE_X11 ifdef around the call to drop_xinput in
- src/dev.c to fix non-X11 build. This should fix github issue #19.
-
----
- src/dev.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/dev.c b/src/dev.c
-index 8b72932..2074895 100644
---- a/src/dev.c
-+++ b/src/dev.c
-@@ -88,7 +88,9 @@ int init_devices(void)
- 		return -1;
- 	}
- 
-+#ifdef USE_X11
- 	drop_xinput();
-+#endif
- 	return 0;
- }
- 

diff --git a/app-misc/spacenavd/spacenavd-0.5-r5.ebuild b/app-misc/spacenavd/spacenavd-0.5-r5.ebuild
deleted file mode 100644
index e586369f045..00000000000
--- a/app-misc/spacenavd/spacenavd-0.5-r5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils 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="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xdpyinfo )"
-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_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
-	epatch "${FILESDIR}"/${P}-custom-flags.patch
-	epatch "${FILESDIR}"/${P}-no-x11.patch
-}
-
-src_configure() {
-	econf \
-		--enable-opt --enable-ldopt \
-		$(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
-	insinto "$(get_udevdir)"
-	newins "${FILESDIR}"/99-space-navigator.rules-r1 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-0.5-r6.ebuild b/app-misc/spacenavd/spacenavd-0.5-r6.ebuild
deleted file mode 100644
index 21dab6b21ab..00000000000
--- a/app-misc/spacenavd/spacenavd-0.5-r6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils 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="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xdpyinfo )"
-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_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
-	epatch "${FILESDIR}"/${P}-custom-flags.patch
-	epatch "${FILESDIR}"/${P}-no-x11.patch
-}
-
-src_configure() {
-	econf \
-		--enable-opt --enable-ldopt \
-		$(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-r1 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-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
deleted file mode 100644
index bc0c390694e..00000000000
--- a/app-misc/spacenavd/spacenavd-0.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic epatch 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="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xdpyinfo )"
-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_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-gcc10.patch
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-debug \
-		--enable-hotplug \
-		--disable-opt \
-		$(use_enable X x11)
-}
-
-src_compile() {
-	append-cflags -fcommon  # bug 708648
-	emake CC="$(tc-getCC)" \
-		add_cflags="${CFLAGS}" \
-		add_ldflags="${LDFLAGS}"
-}
-
-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-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
deleted file mode 100644
index e9fef0e6086..00000000000
--- a/app-misc/spacenavd/spacenavd-0.7.ebuild
+++ /dev/null
@@ -1,84 +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 ~ppc64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc10.patch
-	"${FILESDIR}"/${P}-no-x11.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() {
-	econf \
-		--disable-debug \
-		--enable-hotplug \
-		--disable-opt \
-		$(use_enable X x11)
-}
-
-src_compile() {
-	append-cflags -fcommon  # bug 708648
-	emake CC="$(tc-getCC)" \
-		add_cflags="${CFLAGS}" \
-		add_ldflags="${LDFLAGS}"
-}
-
-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

end of thread, other threads:[~2020-05-22 16:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-15 19:04 [gentoo-commits] repo/gentoo:master commit in: app-misc/spacenavd/files/, app-misc/spacenavd/ Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2020-01-31 23:43 Sebastian Pipping
2020-02-01 20:52 Sebastian Pipping
2020-05-22 16:46 Sebastian Pipping

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox