git: 4b17a16f7e9f - main - games/avp: unbreak
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 07 Jan 2023 16:42:08 UTC
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b17a16f7e9f6c12f4c9d7f5135f905e7f0933f2 commit 4b17a16f7e9f6c12f4c9d7f5135f905e7f0933f2 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2023-01-07 16:40:41 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> 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;