diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /games-emulation/desmume/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'games-emulation/desmume/files')
3 files changed, 80 insertions, 0 deletions
diff --git a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff b/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff new file mode 100644 index 000000000000..8975085133ff --- /dev/null +++ b/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff @@ -0,0 +1,11 @@ +--- a/src/path.h 2015-02-14 16:05:26.000000000 +0100 ++++ b/src/path.h 2016-07-11 12:09:59.591987169 +0200 +@@ -375,7 +375,7 @@ + else if (strchr(strftimeArgs, *p))
+ {
+ char tmp[MAX_PATH];
+- char format[] = { '%', *p, NULL };
++ char format[] = { '%', *p, '\0' };
+ strftime(tmp, MAX_PATH, format, time_struct);
+ file.append(tmp);
+ }
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch new file mode 100644 index 000000000000..761ccef045cf --- /dev/null +++ b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch @@ -0,0 +1,47 @@ +--- a/src/wifi.cpp ++++ b/src/wifi.cpp +@@ -314,9 +314,9 @@ + + #if (WIFI_LOGGING_LEVEL >= 1) + #if WIFI_LOG_USE_LOGC +- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__); + #else +- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__); + #endif + #else + #define WIFI_LOG(level, ...) {} +--- a/src/MMU_timing.h ++++ b/src/MMU_timing.h +@@ -155,8 +155,8 @@ + enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT };
+ enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT };
+ enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT };
+- enum { TAGMASK = (u32)(~0 << TAGSHIFT) };
+- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) };
++ enum { TAGMASK = (u32)(~0U << TAGSHIFT) };
++ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) };
+ enum { WORDSIZE = sizeof(u32) };
+ enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE };
+ enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY };
+--- a/src/ctrlssdl.cpp ++++ b/src/ctrlssdl.cpp +@@ -200,7 +200,7 @@ + break; + case SDL_JOYAXISMOTION: + /* Dead zone of 50% */ +- if( (abs(event.jaxis.value) >> 14) != 0 ) ++ if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) + { + key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); + if (event.jaxis.value > 0) { +@@ -370,7 +370,7 @@ + Note: button constants have a 1bit offset. */ + case SDL_JOYAXISMOTION: + key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); +- if( (abs(event->jaxis.value) >> 14) != 0 ) ++ if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) + { + if (event->jaxis.value > 0) + key_code |= 1; diff --git a/games-emulation/desmume/files/desmume-fix-function-type.patch b/games-emulation/desmume/files/desmume-fix-function-type.patch new file mode 100644 index 000000000000..b370d57912eb --- /dev/null +++ b/games-emulation/desmume/files/desmume-fix-function-type.patch @@ -0,0 +1,22 @@ +diff -Naur a/src/gtk/glx_3Demu.cpp b/src/gtk/glx_3Demu.cpp +--- a/src/gtk/glx_3Demu.cpp 2014-12-06 21:08:12.628393543 +0100 ++++ b/src/gtk/glx_3Demu.cpp 2014-12-06 21:08:26.591393054 +0100 +@@ -31,7 +31,7 @@ + static GLXContext ctx; + static GLXPbuffer pbuf; + +-void deinit_glx_3Demu(void) ++int deinit_glx_3Demu(void) + { + Display *dpy = glXGetCurrentDisplay(); + +diff -Naur a/src/gtk/glx_3Demu.h b/src/gtk/glx_3Demu.h +--- a/src/gtk/glx_3Demu.h 2014-12-06 21:08:12.628393543 +0100 ++++ b/src/gtk/glx_3Demu.h 2014-12-06 21:08:23.999393145 +0100 +@@ -20,5 +20,5 @@ + + #ifdef HAVE_GL_GLX + int init_glx_3Demu(void); +-void deinit_glx_3Demu(void); ++int deinit_glx_3Demu(void); + #endif |