added patch from libsdl cvs from bug #52833

4 files changed, 62 insertions, 10 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 79c51eac8aae..62c65222f93c 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.47 2004/06/02 14:15:38 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.48 2004/06/07 07:48:05 mr_bones_ Exp $
+
+  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> libsdl-1.2.7-r1.ebuild,
+  files/1.2.7-joystick.patch:
+  added patch from libsdl cvs from bug #52833
 
   01 Jun 2004; Travis Tilley <lv@gentoo.org> libsdl-1.2.7-r1.ebuild:
   stable on amd64
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index ba19d52e76ce..13284b24f282 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,14 +1,15 @@
+MD5 3d51cea6bb6642ef417bf5964e97c6a5 ChangeLog 7512
+MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
+MD5 a4236b0d45ce94b829ce7359d2ec80fc libsdl-1.2.7-r1.ebuild 2766
 MD5 ce1a8ba785e834534e748fc65e85b63c libsdl-1.2.6-r3.ebuild 2893
 MD5 070716b93920cef4ba1c626a0afbc4b9 libsdl-1.2.7.ebuild 2493
-MD5 f317fbbe4710a3886637eeddefcb7ae1 libsdl-1.2.7-r1.ebuild 2712
-MD5 57c86e723602bc07fa50f84800d8a961 ChangeLog 7350
-MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
-MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
-MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
 MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
+MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r1 62
+MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
+MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7 62
+MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
+MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
 MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
-MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7 62
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568
-MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
-MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r1 62
+MD5 0af2b62803a27df1c5c41c5511c49d8f files/1.2.7-joystick.patch 1610
diff --git a/media-libs/libsdl/files/1.2.7-joystick.patch b/media-libs/libsdl/files/1.2.7-joystick.patch
new file mode 100644
index 000000000000..d18b398e8974
--- /dev/null
+++ b/media-libs/libsdl/files/1.2.7-joystick.patch
@@ -0,0 +1,46 @@
+diff -u -r1.13 -r1.14
+--- SDL12/src/joystick/linux/SDL_sysjoystick.c	2004/01/04 16:49:18	1.13
++++ SDL12/src/joystick/linux/SDL_sysjoystick.c	2004/03/05 15:09:18	1.14
+@@ -22,7 +22,7 @@
+ 
+ #ifdef SAVE_RCSID
+ static char rcsid =
+- "@(#) $Id: 1.2.7-joystick.patch,v 1.1 2004/06/07 07:48:05 mr_bones_ Exp $";
++ "@(#) $Id: 1.2.7-joystick.patch,v 1.1 2004/06/07 07:48:05 mr_bones_ Exp $";
+ #endif
+ 
+ /* This is the system specific header for the SDL joystick API */
+@@ -383,7 +383,7 @@
+ 
+ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
+ {
+-	int i;
++	int i, t;
+ 	unsigned long keybit[40];
+ 	unsigned long absbit[40];
+ 	unsigned long relbit[40];
+@@ -436,12 +436,18 @@
+ 				    joystick->hwdata->abs_correct[i].used = 0;
+ 				} else {
+ 				    joystick->hwdata->abs_correct[i].used = 1;
+-				    joystick->hwdata->abs_correct[i].coef[0] =
+-					(values[2] + values[1]) / 2 - values[4];
+-				    joystick->hwdata->abs_correct[i].coef[1] =
+-					(values[2] + values[1]) / 2 + values[4];
+-				    joystick->hwdata->abs_correct[i].coef[2] =
+-					(1 << 29) / ((values[2] - values[1]) / 2 - 2 * values[4]);
++				    t = (2 - values[4]);
++				    if ( t != 0 ) {
++				        joystick->hwdata->abs_correct[i].coef[0] = (values[2] + values[1]) / t;
++				    }
++				    t = (2 + values[4]);
++				    if ( t != 0 ) {
++				        joystick->hwdata->abs_correct[i].coef[1] = (values[2] + values[1]) / t;
++				    }
++				    t = ((values[2] - values[1]) / 2 - 2 * values[4]);
++				    if ( t != 0 ) {
++					joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t;
++				    }
+ 				}
+ 				++joystick->naxes;
+ 			}
diff --git a/media-libs/libsdl/libsdl-1.2.7-r1.ebuild b/media-libs/libsdl/libsdl-1.2.7-r1.ebuild
index f7606f8f6cd1..38eedc67be17 100644
--- a/media-libs/libsdl/libsdl-1.2.7-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r1.ebuild,v 1.3 2004/06/02 14:15:38 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r1.ebuild,v 1.4 2004/06/07 07:48:05 mr_bones_ Exp $
 
 inherit fixheadtails eutils
 
@@ -38,6 +38,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-nobuggy-X.patch #30089
 	epatch ${FILESDIR}/${PV}-libcaca.patch #40224
 	epatch ${FILESDIR}/${PV}-gcc34.patch #48947
+	epatch ${FILESDIR}/${PV}-joystick.patch #52833
 
 	ht_fix_file configure.in