From nobody Sun Feb 11 00:51:10 2024 X-Original-To: dev-commits-ports-branches@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 4TXTYC3QTzz590cY; Sun, 11 Feb 2024 00:51:11 +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 4TXTYC1V1tz3yKq; Sun, 11 Feb 2024 00:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707612671; 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=QJT4FRlht+tZRJSaQf2iK+p7FmWDEF2R+hQXLrs8JP8=; b=qiF/CjNQDaZR0lbQpjAD7J3K91YfoFdM60dQWo8ISPCW7ueInU7NhUfPY48spuVl904FuF 9muNAIjnX2BYeJrvp1HFg5wLYnKvXXF50lnOFMSDjcbc9XxezZrMDBKys+zwikibMt681F w4posGoVLjjUGs2RrjEaVynxOFb+mD+wk4yG8oM3jn+2pBX860BlqF6fiDsSRB/oCZeJHE lYGOJ7PtSrIJ6eZk4RNiTLL/vAwRD3MZcoGOVt0gNlomTgihfQu6Y/kBNYWAMDzoaT3cAJ 0gonXiI2qvSYMPXKyH/LrHAnJy8KA43dQXtdEoP37GdLEu/lY6DoIozZXD+51A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707612671; a=rsa-sha256; cv=none; b=Kk0mD5olbUzPdBX9VY9e5tOsfgt0IrX886WhlFFclMnrxyl0WLA7dtOiBzpT5zfYsMMdkA fw5uaCCLFg50qxi7huKGIK0mdzCmgjC2OqKfxGlRVZ55asKololLcEq3S5QU7h3Mu72OJ6 RzttBr/9mvSSgnZa3HSbnuaSQXsB67BIDamFh0KKIXjZ/WsyVtDniVCu30aRx4v4E+YYkg ZdVLh3vo0TsNdZ+JGLXIBnuHTcLLxa3B5GQYf8iZA0Eueu19shCADkgAFYKHph7taUjO77 QNsFiuENKu0Bqlkf6lGUktlssXsOBC7h0rBWh518ucOlsl9fKbPAtOQzKbsqEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707612671; 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=QJT4FRlht+tZRJSaQf2iK+p7FmWDEF2R+hQXLrs8JP8=; b=G0vNYCLKdUbu21vZ+F5TkY727KJUUwo4AHKNp60yCux4w5zecmQ4w8ezXIFjJyO/IvJXCn XHdYZOdK4acvdOj33KQ8hp88OAZFEwSRWD52dzeVKpkq4QEAoh9exeAODgIrjq8VNFEIks 117jX4cj6YC6+zH/K4olUtVof+HFsOtU6QLmInRM3VO49hxSoev13ZmkkVrvtdcU8Oi+3e /S7QAvy+lkH3BIHZGy50hfc05ZBDKbfLHBLk8QQMVsraNQg0DIhhh9slEjhqNs5CuraYke KlEnLnWJrluIp5mUpaL7YO3vj6e+vX5oywebzeCBICOm6V7AU29bwHmQzWknkA== 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 4TXTYC0bXBzdh0; Sun, 11 Feb 2024 00:51:11 +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 41B0pAFK086333; Sun, 11 Feb 2024 00:51:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41B0pAgR086330; Sun, 11 Feb 2024 00:51:10 GMT (envelope-from git) Date: Sun, 11 Feb 2024 00:51:10 GMT Message-Id: <202402110051.41B0pAgR086330@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 2acdc80a5699 - 2024Q1 - games/openbor: update to 7610 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 2acdc80a56993eedc466d6761757c4870d562cc6 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2acdc80a56993eedc466d6761757c4870d562cc6 commit 2acdc80a56993eedc466d6761757c4870d562cc6 Author: Jan Beich AuthorDate: 2024-01-31 18:34:10 +0000 Commit: Jan Beich CommitDate: 2024-02-11 00:51:04 +0000 games/openbor: update to 7610 Changes: https://github.com/DCurrent/openbor/compare/87ea891e...f4510854 (cherry picked from commit b49fedd5dc6d00d8f130972c17d5cd75fbd718fb) --- games/openbor/Makefile | 4 ++-- games/openbor/distinfo | 6 +++--- games/openbor/files/patch-revert | 32 ++++++++++++++++++++++++++++++++ games/openbor/files/patch-source_utils.c | 16 ++++++++++++++-- 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/games/openbor/Makefile b/games/openbor/Makefile index c536eb113f65..1121f0c5f6e3 100644 --- a/games/openbor/Makefile +++ b/games/openbor/Makefile @@ -1,6 +1,6 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 7586 +PORTVERSION?= 7610 PORTREVISION?= 0 CATEGORIES= games @@ -35,7 +35,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= 87ea891e +GH_TAGNAME?= f4510854 USES+= cpe gmake pkgconfig sdl .if ${PORTVERSION} < 4433 diff --git a/games/openbor/distinfo b/games/openbor/distinfo index 6accd1c6e8e5..a803a4d63f53 100644 --- a/games/openbor/distinfo +++ b/games/openbor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706209104 -SHA256 (DCurrent-openbor-7586-87ea891e_GH0.tar.gz) = 14693862178fd4eb1e36fb9f9ac3122b77740a0755942fcc5823fe3165a047bd -SIZE (DCurrent-openbor-7586-87ea891e_GH0.tar.gz) = 89138596 +TIMESTAMP = 1707519600 +SHA256 (DCurrent-openbor-7610-f4510854_GH0.tar.gz) = 0fe777b69a23e2913a37260dbf9c9c680a0376acfe0f2402a7b7fe6281bcfe0b +SIZE (DCurrent-openbor-7610-f4510854_GH0.tar.gz) = 212696672 diff --git a/games/openbor/files/patch-revert b/games/openbor/files/patch-revert new file mode 100644 index 000000000000..67ed7692f6cb --- /dev/null +++ b/games/openbor/files/patch-revert @@ -0,0 +1,32 @@ +Partially revert https://github.com/DCurrent/openbor/commit/16939d70c3af +due to breaking fonts with old games (e.g., Rocket Viper v2.41) + +--- openbor.c.orig 2024-02-09 23:00:00 UTC ++++ openbor.c +@@ -46507,10 +46507,6 @@ void startup() + // init. input recorder + init_input_recorder(); + +- printf("Loading fonts................\t"); +- load_all_fonts(); +- printf("Done!\n"); +- + printf("Loading sprites..............\t"); + load_special_sprites(); + printf("Done!\n"); +@@ -46545,9 +46541,13 @@ void startup() + load_menu_txt(); + printf("Done!\n"); + ++ printf("Loading fonts................\t"); ++ load_all_fonts(); ++ printf("Done!\n"); ++ + /* +- Kratus (01-2024) Moved the translation and menu functions to the end of the engine "startup" function, +- but before the "control init" function (reverted the font function to load before scripts) ++ Kratus (10-2021) Moved the translation, menu and font functions to the end of the engine "startup" function, ++ but before the "control init" function + */ + printf("Loading translation..........\t"); + ob_inittrans(); diff --git a/games/openbor/files/patch-source_utils.c b/games/openbor/files/patch-source_utils.c index 1693b73e8915..8558a0074446 100644 --- a/games/openbor/files/patch-source_utils.c +++ b/games/openbor/files/patch-source_utils.c @@ -1,3 +1,6 @@ +source/utils.c:18:10: fatal error: 'features.h' file not found + 18 | #include + | ^~~~~~~~~~~~ source/utils.c:303:54: error: implicit declaration of function 'mallinfo' is invalid in C99 [-Werror,-Wimplicit-function-declaration] writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); @@ -6,9 +9,18 @@ source/utils.c:303:64: error: member reference base type 'int' is not a structur writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); ~~~~~~~~~~^~~~~~ ---- source/utils.c.orig 2024-01-02 00:04:19 UTC +--- source/utils.c.orig 2024-02-01 15:55:11 UTC +++ source/utils.c -@@ -303,9 +303,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f +@@ -14,7 +14,7 @@ + #include + #include + +-#ifdef LINUX ++#if defined(__linux__) + #include + #endif + +@@ -307,9 +307,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f "\n* Shutting Down *\n\n"); writeToLogFile("Out of memory!\n"); writeToLogFile("Allocation of size %i failed in function '%s' at %s:%i.\n", size, func, file, line);