From nobody Sat Jan 7 16:44:55 2023 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 4Nq5fJ1NR1z2r1l5; Sat, 7 Jan 2023 16:44:56 +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 4Nq5fJ0rcCz3Gx5; Sat, 7 Jan 2023 16:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673109896; 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=GWgw/wzyy0lyT/MqQS1grrdQfPmefUZa+F8U9E8FIYQ=; b=YdFsHTzmT9I4Kr3SYAmGnrvPvHKnybu7NrIfXMj2CyavGwNrzvWf4hAfYSx8tBQAM8498D DJoIPa30mefGTh8b4cMyXSvmAQCev1T0hz6rfyrmnCDMITCoySx244WX00c5NRR7Ik0xKg 3224lUu2ZjQWt+ePdwdVJB0ZbqEg6kPkBNUWNzhJW928/dKGXj0PZN4Fx4yz3p5kU+hPFR KZ1rFao1GTIylVutyJKitAb5QI+YIk8/saKgVLDWy5jwRpl9hy+nZaSPEYcTqtwHJfiFEx knqHHPiDfFONz7aQNNWYi1o9YTZNxoLm1V6qf2YmtiovOw4SNcUqPcCqrRlkkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673109896; 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=GWgw/wzyy0lyT/MqQS1grrdQfPmefUZa+F8U9E8FIYQ=; b=fu2Ph0PD22RAlV+MdF7pbrs3xPxQcPeaXPk+YLsWWeFhmLu3cvOsxyi9QcNfja6gGcSNco xvrO+ZkYyqrncjmaaIJo77VnkwP9h5azqJsVzkytpVTfDPQ4++jvjbN3P8vQrNYURUA2tq gpyvLyj8Gkz6snY7nH0nN4rKQDoLTJJXUu48cTlYU/7idIWSH7mwDkUh28dIXzQv+97t5y jTnJZAtfcXNti+zrhDp5aiPk5ZSKLl2+n3ADMh95GnuPvFxA+Y5hEG9gVgMq2dTPQRr9lw A5l0tSfgmUaF14U7D6MW04oTIdRuSpP4IttaGrTK9k9oPJbUYQMXKcXtoHvsnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673109896; a=rsa-sha256; cv=none; b=iW5lPOfcnbwJyGj9eaKeSrTc/KP+Lq0UadC/A6TVYYb+z0V7nDhS/PBvcyPHU9coBzx2fO WM3E4OLJk2FptlEq6jLMgNrdPz1EH1Yfi2lLsRs/0KucTklJ1REjPr6mSmmxxq8uIUYskZ oNN0B4jzvg26Gw6C8t5TBd20/z1QT1ebegwBP3XvFkqD7y43Z03CnENUdpHcANaVnNW30D 5oqaJsdQLKz0zSS06GbiZMnnJTjZGX+tHInL1S27o91o9fZ00lSy1MkLqbeBev7WOf35to 9N6IfKmIpbpToMnXTDtuzFNUabobW2l6ILp0cMbm/V8+zZys4YFvXLEiOXtkxw== 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 4Nq5fH70VCzGXb; Sat, 7 Jan 2023 16:44:55 +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 307GitGV054618; Sat, 7 Jan 2023 16:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 307Git1M054617; Sat, 7 Jan 2023 16:44:55 GMT (envelope-from git) Date: Sat, 7 Jan 2023 16:44:55 GMT Message-Id: <202301071644.307Git1M054617@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Piotr Kubaj Subject: git: b010e6102065 - 2023Q1 - games/avp: unbreak 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: b010e6102065473c9678ce15d88fd55ae2184b97 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=b010e6102065473c9678ce15d88fd55ae2184b97 commit b010e6102065473c9678ce15d88fd55ae2184b97 Author: Piotr Kubaj AuthorDate: 2023-01-07 16:40:41 +0000 Commit: Piotr Kubaj CommitDate: 2023-01-07 16:44:45 +0000 games/avp: unbreak (cherry picked from commit 4b17a16f7e9f6c12f4c9d7f5135f905e7f0933f2) --- games/avp/Makefile | 2 -- games/avp/files/patch-src_win95_chunk.cpp | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/games/avp/Makefile b/games/avp/Makefile index edbb51b267e3..dfd871f34e56 100644 --- a/games/avp/Makefile +++ b/games/avp/Makefile @@ -12,8 +12,6 @@ WWW= https://icculus.org/avp LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= Doesn't build with NDEBUG defined, error: invalid operands to binary expression ('int' and 'std::nullptr_t') - USES= cmake compiler:c++11-lang gl openal sdl USE_GL= gl USE_SDL= sdl diff --git a/games/avp/files/patch-src_win95_chunk.cpp b/games/avp/files/patch-src_win95_chunk.cpp new file mode 100644 index 000000000000..c5d851961486 --- /dev/null +++ b/games/avp/files/patch-src_win95_chunk.cpp @@ -0,0 +1,11 @@ +--- src/win95/chunk.cpp.orig 2023-01-07 16:38:50 UTC ++++ src/win95/chunk.cpp +@@ -437,7 +437,7 @@ Chunk* Chunk_With_Children::lookup_single_child (const + + if (children) + while (child_ptr != NULL) { +- if (strncmp (class_ident, child_ptr->identifier, 8) == NULL) ++ if (strncmp (class_ident, child_ptr->identifier, 8) == 0) + { + assert (!child_ptr->r_u_miscellaneous()); + return child_ptr;