From de2a5ca3ebfa3f50aeef68e97431425a2be8dd52 Mon Sep 17 00:00:00 2001
From: Stephane D'Alu <sdalu@sdalu.com>
Date: Fri, 27 Oct 2023 12:04:32 +0200
Subject: [PATCH] games/libretro-melonds: update to 0.20230413

PR:		274647
---
 games/libretro-melonds/Makefile                  |  8 ++++----
 games/libretro-melonds/distinfo                  |  6 +++---
 ..._libretro_libretro-common_rthreads_rthreads.c | 16 ++++++++--------
 .../files/patch-src_libretro_platform.cpp        | 10 ----------
 4 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 games/libretro-melonds/files/patch-src_libretro_platform.cpp

diff --git a/games/libretro-melonds/Makefile b/games/libretro-melonds/Makefile
index 2ad860e89b40c..79ac6fd343a38 100644
--- a/games/libretro-melonds/Makefile
+++ b/games/libretro-melonds/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libretro-melonds
-PORTVERSION=	0.20220712
+DISTVERSION=	0.20230413
 CATEGORIES=	games
 
 MAINTAINER=	henry.hu.sh@gmail.com
@@ -13,12 +13,12 @@ USES=		compiler:c++17-lang gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	melonDS
-GH_TAGNAME=	490a66a
+GH_TAGNAME=	c6488c88cb4c7583dbcd61609e0eef441572fae8
 
 PLIST_FILES=	lib/libretro/melonds_libretro.so
 
 do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/melonds_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
+	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro
+	${INSTALL_LIB} ${WRKSRC}/melonds_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro
 
 .include <bsd.port.mk>
diff --git a/games/libretro-melonds/distinfo b/games/libretro-melonds/distinfo
index 645a224d33a99..0087fb68c795d 100644
--- a/games/libretro-melonds/distinfo
+++ b/games/libretro-melonds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662934834
-SHA256 (libretro-melonDS-0.20220712-490a66a_GH0.tar.gz) = e12a41863f9018bb863d4e3f217cc23dd9b67a530f85655c1126471422511ffc
-SIZE (libretro-melonDS-0.20220712-490a66a_GH0.tar.gz) = 2929298
+TIMESTAMP = 1698314786
+SHA256 (libretro-melonDS-0.20230413-c6488c88cb4c7583dbcd61609e0eef441572fae8_GH0.tar.gz) = bd232af7f8b0f491891893096bec6b6a60dc1671cf12907e67f4d6dbf668e0ed
+SIZE (libretro-melonDS-0.20230413-c6488c88cb4c7583dbcd61609e0eef441572fae8_GH0.tar.gz) = 2936744
diff --git a/games/libretro-melonds/files/patch-src_libretro_libretro-common_rthreads_rthreads.c b/games/libretro-melonds/files/patch-src_libretro_libretro-common_rthreads_rthreads.c
index b19846bae1daf..82011262cf5f5 100644
--- a/games/libretro-melonds/files/patch-src_libretro_libretro-common_rthreads_rthreads.c
+++ b/games/libretro-melonds/files/patch-src_libretro_libretro-common_rthreads_rthreads.c
@@ -1,11 +1,11 @@
---- src/libretro/libretro-common/rthreads/rthreads.c.orig	2022-07-12 14:45:04 UTC
+--- src/libretro/libretro-common/rthreads/rthreads.c.orig	2023-11-02 10:45:06 UTC
 +++ src/libretro/libretro-common/rthreads/rthreads.c
-@@ -67,6 +67,8 @@
- #include <mach/mach.h>
+@@ -58,7 +58,7 @@
+ #include <time.h>
+ #endif
+ 
+-#if defined(VITA) || defined(BSD) || defined(ORBIS)
++#if defined(VITA) || defined(BSD) || defined(ORBIS) || (__FreeBSD__ <= 12)
+ #include <sys/time.h>
  #endif
  
-+#include <sys/time.h>
-+
- struct thread_data
- {
-    void (*func)(void*);
diff --git a/games/libretro-melonds/files/patch-src_libretro_platform.cpp b/games/libretro-melonds/files/patch-src_libretro_platform.cpp
deleted file mode 100644
index 1912b18b75eca..0000000000000
--- a/games/libretro-melonds/files/patch-src_libretro_platform.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libretro/platform.cpp.orig	2022-09-11 22:46:37 UTC
-+++ src/libretro/platform.cpp
-@@ -13,6 +13,7 @@
- #include <unistd.h>
- #include <arpa/inet.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #define socket_t    int
- #define sockaddr_t  struct sockaddr
- #define closesocket close