1 |
mr_bones_ 08/09/29 16:24:21 |
2 |
|
3 |
Modified: stella-2.6.1-gcc43.patch |
4 |
Log: |
5 |
additional gcc43 patching from Tomáš Chvátal via bug #238829 |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 games-emulation/stella/files/stella-2.6.1-gcc43.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/stella/files/stella-2.6.1-gcc43.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/stella/files/stella-2.6.1-gcc43.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/stella/files/stella-2.6.1-gcc43.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: stella-2.6.1-gcc43.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/games-emulation/stella/files/stella-2.6.1-gcc43.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- stella-2.6.1-gcc43.patch 23 May 2008 19:14:12 -0000 1.1 |
22 |
+++ stella-2.6.1-gcc43.patch 29 Sep 2008 16:24:21 -0000 1.2 |
23 |
@@ -1,5 +1,6 @@ |
24 |
---- src/emucore/CartAR.cxx |
25 |
-+++ src/emucore/CartAR.cxx |
26 |
+diff -urN stella-2.6.1.old/src/emucore/CartAR.cxx stella-2.6.1/src/emucore/CartAR.cxx |
27 |
+--- stella-2.6.1.old/src/emucore/CartAR.cxx 2008-03-29 00:29:13.000000000 +0100 |
28 |
++++ stella-2.6.1/src/emucore/CartAR.cxx 2008-09-28 11:56:27.000000000 +0200 |
29 |
@@ -17,6 +17,7 @@ |
30 |
//============================================================================ |
31 |
|
32 |
@@ -8,8 +9,9 @@ |
33 |
|
34 |
#include "M6502Hi.hxx" |
35 |
#include "Random.hxx" |
36 |
---- src/emucore/Cart.cxx |
37 |
-+++ src/emucore/Cart.cxx |
38 |
+diff -urN stella-2.6.1.old/src/emucore/Cart.cxx stella-2.6.1/src/emucore/Cart.cxx |
39 |
+--- stella-2.6.1.old/src/emucore/Cart.cxx 2008-05-17 01:56:21.000000000 +0200 |
40 |
++++ stella-2.6.1/src/emucore/Cart.cxx 2008-09-28 11:56:42.000000000 +0200 |
41 |
@@ -18,6 +18,7 @@ |
42 |
|
43 |
#include <cassert> |
44 |
@@ -18,3 +20,36 @@ |
45 |
|
46 |
#include "bspf.hxx" |
47 |
#include "Cart.hxx" |
48 |
+diff -urN stella-2.6.1.old/src/emucore/TrackBall.cxx stella-2.6.1/src/emucore/TrackBall.cxx |
49 |
+--- stella-2.6.1.old/src/emucore/TrackBall.cxx 2008-05-19 05:15:12.000000000 +0200 |
50 |
++++ stella-2.6.1/src/emucore/TrackBall.cxx 2008-09-28 12:28:10.000000000 +0200 |
51 |
+@@ -16,6 +16,7 @@ |
52 |
+ // $Id: stella-2.6.1-gcc43.patch,v 1.2 2008/09/29 16:24:21 mr_bones_ Exp $ |
53 |
+ //============================================================================ |
54 |
+ |
55 |
++#include <cmath> |
56 |
+ #include "Event.hxx" |
57 |
+ #include "System.hxx" |
58 |
+ #include "TIA.hxx" |
59 |
+@@ -143,8 +144,8 @@ |
60 |
+ else myTrakBallLeft = 0; |
61 |
+ if(myHCounter < 0) myTrakBallDown = 0; |
62 |
+ else myTrakBallDown = 1; |
63 |
+- myTrakBallCountH = abs(myVCounter >> 1); |
64 |
+- myTrakBallCountV = abs(myHCounter >> 1); |
65 |
++ myTrakBallCountH = abs(double(myVCounter >> 1)); |
66 |
++ myTrakBallCountV = abs(double(myHCounter >> 1)); |
67 |
+ myTrakBallLinesH = 200 /*LinesInFrame*/ / (myTrakBallCountH + 1); |
68 |
+ if(myTrakBallLinesH == 0) myTrakBallLinesH = 1; |
69 |
+ myTrakBallLinesV = 200 /*LinesInFrame*/ / (myTrakBallCountV + 1); |
70 |
+diff -urN stella-2.6.1.old/src/unix/SerialPortUNIX.cxx stella-2.6.1/src/unix/SerialPortUNIX.cxx |
71 |
+--- stella-2.6.1.old/src/unix/SerialPortUNIX.cxx 2008-04-11 19:56:34.000000000 +0200 |
72 |
++++ stella-2.6.1/src/unix/SerialPortUNIX.cxx 2008-09-28 11:58:00.000000000 +0200 |
73 |
+@@ -16,6 +16,7 @@ |
74 |
+ // $Id: stella-2.6.1-gcc43.patch,v 1.2 2008/09/29 16:24:21 mr_bones_ Exp $ |
75 |
+ //============================================================================ |
76 |
+ |
77 |
++#include <cstring> |
78 |
+ #include <sys/types.h> |
79 |
+ #include <sys/stat.h> |
80 |
+ #include <fcntl.h> |