summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-08-01 22:43:22 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-08-01 22:43:22 +0000
commit3b01afceae65259968279d03d81b601ab6c1394c (patch)
treec85a37fec573ef843b58e787051f0eaeeba503ce /sys-apps/kbd
parentstable on alpha (diff)
downloadgentoo-2-3b01afceae65259968279d03d81b601ab6c1394c.tar.gz
gentoo-2-3b01afceae65259968279d03d81b601ab6c1394c.tar.bz2
gentoo-2-3b01afceae65259968279d03d81b601ab6c1394c.zip
Sparc64 fixes, bug #25517 again.
Diffstat (limited to 'sys-apps/kbd')
-rw-r--r--sys-apps/kbd/ChangeLog6
-rw-r--r--sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch20
2 files changed, 15 insertions, 11 deletions
diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 7ec06686f0d8..68f910712b10 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/kbd
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.14 2003/07/31 04:37:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.15 2003/08/01 22:43:22 azarah Exp $
+
+ 02 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+ files/kbd-1.08-sparc-fixes.patch:
+ Sparc64 fixes, bug #25517 again.
31 Jul 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r1.ebuild:
Fix struct kbd_rate not being fixed for sparc to use 'period' and not 'rate',
diff --git a/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch b/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch
index d12ed2012c0a..85aa2da088b5 100644
--- a/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch
+++ b/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch
@@ -4,7 +4,7 @@
struct kbd_repeat kbdrep_s;
/* don't change, just test */
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ kbdrep_s.rate = -1;
+#else
kbdrep_s.period = -1;
@@ -16,23 +16,23 @@
/* do the change */
if (rate == 0) /* switch repeat off */
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ kbdrep_s.rate = 0;
+#else
kbdrep_s.period = 0;
+#endif
else
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ kbdrep_s.rate = 1000.0 / rate; /* convert cps to msec */
+#else
kbdrep_s.period = 1000.0 / rate; /* convert cps to msec */
+#endif
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ if (kbdrep_s.rate < 1)
+#else
if (kbdrep_s.period < 1)
+#endif
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ kbdrep_s.rate = 1;
+#else
kbdrep_s.period = 1;
@@ -44,14 +44,14 @@
}
/* report */
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ if (kbdrep_s.rate == 0)
+#else
if (kbdrep_s.period == 0)
+#endif
rate = 0;
else
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ rate = 1000.0 / (double) kbdrep_s.rate;
+#else
rate = 1000.0 / (double) kbdrep_s.period;
@@ -63,13 +63,13 @@
exit( 1 );
}
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ kbdrate_s.rate = (int) (rate + 0.5); /* round up */
+#else
kbdrate_s.period = (int) (rate + 0.5); /* round up */
+#endif
kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ if (kbdrate_s.rate > 50)
+ kbdrate_s.rate = 50;
+#else
@@ -83,7 +83,7 @@
if (!silent)
printf( "Typematic Rate set to %d cps (delay = %d ms)\n",
-+#ifdef __sparc__
++#if defined (__sparc__) || defined (__sparc64__)
+ kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ );
+#else
kbdrate_s.period, kbdrate_s.delay * 1000 / HZ );