love: fix the build with ports-gcc

Fix some occurrences where ports-gcc doesn't want to consider
`NULL' as a boolean `false'. Tested on sparc64 by kmos@ and
macppc by me.

Also move HOMEPAGE to https.

OK kmos@
This commit is contained in:
cwen 2019-10-18 15:11:09 +00:00
parent c0e8e99dda
commit d0167f652c
2 changed files with 25 additions and 3 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.24 2019/07/12 20:46:20 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2019/10/18 15:11:09 cwen Exp $
COMMENT= 2D games framework for use with Lua
V= 0.8.0
DISTNAME= love-$V-linux-src
PKGNAME= love-$V
REVISION= 9
REVISION= 10
HOMEPAGE= http://love2d.org/
HOMEPAGE= https://love2d.org/
CATEGORIES= games lang/lua
@ -55,5 +55,8 @@ post-extract:
for i in `find . -type f`; \
do [ "$(tail -c1 $i)" == "$(printf '\n')" ] || ls -l $i; \
done
# And some files have MS-DOS line endings we don't want for patches
cd ${WRKSRC} && perl -i -pe 's/\r$$//' \
./src/libraries/Box2D/Collision/Shapes/b2ChainShape.h
.include <bsd.port.mk>

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_libraries_Box2D_Collision_Shapes_b2ChainShape_h,v 1.1 2019/10/18 15:11:09 cwen Exp $
ports-gcc fix for:
error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization
Index: src/libraries/Box2D/Collision/Shapes/b2ChainShape.h
--- src/libraries/Box2D/Collision/Shapes/b2ChainShape.h.orig
+++ src/libraries/Box2D/Collision/Shapes/b2ChainShape.h
@@ -95,8 +95,8 @@ inline b2ChainShape::b2ChainShape()
m_radius = b2_polygonRadius;
m_vertices = NULL;
m_count = 0;
- m_hasPrevVertex = NULL;
- m_hasNextVertex = NULL;
+ m_hasPrevVertex = false;
+ m_hasNextVertex = false;
}
#endif