| 1 |
sping 12/02/06 19:51:21 |
| 2 |
|
| 3 |
Added: spnavd spacenavd-0.5-destdir.patch |
| 4 |
spacenavd-0.5-custom-flags.patch |
| 5 |
Log: |
| 6 |
app-misc/spacenavd: 0.5-r1 (bug #390427) |
| 7 |
|
| 8 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-misc/spacenavd/files/spnavd |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/spacenavd/files/spnavd?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/spacenavd/files/spnavd?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: spnavd |
| 17 |
=================================================================== |
| 18 |
#!/sbin/runscript |
| 19 |
# Copyright 1999-2012 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License, v2 or later |
| 21 |
|
| 22 |
depend() { |
| 23 |
need localmount |
| 24 |
after bootmisc |
| 25 |
} |
| 26 |
|
| 27 |
start() { |
| 28 |
ebegin "Starting Spacenav system daemon" |
| 29 |
|
| 30 |
start-stop-daemon --start --pidfile /var/run/spnavd.pid --exec /usr/bin/spacenavd |
| 31 |
eend $? |
| 32 |
} |
| 33 |
|
| 34 |
stop() { |
| 35 |
local retval |
| 36 |
|
| 37 |
ebegin "Stopping Spacenav system daemon" |
| 38 |
|
| 39 |
start-stop-daemon --stop --pidfile /var/run/spnavd.pid |
| 40 |
retval=$? |
| 41 |
|
| 42 |
eend ${retval} |
| 43 |
return ${retval} |
| 44 |
} |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 app-misc/spacenavd/files/spacenavd-0.5-destdir.patch |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: spacenavd-0.5-destdir.patch |
| 54 |
=================================================================== |
| 55 |
diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in |
| 56 |
--- spacenavd-0.5.orig/Makefile.in 2011-11-16 21:43:53.210859753 +0100 |
| 57 |
+++ spacenavd-0.5/Makefile.in 2011-11-16 21:45:36.386857932 +0100 |
| 58 |
@@ -24,9 +24,9 @@ clean: |
| 59 |
|
| 60 |
.PHONY: install |
| 61 |
install: $(bin) |
| 62 |
- $(INSTALL) -d $(PREFIX)/bin |
| 63 |
- $(INSTALL) -m 755 $(bin) $(PREFIX)/bin/$(bin) |
| 64 |
- $(INSTALL) -m 755 $(srcdir)/$(ctl) $(PREFIX)/bin/$(ctl) |
| 65 |
+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin |
| 66 |
+ $(INSTALL) -m 755 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin) |
| 67 |
+ $(INSTALL) -m 755 $(srcdir)/$(ctl) $(DESTDIR)$(PREFIX)/bin/$(ctl) |
| 68 |
cd $(srcdir) && ./setup_init --no-install |
| 69 |
|
| 70 |
# [ -d /etc/hal/fdi/policy ] && \ |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.1 app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch?rev=1.1&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch?rev=1.1&content-type=text/plain |
| 78 |
|
| 79 |
Index: spacenavd-0.5-custom-flags.patch |
| 80 |
=================================================================== |
| 81 |
diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in |
| 82 |
--- spacenavd-0.5.orig/Makefile.in 2012-01-31 22:22:20.460368687 +0100 |
| 83 |
+++ spacenavd-0.5/Makefile.in 2012-01-31 22:23:18.170367675 +0100 |
| 84 |
@@ -6,8 +6,8 @@ ctl = spnavd_ctl |
| 85 |
|
| 86 |
CC = gcc |
| 87 |
INSTALL = install |
| 88 |
-CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src |
| 89 |
-LDFLAGS = $(xlib) |
| 90 |
+CFLAGS = $(opt) -fno-strict-aliasing -I$(srcdir)/src |
| 91 |
+LDFLAGS = $(ldopt) $(xlib) |
| 92 |
|
| 93 |
$(bin): $(obj) |
| 94 |
$(CC) -o $@ $(obj) $(LDFLAGS) |
| 95 |
diff -Npur spacenavd-0.5.orig/configure spacenavd-0.5/configure |
| 96 |
--- spacenavd-0.5.orig/configure 2012-01-31 22:22:20.460368687 +0100 |
| 97 |
+++ spacenavd-0.5/configure 2012-01-31 22:22:49.257368187 +0100 |
| 98 |
@@ -28,6 +28,7 @@ test_kver() { |
| 99 |
|
| 100 |
PREFIX=/usr/local |
| 101 |
OPT=yes |
| 102 |
+LDOPT=yes |
| 103 |
DBG=yes |
| 104 |
X11=yes |
| 105 |
HOTPLUG=yes |
| 106 |
@@ -70,6 +71,11 @@ for arg; do |
| 107 |
--disable-opt) |
| 108 |
OPT=no;; |
| 109 |
|
| 110 |
+ --enable-ldopt) |
| 111 |
+ LDOPT=yes;; |
| 112 |
+ --disable-ldopt) |
| 113 |
+ LDOPT=no;; |
| 114 |
+ |
| 115 |
--enable-debug) |
| 116 |
DBG=yes;; |
| 117 |
--disable-debug) |
| 118 |
@@ -95,6 +101,8 @@ for arg; do |
| 119 |
echo ' --disable-hotplug: disable hotplug, fallback to polling for the device' |
| 120 |
echo ' --enable-opt: enable speed optimizations (default)' |
| 121 |
echo ' --disable-opt: disable speed optimizations' |
| 122 |
+ echo ' --enable-ldopt: enable link optimizations (default)' |
| 123 |
+ echo ' --disable-ldopt: disable link optimizations' |
| 124 |
echo ' --enable-debug: include debugging symbols (default)' |
| 125 |
echo ' --disable-debug: do not include debugging symbols' |
| 126 |
echo 'all invalid options are silently ignored' |
| 127 |
@@ -105,6 +113,7 @@ done |
| 128 |
|
| 129 |
echo " prefix: $PREFIX" |
| 130 |
echo " optimize for speed: $OPT" |
| 131 |
+echo " optimize link: $LDOPT" |
| 132 |
echo " include debugging symbols: $DBG" |
| 133 |
echo " x11 communication method: $X11" |
| 134 |
echo " use hotplug: $HOTPLUG" |
| 135 |
@@ -128,7 +137,11 @@ if [ "$DBG" = 'yes' ]; then |
| 136 |
fi |
| 137 |
|
| 138 |
if [ "$OPT" = 'yes' ]; then |
| 139 |
- echo 'opt = -O3' >>Makefile |
| 140 |
+ echo "opt = ${CFLAGS:--O3}" >>Makefile |
| 141 |
+fi |
| 142 |
+ |
| 143 |
+if [ "$LDOPT" = 'yes' ]; then |
| 144 |
+ echo "ldopt = ${LDFLAGS}" >>Makefile |
| 145 |
fi |
| 146 |
|
| 147 |
if [ "$X11" = 'yes' ]; then |
Archives