From 383511762da58a16c4d3f37f0bcf15efb3181dce Mon Sep 17 00:00:00 2001 From: zlice Date: Wed, 29 May 2024 18:05:01 -0400 Subject: [PATCH] desmume: update to 0.9.13 --- srcpkgs/desmume/patches/fix-gcc7.patch | 38 --------------------- srcpkgs/desmume/patches/glx_3Demu.cpp.patch | 16 --------- srcpkgs/desmume/template | 26 ++++++++------ 3 files changed, 15 insertions(+), 65 deletions(-) delete mode 100644 srcpkgs/desmume/patches/fix-gcc7.patch delete mode 100644 srcpkgs/desmume/patches/glx_3Demu.cpp.patch diff --git a/srcpkgs/desmume/patches/fix-gcc7.patch b/srcpkgs/desmume/patches/fix-gcc7.patch deleted file mode 100644 index 2c2c6538db61d0..00000000000000 --- a/srcpkgs/desmume/patches/fix-gcc7.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/src/wifi.cpp 2018-01-16 14:39:01.175395010 +0100 -+++ b/src/wifi.cpp 2018-01-16 14:38:10.762596117 +0100 -@@ -314,9 +314,9 @@ WifiComInterface* wifiCom; - - #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 2018-01-16 14:47:05.818461679 +0100 -+++ b/src/MMU_timing.h 2018-01-16 14:48:05.344224219 +0100 -@@ -155,8 +155,8 @@ private: - 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)(((u32)~0) << TAGSHIFT) }; -+ enum { BLOCKMASK = ((u32)((u32)~0) >> (32 - TAGSHIFT)) & (u32)(((u32)~0) << BLOCKSIZESHIFT) }; - enum { WORDSIZE = sizeof(u32) }; - enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; - enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; ---- a/src/utils/libfat/directory.cpp 2018-01-16 14:52:24.057192162 +0100 -+++ b/src/utils/libfat/directory.cpp 2018-01-16 14:52:27.833177099 +0100 -@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 ( - 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; diff --git a/srcpkgs/desmume/patches/glx_3Demu.cpp.patch b/srcpkgs/desmume/patches/glx_3Demu.cpp.patch deleted file mode 100644 index b4cbc755f29ea1..00000000000000 --- a/srcpkgs/desmume/patches/glx_3Demu.cpp.patch +++ /dev/null @@ -1,16 +0,0 @@ -Function returning void should not return a value :-) - ---- a/src/gtk/glx_3Demu.cpp 2014-02-01 16:26:52.801231527 +0100 -+++ b/src/gtk/glx_3Demu.cpp 2014-02-01 16:27:17.632357063 +0100 -@@ -41,11 +41,7 @@ void deinit_glx_3Demu(void) - glXDestroyContext(dpy, ctx); - - XCloseDisplay(dpy); -- -- return true; - } -- -- return false; - } - - int init_glx_3Demu(void) diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template index 3afaa5027f74be..5c8b663bbd64cf 100644 --- a/srcpkgs/desmume/template +++ b/srcpkgs/desmume/template @@ -1,24 +1,28 @@ # Template file for 'desmume' pkgname=desmume -version=0.9.11 -revision=4 -build_style=gnu-configure -configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx" -hostmakedepends="pkg-config intltool dos2unix" -makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel - gtk+-devel agg-devel zziplib-devel glu-devel" +version=0.9.13 +revision=1 +build_style=meson +configure_args="-D openal=false -D wifi=true" +hostmakedepends="pkg-config intltool dos2unix cmake" +makedepends="SDL2-devel libpcap-devel soundtouch-devel alsa-lib-devel + gtk+3-devel agg-devel zziplib-devel glu-devel glib-devel" depends="desktop-file-utils" short_desc="Nintendo DS emulator" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="http://www.desmume.org" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896 +homepage="http://www.desmume.com" +distfiles="https://github.com/TASEmulators/desmume/releases/download/release_${version//./_}/desmume-${version}.tar.xz" +checksum=5734450e0c25f442dd44cda6a40410fd65470f4fe2fa1eb9f0b7b6dae22dabaf post_extract() { # git eats CRLFs, so the patch has wrong line ending. Instead # convert the target file to LF-only. - dos2unix $wrksrc/src/MMU_timing.h + dos2unix $wrksrc/desmume/src/MMU_timing.h +} + +do_configure() { + meson --prefix /usr desmume/src/frontend/posix build ${configure_args} } post_install() {