Date: Tuesday, August 9, 2022 @ 17:36:59 Author: alucryd Revision: 1264226
archrelease: copy trunk to community-x86_64 Added: desmume/repos/community-x86_64/PKGBUILD (from rev 1264225, desmume/trunk/PKGBUILD) Deleted: desmume/repos/community-x86_64/PKGBUILD desmume/repos/community-x86_64/gcc6_fixes.patch desmume/repos/community-x86_64/gcc7_fixes.patch ------------------+ PKGBUILD | 114 +++++++++++++++++++++++++++-------------------------- gcc6_fixes.patch | 59 --------------------------- gcc7_fixes.patch | 18 -------- 3 files changed, 60 insertions(+), 131 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-08-09 17:36:56 UTC (rev 1264225) +++ PKGBUILD 2022-08-09 17:36:59 UTC (rev 1264226) @@ -1,54 +0,0 @@ -# Maintainer: schuay <jakob.gru...@gmail.com> -# Contributor: Jonathan Conder <jonno dot conder at gmail dot com> -# Contributor: Brad Fanella <bradfane...@archlinux.us> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Nathan Jones <nath...@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=8 -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-x86_64/PKGBUILD (from rev 1264225, desmume/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-08-09 17:36:59 UTC (rev 1264226) @@ -0,0 +1,60 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: schuay <jakob.gru...@gmail.com> +# Contributor: Jonathan Conder <jonno dot conder at gmail dot com> +# Contributor: Brad Fanella <bradfane...@archlinux.us> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Nathan Jones <nath...@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.13 +pkgrel=1 +pkgdesc='Nintendo DS emulator' +arch=(x86_64) +url=https://desmume.org/ +license=(GPL) +depends=( + alsa-lib + desktop-file-utils + glu + gtk3 + libopenal.so + libpcap + sdl2 + soundtouch + zlib + zziplib +) +makedepends=( + git + intltool + mesa + meson +) +_tag=08b6fade0bc95749acc9820cb9688aaf39d00c87 +source=(git+https://github.com/TASEmulators/desmume.git#tag=${_tag}) +b2sums=(SKIP) + +pkgver() { + cd desmume + git describe --tags | sed 's/^release_//; s/_/./g' +} + +build() { + export CXXFLAGS+=' -Wno-format-security' + arch-meson desmume/desmume/src/frontend/posix build \ + -D openal=true \ + -D wifi=true + ninja -C build +} + +package() { + DESTDIR="${pkgdir}" ninja install -C build +} + +# vim: ts=2 sw=2 et: Deleted: gcc6_fixes.patch =================================================================== --- gcc6_fixes.patch 2022-08-09 17:36:56 UTC (rev 1264225) +++ gcc6_fixes.patch 2022-08-09 17:36:59 UTC (rev 1264226) @@ -1,59 +0,0 @@ -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, ...) {} Deleted: gcc7_fixes.patch =================================================================== --- gcc7_fixes.patch 2022-08-09 17:36:56 UTC (rev 1264225) +++ gcc7_fixes.patch 2022-08-09 17:36:59 UTC (rev 1264226) @@ -1,18 +0,0 @@ -From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 -From: rogerman <roger...@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;