diff options
Diffstat (limited to 'app-misc/spacenavd/files')
6 files changed, 29 insertions, 107 deletions
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 ef2640e65715..000000000000 --- 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 fa5dc93fcca5..000000000000 --- 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 3b834a43952d..000000000000 --- 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 5b2372242e14..000000000000 --- 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 bbdd7d6196ec..000000000000 --- 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.8-version.patch b/app-misc/spacenavd/files/spacenavd-0.8-version.patch new file mode 100644 index 000000000000..d4113d38399e --- /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 + |