diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /app-misc/spacenavd/files | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'app-misc/spacenavd/files')
7 files changed, 0 insertions, 155 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.7-gcc10.patch b/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch deleted file mode 100644 index 485aa6c59338..000000000000 --- 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 8dbdb7df3151..000000000000 --- 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; - } - |