Fixed -delay handling for values more similar to previous ones.

Package-Manager: portage-2.1.2.4

diff --git a/app-emulation/xtrs/ChangeLog b/app-emulation/xtrs/ChangeLog
index c8974ecfb0cacd17ca0c59fd1e7e11088ecd130d..1d9f2eefd03f4deee5cc3e651fc3776fdb4d52dd 100644 (file)
--- a/app-emulation/xtrs/ChangeLog
+++ b/app-emulation/xtrs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/xtrs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/ChangeLog,v 1.16 2007/04/26 09:27:02 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/ChangeLog,v 1.17 2007/04/27 17:17:35 ulm Exp $
+
+  27 Apr 2007; Ulrich Mueller <ulm@gentoo.org> files/xtrs-4.9c-gentoo.patch:
+  Delay loop changed, for -delay values more similar to the previous ones.
 
   26 Apr 2007; Timothy Redaelli <drizzt@gentoo.org> xtrs-4.9c.ebuild:
   Add ~x86-fbsd keyword.

diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index a3766441b5c05d43eba089fabc83ff41f6b3361a..e6b255f36eff233b006793793344ed2289cb7d06 100644 (file)
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -5,10 +5,10 @@ AUX xtrs-4.9-gentoo.diff 4318 RMD160 50f9316db744a693f32c8fe2d015b3135162dde6 SH
 MD5 4bcbf9c6717042e4c3793af452ada659 files/xtrs-4.9-gentoo.diff 4318
 RMD160 50f9316db744a693f32c8fe2d015b3135162dde6 files/xtrs-4.9-gentoo.diff 4318
 SHA256 9292ede299cbff3f5b079ba4552a340d06247ee731a30e027fe834654364d394 files/xtrs-4.9-gentoo.diff 4318
-AUX xtrs-4.9c-gentoo.patch 2634 RMD160 a506d312006618f1c769de1e7c51f84b66d90ad7 SHA1 0705eb5785bcd57b8168fd8d1d2a6ac2c558e874 SHA256 bdc658439355ee1b0ad4530d1cafba712865c51fc8c11272054488ad655d218f
-MD5 8cc82059b866290c050e3ccb85002cea files/xtrs-4.9c-gentoo.patch 2634
-RMD160 a506d312006618f1c769de1e7c51f84b66d90ad7 files/xtrs-4.9c-gentoo.patch 2634
-SHA256 bdc658439355ee1b0ad4530d1cafba712865c51fc8c11272054488ad655d218f files/xtrs-4.9c-gentoo.patch 2634
+AUX xtrs-4.9c-gentoo.patch 2650 RMD160 7e2b9bb228b2cc6ea0daacce4b82403b9c5f364a SHA1 373dcff9bb16a4b21f1eb78c17e89970b2c90007 SHA256 6b9a52848783854937e0f1508076f86da317e7a5c9bc553255597403101be07a
+MD5 8905ba663dfaf50b0a37275c40e86eef files/xtrs-4.9c-gentoo.patch 2650
+RMD160 7e2b9bb228b2cc6ea0daacce4b82403b9c5f364a files/xtrs-4.9c-gentoo.patch 2650
+SHA256 6b9a52848783854937e0f1508076f86da317e7a5c9bc553255597403101be07a files/xtrs-4.9c-gentoo.patch 2650
 DIST ld4-631.tar.gz 191393 RMD160 2460b1f5490039c02aaec8e1645b23c511b557d9 SHA1 2ad71c65e5b78fb2c67080ab332f723eb6f90be8 SHA256 7f810d5fe0ce5c2fdabf25b5631ed2c84b19301b2e4df452bc57ca1375a84650
 DIST xtrs-4.9.tar.gz 422910 RMD160 6daabf36a53e4af8b9d6b97d91cba00cc55b406f SHA1 abfbbdb972c7fa2b3545ed42698162a88168bded SHA256 ceb0044ce02f705b256139276e1dcb0b73b39aeb7b0f4f8d243faf9aca3491c4
 DIST xtrs-4.9c.tar.gz 443651 RMD160 db6057adb8a648362856026b9e8b4edd9a43b117 SHA1 23b3440fca962104c7676c633974d413ef4d3b92 SHA256 a5071dee883b83d893467b913441f8bb75984d0d4e567eef0479d43891dfb978
@@ -20,10 +20,10 @@ EBUILD xtrs-4.9c.ebuild 2153 RMD160 ae3c661c2c97579068f6705a10db8a0261271a25 SHA
 MD5 e51762942ebc89a1dfab7adc9984339f xtrs-4.9c.ebuild 2153
 RMD160 ae3c661c2c97579068f6705a10db8a0261271a25 xtrs-4.9c.ebuild 2153
 SHA256 33c64ea660abba979bc492e3fe9ad8370878486b1d9c3f652fabed103452fc9b xtrs-4.9c.ebuild 2153
-MISC ChangeLog 2093 RMD160 8c00a9af0e836906d24dc6c18145cdf52906e51f SHA1 58b347c4e593c09746cf6810f801944276506f46 SHA256 dfcabbca792dfd854aaf2ec18f95358c8fb9ab77ad398da0e7109698e74d84fb
-MD5 47719bb9f63f06a522fe46254c7e8860 ChangeLog 2093
-RMD160 8c00a9af0e836906d24dc6c18145cdf52906e51f ChangeLog 2093
-SHA256 dfcabbca792dfd854aaf2ec18f95358c8fb9ab77ad398da0e7109698e74d84fb ChangeLog 2093
+MISC ChangeLog 2243 RMD160 606e039934a3be390c0f6795fba43ede41a57f3d SHA1 2a825c4fd7c3f8a4f3a2e8776c8d0913a9a0cee7 SHA256 7a06a08758baa4c653480b8cfdeb3430d05d6e77898b1f0a7061b7488f1aeafe
+MD5 f33cb39196b6b76522c69d9096c4abef ChangeLog 2243
+RMD160 606e039934a3be390c0f6795fba43ede41a57f3d ChangeLog 2243
+SHA256 7a06a08758baa4c653480b8cfdeb3430d05d6e77898b1f0a7061b7488f1aeafe ChangeLog 2243
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 MD5 d011c0faecf2cf73ac0eea9bab7ea4c1 metadata.xml 219
 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 metadata.xml 219
@@ -35,9 +35,9 @@ MD5 2ad8c343c521cd0fa233931860ebe579 files/digest-xtrs-4.9c 452
 RMD160 2681fb78a31fdaceb46c50d560310377e5c7bfd1 files/digest-xtrs-4.9c 452
 SHA256 bdbee17043828bd9201ecaef4893e3c844267546dbcc4b41875fe9237a19a754 files/digest-xtrs-4.9c 452
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGMHBsjJyKLBkBVroRAmemAKCpEFBi4OvhMEHY1nschG8yxxPxAQCgvFXC
-c8m4c6IQgfmrFKLu98Hqs7Q=
-=Ixe+
+iD8DBQFGMjCwOeoy/oIi7uwRAg+MAKDlvVVySmV4UaNexWj8GCmKhjln9gCguacx
+ffVBHkFPqrmv+mgHk4wCncc=
+=yknE
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch b/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
index 113e26afcfed8832c518118ef66ae1223932c0f0..c9f5029b6afc02890b04a6d37c416e49b8157f76 100644 (file)
--- a/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
+++ b/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
@@ -5,7 +5,7 @@ diff -Nur xtrs-4.9c-orig/ChangeLog xtrs-4.9c/ChangeLog
 +4.9c-Gentoo -- Sat Apr 21 14:37:00 MDT 2007  Joe Peterson <joe@skyrush.com>
 +
 +* Patched for Gentoo ebuild
-+  - Change "int i" in the z80 delay loop to "volatile int"
++  - Added assignment to volatile variable in the z80 delay loop
 +    (allows near-actual speed emulation with optimization)
 +  - Fixed keyboard wait issue that caused CPU spinning (i.e. max
 +    CPU usage) after using F10 (reset), F7, F8, or F9.
@@ -74,12 +74,13 @@ diff -Nur xtrs-4.9c-orig/trs_xinterface.c xtrs-4.9c/trs_xinterface.c
 diff -Nur xtrs-4.9c-orig/z80.c xtrs-4.9c/z80.c
 --- xtrs-4.9c-orig/z80.c       2005-05-22 08:57:01.000000000 +0200
 +++ xtrs-4.9c/z80.c    2007-04-25 22:12:20.000000000 +0200
-@@ -2999,7 +2999,7 @@
-     Uchar instruction;
-     Ushort address; /* generic temps */
-     int ret = 0;
--    int i;
-+    volatile int i;
-     trs_continuous = continuous;
+@@ -3027,7 +3027,8 @@
+ #endif
+         /* Speed control */
+         if ((i = z80_state.delay)) {
+-          while (--i) /*nothing*/;
++          volatile int dummy;
++          while (--i) dummy = i;
+       }
  
-     /* loop to do a z80 instruction */
+       instruction = mem_read(REG_PC++);