add threads useflag by backporting upstream fix

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 84 insertions, 17 deletions

diff --git a/media-libs/libsdl2/ChangeLog b/media-libs/libsdl2/ChangeLog
index ed3608ebaa70..61130c2bba5d 100644
--- a/media-libs/libsdl2/ChangeLog
+++ b/media-libs/libsdl2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsdl2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.3 2013/08/31 14:34:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.4 2013/09/05 18:46:48 hasufell Exp $
+
+  05 Sep 2013; Julian Ospald <hasufell@gentoo.org> libsdl2-2.0.0.ebuild,
+  +files/libsdl2-2.0.0-threads.patch:
+  add threads useflag by backporting upstream fix
 
   31 Aug 2013; Julian Ospald <hasufell@gentoo.org> libsdl2-2.0.0.ebuild:
   add custom-cflags useflag
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 1adaa988a82e..96f5d4e37438 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX libsdl2-2.0.0-static-libs.patch 4322 SHA256 99f160183490c3a4d321c9405088e55ff528a84e4b7a795a2dfd9ba0e7716ff0 SHA512 a5f6e281fc7c4030690eaa8b5266343a631cf790f455c210abeb11def05a154ceceb443708494c2bddeb1d0f1d424b2a4648184ef39653f881d327841d8cc76d WHIRLPOOL 9b6c334e4a907336afa0460c2737bad42a7121d4a4233b2977d23c4552e5e144f55711fd97272d61982ccf9fa19950909e17f2697023e9fae4547f929beeaba1
+AUX libsdl2-2.0.0-threads.patch 1983 SHA256 e5c1aa795e33c9e82fa3f407396c9a8f4fd8fb79e7b92a34c4bbdf0accc5e566 SHA512 46ed26e36e79ea9a2d2538da8cad25fcc8bd3bc7d01c5206c39f74636e0409bbf063ae81fb6bb9eb2788097a743e66243be4863e8403c976ff78203605e9dda4 WHIRLPOOL f812bbf3a4f1df226c00b37ee3518f58a55593f51829e2d25ff7a525555ea27fc49cd59788f5caad6df9f5f8d49d8d54203c79bf2a91697740cbbb86313d31a6
 DIST SDL2-2.0.0.tar.gz 3623960 SHA256 6f6ac8153d90e06a118474d5400624ae82b3d3e080915505db27cebc52b27178 SHA512 6650ca1afcf2ad172f511adb80d265722c7533b1e614925ef5bcdce1b898b42c261d6ed8188e15e56bab2002f16d16c255bdd984932e347de6252c0ee54a7f53 WHIRLPOOL 38111cb4f47dda36a658b94f8ab9b50c6009926b45e3d55f255d03e2c0f66040a5b8786d44da51fe572a03eb7fa5ac5d8fa5a0933bbc0579ed0e86de1b2a4c12
-EBUILD libsdl2-2.0.0.ebuild 4021 SHA256 86fbbb93867d59225d3c384ab8088874cc298889726e5374a45373214577dc3a SHA512 dc5d24b422f84169b56755b88b55dfcd3be9b2e5b58e3f6a3ef0797fcf191b8c548b4e76e5d2db6d3ed3b085b8482c4abe06b17e41e98d6104b78e86d5d11119 WHIRLPOOL c19c9165a7b8a923e0fdc31ec27a0b4d52f7f99803a2e1e7dc137288608a412380234d014a3897dd59fdac04c256f99031ed0a403d699d8a301f7d47e9420c4b
-MISC ChangeLog 637 SHA256 8ac465b767147e647bd37d907097db63f0b3993071abd08fc7501f7296dc0df4 SHA512 ebca6e102981abdd54526ce4e5c58de1342e373609b8349c979d98b38a7b5c8fa85084932264b0e1b067ed4ce2c94ccc364bf65a094dcc1a0c90b58a819d642f WHIRLPOOL 816c86a5eadc8163af95c80e50aaef2c41b3b7f5d268792ed8818096bb975960ea8fde4fec9c25753ff2d56e8522427d9e985b0dfa05c99b1c4ec1352f483f88
+EBUILD libsdl2-2.0.0.ebuild 3989 SHA256 7e9c5e7cad3fa00bacfbfbee5fc2ddee185b7046e2b41be1457b48d46704bd9c SHA512 6da883149e70d5264d6e2b6706b306b531e67749adc235505d737ccce3dab98cc03e0087bb863c86d6befb64394392322b436e2ee7bf15564845d0039966d134 WHIRLPOOL b2ea3be7f8085d772096992cb82a2e9c2ecd33ea47e090c0aed7fcf72e1035a59f6e13ab0feb65d9a4d3087ed5e192f55bb66ff1ce6dfb7be34fd96db88bb716
+MISC ChangeLog 799 SHA256 8a7934cd60b9795f8819d52e1caa144b19d00f14b16f26bb6014d26deeb3b664 SHA512 3f17f5fab19db29b2015e456f5e7b3ade93972180cbeba61ef4818db2de5403825e96cc67d68c3808c833cc8c7ae55f5cd8dd21da0310bf03c7bf64ca020aac7 WHIRLPOOL 05943d54f2624b9e757af69159f8cb0d4522b694a279c1d8192d09b67befb318c14bde33859404e3b8e008c030a3ef500cc8f5f3232f2a9f6f89a58310496cf8
 MISC metadata.xml 1532 SHA256 b0de84edcfbcf286934f7adf119917dcd138c0570d78b25286f25b3a2d110da9 SHA512 fe8e84981baee1567e80430a2352feffa03915864b871916c13cfec4fd734c12dd6d9195ed20da26e7985dcd39c55498d1f55ac0a5dd61c2d4100e6e964b5e79 WHIRLPOOL dfda175811d3dc27eadc3e7b61920c6257ad9e062626cd786adaf0a1c52ab283f8814feb85d0121bfd01ce52cab56f587c078b3d20aa1fc954a1986d176bb4aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSIf8PAAoJEFpvPKfnPDWzoDAH/2FinSo/bWTUBBGS9GfD5fv0
-N/kZ9LULaBbMt3aJ1J7N2iwZunrL44KI53BspdWVLcCWptyFKEUuIMThlk8Ot4/5
-uiO1ScCbZd/Ko63EYpZTMnqzDE41xFyPhlZKtUu/2D9KHVDCivYg04mf/TvRH8qU
-4dsmKXdcAL+5SciBPTUxzkGRdHgrP2zoGHTn3Ug/zBRLevcj76ZE5PnwTh+O8kzx
-0sJs/pr/JdqLXcWIREkEQaJbTplKqDedMh3qj6fNtkVlmJARHRxZMT3bij0+4VgI
-fmeQzMofZ1lFjMM4HQ1dNytE2hYxwgbGfeOCPwO0yIZr8WUsuhim770JR0kNM3Q=
-=wZZA
+iQEcBAEBCAAGBQJSKNGbAAoJEFpvPKfnPDWzhDoH/3MFV6ZyIUZ12NMTCH39ogwL
+9UrCRpcQokclG7GyREi2Bgkmmga4gKK/vySkX0sZp0yCeFrpjIIJtNoUMbmPqRzR
+CuR/rXT7jv1tOSkOGpPNGMPGWEGDMqxd90MDzLhPWhIovBolSi8GkhvuqwdoK0Ty
+6knc/O8GJPA5faLjOp8X0NeXHs0BRlGziR72Y4dHAQzoUEk3Va9y+PB0/HwUfD5N
+DJhOYPc+SRA68jkjQPEHGf9py7q4rJ4dhgbYIn9MU6tU8QAafXMFQUb9wQtzMW2Q
+/7t93OfCYk7sj8Q6W0alk8gK0nIXTuNgOme9s3C7jFEnvuzRQq7F9bAgNkph01Q=
+=P5H6
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch b/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
new file mode 100644
index 000000000000..48c3dadda475
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
@@ -0,0 +1,64 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1378390526 25200
+# Node ID e928464b98ec679471ea80d0d5fefe8b3406eef1
+# Parent  384d5ba7ee44f4c90ecb5b581113918a66b8371e
+Fixed bug 2076 - OpenGL doesn't work with --disable-threads
+
+stepik-777
+
+Thread local storage is used to store current window and current opengl context. OpenGL worked before this changeset: 7596 (45e5c263c096)
+
+diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_systhread.h
+--- a/src/thread/SDL_systhread.h	Thu Sep 05 07:02:27 2013 -0700
++++ b/src/thread/SDL_systhread.h	Thu Sep 05 07:15:26 2013 -0700
+@@ -26,6 +26,7 @@
+ #define _SDL_systhread_h
+ 
+ #include "SDL_thread.h"
++#include "SDL_thread_c.h"
+ 
+ /* This function creates a thread, passing args to SDL_RunThread(),
+    saves a system-dependent thread id in thread->id, and returns 0
+diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread.c
+--- a/src/thread/SDL_thread.c	Thu Sep 05 07:02:27 2013 -0700
++++ b/src/thread/SDL_thread.c	Thu Sep 05 07:15:26 2013 -0700
+@@ -125,6 +125,7 @@
+     SDL_TLSEntry *entry;
+     SDL_TLSData *storage = NULL;
+ 
++#if !SDL_THREADS_DISABLED
+     if (!SDL_generic_TLS_mutex) {
+         static SDL_SpinLock tls_lock;
+         SDL_AtomicLock(&tls_lock);
+@@ -139,6 +140,7 @@
+         }
+         SDL_AtomicUnlock(&tls_lock);
+     }
++#endif /* SDL_THREADS_DISABLED */
+ 
+     SDL_MemoryBarrierAcquire();
+     SDL_LockMutex(SDL_generic_TLS_mutex);
+@@ -148,7 +150,9 @@
+             break;
+         }
+     }
++#if !SDL_THREADS_DISABLED
+     SDL_UnlockMutex(SDL_generic_TLS_mutex);
++#endif
+ 
+     return storage;
+ }
+diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread_c.h
+--- a/src/thread/SDL_thread_c.h	Thu Sep 05 07:02:27 2013 -0700
++++ b/src/thread/SDL_thread_c.h	Thu Sep 05 07:15:26 2013 -0700
+@@ -23,6 +23,8 @@
+ #ifndef _SDL_thread_c_h
+ #define _SDL_thread_c_h
+ 
++#include "SDL_thread.h"
++
+ /* Need the definitions of SYS_ThreadHandle */
+ #if SDL_THREADS_DISABLED
+ #include "generic/SDL_systhread_c.h"
diff --git a/media-libs/libsdl2/libsdl2-2.0.0.ebuild b/media-libs/libsdl2/libsdl2-2.0.0.ebuild
index 7e17443eb508..496a8a42cb23 100644
--- a/media-libs/libsdl2/libsdl2-2.0.0.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.0.ebuild,v 1.2 2013/08/31 14:34:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.0.ebuild,v 1.3 2013/09/05 18:46:48 hasufell Exp $
 
 EAPI=5
 inherit autotools flag-o-matic toolchain-funcs eutils
@@ -14,7 +14,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs tslib udev +video X xinerama xscreensaver"
+IUSE="3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( audio )
 	fusionsound? ( audio )
@@ -58,7 +58,8 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-	epatch "${FILESDIR}"/${P}-static-libs.patch
+	epatch "${FILESDIR}"/${P}-static-libs.patch \
+		"${FILESDIR}"/${P}-threads.patch
 	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
 }
 
@@ -77,9 +78,6 @@ src_configure() {
 	fi
 
 	# sorted by `./configure --help`
-	#
-	# --disable-threads broken
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=2070
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable audio) \
@@ -89,7 +87,7 @@ src_configure() {
 		$(use_enable joystick) \
 		$(use_enable haptic) \
 		--enable-power \
-		--enable-threads \
+		$(use_enable threads) \
 		--enable-timers \
 		--enable-file \
 		--disable-loadso \