From nobody Sat Jan 07 16:42:08 2023 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 4Nq5b51b8Cz2r1nf; Sat, 7 Jan 2023 16:42:09 +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 4Nq5b518svz3GR5; Sat, 7 Jan 2023 16:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673109729; 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=QZ5NBVOvOSiRIyVakYD0UrMZlhEalwMwJiUgcGqRCe8=; b=CNLDAAl17UndluVgq1ZbesYnR2FVFptxJSYsO52wXz7fJ5IBru0vVKKXH38665PEAsPlt1 dmeZH8hiJ7mjH0bDq71/MFYSE/nCU3Koa61R3yZ/sZjpHaZAJmCwmgfe17kuk0+yRpHRVg aH8dwoC6WCs9gyPN2M1YWG4FGsaN50xwwhJ0AgUZT0ph0NOKdGD6izDKj9vaFWLR62Ofvg isGehNbwirdtnudO9C2NIqsZp5IdMmhUtDiCXNdXYQ+cj0bsH9FtjX6iOMrs2CEfWdklvl u0qOO81s1NXcDwVcSqbmWjNHR26vvQFEVxowvvZvIHuFDW+xSIuuYHt2ynW3Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673109729; 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=QZ5NBVOvOSiRIyVakYD0UrMZlhEalwMwJiUgcGqRCe8=; b=LKZtwnlb4G0O3aQMRcdadwolddKf24T12aOxLOX8kseo3j27S/f2yyy0j06JsdQ8m7e0O/ zpxcodK3aQvSmvKCerksD3VIE1KH2WeUyB8zpQFpkvr6G755D+rmrdEwg9ZQpT/YfWx+T4 ig1pMASIBUHvHW3ntIyc/2bLGBUJGxqnMHcU2eCitg99kgJgY87QdfB3RDRqs03aIj4cgl FnK7mX/7NkcS/sHi0fl8siJC3JtQ9x5xivc/lBOWL/yTXQefUAtNq9rr9CJSuGhCJMN4zz X9X/pFiY7sgxCuBmyLuJ6ihBhbVftGljtKNl5b4HfHQsMePBhnPEfpgNPXqZCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673109729; a=rsa-sha256; cv=none; b=IHXTRg27yThEUhMjPyE3zs+SSIRZDNGsHTLNLU5rknfPFz2C3HssqB6OSWVTCXWif1CAmQ lfE4LvLt8i4WPL2Qw633y+reg3tOm24TXamkrKwF8xlXwme3Mfnk9E0BiUHitpmfEWkp82 U1kmZH7Y8gF4wlU5MOYa9ut0iDDZ42cZxXMtgUii6ACGpyxdvn9SToilXWDpw5GQriP9wT rokbT7F/NAkCWWzrtQNq761tyQtNwu1R80xQFqXLm2L4JF19DSQadx+Ig6ei668ywwlcNs ngnzXrwgMSSjdz+RVY9DErNNW3DCjKIjS9G1KhvF2I7wE+HP8i6PdrAsCOMRew== 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 4Nq5b50CDrzGmJ; Sat, 7 Jan 2023 16:42:09 +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 307Gg8EK051618; Sat, 7 Jan 2023 16:42:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 307Gg8pe051617; Sat, 7 Jan 2023 16:42:08 GMT (envelope-from git) Date: Sat, 7 Jan 2023 16:42:08 GMT Message-Id: <202301071642.307Gg8pe051617@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: 4b17a16f7e9f - main - games/avp: unbreak 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: 4b17a16f7e9f6c12f4c9d7f5135f905e7f0933f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b17a16f7e9f6c12f4c9d7f5135f905e7f0933f2 commit 4b17a16f7e9f6c12f4c9d7f5135f905e7f0933f2 Author: Piotr Kubaj AuthorDate: 2023-01-07 16:40:41 +0000 Commit: Piotr Kubaj CommitDate: 2023-01-07 16:42:06 +0000 games/avp: unbreak --- 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;