From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:44457) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5R8m-0008WT-Ir for guix-patches@gnu.org; Sat, 22 Feb 2020 04:32:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5R8k-0002h4-6w for guix-patches@gnu.org; Sat, 22 Feb 2020 04:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42591) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5R8j-0002g6-Te for guix-patches@gnu.org; Sat, 22 Feb 2020 04:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5R8j-0001QJ-R6 for guix-patches@gnu.org; Sat, 22 Feb 2020 04:32:01 -0500 Subject: [bug#39675] [PATCH] fix Desmume on newer GCC Resent-Message-ID: Date: Sat, 22 Feb 2020 10:31:31 +0100 From: raingloom Message-Id: <1582363891.3461.0@riseup.net> In-Reply-To: <20200220160417.mbd2twtzkoknr5z7@gravity> References: <1582119681.2225.1@riseup.net> <20200220160417.mbd2twtzkoknr5z7@gravity> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-zj47ijjnTOuI9PiW2hNC" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39675@debbugs.gnu.org --=-zj47ijjnTOuI9PiW2hNC Content-Type: text/plain; charset=iso-8859-2; format=flowed Content-Transfer-Encoding: quoted-printable Ah, I forgot to leave a blank line in the commit message. Here is a patch for the current master as of a few minutes ago. On Thu, Feb 20, 2020 at 17:04, Jakub K=B1dzio=B3ka =20 wrote: > On Wed, Feb 19, 2020 at 02:41:21PM +0100, raingloom wrote: >> The project has not seen much development in some time, so it=20 >> needed a few >> patches. I found them in the Arch package, but they seem to be from=20 >> the >> upstream SourceForge project and mailing list. >>=20 >=20 > Hi, >=20 > the bullet points in your commit message are at the end of the lines=20 > for > some reason. Also, the added .patch files don't apply when I `guix=20 > build > desmume'. I think you'll need to resend the patch. Also, when you add > .patch files, you need to add them to a list in gnu/local.mk. >=20 > Regards, > Jakub K=B1dzio=B3ka = --=-zj47ijjnTOuI9PiW2hNC Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-desmume-fix-build-on-new-GCC-versions.patch Content-Transfer-Encoding: quoted-printable >From 5fd558ad04249d6214fdbf12f376962f65af1a9e Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 19 Feb 2020 14:36:26 +0100 Subject: [PATCH] gnu: desmume: fix build on new GCC versions * gnu/packages/emulation.scm (desmume) add patches * gnu/packages/patches/desmume-gcc6-fixes.patch: new file * gnu/packages/patches/desmume-gcc7-fixes.patch: new file --- gnu/packages/emulators.scm | 4 +- gnu/packages/patches/desmume-gcc6-fixes.patch | 59 +++++++++++++++++++ gnu/packages/patches/desmume-gcc7-fixes.patch | 18 ++++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/desmume-gcc6-fixes.patch create mode 100644 gnu/packages/patches/desmume-gcc7-fixes.patch diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index b7f29a6f5b..aec4ce73ba 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -102,7 +102,9 @@ version "/desmume-" version ".tar.gz")) (sha256 (base32 - "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs")))) + "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs")) + (patches (search-patches "desmume-gcc6-fixes.patch" + "desmume-gcc7-fixes.patch")))) (build-system gnu-build-system) (arguments ;; Enable support for WiFi and microphone. diff --git a/gnu/packages/patches/desmume-gcc6-fixes.patch b/gnu/packages/p= atches/desmume-gcc6-fixes.patch new file mode 100644 index 0000000000..6eb9576f64 --- /dev/null +++ b/gnu/packages/patches/desmume-gcc6-fixes.patch @@ -0,0 +1,59 @@ +From: zeromus +Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sou= rceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/54= 30 +Subject: fix GCC6 issues +Bug: https://sourceforge.net/p/desmume/bugs/1570/ +Bug-Debian: http://bugs.debian.org/811691 + +Index: desmume/src/MMU_timing.h +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- desmume/src/MMU_timing.h (revision 5513) ++++ desmume/src/MMU_timing.h (revision 5517) +@@ -155,8 +155,8 @@ + enum { ASSOCIATIVITY =3D 1 << ASSOCIATIVESHIFT }; + enum { BLOCKSIZE =3D 1 << BLOCKSIZESHIFT }; + enum { TAGSHIFT =3D SIZESHIFT - ASSOCIATIVESHIFT }; +- enum { TAGMASK =3D (u32)(~0 << TAGSHIFT) }; +- enum { BLOCKMASK =3D ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZ= ESHIFT) }; ++ enum { TAGMASK =3D (u32)(~0U << TAGSHIFT) }; ++ enum { BLOCKMASK =3D ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKS= IZESHIFT) }; + enum { WORDSIZE =3D sizeof(u32) }; + enum { WORDSPERBLOCK =3D (1 << BLOCKSIZESHIFT) / WORDSIZE }; + enum { DATAPERWORD =3D WORDSIZE * ASSOCIATIVITY }; +Index: desmume/src/ctrlssdl.cpp +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- desmume/src/ctrlssdl.cpp (revision 5513) ++++ desmume/src/ctrlssdl.cpp (revision 5517) +@@ -200,7 +200,7 @@ + break; + case SDL_JOYAXISMOTION: + /* Dead zone of 50% */ +- if( (abs(event.jaxis.value) >> 14) !=3D 0 ) ++ if( ((u32)abs(event.jaxis.value) >> 14) !=3D 0 ) + { + key =3D ((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 =3D ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((= event->jaxis.axis & 127) << 1); +- if( (abs(event->jaxis.value) >> 14) !=3D 0 ) ++ if( ((u32)abs(event->jaxis.value) >> 14) !=3D 0 ) + { + if (event->jaxis.value > 0) + key_code |=3D 1; +Index: desmume/src/wifi.cpp +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- desmume/src/wifi.cpp (revision 5429) ++++ desmume/src/wifi.cpp (revision 5430) +@@ -320,9 +320,9 @@ +=20 + #if (WIFI_LOGGING_LEVEL >=3D 1) + #if WIFI_LOG_USE_LOGC +- #define WIFI_LOG(level, ...) if(level <=3D WIFI_LOGGING_LEVEL) LOGC(8, = "WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <=3D WIFI_LOGGING_LEVEL) LOGC(8, = "WIFI: " __VA_ARGS__); + #else +- #define WIFI_LOG(level, ...) if(level <=3D WIFI_LOGGING_LEVEL) printf("= WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <=3D WIFI_LOGGING_LEVEL) printf("= WIFI: " __VA_ARGS__); + #endif + #else + #define WIFI_LOG(level, ...) {} diff --git a/gnu/packages/patches/desmume-gcc7-fixes.patch b/gnu/packages/p= atches/desmume-gcc7-fixes.patch new file mode 100644 index 0000000000..a4934ff6e6 --- /dev/null +++ b/gnu/packages/patches/desmume-gcc7-fixes.patch @@ -0,0 +1,18 @@ +From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Mon, 17 Aug 2015 21:15:04 +0000 +Subject: Fix bug with libfat string handling. + +diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.c= pp +index 765d7ae5..b6d7f01f 100644 +--- a/src/utils/libfat/directory.cpp ++++ b/src/utils/libfat/directory.cpp +@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, c= onst char* src, size_t len + int bytes; + size_t count =3D 0; +=20 +- while (count < len-1 && src !=3D '\0') { ++ while (count < len-1 && *src !=3D '\0') { + bytes =3D mbrtowc (&tempChar, src, MB_CUR_MAX, &ps); + if (bytes > 0) { + *dst =3D (ucs2_t)tempChar; --=20 2.25.0 = --=-zj47ijjnTOuI9PiW2hNC--