From: Mike Frysinger Date: Mon, 3 Jan 2005 02:19:12 +0000 (+0000) Subject: Add patch from upstream to fix keyrepeating #76448 by Jon Daniel. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=229bee0902aa7e43d07c484979b3238a4006094e;p=gentoo.git Add patch from upstream to fix keyrepeating #76448 by Jon Daniel. --- diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 12c71c7b3a89..59637b77aa30 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsdl -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.70 2005/01/01 01:20:29 kingtaco Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.71 2005/01/03 02:19:12 vapier Exp $ + + 02 Jan 2005; Mike Frysinger + +files/1.2.8-keyrepeat.patch, libsdl-1.2.7-r3.ebuild, libsdl-1.2.8.ebuild: + Add patch from upstream to fix keyrepeating #76448 by Jon Daniel. 31 Dec 2004; Mike Doty libsdl-1.2.8.ebuild: strip-flags -funroll-all-loops & -fpeel-loops bug #74608 diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index de0e05a1e7b8..51651598706a 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,31 +1,32 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 dd702b9884116d97397481042309dd92 ChangeLog 10451 -MD5 ca3bfcb303f4ddb5c6f708f377e4dc61 libsdl-1.2.6-r3.ebuild 2900 -MD5 005245593e4a759633e6e5e897aaf837 libsdl-1.2.8.ebuild 3932 -MD5 e4a05431dd91039287fbfa7df275997d libsdl-1.2.7-r3.ebuild 3795 +MD5 cafa493729aa0ae378b07acf4bc8404d ChangeLog 10645 +MD5 fd55634b60350f7521355234997df29c libsdl-1.2.6-r3.ebuild 2897 +MD5 d1354ee11e24509f444f75566c12a58b libsdl-1.2.7-r3.ebuild 3846 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974 +MD5 605910702f91c98f16eb8e447fbc080a libsdl-1.2.8.ebuild 3981 MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557 -MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568 -MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017 -MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196 -MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317 -MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196 +MD5 60ecfde6cc7b734ef03b93357c537674 files/1.2.8-keyrepeat.patch 598 MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266 -MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568 MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62 -MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8 62 -MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62 +MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196 MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094 -MD5 22c541533c3c588f430b62440053071f files/1.2.8-gcc2-asm.patch 10160 +MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317 +MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568 +MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568 +MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196 +MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017 MD5 323ad5b1e83521630dd4d54819c5efbd files/1.2.8-gcc2.patch 743 +MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62 MD5 88437c556d9b4571f08de4a4e2d9323a files/1.2.8-libcaca.patch 23278 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568 +MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8 62 +MD5 22c541533c3c588f430b62440053071f files/1.2.8-gcc2-asm.patch 10160 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFB1frw0K3RJaeXx6cRAg96AJsFG0dhJAhBwv85a0lJ0aF0AKp4fgCfZWrV -OES0ZPzGyWZjZB7sqVjK5tw= -=XF6N +iD8DBQFB2Ku0roRuSHgZdywRAtuaAJ988wmZVU2OIOM3VttUiEjkt6GBZgCeLqvT +OxCnR4PTd1YJ5JNgxvIIaOw= +=gbiU -----END PGP SIGNATURE----- diff --git a/media-libs/libsdl/files/1.2.8-keyrepeat.patch b/media-libs/libsdl/files/1.2.8-keyrepeat.patch new file mode 100644 index 000000000000..c716b4a2a929 --- /dev/null +++ b/media-libs/libsdl/files/1.2.8-keyrepeat.patch @@ -0,0 +1,18 @@ +Index: SDL_keyboard.c +=================================================================== +RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/events/SDL_keyboard.c,v +retrieving revision 1.9 +retrieving revision 1.10 +diff -u -r1.9 -r1.10 +--- src/events/SDL_keyboard.c 4 Jan 2004 16:49:17 -0000 1.9 ++++ src/events/SDL_keyboard.c 3 Jan 2005 00:24:44 -0000 1.10 +@@ -491,7 +491,8 @@ + /* + * jk 991215 - Added + */ +- if ( SDL_KeyRepeat.timestamp ) { ++ if ( SDL_KeyRepeat.timestamp && ++ SDL_KeyRepeat.evt.key.keysym.sym == keysym->sym ) { + SDL_KeyRepeat.timestamp = 0; + } + break; diff --git a/media-libs/libsdl/libsdl-1.2.6-r3.ebuild b/media-libs/libsdl/libsdl-1.2.6-r3.ebuild index c38eceff5b5c..f60e5bb39f31 100644 --- a/media-libs/libsdl/libsdl-1.2.6-r3.ebuild +++ b/media-libs/libsdl/libsdl-1.2.6-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.6-r3.ebuild,v 1.11 2004/10/01 10:19:07 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.6-r3.ebuild,v 1.12 2005/01/03 02:19:12 vapier Exp $ inherit eutils diff --git a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild index 48293c122437..a81a149819db 100644 --- a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild +++ b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.7 2004/11/16 06:34:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.8 2005/01/03 02:19:12 vapier Exp $ inherit toolchain-funcs fixheadtails eutils gnuconfig @@ -51,6 +51,7 @@ src_unpack() { && epatch "${FILESDIR}/${PV}-gcc34.patch" #48947 epatch "${FILESDIR}/${PV}-joystick2.patch" #52833 epatch "${FILESDIR}/${PV}-26headers.patch" #58192 + epatch "${FILESDIR}"/1.2.8-keyrepeat.patch #76448 ht_fix_file configure.in diff --git a/media-libs/libsdl/libsdl-1.2.8.ebuild b/media-libs/libsdl/libsdl-1.2.8.ebuild index 6e8cb1e5bd70..2dcea920f6a9 100644 --- a/media-libs/libsdl/libsdl-1.2.8.ebuild +++ b/media-libs/libsdl/libsdl-1.2.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8.ebuild,v 1.7 2005/01/01 01:20:29 kingtaco Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8.ebuild,v 1.8 2005/01/03 02:19:12 vapier Exp $ inherit flag-o-matic toolchain-funcs eutils gnuconfig @@ -49,6 +49,7 @@ src_unpack() { epatch "${FILESDIR}"/${PV}-nobuggy-X.patch #30089 epatch "${FILESDIR}"/${PV}-libcaca.patch #40224 epatch "${FILESDIR}"/${PV}-gcc2.patch #75392 + epatch "${FILESDIR}"/${PV}-keyrepeat.patch #76448 [[ $(gcc-major-version) -eq 2 ]] && \ epatch "${FILESDIR}"/${PV}-gcc2-asm.patch #75392