Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-emulation/fceux/files: fceux-2.1.5-gcc46.patch fceux-2.1.5-gcc47.patch fceux-2.1.5-underlink.patch fceux-2.2.2-warnings.patch
Date: Wed, 31 Dec 2014 07:54:00
Message-Id: 20141231075354.36B2CE8D7@oystercatcher.gentoo.org
1 mr_bones_ 14/12/31 07:53:54
2
3 Modified: fceux-2.1.5-gcc46.patch fceux-2.1.5-gcc47.patch
4 fceux-2.1.5-underlink.patch
5 Added: fceux-2.2.2-warnings.patch
6 Log:
7 version bump (bug #466382); create menu entry (bug #499938)
8
9 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
10
11 Revision Changes Path
12 1.2 games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch?r1=1.1&r2=1.2
17
18 Index: fceux-2.1.5-gcc46.patch
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- fceux-2.1.5-gcc46.patch 12 Mar 2012 19:12:43 -0000 1.1
25 +++ fceux-2.1.5-gcc46.patch 31 Dec 2014 07:53:54 -0000 1.2
26 @@ -1,6 +1,5 @@
27 -diff -Naur a/fceu2.1.5/src/file.cpp b/fceu2.1.5/src/file.cpp
28 ---- a/fceu2.1.5/src/file.cpp 2010-09-19 00:05:09.000000000 +0000
29 -+++ b/fceu2.1.5/src/file.cpp 2012-03-01 19:21:25.856204727 +0000
30 +--- a/fceu2.1.5/src/file.cpp
31 ++++ b/fceu2.1.5/src/file.cpp
32 @@ -310,7 +310,7 @@
33 if(magic==0x088b1f) {
34 // maybe gzip...
35
36
37
38 1.2 games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch?r1=1.1&r2=1.2
43
44 Index: fceux-2.1.5-gcc47.patch
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- fceux-2.1.5-gcc47.patch 26 Oct 2012 07:31:51 -0000 1.1
51 +++ fceux-2.1.5-gcc47.patch 31 Dec 2014 07:53:54 -0000 1.2
52 @@ -1,5 +1,5 @@
53 ---- src/utils/endian.h.old 2012-10-26 09:07:24.000000000 +0200
54 -+++ src/utils/endian.h 2012-10-26 09:08:25.000000000 +0200
55 +--- src/utils/endian.h.old
56 ++++ src/utils/endian.h
57 @@ -93,19 +93,6 @@
58 }
59 }
60
61
62
63 1.3 games-emulation/fceux/files/fceux-2.1.5-underlink.patch
64
65 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-underlink.patch?rev=1.3&view=markup
66 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-underlink.patch?rev=1.3&content-type=text/plain
67 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-underlink.patch?r1=1.2&r2=1.3
68
69 Index: fceux-2.1.5-underlink.patch
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo-x86/games-emulation/fceux/files/fceux-2.1.5-underlink.patch,v
72 retrieving revision 1.2
73 retrieving revision 1.3
74 diff -u -r1.2 -r1.3
75 --- fceux-2.1.5-underlink.patch 21 Jun 2011 06:21:34 -0000 1.2
76 +++ fceux-2.1.5-underlink.patch 31 Dec 2014 07:53:54 -0000 1.3
77 @@ -1,5 +1,5 @@
78 ---- SConstruct.org 2011-06-07 21:33:28.876609681 +0200
79 -+++ SConstruct 2011-06-07 21:34:11.420368249 +0200
80 +--- SConstruct.org
81 ++++ SConstruct
82 @@ -70,6 +70,10 @@
83 env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
84 env.Append(CPPDEFINES=["_GTK3"])
85
86
87
88 1.1 games-emulation/fceux/files/fceux-2.2.2-warnings.patch
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.2.2-warnings.patch?rev=1.1&view=markup
91 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/fceux/files/fceux-2.2.2-warnings.patch?rev=1.1&content-type=text/plain
92
93 Index: fceux-2.2.2-warnings.patch
94 ===================================================================
95 diff -ru fceux-2.2.2.orig/src/input.cpp fceux-2.2.2/src/input.cpp
96 --- fceux-2.2.2.orig/src/input.cpp 2013-06-15 15:44:11.000000000 -0400
97 +++ fceux-2.2.2/src/input.cpp 2014-12-31 01:32:46.302001912 -0500
98 @@ -1161,7 +1161,7 @@
99 // FIXME this will always evaluate to true, should this be
100 // if (*lastSavestateMade...) to check if it holds a string or just
101 // a '\0'?
102 - if (lastSavestateMade && (undoSS || redoSS))
103 + if (*lastSavestateMade && (undoSS || redoSS))
104 SwapSaveState();
105 }
106
107 diff -ru fceux-2.2.2.orig/src/state.cpp fceux-2.2.2/src/state.cpp
108 --- fceux-2.2.2.orig/src/state.cpp 2013-09-18 19:03:59.000000000 -0400
109 +++ fceux-2.2.2/src/state.cpp 2014-12-31 01:33:11.453155054 -0500
110 @@ -1048,7 +1048,7 @@
111 //Both files must exist
112 //--------------------------------------------------------------------------------------------
113
114 - if (!lastSavestateMade)
115 + if (!*lastSavestateMade)
116 {
117 FCEUI_DispMessage("Can't Undo",0);
118 FCEUI_printf("Undo savestate was attempted but unsuccessful because there was not a recently used savestate.\n");
119 @@ -1153,7 +1153,7 @@
120 void RedoLoadState()
121 {
122 if (!redoLS) return;
123 - if (lastLoadstateMade && redoLS)
124 + if (*lastLoadstateMade && redoLS)
125 {
126 FCEUSS_Load(lastLoadstateMade);
127 FCEUI_printf("Redoing %s\n",lastLoadstateMade);