[arch-commits] Commit in desmume/repos (4 files)
Felix Yan
felixonmars at archlinux.org
Tue Jul 7 18:10:45 UTC 2020
Date: Tuesday, July 7, 2020 @ 18:10:45
Author: felixonmars
Revision: 660021
archrelease: copy trunk to community-staging-x86_64
Added:
desmume/repos/community-staging-x86_64/
desmume/repos/community-staging-x86_64/PKGBUILD
(from rev 660019, desmume/trunk/PKGBUILD)
desmume/repos/community-staging-x86_64/gcc6_fixes.patch
(from rev 660020, desmume/trunk/gcc6_fixes.patch)
desmume/repos/community-staging-x86_64/gcc7_fixes.patch
(from rev 660020, desmume/trunk/gcc7_fixes.patch)
------------------+
PKGBUILD | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
gcc6_fixes.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
gcc7_fixes.patch | 18 ++++++++++++++++
3 files changed, 131 insertions(+)
Copied: desmume/repos/community-staging-x86_64/PKGBUILD (from rev 660019, desmume/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2020-07-07 18:10:45 UTC (rev 660021)
@@ -0,0 +1,54 @@
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Jonathan Conder <jonno dot conder at gmail dot com>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Nathan Jones <nathanj at insightbb.com>
+# Contributor: Javier "Phrodo_00" Aravena <phrodo.00 at gmail dot com>
+# Contributor: angvp <angvp at archlinux dot us>
+# Contributor: Allan <mcrae_allan at hotmail dot com>
+# Contributor: w0rm <w0rmtux at gmail dot com>
+# Contributor: vEX <vex at niechift dot com>
+# Contributor: Asher256 <achrafcherti at gmail dot com>
+
+pkgname=desmume
+pkgver=0.9.11
+pkgrel=7
+pkgdesc="Nintendo DS emulator"
+arch=('x86_64')
+url="https://desmume.org/"
+license=('GPL')
+depends=('desktop-file-utils' 'libpcap' 'soundtouch' 'alsa-lib' 'glu' 'sdl' 'gtk2' 'zziplib')
+makedepends=('intltool' 'mesa' 'clang')
+source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+ gcc6_fixes.patch
+ gcc7_fixes.patch)
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Fix build
+ patch -Np1 -i ../gcc6_fixes.patch
+ patch -Np1 -i ../gcc7_fixes.patch
+
+
+ # See https://bugs.archlinux.org/task/35086 and
+ # https://sourceforge.net/tracker/?func=detail&aid=3612768&group_id=164579&atid=832291
+ sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr --enable-wifi --enable-openal
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+}
+
+md5sums=('269b5d4ddc5715720469a9d0efc53044'
+ '7887bff9ca494999f27cbd08bf54ce41'
+ '02bfa83f96cee77d8a349dfd8ce56d5a')
Copied: desmume/repos/community-staging-x86_64/gcc6_fixes.patch (from rev 660020, desmume/trunk/gcc6_fixes.patch)
===================================================================
--- community-staging-x86_64/gcc6_fixes.patch (rev 0)
+++ community-staging-x86_64/gcc6_fixes.patch 2020-07-07 18:10:45 UTC (rev 660021)
@@ -0,0 +1,59 @@
+From: zeromus
+Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/5430
+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
+===================================================================
+--- desmume/src/MMU_timing.h (revision 5513)
++++ desmume/src/MMU_timing.h (revision 5517)
+@@ -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 };
+Index: desmume/src/ctrlssdl.cpp
+===================================================================
+--- 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) != 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;
+Index: desmume/src/wifi.cpp
+===================================================================
+--- desmume/src/wifi.cpp (revision 5429)
++++ desmume/src/wifi.cpp (revision 5430)
+@@ -320,9 +320,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, ...) {}
Copied: desmume/repos/community-staging-x86_64/gcc7_fixes.patch (from rev 660020, desmume/trunk/gcc7_fixes.patch)
===================================================================
--- community-staging-x86_64/gcc7_fixes.patch (rev 0)
+++ community-staging-x86_64/gcc7_fixes.patch 2020-07-07 18:10:45 UTC (rev 660021)
@@ -0,0 +1,18 @@
+From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001
+From: rogerman <rogerman at users.sf.net>
+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.cpp
+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, const char* src, size_t len
+ int bytes;
+ size_t count = 0;
+
+- while (count < len-1 && src != '\0') {
++ while (count < len-1 && *src != '\0') {
+ bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps);
+ if (bytes > 0) {
+ *dst = (ucs2_t)tempChar;
More information about the arch-commits
mailing list