git: cc1f91bef63b - main - games/libretro-desmume2015: update to 0.20220405

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc1f91bef63b600d4f558428308181962bc4c966

commit cc1f91bef63b600d4f558428308181962bc4c966
Author:     Stephane D'Alu <sdalu@sdalu.com>
AuthorDate: 2023-10-27 10:00:40 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-11-07 00:17:07 +0000

    games/libretro-desmume2015: update to 0.20220405
    
    PR:             274647
---
 games/libretro-desmume2015/Makefile                      | 15 +++++++--------
 games/libretro-desmume2015/distinfo                      |  6 +++---
 games/libretro-desmume2015/files/patch-Makefile.freebsd  |  5 -----
 ...-desmume_src_libretro-common_features_features__cpu.c |  4 ++--
 ...patch-desmume_src_libretro-common_rthreads_rthreads.c | 16 ++++++++--------
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/games/libretro-desmume2015/Makefile b/games/libretro-desmume2015/Makefile
index 500a6ed15fbe..658673207e84 100644
--- a/games/libretro-desmume2015/Makefile
+++ b/games/libretro-desmume2015/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libretro-desmume2015
-PORTVERSION=	0.20220405
-PORTREVISION=	2
+DISTVERSION=	0.20220405
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
@@ -11,18 +10,18 @@ LICENSE=	GPLv2
 
 BROKEN_aarch64=	fails to compile: invokes x86 assembler
 
-USES=		compiler:c++11-lib gmake gl
+USES=		compiler:c++11-lib gmake
 USE_LDCONFIG=	yes
-USE_GL=		gl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	desmume2015
-GH_TAGNAME=	af397ff
+GH_TAGNAME=	af397ff3d1f208c27f3922cc8f2b8e08884ba893
 
 PLIST_FILES=	lib/libretro/desmume2015_libretro.so
 
-MAKEFILE=	Makefile.freebsd
+MAKEFILE=	Makefile.libretro
+BUILD_WRKSRC=	${WRKSRC}/desmume
 
 .include <bsd.port.options.mk>
 
@@ -31,7 +30,7 @@ MAKE_ENV+=	DESMUME_JIT=0
 .endif
 
 do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/desmume/desmume2015_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
+	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro
+	${INSTALL_LIB} ${WRKSRC}/desmume/desmume2015_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro
 
 .include <bsd.port.mk>
diff --git a/games/libretro-desmume2015/distinfo b/games/libretro-desmume2015/distinfo
index a12043a6a6a3..bcfadc71838f 100644
--- a/games/libretro-desmume2015/distinfo
+++ b/games/libretro-desmume2015/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649323865
-SHA256 (libretro-desmume2015-0.20220405-af397ff_GH0.tar.gz) = 2fbd6aba7cfe4c94e78af5962febeb2a781030c03c6d2d8f7e646528fbcd1c30
-SIZE (libretro-desmume2015-0.20220405-af397ff_GH0.tar.gz) = 1364217
+TIMESTAMP = 1698314741
+SHA256 (libretro-desmume2015-0.20220405-af397ff3d1f208c27f3922cc8f2b8e08884ba893_GH0.tar.gz) = de35962a758dfee9c82c7a2055c62a80a539d602fd4db20bdce6b0619f5e34dd
+SIZE (libretro-desmume2015-0.20220405-af397ff3d1f208c27f3922cc8f2b8e08884ba893_GH0.tar.gz) = 1366483
diff --git a/games/libretro-desmume2015/files/patch-Makefile.freebsd b/games/libretro-desmume2015/files/patch-Makefile.freebsd
deleted file mode 100644
index aea5189f337d..000000000000
--- a/games/libretro-desmume2015/files/patch-Makefile.freebsd
+++ /dev/null
@@ -1,5 +0,0 @@
---- Makefile.freebsd.orig	2020-03-17 22:12:07 UTC
-+++ Makefile.freebsd
-@@ -0,0 +1,2 @@
-+all:
-+	cd desmume && ${MAKE} -f Makefile.libretro
diff --git a/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c b/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c
index 288dbb0b252d..a1423df2f538 100644
--- a/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c
+++ b/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c
@@ -1,6 +1,6 @@
---- desmume/src/libretro-common/features/features_cpu.c.orig	2021-02-16 18:16:47 UTC
+--- desmume/src/libretro-common/features/features_cpu.c.orig	2022-04-05 21:03:52 UTC
 +++ desmume/src/libretro-common/features/features_cpu.c
-@@ -144,7 +144,7 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
+@@ -138,7 +138,7 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
     tv_sec     = (long)((ularge.QuadPart - epoch) / 10000000L);
     tv_usec    = (long)(system_time.wMilliseconds * 1000);
     time_ticks = (1000000 * tv_sec + tv_usec);
diff --git a/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_rthreads_rthreads.c b/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_rthreads_rthreads.c
index 33166ce59c20..c200226de715 100644
--- a/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_rthreads_rthreads.c
+++ b/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_rthreads_rthreads.c
@@ -1,11 +1,11 @@
---- desmume/src/libretro-common/rthreads/rthreads.c.orig	2020-03-17 22:13:05 UTC
+--- desmume/src/libretro-common/rthreads/rthreads.c.orig	2023-11-02 10:28:36 UTC
 +++ desmume/src/libretro-common/rthreads/rthreads.c
-@@ -60,6 +60,8 @@
- #include <mach/mach.h>
+@@ -48,7 +48,7 @@
+ #include <time.h>
+ #endif
+ 
+-#if defined(VITA)
++#if defined(VITA) || (__FreeBSD__ <= 12)
+ #include <sys/time.h>
  #endif
  
-+#include <sys/time.h>
-+
- struct thread_data
- {
-    void (*func)(void*);