From nobody Tue Nov 07 00:22:01 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPTRt19HNz50pmp; Tue, 7 Nov 2023 00:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPTRs63Vcz4Ztl; Tue, 7 Nov 2023 00:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nbsriO+BS1lw9SE7sFXx69rnYNnvhqq5Y0nshVPNd0g=; b=MgAdDyegtEZMFlPssdbYgn2d6vnTomS0c3VA3kZ6U4A8kwp9PiueHd7+G8sj8U6sK7CBtS KRRpsX2tReNLXqgXvXzWL4ouwbki/yL/LfQXGAmw+ZxGd7vRBS8CD556gcfuF2QhYIwR+f aYQFhNgNNTaFP26xV8w2wR3/hh/QcO94O6blmHyb2vUR2S5WyhuWdy1Pntv0hapdBgHgjD N7gFqagTKxrQmJ2hIoiwlcHcv+6CjD9AwBEllPa9imPoVxRRsXeiG24I00u5jthrlDA4iN 1rIqfx/O/95rmXwjr3eT7bWz7U+G8gFvrLNjdYwj0Lh1JxEFX86A+CCJjCDOgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nbsriO+BS1lw9SE7sFXx69rnYNnvhqq5Y0nshVPNd0g=; b=pr/jRR4Zy7ZMrtOahGKAsx2kYN5Zzc8mC6rudCC/V2Y8/q/Z8lBxa0XPsV8VDOzrnSZsJb JkxQTPnZq8E0dNbBo7PQfKli4XzO1yoV52kws8WhKNJ0D1Dz3wNpotFxqNqzVFqpe7hPIP lHGELHMKdl/yMVlRK2wfRl3nn+SCby/mMFEheJJTyZc3Kxg6bmB8zL5MGWpSM0kvIhcRbA Xs0N3Z41PY0jTTNrQdVn/H98+HWf/RL4ot5MayMM/VVNCzRQL2bH/4J22T8jRR2bcUjiUh PmRAdVPwDmqx7ZGUJto0B9zUs6gJiLJbQVawjphtm4H1xzpP6k1Vz5fH1d0G4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699316521; a=rsa-sha256; cv=none; b=SdJxpaT3TZExbDKgJxb96z2RPBX3XqTWdj+AohQa9MykWJdoqW5MFcJE5HouWnBJNdpAJq wJBzMby8KereF8UVoNrMFHwcXVs2ql5BmhUsBViuIS05BBLnRm+8jqyRO1/EnaC4COC9Zo +2lzkTmeXJz2mguHfAWs5kOLVCigz/QwSahfvmkecMzmyupKoEFNcFRqLWsNh1Ct6gvuwi 38IWqB4MVZnVX/BvJ8VNK6UBTuhag3N/gucpILHvDsf+sZLgll0gpXJZ8QzM2f1qYVH1KI /FPsiKcnfVEm9x0ASBFZDytcKuV1s5TRbItKkGJt31+otVDTv94p5tjjMu+amA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPTRs58gFzTWn; Tue, 7 Nov 2023 00:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A70M1dX027403; Tue, 7 Nov 2023 00:22:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A70M1n6027400; Tue, 7 Nov 2023 00:22:01 GMT (envelope-from git) Date: Tue, 7 Nov 2023 00:22:01 GMT Message-Id: <202311070022.3A70M1n6027400@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 0ef7a36356ab - main - games/libretro-scummvm: update to 0.20231021 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ef7a36356abe7f635cc61b668be2e0a145f11e7 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ef7a36356abe7f635cc61b668be2e0a145f11e7 commit 0ef7a36356abe7f635cc61b668be2e0a145f11e7 Author: Stephane D'Alu AuthorDate: 2023-10-27 16:58:08 +0000 Commit: Robert Clausecker 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 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 + #include +-#include ++#include + + 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 - - #ifndef IOS --#include -+#include -+ -+void * -+memalign(size_t align, size_t size) -+{ -+ return (aligned_alloc(align, roundup(size, align))); -+} - #endif - - #ifdef __cplusplus