Added a patch fixing a potential problem with the animation thread.

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 70 insertions, 13 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 4c00d681d585..08cb373e8a9c 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.60 2006/07/15 13:01:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.61 2006/07/15 21:47:53 spock Exp $
+
+  15 Jul 2006; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.3-pthreads.patch, splashutils-1.3-r1.ebuild:
+  Added a patch fixing a potential problem with the animation thread.
 
   15 Jul 2006; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.3-fdset.patch, splashutils-1.3-r1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 1cf0dc7b6e85..a342f5a01a81 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -13,6 +13,10 @@ AUX splashutils-1.3-fdset.patch 373 RMD160 120858f4ba1f70d9c94214204b12ba973336a
 MD5 440a1a6ed07852e0f4ddae55fb566ca1 files/splashutils-1.3-fdset.patch 373
 RMD160 120858f4ba1f70d9c94214204b12ba973336a9e3 files/splashutils-1.3-fdset.patch 373
 SHA256 a6c177ef2703b413ef8449182b00dd3619033dfdc3b43901858a675f91f55fa0 files/splashutils-1.3-fdset.patch 373
+AUX splashutils-1.3-pthreads.patch 1375 RMD160 3bbbccb8c42910428b319ab28655ef3a8a1a81bd SHA1 5dac07fcd6f010eb308a026b6fa4274643403fc1 SHA256 db76a9c9c9c3bfe06cfd3e7532b1aaa7bb702b1eef387b8395bf03bca9f8ff3a
+MD5 e88a1248bcf97dd10b7598a69b31ee1c files/splashutils-1.3-pthreads.patch 1375
+RMD160 3bbbccb8c42910428b319ab28655ef3a8a1a81bd files/splashutils-1.3-pthreads.patch 1375
+SHA256 db76a9c9c9c3bfe06cfd3e7532b1aaa7bb702b1eef387b8395bf03bca9f8ff3a files/splashutils-1.3-pthreads.patch 1375
 AUX splashutils-depscan.patch 2197 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 SHA1 6e8406a714b71446089b4337f329c9eeeff0465e SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9
 MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
@@ -39,14 +43,14 @@ EBUILD splashutils-1.1.9.8-r1.ebuild 6450 RMD160 ee8219564a3b039de20831eb52cb44d
 MD5 e79713db9ac0cc2a97fcabab4fe83275 splashutils-1.1.9.8-r1.ebuild 6450
 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 splashutils-1.1.9.8-r1.ebuild 6450
 SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b splashutils-1.1.9.8-r1.ebuild 6450
-EBUILD splashutils-1.3-r1.ebuild 6248 RMD160 44bab1a5254bc8de8cc4e814196053e33b8b4efd SHA1 d35863703c93fcc3306349db6d3b9627f589c6c1 SHA256 77e307cf5cd2ed8180517d7f24f9420fdabdda3cc378edfd968a026c6487bb57
-MD5 2e1741ea7bda1257243e1f3b31c945ff splashutils-1.3-r1.ebuild 6248
-RMD160 44bab1a5254bc8de8cc4e814196053e33b8b4efd splashutils-1.3-r1.ebuild 6248
-SHA256 77e307cf5cd2ed8180517d7f24f9420fdabdda3cc378edfd968a026c6487bb57 splashutils-1.3-r1.ebuild 6248
-MISC ChangeLog 12924 RMD160 3e803871b1e46be99baa910ac16edffe46bde47d SHA1 7a47535879de180b2e6165178a63b882b1eb2ef9 SHA256 f05e7f4909d98bf9f765da15e38c50f0a20f5298428e5028a456368c67a25a97
-MD5 62761ac253bb1605fe17ad1913d36d87 ChangeLog 12924
-RMD160 3e803871b1e46be99baa910ac16edffe46bde47d ChangeLog 12924
-SHA256 f05e7f4909d98bf9f765da15e38c50f0a20f5298428e5028a456368c67a25a97 ChangeLog 12924
+EBUILD splashutils-1.3-r1.ebuild 6299 RMD160 c40e24d1a45a9685ec7d1e86bf617c5f624021fb SHA1 6129b99b6b6f45c62ef489a8c8a264b366af3dc8 SHA256 bbbd1727410eb50bd6e94211dc0d9e62383e282a6aaa10db686a3c145a64b8a7
+MD5 624c3cd07b0410f785600f9caff2e17a splashutils-1.3-r1.ebuild 6299
+RMD160 c40e24d1a45a9685ec7d1e86bf617c5f624021fb splashutils-1.3-r1.ebuild 6299
+SHA256 bbbd1727410eb50bd6e94211dc0d9e62383e282a6aaa10db686a3c145a64b8a7 splashutils-1.3-r1.ebuild 6299
+MISC ChangeLog 13117 RMD160 c3c5ef1b119811c160560e44a20f0432f0968f62 SHA1 1fe7f48484aed7300c463104893ccca83d1863e3 SHA256 a798b82b3795949ee30227410edc8ea1e6883b095cb744d6426f98bab28f066c
+MD5 7248eda7261ac2930024803692b89b05 ChangeLog 13117
+RMD160 c3c5ef1b119811c160560e44a20f0432f0968f62 ChangeLog 13117
+SHA256 a798b82b3795949ee30227410edc8ea1e6883b095cb744d6426f98bab28f066c ChangeLog 13117
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -63,7 +67,7 @@ SHA256 70ddd8f011a31dd68111a95d08c6ec04e4f0f2ed8aed0c0c566d28e13c5e2ec7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuOcdchej4aZK9/cRArhgAJ9rsvInWdREbY4PEAPiSfIL/18AlgCfXdJO
-PSClNCQc7fF6+kanoIwPigU=
-=PGt0
+iD8DBQFEuWKbchej4aZK9/cRAuu2AJ90QWHd6hIcK2E4IdEIxRlYcdt63QCdHkmb
+JMHXRqjqNhaAiQ4lTUSGWYc=
+=tJoV
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.3-pthreads.patch b/media-gfx/splashutils/files/splashutils-1.3-pthreads.patch
new file mode 100644
index 000000000000..340b81a9357b
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.3-pthreads.patch
@@ -0,0 +1,48 @@
+diff --git a/core/daemon.c b/core/daemon.c
+index 5f3f7db..0cf2e23 100644
+--- a/core/daemon.c
++++ b/core/daemon.c
+@@ -98,9 +98,10 @@ void *thf_anim(void *unused)
+ 	anim *a = NULL, *ca;
+ 	item *i;
+ 	mng_anim *mng;
+-	int delay = 10000;
++	int delay = 10000, oldstate;
+ 
+ 	/* Render the first frame of all animations on the screen. */
++	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
+ 	pthread_mutex_lock(&mtx_paint);
+ 	for (i = anims.head; i != NULL; i = i->next) {
+ 		ca = i->p;
+@@ -113,9 +114,10 @@ void *thf_anim(void *unused)
+ 			anim_render_frame(ca);
+ 	}
+ 	pthread_mutex_unlock(&mtx_paint);
++	pthread_setcancelstate(oldstate, NULL);
+ 
+ 	while(1) {
+-
++		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
+ 		pthread_mutex_lock(&mtx_paint);
+ 		/* Find the shortest delay. */
+ 		for (i = anims.head; i != NULL; i = i->next) {
+@@ -133,9 +135,11 @@ void *thf_anim(void *unused)
+ 			}
+ 		}
+ 		pthread_mutex_unlock(&mtx_paint);
++		pthread_setcancelstate(oldstate, NULL);
+ 
+ 		usleep(delay * 1000);
+ 
++		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
+ 		pthread_mutex_lock(&mtx_paint);
+ 		/* Don't paint anything if we aren't in silent mode. */
+ 		if (ctty != CTTY_SILENT)
+@@ -161,6 +165,7 @@ void *thf_anim(void *unused)
+ 		}
+ 	
+ next:	pthread_mutex_unlock(&mtx_paint);
++		pthread_setcancelstate(oldstate, NULL);
+ 		
+ 		a = NULL;
+ 		delay = 10000;
diff --git a/media-gfx/splashutils/splashutils-1.3-r1.ebuild b/media-gfx/splashutils/splashutils-1.3-r1.ebuild
index 902ca0660cad..e9fcba42c85b 100644
--- a/media-gfx/splashutils/splashutils-1.3-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r1.ebuild,v 1.2 2006/07/15 13:01:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r1.ebuild,v 1.3 2006/07/15 21:47:53 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -65,6 +65,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/splashutils-1.3-fdset.patch
+	epatch ${FILESDIR}/splashutils-1.3-pthreads.patch
 
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${ROOT}/usr/lib/klibc/include/linux/console_splash.h ]]; then