git: 0ef7a36356ab - main - games/libretro-scummvm: update to 0.20231021

The branch main has been updated by fuz:

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

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

    games/libretro-scummvm: update to 0.20231021
    
    PR:             274647
---
 games/libretro-scummvm/Makefile                    | 23 ++++++++++++----------
 games/libretro-scummvm/distinfo                    |  6 +++---
 .../libretro-scummvm/files/patch-Makefile.freebsd  |  5 -----
 .../files/patch-audio_alsa__opl.cpp                | 11 +++++++++++
 ...atform_libretro_libretro-common_libco_aarch64.c | 17 ----------------
 5 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/games/libretro-scummvm/Makefile b/games/libretro-scummvm/Makefile
index 4b14298793bf..93c7f58060c7 100644
--- a/games/libretro-scummvm/Makefile
+++ b/games/libretro-scummvm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libretro-scummvm
-PORTVERSION=	0.20201129
+DISTVERSION=	0.20231021
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
@@ -8,24 +8,27 @@ WWW=		https://github.com/libretro/scummvm
 
 LICENSE=	GPLv2
 
-DEPRECATED=	BROKEN on all supported versions for more than 2 years
-EXPIRATION_DATE=	2023-11-30
-BROKEN=	engines/sludge/loadsave.cpp:201:10: error: cannot initialize return object of type 'bool' with an rvalue of type 'nullptr_t'
+BROKEN=		requires network access
 
-USES=		compiler:c++11-lib gmake
+BUILD_DEPENDS=	bash:shells/bash \
+		git:devel/git
+
+USES=		compiler:c++11-lib gmake shebangfix
 USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
+USE_GITHUB=	yesx
 GH_ACCOUNT=	libretro
 GH_PROJECT=	scummvm
-GH_TAGNAME=	7b1e929
+GH_TAGNAME=	d836ec97edb3aca21ab1d2aea6a4dbf00420cbf9
 
 PLIST_FILES=	lib/libretro/scummvm_libretro.so
 
-MAKEFILE=	Makefile.freebsd
+BUILD_WRKSRC=	${WRKSRC}/backends/platform/libretro
+
+SHEBANG_FILES=	backends/platform/libretro/scripts/*.sh
 
 do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/backends/platform/libretro/build/scummvm_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
+	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro
+	${INSTALL_LIB} ${BUILD_WRKSRC}/scummvm_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro
 
 .include <bsd.port.mk>
diff --git a/games/libretro-scummvm/distinfo b/games/libretro-scummvm/distinfo
index 86c79afe53e6..6631c4193cbf 100644
--- a/games/libretro-scummvm/distinfo
+++ b/games/libretro-scummvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606661813
-SHA256 (libretro-scummvm-0.20201129-7b1e929_GH0.tar.gz) = b6758de5025574a833697776ee9c90677914276b27d6d7e38ef1042d258b8f3f
-SIZE (libretro-scummvm-0.20201129-7b1e929_GH0.tar.gz) = 54533110
+TIMESTAMP = 1698314771
+SHA256 (libretro-scummvm-0.20231021-d836ec97edb3aca21ab1d2aea6a4dbf00420cbf9_GH0.tar.gz) = 3410d0a491a3e114fca6a6be3207b3d25d192b52b2b43e1a8f5580319cc77d44
+SIZE (libretro-scummvm-0.20231021-d836ec97edb3aca21ab1d2aea6a4dbf00420cbf9_GH0.tar.gz) = 241060335
diff --git a/games/libretro-scummvm/files/patch-Makefile.freebsd b/games/libretro-scummvm/files/patch-Makefile.freebsd
deleted file mode 100644
index b00d5b61ec2e..000000000000
--- a/games/libretro-scummvm/files/patch-Makefile.freebsd
+++ /dev/null
@@ -1,5 +0,0 @@
---- Makefile.freebsd.orig	2020-03-17 23:56:43 UTC
-+++ Makefile.freebsd
-@@ -0,0 +1,2 @@
-+all:
-+	cd backends/platform/libretro/build && ${MAKE}
diff --git a/games/libretro-scummvm/files/patch-audio_alsa__opl.cpp b/games/libretro-scummvm/files/patch-audio_alsa__opl.cpp
new file mode 100644
index 000000000000..faf37f9ea163
--- /dev/null
+++ b/games/libretro-scummvm/files/patch-audio_alsa__opl.cpp
@@ -0,0 +1,11 @@
+--- audio/alsa_opl.cpp.orig	2023-10-25 18:59:21 UTC
++++ audio/alsa_opl.cpp
+@@ -38,7 +38,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <alsa/asoundlib.h>
+-#include <sound/asound_fm.h>
++#include <alsa/sound/asound_fm.h>
+ 
+ namespace OPL {
+ namespace ALSA {
diff --git a/games/libretro-scummvm/files/patch-backends_platform_libretro_libretro-common_libco_aarch64.c b/games/libretro-scummvm/files/patch-backends_platform_libretro_libretro-common_libco_aarch64.c
deleted file mode 100644
index 77636d1e4da2..000000000000
--- a/games/libretro-scummvm/files/patch-backends_platform_libretro_libretro-common_libco_aarch64.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- backends/platform/libretro/libretro-common/libco/aarch64.c.orig	2020-04-28 06:18:38 UTC
-+++ backends/platform/libretro/libretro-common/libco/aarch64.c
-@@ -18,7 +18,13 @@
- #include <stdint.h>
- 
- #ifndef IOS
--#include <malloc.h>
-+#include <sys/param.h>
-+
-+void *
-+memalign(size_t align, size_t size)
-+{
-+	return (aligned_alloc(align, roundup(size, align)));
-+}
- #endif
- 
- #ifdef __cplusplus