From nobody Wed Aug 31 20:20:21 2022 X-Original-To: dev-commits-ports-main@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 4MHwXQ0sFXz4bCX0; Wed, 31 Aug 2022 20:20:22 +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 4MHwXQ0JLRz3b9q; Wed, 31 Aug 2022 20:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661977222; 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=Phukvcgfc3pbyVdkqvifd1DAp2dyTBXpkUgVyCJWCN8=; b=imth43jH9TryXo0IRvFvK1CZjdjLRh7fc3SYOz8hSaB5H/4GWTswShKILYLcWumUFUVYHX TyFNtSrlYY1+OR0BK9x03Fy9/hGV+pT+/BxZqJeEMZajgIVyidGdOI9571B7kDnviFkuWg YPRyA/aUKNIOmwu/K6uLG82wAaDRou7EQJs2ox/Rn7M4EipKGkwHemisuGVTFyu0MnT1UH diGIFv5UoWwJH2A2oCK36YpxgYGMVk0Fc/l3pjJQrupnXS7lVvWTGodoeJ6d9WxW44d0gh NuFDaEkW2NsYOV4wBhcwmS5TbYyQLSWCFHnujE+FyIQE0rSSBQRUT02zajy7KA== 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 4MHwXP6SbrzFJ0; Wed, 31 Aug 2022 20:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27VKKL9h051283; Wed, 31 Aug 2022 20:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VKKLcg051274; Wed, 31 Aug 2022 20:20:21 GMT (envelope-from git) Date: Wed, 31 Aug 2022 20:20:21 GMT Message-Id: <202208312020.27VKKLcg051274@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 4dc53e36820c - main - games/NBlood: update to 20220802 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dc53e36820cea95b70722dae4abfac08aca8281 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661977222; 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=Phukvcgfc3pbyVdkqvifd1DAp2dyTBXpkUgVyCJWCN8=; b=YYC2y3Emu/WVo73MU0LxDHyvWTdlPeInNE2h7KCuPtxDa+tmEUWA8Z3JDUz4no7fOYJrWA UhMsXv5ndeBbRjv7ln8RjmktQc+MdZYRkU8F20jlU+9cp61f1PGxknj0ihL/7cIC43Ln8F OmQwS4xVvX5IH7XDOWzkEvl+53xDmoVZfCsUdw1csbGLjWOCcJscfN5iVbHmyDP+/dTAiQ 0r04D4kD/x+Ma/EAN6DbID31+wEkIZnT3hbEeTern+tKjxWl9NdxoFLBjTFnH1piy3C3pn lrwDGyCQgwToCj+QOX2V8d3STtSkufuqYgmd3DvTCaYMNBo3yJZUik1X8a6iIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661977222; a=rsa-sha256; cv=none; b=IvQbj82vZVS6q+bHBx9DDN/a+/gZRapuZOUP69+R0oTdX/Mi5avgFOuI4NXTjGKCXqoFsM /Wr+Zni61vqMNevTtdsAThJLhFfLuA3P/s0gkLX6PCjmThwkdrwkJa5fdPs5defRi0DUps qHc0t1Z+O7ut57dcmUeFCfDx0jcJqxAMbDotxYDaVRr56URXjUbVOkL3NtR8PbmXut0zmf YpicBKLU0+5wjBFrPMLRZ3Az8I+y1HqgJ4nwgDoxWbibrENasyMrHPJut0E/U4z7bkfR85 onSn2QVl749hfRjGxO5zziu0vAG0jL0PM+htuy/g7E4sYyFJJZ//17ILJwGfVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=4dc53e36820cea95b70722dae4abfac08aca8281 commit 4dc53e36820cea95b70722dae4abfac08aca8281 Author: Piotr Kubaj AuthorDate: 2022-08-31 20:03:42 +0000 Commit: Piotr Kubaj CommitDate: 2022-08-31 20:03:42 +0000 games/NBlood: update to 20220802 Also fix header collision with newer LLVM. --- games/NBlood/Makefile | 7 +++++-- games/NBlood/distinfo | 6 +++--- games/NBlood/files/patch-source_build_src_lz4.c | 11 +++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/games/NBlood/Makefile b/games/NBlood/Makefile index a93bce55b20f..29b96004f874 100644 --- a/games/NBlood/Makefile +++ b/games/NBlood/Makefile @@ -1,5 +1,5 @@ PORTNAME= NBlood -DISTVERSION= g20220210 +DISTVERSION= g20220802 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org @@ -20,7 +20,7 @@ LIB_DEPENDS= libvpx.so:multimedia/libvpx \ USES= compiler:c++14-lang gl gmake pkgconfig sdl USE_GITHUB= yes GH_ACCOUNT= nukeykt -GH_TAGNAME= d2c0ef3 +GH_TAGNAME= 4c3ce1e USE_GL= glu USE_SDL= sdl2 @@ -36,6 +36,9 @@ PLIST_FILES= bin/pcexhumed \ MAKE_ARGS+= LTO=0 .endif +post-patch: + ${MV} ${WRKSRC}/source/build/include/lz4.h ${WRKSRC}/source/build/include/my_lz4.h + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pcexhumed ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/nblood ${STAGEDIR}${PREFIX}/bin diff --git a/games/NBlood/distinfo b/games/NBlood/distinfo index 09aea702630a..ff00b261224e 100644 --- a/games/NBlood/distinfo +++ b/games/NBlood/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645058538 -SHA256 (nukeykt-NBlood-g20220210-d2c0ef3_GH0.tar.gz) = 1139d052ad10c1afa4ae961c1ccbb9a3a15948f7b00b89e27e65927ebb653541 -SIZE (nukeykt-NBlood-g20220210-d2c0ef3_GH0.tar.gz) = 42659875 +TIMESTAMP = 1661952280 +SHA256 (nukeykt-NBlood-g20220802-4c3ce1e_GH0.tar.gz) = e50b511f7804a4132cc64a7bf59cd9496e6d9802d528e2aca88e68d345260222 +SIZE (nukeykt-NBlood-g20220802-4c3ce1e_GH0.tar.gz) = 43497014 diff --git a/games/NBlood/files/patch-source_build_src_lz4.c b/games/NBlood/files/patch-source_build_src_lz4.c new file mode 100644 index 000000000000..b209a53b5433 --- /dev/null +++ b/games/NBlood/files/patch-source_build_src_lz4.c @@ -0,0 +1,11 @@ +--- source/build/src/lz4.c.orig 2022-08-31 13:24:58 UTC ++++ source/build/src/lz4.c +@@ -114,7 +114,7 @@ + #endif + + #define LZ4_STATIC_LINKING_ONLY /* LZ4_DISTANCE_MAX */ +-#include "lz4.h" ++#include "my_lz4.h" + /* see also "memory routines" below */ + +