diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2008-09-29 16:24:21 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2008-09-29 16:24:21 +0000 |
| commit | ea63c4605ec7c5f5954686f742cafea561ef1845 (patch) | |
| tree | 5fb89279543cb07a238e115f2e8b134230538c0a /games-emulation | |
| parent | Adjusting kwin dep to >=4.1.0 instead of slot, as kde-testing overlay is chan... (diff) | |
| download | historical-ea63c4605ec7c5f5954686f742cafea561ef1845.tar.gz historical-ea63c4605ec7c5f5954686f742cafea561ef1845.tar.bz2 historical-ea63c4605ec7c5f5954686f742cafea561ef1845.zip | |
additional gcc43 patching from Tomáš Chvátal via bug #238829
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/stella/ChangeLog | 6 | ||||
| -rw-r--r-- | games-emulation/stella/Manifest | 4 | ||||
| -rw-r--r-- | games-emulation/stella/files/stella-2.6.1-gcc43.patch | 43 |
3 files changed, 46 insertions, 7 deletions
diff --git a/games-emulation/stella/ChangeLog b/games-emulation/stella/ChangeLog index ec3615e7ed48..ba5788ed354a 100644 --- a/games-emulation/stella/ChangeLog +++ b/games-emulation/stella/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/stella # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/ChangeLog,v 1.31 2008/07/24 17:53:58 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/ChangeLog,v 1.32 2008/09/29 16:24:20 mr_bones_ Exp $ + + 29 Sep 2008; Michael Sterrett <mr_bones_@gentoo.org> + files/stella-2.6.1-gcc43.patch: + additional gcc43 patching from Tomáš Chvátal via bug #238829 24 Jul 2008; Raúl Porcel <armin76@gentoo.org> stella-2.6.1.ebuild: x86 stable wrt #232223 diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest index 3ea3e2b803ec..49714d460edf 100644 --- a/games-emulation/stella/Manifest +++ b/games-emulation/stella/Manifest @@ -1,5 +1,5 @@ -AUX stella-2.6.1-gcc43.patch 417 RMD160 eab12d78ab46760b47b43e330c4a93ed04d471c0 SHA1 6c40fb8b013ebfe948d08155b1ae0aff6f36f43c SHA256 17c3a20bbdd545f9747fcce4e7aaa1e96f15906b1336707746f57914f6adf23f +AUX stella-2.6.1-gcc43.patch 2354 RMD160 1d015be836a9aac1c7d8367210078d9ce384a4c7 SHA1 1107c919becc3aa76729b87b61c1bd44a4b99a3a SHA256 754c7a144ae8b5e8e330eab82269057f40be93f175e72437ca24bdf1082d4603 DIST stella-2.6.1-src.tar.gz 1343034 RMD160 02720903c5bd7a88e44a5b83076cb811f9a3b312 SHA1 76fa0b879f9e8192449068f1ce092780a4825dd9 SHA256 35aad777f51e294b444d7c81051114bcbbaf3a3674a9de698407b75f746daea9 EBUILD stella-2.6.1.ebuild 1300 RMD160 cbfd3fb24ba34a75e8ca0657026f4bd6a833bfc1 SHA1 5b0b6310fb0f85faf10293226497843519518756 SHA256 eb4179f1fbf0af570eaae1004ce932432e1a89668b1731c3e92c6dd2087e8c6a -MISC ChangeLog 4001 RMD160 3fb4a3fe7780ace25e5a68d3b85a694ecd5bb7c8 SHA1 e9c7ed26169d422292d34f78ce191f61024f1f2f SHA256 bc766187f75e95640c8d32ca923941266f120815a7c491accc97898fa39887fe +MISC ChangeLog 4159 RMD160 e900b1eef180c30634f3508bf06e3b6d1ae29a8b SHA1 686a132e5fffa3d5fd47c52146955b0c6bfcf16a SHA256 bff193be65dcc9268f33d023eb142c81be0865f13b1ac96f9d95280d860abb66 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-emulation/stella/files/stella-2.6.1-gcc43.patch b/games-emulation/stella/files/stella-2.6.1-gcc43.patch index 175c8112d9ac..77a831414196 100644 --- a/games-emulation/stella/files/stella-2.6.1-gcc43.patch +++ b/games-emulation/stella/files/stella-2.6.1-gcc43.patch @@ -1,5 +1,6 @@ ---- src/emucore/CartAR.cxx -+++ src/emucore/CartAR.cxx +diff -urN stella-2.6.1.old/src/emucore/CartAR.cxx stella-2.6.1/src/emucore/CartAR.cxx +--- stella-2.6.1.old/src/emucore/CartAR.cxx 2008-03-29 00:29:13.000000000 +0100 ++++ stella-2.6.1/src/emucore/CartAR.cxx 2008-09-28 11:56:27.000000000 +0200 @@ -17,6 +17,7 @@ //============================================================================ @@ -8,8 +9,9 @@ #include "M6502Hi.hxx" #include "Random.hxx" ---- src/emucore/Cart.cxx -+++ src/emucore/Cart.cxx +diff -urN stella-2.6.1.old/src/emucore/Cart.cxx stella-2.6.1/src/emucore/Cart.cxx +--- stella-2.6.1.old/src/emucore/Cart.cxx 2008-05-17 01:56:21.000000000 +0200 ++++ stella-2.6.1/src/emucore/Cart.cxx 2008-09-28 11:56:42.000000000 +0200 @@ -18,6 +18,7 @@ #include <cassert> @@ -18,3 +20,36 @@ #include "bspf.hxx" #include "Cart.hxx" +diff -urN stella-2.6.1.old/src/emucore/TrackBall.cxx stella-2.6.1/src/emucore/TrackBall.cxx +--- stella-2.6.1.old/src/emucore/TrackBall.cxx 2008-05-19 05:15:12.000000000 +0200 ++++ stella-2.6.1/src/emucore/TrackBall.cxx 2008-09-28 12:28:10.000000000 +0200 +@@ -16,6 +16,7 @@ + // $Id: stella-2.6.1-gcc43.patch,v 1.2 2008/09/29 16:24:21 mr_bones_ Exp $ + //============================================================================ + ++#include <cmath> + #include "Event.hxx" + #include "System.hxx" + #include "TIA.hxx" +@@ -143,8 +144,8 @@ + else myTrakBallLeft = 0; + if(myHCounter < 0) myTrakBallDown = 0; + else myTrakBallDown = 1; +- myTrakBallCountH = abs(myVCounter >> 1); +- myTrakBallCountV = abs(myHCounter >> 1); ++ myTrakBallCountH = abs(double(myVCounter >> 1)); ++ myTrakBallCountV = abs(double(myHCounter >> 1)); + myTrakBallLinesH = 200 /*LinesInFrame*/ / (myTrakBallCountH + 1); + if(myTrakBallLinesH == 0) myTrakBallLinesH = 1; + myTrakBallLinesV = 200 /*LinesInFrame*/ / (myTrakBallCountV + 1); +diff -urN stella-2.6.1.old/src/unix/SerialPortUNIX.cxx stella-2.6.1/src/unix/SerialPortUNIX.cxx +--- stella-2.6.1.old/src/unix/SerialPortUNIX.cxx 2008-04-11 19:56:34.000000000 +0200 ++++ stella-2.6.1/src/unix/SerialPortUNIX.cxx 2008-09-28 11:58:00.000000000 +0200 +@@ -16,6 +16,7 @@ + // $Id: stella-2.6.1-gcc43.patch,v 1.2 2008/09/29 16:24:21 mr_bones_ Exp $ + //============================================================================ + ++#include <cstring> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> |