| 1 |
commit: 0a56a8b1acb1a845003e63121029e7c5741a074b |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 13 13:08:09 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 13 13:12:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a56a8b1 |
| 7 |
|
| 8 |
games-emulation/desmume: remove unused patches |
| 9 |
|
| 10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 11 |
|
| 12 |
...mume-0.9.11-fix-pointer-conversion-warning.diff | 11 ----- |
| 13 |
.../desmume/files/desmume-0.9.11-gcc6.patch | 47 ---------------------- |
| 14 |
.../desmume/files/desmume-0.9.11-gcc7.patch | 21 ---------- |
| 15 |
3 files changed, 79 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index 8975085133f..00000000000 |
| 20 |
--- a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,11 +0,0 @@ |
| 23 |
---- a/src/path.h 2015-02-14 16:05:26.000000000 +0100 |
| 24 |
-+++ b/src/path.h 2016-07-11 12:09:59.591987169 +0200 |
| 25 |
-@@ -375,7 +375,7 @@ |
| 26 |
- else if (strchr(strftimeArgs, *p)) |
| 27 |
- { |
| 28 |
- char tmp[MAX_PATH]; |
| 29 |
-- char format[] = { '%', *p, NULL }; |
| 30 |
-+ char format[] = { '%', *p, '\0' }; |
| 31 |
- strftime(tmp, MAX_PATH, format, time_struct); |
| 32 |
- file.append(tmp); |
| 33 |
- } |
| 34 |
|
| 35 |
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch |
| 36 |
deleted file mode 100644 |
| 37 |
index 761ccef045c..00000000000 |
| 38 |
--- a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,47 +0,0 @@ |
| 41 |
---- a/src/wifi.cpp |
| 42 |
-+++ b/src/wifi.cpp |
| 43 |
-@@ -314,9 +314,9 @@ |
| 44 |
- |
| 45 |
- #if (WIFI_LOGGING_LEVEL >= 1) |
| 46 |
- #if WIFI_LOG_USE_LOGC |
| 47 |
-- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); |
| 48 |
-+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__); |
| 49 |
- #else |
| 50 |
-- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); |
| 51 |
-+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__); |
| 52 |
- #endif |
| 53 |
- #else |
| 54 |
- #define WIFI_LOG(level, ...) {} |
| 55 |
---- a/src/MMU_timing.h |
| 56 |
-+++ b/src/MMU_timing.h |
| 57 |
-@@ -155,8 +155,8 @@ |
| 58 |
- enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; |
| 59 |
- enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; |
| 60 |
- enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT }; |
| 61 |
-- enum { TAGMASK = (u32)(~0 << TAGSHIFT) }; |
| 62 |
-- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) }; |
| 63 |
-+ enum { TAGMASK = (u32)(~0U << TAGSHIFT) }; |
| 64 |
-+ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) }; |
| 65 |
- enum { WORDSIZE = sizeof(u32) }; |
| 66 |
- enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; |
| 67 |
- enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; |
| 68 |
---- a/src/ctrlssdl.cpp |
| 69 |
-+++ b/src/ctrlssdl.cpp |
| 70 |
-@@ -200,7 +200,7 @@ |
| 71 |
- break; |
| 72 |
- case SDL_JOYAXISMOTION: |
| 73 |
- /* Dead zone of 50% */ |
| 74 |
-- if( (abs(event.jaxis.value) >> 14) != 0 ) |
| 75 |
-+ if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) |
| 76 |
- { |
| 77 |
- key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); |
| 78 |
- if (event.jaxis.value > 0) { |
| 79 |
-@@ -370,7 +370,7 @@ |
| 80 |
- Note: button constants have a 1bit offset. */ |
| 81 |
- case SDL_JOYAXISMOTION: |
| 82 |
- key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); |
| 83 |
-- if( (abs(event->jaxis.value) >> 14) != 0 ) |
| 84 |
-+ if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) |
| 85 |
- { |
| 86 |
- if (event->jaxis.value > 0) |
| 87 |
- key_code |= 1; |
| 88 |
|
| 89 |
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch |
| 90 |
deleted file mode 100644 |
| 91 |
index 8b8a67f2291..00000000000 |
| 92 |
--- a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch |
| 93 |
+++ /dev/null |
| 94 |
@@ -1,21 +0,0 @@ |
| 95 |
-Bug: https://bugs.gentoo.org/646352 |
| 96 |
-Patch: https://sources.debian.org/data/main/d/desmume/0.9.11-3/debian/patches/gcc7_fixes.patch |
| 97 |
- |
| 98 |
-From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 |
| 99 |
-From: rogerman <rogerman@××××××××.net> |
| 100 |
-Date: Mon, 17 Aug 2015 21:15:04 +0000 |
| 101 |
-Subject: Fix bug with libfat string handling. |
| 102 |
- |
| 103 |
-diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp |
| 104 |
-index 765d7ae5..b6d7f01f 100644 |
| 105 |
---- a/src/utils/libfat/directory.cpp |
| 106 |
-+++ b/src/utils/libfat/directory.cpp |
| 107 |
-@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len |
| 108 |
- int bytes; |
| 109 |
- size_t count = 0; |
| 110 |
- |
| 111 |
-- while (count < len-1 && src != '\0') { |
| 112 |
-+ while (count < len-1 && *src != '\0') { |
| 113 |
- bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps); |
| 114 |
- if (bytes > 0) { |
| 115 |
- *dst = (ucs2_t)tempChar; |
Archives