Add upstream patch to fix regression in joystick axis detection (bug #413839)

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 169 insertions, 12 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index d49fb96cfbef..60c6d97cead2 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.189 2012/05/09 13:15:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.190 2012/06/06 17:45:11 mr_bones_ Exp $
+
+*libsdl-1.2.15-r2 (06 Jun 2012)
+
+  06 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +libsdl-1.2.15-r2.ebuild, +files/libsdl-1.2.15-joystick.patch:
+  Add upstream patch to fix regression in joystick axis detection (bug #413839)
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> libsdl-1.2.15-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 31c49e643634..bf617791bdc0 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libsdl-1.2.13-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 SHA1 01c8d54cb8a22ea2a1e898b3ca39f9baca07dc98 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015
 AUX libsdl-1.2.14-click.patch 625 RMD160 2b0f53e7214c828259743104e77473d287b50b3f SHA1 56031d605cef0468ee0552a42edcb0bb3703cb04 SHA256 e1ff242656caf11e7d554149da0c97840c4cd5d7833cd10c655282603e3846d8
 AUX libsdl-1.2.14-glibc213.patch 246 RMD160 c3de39823107671b31293728ef59cce6d711d48d SHA1 b35bfedbbbe502c6446d2b03548f5493d6ff6160 SHA256 be5c1cf2d7405e03c59dcb2ee519b0546b59d67f6b4b2b3bc792143cfab3a109
 AUX libsdl-1.2.14-joystick.patch 1477 RMD160 67bf6283dc54c5a7f3ed587d8f301b78904ab9e1 SHA1 87074ef0e694da1f895b45de75fb53229d30ba95 SHA256 a16b6e5af27921357bb082c68cc786b23209c2a5bd4e3ffa5e997709c26f36c8
+AUX libsdl-1.2.15-joystick.patch 387 RMD160 85ec94911941f326d52b09a6e77775f0e9be7796 SHA1 07f83243ac21f92809ac6ce96b1134836bdbfbe4 SHA256 346cc55094db27030a11edb777038e424897cccf0c3881ee9a904d29d38e48b2
 AUX libsdl-1.2.15-resizing.patch 2438 RMD160 84fcc50006bf33f196fa6c42029b6c28f8df2b25 SHA1 1ba49f7c160288360ec899fcc16ed7a4d7ca21ba SHA256 5160fb1c07b04480d98d45b89a0aa6e577f2ac4c3bace0c80b251e6aca1fb4a1
 AUX libsdl-1.2.15-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 SHA1 01c8d54cb8a22ea2a1e898b3ca39f9baca07dc98 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015
 DIST SDL-1.2.14.tar.gz 4014154 RMD160 a3a9a691f5510eb5327ca159a034f55a70cb5801 SHA1 ba625b4b404589b97e92d7acd165992debe576dd SHA256 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
 DIST SDL-1.2.15.tar.gz 3920622 RMD160 d4802a090cb4a24eeb0c8ce5690802f596d394c3 SHA1 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c SHA256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
 EBUILD libsdl-1.2.14-r6.ebuild 4602 RMD160 d15ea01461931507f9b976bc14710db2b4598626 SHA1 33d3c05623dfce30d618129a88959c40050b8441 SHA256 721475233becb6a6893ed72480790ad2a477618f4bdb6566dae938e11d8b1975
 EBUILD libsdl-1.2.15-r1.ebuild 4124 RMD160 2843b9c80534017466ba2cad927dcfcaeafab5e4 SHA1 3417e7af3eee01ecfd83a2cd59d0d2a2770d1c5c SHA256 3ebec42950f60bd7fb1af9acf015fc743f6706ec99f89c1daf51dc8032ca657a
+EBUILD libsdl-1.2.15-r2.ebuild 4163 RMD160 86a16e66e5c8cff90b6a351038ed43682ac56d27 SHA1 1af2c9262609cdd1e4e650e1d416e0efdceb6ed2 SHA256 023ebd30f5d8a3afafcc422dc8b88c09c6ef2c028031f35fb2e4c46eabaaa3b3
 EBUILD libsdl-1.2.15.ebuild 4056 RMD160 3b7764da10814f46c296bb639861de8bdd0ac4ce SHA1 b52a714b400a1a3cf419742081ad1b07a448285c SHA256 9188148a9cd6af3da208cc03eaf4643ebe5762870035058c53317af4cc386883
-MISC ChangeLog 29447 RMD160 d7742129c3ff959a51ba0190f23ca91b70573ac5 SHA1 f79a4bfbe11d4391e80e388a117ca14e1b2338e1 SHA256 52d3f92376b2e39b2ea973d99f9b51ce45dcb35f07c213a1dc83804f12c4da96
+MISC ChangeLog 29682 RMD160 736c01ca9c8b05924dafa6ce9b48d54e48a73109 SHA1 5edbf0221e7e56e549377666d656a347007e6622 SHA256 0ebcb807cf13d3be54cac827465a4d30d11492dee8a137776124c23edf7d3cf7
 MISC metadata.xml 1357 RMD160 f76f0ef20941fc2c320b8a13f497dcb43f124cc9 SHA1 e5c05312f46bc682fc7fed1c7cec23bbdb59cd07 SHA256 a19b0d85c597bbe4d3dffa744d2ed9365660f8082145ab6b6f0813e36e174827
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+qbf0ACgkQvFcC4BYPU0pf3wCgsJA0jvbRKOQkI3C+/7BB3SuH
-4UMAnjzWXJaLoyGuFIx1eZoJRJVPjtRb
-=n87m
------END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch
new file mode 100644
index 000000000000..35374c58364a
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch
@@ -0,0 +1,13 @@
+--- src/joystick/linux/SDL_sysjoystick.c.org	2012-06-06 18:03:56.700819599 +0300
++++ src/joystick/linux/SDL_sysjoystick.c	2012-06-06 18:04:31.473143816 +0300
+@@ -1106,6 +1106,10 @@ static __inline__ void EV_HandleEvents(S
+ 				}
+ 				break;
+ 			    case EV_ABS:
++				if (code >= ABS_MISC) {
++				    break;
++				}
++
+ 				switch (code) {
+ 				    case ABS_HAT0X:
+ 				    case ABS_HAT0Y:
diff --git a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild b/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
new file mode 100644
index 000000000000..8f07aeaf334c
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r2.ebuild,v 1.1 2012/06/06 17:45:11 mr_bones_ Exp $
+
+EAPI=2
+inherit flag-o-matic multilib toolchain-funcs eutils libtool
+
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org/"
+SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+# WARNING:
+# If you turn on the custom-cflags use flag in USE and something breaks,
+# you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
+IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
+
+RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
+	alsa? ( media-libs/alsa-lib )
+	nas? (
+		media-libs/nas
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+	)
+	X? (
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXrandr
+	)
+	directfb? ( >=dev-libs/DirectFB-0.9.19 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	aalib? ( media-libs/aalib )
+	libcaca? ( >=media-libs/libcaca-0.9-r1 )
+	opengl? ( virtual/opengl virtual/glu )
+	ppc64? ( ps3? ( sys-libs/libspe2 ) )
+	tslib? ( x11-libs/tslib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	nas? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
+
+S=${WORKDIR}/SDL-${PV}
+
+pkg_setup() {
+	if use custom-cflags ; then
+		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl without the custom-cflags use flag in USE."
+		epause 10
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sdl-config.patch \
+		"${FILESDIR}"/${P}-resizing.patch \
+		"${FILESDIR}"/${P}-joystick.patch
+
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=
+	if [[ $(tc-arch) != "x86" ]] ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use custom-cflags || strip-flags
+	use audio || myconf="${myconf} --disable-audio"
+	use video \
+		&& myconf="${myconf} --enable-video-dummy" \
+		|| myconf="${myconf} --disable-video"
+	use joystick || myconf="${myconf} --disable-joystick"
+
+	local directfbconf="--disable-video-directfb"
+	if use directfb ; then
+		# since DirectFB can link against SDL and trigger a
+		# dependency loop, only link against DirectFB if it
+		# isn't broken #61592
+		echo 'int main(){}' > directfb-test.c
+		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
+			&& directfbconf="--enable-video-directfb" \
+			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
+	fi
+
+	myconf="${myconf} ${directfbconf}"
+
+	econf \
+		--disable-rpath \
+		--disable-arts \
+		--disable-esd \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-file \
+		--enable-cpuinfo \
+		--disable-alsa-shared \
+		--disable-esd-shared \
+		--disable-pulseaudio-shared \
+		--disable-arts-shared \
+		--disable-nas-shared \
+		--disable-osmesa-shared \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		$(use_enable nas) \
+		$(use_enable X video-x11) \
+		$(use_enable dga) \
+		$(use_enable xv video-x11-xv) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable dga video-dga) \
+		$(use_enable fbcon video-fbcon) \
+		$(use_enable ggi video-ggi) \
+		$(use_enable svga video-svga) \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		$(use_enable ps3 video-ps3) \
+		$(use_enable tslib input-tslib) \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--disable-video-x11-xme \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
+	dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
+	dohtml -r ./
+}