From nobody Tue Nov 07 00:21:16 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 4SPTR11YHmz50p6H; Tue, 7 Nov 2023 00:21:17 +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 4SPTR06M3qz4X5K; Tue, 7 Nov 2023 00:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316476; 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=SSQwfk2fQ9+FqnSgFTqcZf/8wvVEpvHeTG0HV0UtDeo=; b=TCmGFm4hij7iYSQkwlg2+dWCzJqE3wDlDYIRnVZXHDTUBnrMZoSrQT9b7vHGB6NLEL6I5Q 7WmnIuXK5hgNq04d//JPxXL/Kqq2zMZkZ8c9OhttOTz+jHwrF5LgPKorlvARfunX7dC7C6 stBy/TwpAwnFYKKLPjF8z6djgeEyJamrMdjiPE9ez7u1E5d7OJNf4Ml7q1QsY3UK+rp9FL D7YoKDllgE6jJmpugDV8GPpL4eOcoMYrUfceCEPXh2zckNet7Bas13xSzQyiz4BjonlSLi 9KpO+lXueLqgkY5S+lkGi4wdsrGrYNeRBob5064yIED7cj6yr0BNc/hvWbfF5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316476; 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=SSQwfk2fQ9+FqnSgFTqcZf/8wvVEpvHeTG0HV0UtDeo=; b=FAwgGDnolzIBSy7MIH0nvm7YT2M9FeJN38SnFzaHqL72D3BUGRsoQTTqU58rN5+mNv2L2C GuvPlR9/dLbcDeVEceDWHyhR4GdP+bUGKsYUlMn3gtdgRxNirsmpHxsRPQFTOW0EdQA3F4 +4gyibphgVPmu1gC1FTeojjtQZUICUdykG6227cmAArzhcFi3bmDB6Ry2cAVGjabIjL6om jJrIO2EoqYcTSTFR+AOcziEWkBUwBK4J7b+/rnroDCcRWbPkuJMV/qYJAMXTnnDZuCOtPK 7EdQn8r7i1Quy6NFvLtQm17fH8e+mbYYcNUZj6r4S71NuD2ocOA3qfA+NOuWBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699316476; a=rsa-sha256; cv=none; b=EaDjPYNCHZhqDRBRQ/rtHvTLrOU7j/zL8R0bT5N+mWbAc16QkFk42bcupPwxal2mbjSqFQ ILZQ3njp98KXKWCTTzevCCxEzL2EPz2XPjIRLKDO1FU88B9LfBiSdhr8MCnLvvNVHLkP9v Zhu4Beqtbn9IFpLxVGQpq0fwc8KugZPJU7eLV1nZ1Y0EwTFMLGErnT8YiH8ndzacJCfwQn ojGwfXYUDKmtg62Le8dmrYnGonqh/zWZ5omFRLstZY4SGm5a+TMZk04qkVwDCQodzoyZei RFzubbuV5cqUH30RSoyubaqFLtfsmuPSTio5UKvPyFHro6E8zNAsljGjXhEaNg== 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 4SPTR05Sq6zTT6; Tue, 7 Nov 2023 00:21:16 +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 3A70LGI3024808; Tue, 7 Nov 2023 00:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A70LG5C024805; Tue, 7 Nov 2023 00:21:16 GMT (envelope-from git) Date: Tue, 7 Nov 2023 00:21:16 GMT Message-Id: <202311070021.3A70LG5C024805@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: cc1f91bef63b - main - games/libretro-desmume2015: update to 0.20220405 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: cc1f91bef63b600d4f558428308181962bc4c966 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc1f91bef63b600d4f558428308181962bc4c966 commit cc1f91bef63b600d4f558428308181962bc4c966 Author: Stephane D'Alu AuthorDate: 2023-10-27 10:00:40 +0000 Commit: Robert Clausecker 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 @@ -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 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 +@@ -48,7 +48,7 @@ + #include + #endif + +-#if defined(VITA) ++#if defined(VITA) || (__FreeBSD__ <= 12) + #include #endif -+#include -+ - struct thread_data - { - void (*func)(void*);