Re: [PR PATCH] [Updated] desmume: update to 0.9.13

[zlice <zlice@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 861 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages desmume0.9.13
https://github.com/void-linux/void-packages/pull/50600

desmume: update to 0.9.13
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Current version 0.9.11 segfaults, may have needed a revdep-rebuild or something.

Game starts, sound play, clicks register for DS touchscreen.

Changed site as desmume.org and sorceforge do not seem to be online, though whois says .org is registered til 2031 or something and github and docs still mention the .org. 'desmume.com' points to .org as well.

A patch file from https://github.com/void-linux/void-packages/pull/50600.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-desmume0.9.13-50600.patch --]
[-- Type: text/x-diff, Size: 6392 bytes --]

From 4b6061b494da664d86be573a7f7ef889e381c539 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Wed, 29 May 2024 18:05:01 -0400
Subject: [PATCH] desmume: update to 0.9.13

---
 srcpkgs/desmume/patches/aarch64.patch       | 12 +++++++
 srcpkgs/desmume/patches/fix-gcc7.patch      | 38 ---------------------
 srcpkgs/desmume/patches/glx_3Demu.cpp.patch | 16 ---------
 srcpkgs/desmume/template                    | 28 +++++++--------
 srcpkgs/desmume/update                      |  3 +-
 5 files changed, 27 insertions(+), 70 deletions(-)
 create mode 100644 srcpkgs/desmume/patches/aarch64.patch
 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/aarch64.patch b/srcpkgs/desmume/patches/aarch64.patch
new file mode 100644
index 00000000000000..8a4254381c3093
--- /dev/null
+++ b/srcpkgs/desmume/patches/aarch64.patch
@@ -0,0 +1,12 @@
+--- a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp	2024-05-30 16:41:15.411778633 -0400
++++ b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp	2024-05-30 16:40:50.624235060 -0400
+@@ -705,7 +705,7 @@
+ 		for (; i < pixCountVec128; i+=(sizeof(v128u32)/sizeof(u32)))
+ 		{
+ 			v128u32 dstVec = vld1q_u32(dst+i);
+-			v128u32 tempDst = (SWAP_RB) ? COLOR32_SWAPRB_NEON(dstVec) : dstVec;
++			v128u32 tempDst = (SWAP_RB) ? (v128u32) COLOR32_SWAPRB_NEON(dstVec) : (v128u32) dstVec;
+ 			
+ 			v128u32 rb = vandq_u32(             tempDst,      vdupq_n_u32(0x00FF00FF) );
+ 			v128u32 g  = vandq_u32( vshrq_n_u32(tempDst,  8), vdupq_n_u32(0x000000FF) );
+
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..0792cfc5385414 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,25 +1,23 @@
 # Template file for 'desmume'
 pkgname=desmume
-version=0.9.11
-revision=4
+version=0.9.13
+revision=1
 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"
+build_wrksrc=desmume/src/frontend/posix
+configure_args="--enable-wifi --enable-hud --disable-openal"
+hostmakedepends="pkg-config intltool"
+makedepends="SDL2-devel libpcap-devel soundtouch-devel alsa-lib-devel
+ gtk+3-devel agg-devel zziplib-devel glu-devel clang17-headers"
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.desmume.org"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
-
-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
-}
+homepage="http://www.desmume.com"
+distfiles="https://github.com/TASEmulators/desmume/releases/download/release_${version//./_}/desmume-${version}.tar.xz"
+checksum=5734450e0c25f442dd44cda6a40410fd65470f4fe2fa1eb9f0b7b6dae22dabaf
+CPPFLAGS="-flax-vector-conversions"
+CXXFLAGS="-flax-vector-conversions"
+CFLAGS="-flax-vector-conversions"
 
 post_install() {
 	# locales is only used for glade, but it's never built
diff --git a/srcpkgs/desmume/update b/srcpkgs/desmume/update
index 631a66c30eef45..a9229be9378e92 100644
--- a/srcpkgs/desmume/update
+++ b/srcpkgs/desmume/update
@@ -1 +1,2 @@
-pattern="${pkgname}-\K[\d.]+(?=\.tar)"
+site=https://github.com/TASEmulators/desmume/tags
+pattern="\Krelease_[\d]_[\d]_[\d]+(?=\.tar)"