add backported patch from upstream report by Rafał Mużyło via bug #499180 to fix input in some conditions

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

4 files changed, 201 insertions, 2 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index e89966abb3c4..153285c479fa 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.238 2015/03/31 20:24:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.239 2015/05/12 19:56:33 mr_bones_ Exp $
+
+*libsdl-1.2.15-r9 (12 May 2015)
+
+  12 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/libsdl-1.2.15-SDL_EnableUNICODE.patch, +libsdl-1.2.15-r9.ebuild:
+  add backported patch from upstream report by Rafał Mużyło via bug #499180 to
+  fix input in some conditions
 
   31 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
   clean unused ps3 use flag
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 5d2cd4a890d3..dbb43f9eeb93 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,3 +1,4 @@
+AUX libsdl-1.2.15-SDL_EnableUNICODE.patch 1542 SHA256 edaaef172891ee0d25700a5d1acdbd7a33dfdbdc9774329f4e1a1728b7af6231 SHA512 9a724a4156904d34c067b2f7640e110267bdcf457730674385d431d382625a6a4c012cd707fafba645125217bb09a8a496ae09d4352840f5babbc9c71dd49efc WHIRLPOOL 916aa2dbab5ffa6a8da43b62c55cc6c0aaa551c3e84f0c62a6a06b64e22aa754197f6b6688723bbc01a0e0944381660abc30482f13c05f3dc8ad8c9ef6cec5bf
 AUX libsdl-1.2.15-bsd-joystick.patch 1079 SHA256 e621c2c67b5e2774b69b207f4614250cd3994cd5d6e5612a248bba237c994b09 SHA512 18ba45c8e0f676852168bf2e13616777dc0616e976b459c93c1f4a41bf219b13cac8f63e1daa1038ea9d7a648888836fad268b3c076fa9416d5044ac2365b0cd WHIRLPOOL 8c1a0740b9e019b4fb50e0b03e4eb9821603e21b8abc74e789fed8ea208246355e7c7bfd997aef0d50efe2a2ea4f6d1444728239657cd12990352d87531b6d77
 AUX libsdl-1.2.15-caca.patch 1086 SHA256 4673baf63eeaf44eabc5e8c11305dfc074253ed584cfe1c5442e2ae2ff581bac SHA512 3b41306c21bca41f27a5a6857f958ba3d594c27ee36b865a7a5e08db871025fe5aab7177d72b8534cd53a7aa9f943e268e8a2453eb48cdadcbe8d40ad81d6a58 WHIRLPOOL c3d175d0f2ccb10a4db26d6a793151697d7c8923c6e0353432749d38284db49c12afc4e4c096a1f6f6a803d9e34eced9c66d31e7798c961d2632b74ea7115c2a
 AUX libsdl-1.2.15-const-xdata32.patch 2253 SHA256 b0560f37c8927d00cfb034580f15d08ebfd31bca38f470761957c02590b87f9e SHA512 f1804afb7e70f80a7262df8affc5c1c71b3da1a448085e88fc0b50df4fa293f595542e5456e988ba1477c8aaefea3ba81d7c3e729307da21ce3560b369abe327 WHIRLPOOL d32d5ad03a34b41bff6c693bbba7e65fce6e8346e66aaf9d58b157de04abed2e88744fa0ff26d26da882415b57d6612bb226171977cb313a36ce5dee18a6c46e
@@ -7,5 +8,6 @@ AUX libsdl-1.2.15-resizing.patch 2098 SHA256 0e4c2c4a11dbf611e317be4e866f99bde61
 AUX libsdl-1.2.15-sdl-config.patch 780 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015 SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03 WHIRLPOOL 5762b64726808967cd51215b1fd04c3cd52baa9517b25c30c99e669d450f19666d7179c9c69bf8d6a09ac109d52148fee0bbaa458ab77aacddf793914faf1c80
 DIST SDL-1.2.15.tar.gz 3920622 SHA256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc WHIRLPOOL 21b9aadb7b00002a6f3760902cd40aeb1b145228348b887049b40a435c2b9a1a3679a83100421e9634178b9da32d524371d6912c190a75e83ef3170ad45bc159
 EBUILD libsdl-1.2.15-r8.ebuild 4396 SHA256 cd41031e007b57f301b48a0295ed04efb1a04c97cd43bae0043f6d165f9ee1d0 SHA512 f368619a5724506603b8a8b7eb6bdc295e4efb4abd5011d5c4a042abb765bad8e8014b8b1c60d63a14df7907a0089594c06467681894454effc5026e162dc6be WHIRLPOOL 0dbede07280a9ad18afbb8c74d045499cafa0d91ca00a9dced7ca891389294f19c26a7e950fddba7689f1d9b535860e0c54a52bb119bdf78a5a7f469b39db4d8
-MISC ChangeLog 35942 SHA256 2fe7cd3e4928e225858cd391e38ea6805c42e71580ca8a75293f99db52db5bd4 SHA512 e80dc9b192184e7c4e30e070bd2cae2d4f6def796cb3cfda811a8021eddc1313d3d078a9685523f20a0a407019f56c826c2816b350699b8db1c6d7f855db50bf WHIRLPOOL 6229cc596af2ad0535c6e2d2c74cdba3f7bb4a8518c51e63888871f80e0e4c32f84fb16104b62675c3da21f6d9f33d86a53a97b0cb8fbd23fe4dfa6fecfa2cee
+EBUILD libsdl-1.2.15-r9.ebuild 4451 SHA256 3e7bf6bdda7d7d8c0910f58a9c2f2adb7207c2ac3b7fa6c514088ba31b3bee2f SHA512 2c72cd0b391a1a67af3a49f5edc620eff91a3e80665c1a4a9f5a2affc1585c93a528f6c3242da5b45f31a4cea4e1ddf8907ba87cb0f7305882159d4bed645601 WHIRLPOOL 060b1dbea70d12116573620ffd4bfd859d25eab32bc765c8b69f39005623fc9e177fa57aad78437c80f87eaac504b32afbf0adfdb6e03e2232e0b74ed0892991
+MISC ChangeLog 36218 SHA256 de0c5612429344d76a3b307cfa92c7b83651ea277e1927b003c537dbf61c0f3d SHA512 3bd6ca15cb7949bef33616be665387c232f9c49e58dc543ae5d9ffcf251c39ca173cf9279228397aeb1371ade2f3d5c8a240c87a397eae84261c43028058b295 WHIRLPOOL e0bda17ccbe27fd1897308f7706a026669118f79aa456e8d95f6b320e69d1274e3368de9d54801aff8453838c40ed6e27afdca627ecc708d2093d5af0d49a863
 MISC metadata.xml 1305 SHA256 db087da372a58e048b09b72bd7fc3b6eb0006613d2dfc462becb6244334ed2c6 SHA512 0bb2d9731571884aa2413ee8417106d21405592241ec689a6715a21aaa7e566939b1ca796913c489c4ec7fbbcd75604ced08f8068c95fe07f99bb24de7a6d784 WHIRLPOOL 7eab01cbd39c9882028b93578b46a6f55ad5442e2b8bd9a23db66ab55477e2752cf531b7e41dff54df07b4ef0e4c54c8947e05c13640042844599aacf21b8df3
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-SDL_EnableUNICODE.patch b/media-libs/libsdl/files/libsdl-1.2.15-SDL_EnableUNICODE.patch
new file mode 100644
index 000000000000..bf68b2e44f44
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.15-SDL_EnableUNICODE.patch
@@ -0,0 +1,47 @@
+
+diff -r 22a7f096bb9d -r 0aade9c0203f src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.c	Sun Dec 01 00:00:17 2013 -0500
++++ b/src/video/x11/SDL_x11events.c	Thu Apr 17 22:36:14 2014 -0700
+@@ -395,6 +395,8 @@
+ {
+ 	int posted;
+ 	XEvent xevent;
++	int orig_event_type;
++	KeyCode orig_keycode;
+ 
+ 	SDL_memset(&xevent, '\0', sizeof (XEvent));  /* valgrind fix. --ryan. */
+ 	XNextEvent(SDL_Display, &xevent);
+@@ -410,9 +412,29 @@
+ #ifdef X_HAVE_UTF8_STRING
+ 	/* If we are translating with IM, we need to pass all events
+ 	   to XFilterEvent, and discard those filtered events immediately.  */
++	orig_event_type = xevent.type;
++	if (orig_event_type == KeyPress || orig_event_type == KeyRelease) {
++	     orig_keycode = xevent.xkey.keycode;
++	} else {
++	     orig_keycode = 0;
++	}
+ 	if ( SDL_TranslateUNICODE
+ 	     && SDL_IM != NULL
+ 	     && XFilterEvent(&xevent, None) ) {
++	        if (orig_keycode) {
++	            SDL_keysym keysym;
++	            static XComposeStatus state;
++	            char keybuf[32];
++
++	            keysym.scancode = xevent.xkey.keycode;
++	            keysym.sym = X11_TranslateKeycode(SDL_Display, xevent.xkey.keycode);
++	            keysym.mod = KMOD_NONE;
++	            keysym.unicode = 0;
++	            if (orig_event_type == KeyPress && XLookupString(&xevent.xkey, keybuf, sizeof(keybuf), NULL, &state))
++	                keysym.unicode = (Uint8)keybuf[0];
++
++	            SDL_PrivateKeyboard(orig_event_type == KeyPress ? SDL_PRESSED : SDL_RELEASED, &keysym);
++	        }
+ 		return 0;
+ 	}
+ #endif
+
+
+
+
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
new file mode 100644
index 000000000000..e782a36de9e6
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 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-r9.ebuild,v 1.1 2015/05/12 19:56:33 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools flag-o-matic multilib toolchain-funcs eutils multilib-minimal
+
+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 ~arm64 ~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 tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio static-libs"
+
+RDEPEND="
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-sdl-20140406
+	)
+	sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	)
+	aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	nas? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	)
+	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."
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sdl-config.patch \
+		"${FILESDIR}"/${P}-resizing.patch \
+		"${FILESDIR}"/${P}-joystick.patch \
+		"${FILESDIR}"/${P}-bsd-joystick.patch \
+		"${FILESDIR}"/${P}-gamma.patch \
+		"${FILESDIR}"/${P}-const-xdata32.patch \
+		"${FILESDIR}"/${P}-caca.patch \
+		"${FILESDIR}"/${P}-SDL_EnableUNICODE.patch
+	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=
+	if use !x86 ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use custom-cflags || strip-flags
+	use sound || myconf="${myconf} --disable-audio"
+	use video \
+		&& myconf="${myconf} --enable-video-dummy" \
+		|| myconf="${myconf} --disable-video"
+	use joystick || myconf="${myconf} --disable-joystick"
+
+	ECONF_SOURCE="${S}" 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) \
+		--disable-video-ggi \
+		--disable-video-svga \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		--disable-video-ps3 \
+		$(use_enable tslib input-tslib) \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--disable-video-x11-xme \
+		--disable-video-directfb \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	use static-libs || prune_libtool_files --all
+	dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
+	dohtml -r ./
+}