summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2014-12-31 07:53:54 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2014-12-31 07:53:54 +0000
commit96a85cd267e6fa53eda3548c923fdc9bd058cbf7 (patch)
treef82509c57658d537697b09f29f2a9077ac34b851 /games-emulation/fceux/files
parentMark arm64/m68k/s390/sh stable. (diff)
downloadgentoo-2-96a85cd267e6fa53eda3548c923fdc9bd058cbf7.tar.gz
gentoo-2-96a85cd267e6fa53eda3548c923fdc9bd058cbf7.tar.bz2
gentoo-2-96a85cd267e6fa53eda3548c923fdc9bd058cbf7.zip
version bump (bug #466382); create menu entry (bug #499938)
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-emulation/fceux/files')
-rw-r--r--games-emulation/fceux/files/fceux-2.1.5-gcc46.patch5
-rw-r--r--games-emulation/fceux/files/fceux-2.1.5-gcc47.patch4
-rw-r--r--games-emulation/fceux/files/fceux-2.1.5-underlink.patch4
-rw-r--r--games-emulation/fceux/files/fceux-2.2.2-warnings.patch33
4 files changed, 39 insertions, 7 deletions
diff --git a/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch b/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
index 90dacf4bb4a8..8062f946518a 100644
--- a/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
+++ b/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
@@ -1,6 +1,5 @@
-diff -Naur a/fceu2.1.5/src/file.cpp b/fceu2.1.5/src/file.cpp
---- a/fceu2.1.5/src/file.cpp 2010-09-19 00:05:09.000000000 +0000
-+++ b/fceu2.1.5/src/file.cpp 2012-03-01 19:21:25.856204727 +0000
+--- a/fceu2.1.5/src/file.cpp
++++ b/fceu2.1.5/src/file.cpp
@@ -310,7 +310,7 @@
if(magic==0x088b1f) {
// maybe gzip...
diff --git a/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch b/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
index 0b15cc89ad5c..de32c5f35b73 100644
--- a/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
+++ b/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
@@ -1,5 +1,5 @@
---- src/utils/endian.h.old 2012-10-26 09:07:24.000000000 +0200
-+++ src/utils/endian.h 2012-10-26 09:08:25.000000000 +0200
+--- src/utils/endian.h.old
++++ src/utils/endian.h
@@ -93,19 +93,6 @@
}
}
diff --git a/games-emulation/fceux/files/fceux-2.1.5-underlink.patch b/games-emulation/fceux/files/fceux-2.1.5-underlink.patch
index b45730738ac0..9e98967227d4 100644
--- a/games-emulation/fceux/files/fceux-2.1.5-underlink.patch
+++ b/games-emulation/fceux/files/fceux-2.1.5-underlink.patch
@@ -1,5 +1,5 @@
---- SConstruct.org 2011-06-07 21:33:28.876609681 +0200
-+++ SConstruct 2011-06-07 21:34:11.420368249 +0200
+--- SConstruct.org
++++ SConstruct
@@ -70,6 +70,10 @@
env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
env.Append(CPPDEFINES=["_GTK3"])
diff --git a/games-emulation/fceux/files/fceux-2.2.2-warnings.patch b/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
new file mode 100644
index 000000000000..f0af4631abda
--- /dev/null
+++ b/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
@@ -0,0 +1,33 @@
+diff -ru fceux-2.2.2.orig/src/input.cpp fceux-2.2.2/src/input.cpp
+--- fceux-2.2.2.orig/src/input.cpp 2013-06-15 15:44:11.000000000 -0400
++++ fceux-2.2.2/src/input.cpp 2014-12-31 01:32:46.302001912 -0500
+@@ -1161,7 +1161,7 @@
+ // FIXME this will always evaluate to true, should this be
+ // if (*lastSavestateMade...) to check if it holds a string or just
+ // a '\0'?
+- if (lastSavestateMade && (undoSS || redoSS))
++ if (*lastSavestateMade && (undoSS || redoSS))
+ SwapSaveState();
+ }
+
+diff -ru fceux-2.2.2.orig/src/state.cpp fceux-2.2.2/src/state.cpp
+--- fceux-2.2.2.orig/src/state.cpp 2013-09-18 19:03:59.000000000 -0400
++++ fceux-2.2.2/src/state.cpp 2014-12-31 01:33:11.453155054 -0500
+@@ -1048,7 +1048,7 @@
+ //Both files must exist
+ //--------------------------------------------------------------------------------------------
+
+- if (!lastSavestateMade)
++ if (!*lastSavestateMade)
+ {
+ FCEUI_DispMessage("Can't Undo",0);
+ FCEUI_printf("Undo savestate was attempted but unsuccessful because there was not a recently used savestate.\n");
+@@ -1153,7 +1153,7 @@
+ void RedoLoadState()
+ {
+ if (!redoLS) return;
+- if (lastLoadstateMade && redoLS)
++ if (*lastLoadstateMade && redoLS)
+ {
+ FCEUSS_Load(lastLoadstateMade);
+ FCEUI_printf("Redoing %s\n",lastLoadstateMade);