diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2012-02-27 14:58:33 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-02-27 14:58:33 +0000 |
commit | b968117cbec5f2b3a0852d814cfe5832e131fde7 (patch) | |
tree | 8bbb943e8826e6e6112db7b186bd1e81ef4f01d9 /x11-plugins/wmfire | |
parent | Restricting pypy (diff) | |
download | historical-b968117cbec5f2b3a0852d814cfe5832e131fde7.tar.gz historical-b968117cbec5f2b3a0852d814cfe5832e131fde7.tar.bz2 historical-b968117cbec5f2b3a0852d814cfe5832e131fde7.zip |
Fix display for SMP systems, report and patch by wbk in bug #404323
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
Diffstat (limited to 'x11-plugins/wmfire')
-rw-r--r-- | x11-plugins/wmfire/ChangeLog | 10 | ||||
-rw-r--r-- | x11-plugins/wmfire/Manifest | 15 | ||||
-rw-r--r-- | x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch | 130 | ||||
-rw-r--r-- | x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild (renamed from x11-plugins/wmfire/wmfire-1.2.4.ebuild) | 10 |
4 files changed, 152 insertions, 13 deletions
diff --git a/x11-plugins/wmfire/ChangeLog b/x11-plugins/wmfire/ChangeLog index 81b2241ec933..6def55028bf1 100644 --- a/x11-plugins/wmfire/ChangeLog +++ b/x11-plugins/wmfire/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-plugins/wmfire -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.19 2011/12/26 12:34:27 maekke Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.20 2012/02/27 14:58:33 voyageur Exp $ + +*wmfire-1.2.4-r2 (27 Feb 2012) + + 27 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> -wmfire-1.2.4.ebuild, + +wmfire-1.2.4-r2.ebuild, +files/wmfire-1.2.4-lastprocessor_SMP.patch: + Fix display for SMP systems, report and patch by wbk in bug #404323 26 Dec 2011; Markus Meier <maekke@gentoo.org> wmfire-1.2.4-r1.ebuild: x86 stable, bug #394081 diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest index 7cfcee445bfc..459e45e57b72 100644 --- a/x11-plugins/wmfire/Manifest +++ b/x11-plugins/wmfire/Manifest @@ -1,19 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX wmfire-1.2.3-stringh.patch 352 RMD160 f73e89b652caad5a306c955af25a96e524aba036 SHA1 6c386924c343844e1647cd17c1acef6cefcc0441 SHA256 e3058bfc7c44584a405e16232747559e264153800e3b04309931ac5ce4cd1991 +AUX wmfire-1.2.4-lastprocessor_SMP.patch 3890 RMD160 d380c0f4bf5e7c05f423f931b064649147fe8c78 SHA1 0a44ee648fa8370446093fa7815a8dcd5ecba617 SHA256 c54aeb288db41e4b753bf87b7d6f5330808c672ca94732e4f55e8673bd3c385b AUX wmfire-1.2.4-no_display.patch 561 RMD160 7d77455d382cf1fcd2b72b78a0f267e6f801da76 SHA1 5e04a2e851cf092ab487ea9b14cb5cc7c9c9d2b9 SHA256 12ea9b3631b174d8c38f8f4d5eef0479c6424d2274f52285e5f8d11cbe3ba64b DIST wmfire-1.2.3.tar.gz 90979 RMD160 af3e38cb2fbf7f5dfe5e0776d43ca3b8117fc813 SHA1 a0e296c454571dd650abd7d830a311c2c84e9339 SHA256 a254ca65b1df302c35dc5cdabd1d991889816389fb3e92084469c27a090559ba DIST wmfire-1.2.4.tar.gz 91144 RMD160 a0bdb91c589d12cffbc323949ceffb4c90b7f145 SHA1 9818cddaa5d32389d0706ede2d97c96a22725928 SHA256 e38b508519faf132273a9eaf75db56f1b14a5912667dd6843fc902d4a0ca2f80 EBUILD wmfire-1.2.3.ebuild 965 RMD160 adca2362cea9c1ae74c2e56c538d6e25f58c604b SHA1 81b3924e09d99f208ff5dbcc41832ee8ff0763b2 SHA256 4111c674e1146ac2133344d20f034321e6a9244d679bb14a36819dd38ccb6fd1 EBUILD wmfire-1.2.4-r1.ebuild 1000 RMD160 c9ecfb0c8f4028b15b92437decf733e7300ba449 SHA1 4666dc7ad62b70246780802f45032c43a62fc5f8 SHA256 4040c9b90f0dde0c45bd5deb7b857fa9ce1be0631f0ab75f0c34263a4ddf4a75 -EBUILD wmfire-1.2.4.ebuild 957 RMD160 e7b296f36f60de0b3015e7f9c1fc979dbfae48ca SHA1 0a7b99a0fe0bad91fbf52002c6c8d7b4adf86e90 SHA256 25a59745f4929d733dd392f8f8f9ee440aa81e547a725769c196038ee08677bf -MISC ChangeLog 2383 RMD160 1017b532d8c93d7b7646ad90e5f603cd02eada34 SHA1 540503cbec772b923da26e99e7ac91c6d0a4adae SHA256 0c2bd1f380b2c4a3eac8c3c7d3281b22f21dc7e6dc1c0411af99ef4351e540a2 +EBUILD wmfire-1.2.4-r2.ebuild 1048 RMD160 bc0c75e847660319dd50310b400488c008a51e86 SHA1 3eccf9d6520b7573a8ce787ff1d312b5852cf777 SHA256 e59b0dd19d6ed172396b8c404e50ce09f11daed586b7b0d640fb7078a788f3a4 +MISC ChangeLog 2637 RMD160 a3903c6d2a47b49723ef7246f8eb069f1cd34c7f SHA1 7cbd712da71c8c3d452a87059f8c2b440cce46ad SHA256 50f3196985163a5f70caf0b2ae246515fe08fb784d9b8a266064ced730866123 MISC metadata.xml 489 RMD160 ae1c206da8b6b1698e330e462cafac5275da1f47 SHA1 109e676e339c5907ef565e4d1a362d489bea3981 SHA256 85390853aeb9cc92782817b6ed2d921d2efb15e312d6ed20e98afaebe687c1cd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk74akUACgkQkKaRLQcq0GKwvQCeMIXAKaDBteKHFkV7kZ5g1TK8 -vxoAoKQmrzgLJNrWxSehudmHqTrDj7WY -=Yatq +iF4EAREIAAYFAk9LmioACgkQFYEBGcdFJfL+FwD9EomS9Yl+J7kszgeJDx0eKsCg +4VNezBuzHnn8SuMZbCoBAJ5ynaLKynDV9T4Wnor4iPfYPL6IjPWD59KpyKS0G194 +=rJYc -----END PGP SIGNATURE----- diff --git a/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch b/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch new file mode 100644 index 000000000000..2b389fecdd68 --- /dev/null +++ b/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch @@ -0,0 +1,130 @@ +--- wmfire-1.2.4/src/wmfire.c.orig 2005-12-04 11:39:16.000000000 +0100 ++++ wmfire-1.2.4/src/wmfire.c 2012-02-27 15:48:05.136807354 +0100 +@@ -63,6 +63,10 @@ + #define FIRE_NET 3 + #define FIRE_FILE 4 + ++/* wbk 20120220 - cleaning up "next cpu" logic */ ++#define CPU_AV -1 /* needs to be 1st CPU - 1 */ ++#define CPU_NEXT -2 /* arbitrary but must be < CPU_AV */ ++ + #define NET_SPD_PPP 56 + #define NET_SPD_ETH 100 + +@@ -104,7 +108,8 @@ + int update_mem(); + int update_net(); + int update_file(); +-int change_cpu(int); ++void change_cpu(int); ++int more_cpus(); + void change_flame(int); + GdkCursor *setup_cursor(); + void burn_spot(int, int, int); +@@ -130,8 +135,7 @@ + + int monitor = FIRE_CPU; + int load = 100; +-int cpu_av = 1; +-int cpu_id = 0; ++int cpu_id = CPU_AV; /* wbk - special value instead of separate flag */ + int cpu_nice = 1; + char net_dev[16] = "ppp0"; + int net_spd = 0; +@@ -224,8 +228,15 @@ + next = 0; + + if (!lock) { +- if (monitor == FIRE_CPU && change_cpu(-1)) +- monitor = FIRE_MEM; ++ if (monitor == FIRE_CPU) ++ { ++ /* First, check if we have more CPU's to monitor. If none, * ++ * move along to FIRE_MEM. Regardless, after this check, we * ++ * call change_cpu() to increment or reset CPU number. */ ++ if (!more_cpus()) ++ monitor = FIRE_MEM; ++ change_cpu(CPU_NEXT); ++ } + else if (monitor == FIRE_MEM) + monitor = FIRE_NET; + else if (monitor == FIRE_NET) +@@ -285,7 +296,7 @@ + + glibtop_get_cpu(&cpu); + +- if (cpu_av) { ++ if (cpu_id == CPU_AV) { + if (cpu_nice) + load = cpu.user + cpu.nice + cpu.sys; + else +@@ -383,30 +394,46 @@ + /* Change CPU monitor */ + /******************************************/ + +-int ++void + change_cpu(int which) + { +- glibtop_cpu cpu; ++ /* wbk 20120221 - Changed return type to void. Use more_cpus() * ++ * for tests instead. Mixing test logic with changing the CPU * ++ * was causing CPU's to be skipped in calling function. */ + ++ /* wbk - Even though we never use the cpu struct, I think this * ++ * call may be necessary to set up glibtop_global_server? */ ++ glibtop_cpu cpu; + glibtop_get_cpu(&cpu); + + /* This should work, but I have a lonely uniprocessor system */ ++ /* wbk - tested with a quad core. */ + +- if (which >= 0) { ++ if (which != CPU_NEXT) /* was run with command-line CPU specifier */ + cpu_id = which; +- cpu_av = 0; +- } else { +- cpu_id++; +- cpu_av = 0; +- } ++ else /* negative value "special case" for which */ ++ cpu_id++; + +- if (cpu_id >= glibtop_global_server->ncpu || cpu_id >= GLIBTOP_NCPU) { +- cpu_id = 0; +- cpu_av = 1; +- return 1; +- } ++ /* Since we already incremented cpu_id, we are comparing a * ++ * 1-index with 0-index value essentially. But since GLIBTOP_NCPU * ++ * is 1-indexed, keep >= for it. (a bit of an oversimplification: * ++ * cpu_id is still definitely regarded as 0-indexed elsewhere. We * ++ * index an array with it later, so this is important) */ ++ if (cpu_id > glibtop_global_server->ncpu || cpu_id >= GLIBTOP_NCPU) ++ cpu_id = CPU_AV; + +- return 0; ++ return; ++} ++ ++int ++more_cpus() ++{ ++ /* returns positive if next CPU would be valid, Negative if * ++ * already monitoring highest-numbered CPU or if more cores than * ++ * glibtop supports. */ ++ int next_cpu = cpu_id + 1; ++ return !(next_cpu > glibtop_global_server->ncpu ++ || next_cpu >= GLIBTOP_NCPU); + } + + /******************************************/ +@@ -494,7 +521,7 @@ + if (proximity++ > 100) { + + if (monitor == FIRE_CPU) { +- if (cpu_av) { ++ if (cpu_id == CPU_AV) { + /* Horizontal bar for average cpu */ + memset(&bm.cmap[27 * XMAX + 20], 255, 16); + memset(&bm.cmap[28 * XMAX + 20], 255, 16); diff --git a/x11-plugins/wmfire/wmfire-1.2.4.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild index 3d428c317fe8..60ec02426128 100644 --- a/x11-plugins/wmfire/wmfire-1.2.4.ebuild +++ b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/wmfire-1.2.4.ebuild,v 1.2 2011/03/28 14:43:30 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild,v 1.1 2012/02/27 14:58:33 voyageur Exp $ -EAPI=2 +EAPI=4 inherit autotools eutils DESCRIPTION="Load monitoring dockapp displaying dancing flame." @@ -25,6 +25,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${PN}-1.2.3-stringh.patch + epatch "${FILESDIR}"/${P}-no_display.patch + epatch "${FILESDIR}"/${P}-lastprocessor_SMP.patch eautoreconf } @@ -35,6 +37,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc ALL_I_GET_IS_A_GREY_BOX AUTHORS ChangeLog NEWS README } |