Date: Mon, 22 Feb 2021 06:44:28 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566272 - in head/devel/py-bullet3: . files Message-ID: <202102220644.11M6iSP8005970@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Mon Feb 22 06:44:27 2021 New Revision: 566272 URL: https://svnweb.freebsd.org/changeset/ports/566272 Log: devel/py-bullet3: Use system zlib instead of a bundled one to fix SEGV due to a conflict Reported by: Henrik Gulbrandsen <henrik@gulbra.net> (via e-mail) Added: head/devel/py-bullet3/files/ head/devel/py-bullet3/files/patch-setup.py (contents, props changed) Modified: head/devel/py-bullet3/Makefile Modified: head/devel/py-bullet3/Makefile ============================================================================== --- head/devel/py-bullet3/Makefile Mon Feb 22 06:42:59 2021 (r566271) +++ head/devel/py-bullet3/Makefile Mon Feb 22 06:44:27 2021 (r566272) @@ -2,7 +2,7 @@ PORTNAME= bullet3 DISTVERSION= 3.08 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Added: head/devel/py-bullet3/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-bullet3/files/patch-setup.py Mon Feb 22 06:44:27 2021 (r566272) @@ -0,0 +1,35 @@ +- use system zlib because of SEGV: https://github.com/bulletphysics/bullet3/issues/3280 + +--- setup.py.orig 2021-02-22 06:17:11 UTC ++++ setup.py +@@ -160,21 +160,6 @@ sources = ["examples/pybullet/pybullet.c"]\ + +["examples/ThirdPartyLibs/minizip/ioapi.c"]\ + +["examples/ThirdPartyLibs/minizip/unzip.c"]\ + +["examples/ThirdPartyLibs/minizip/zip.c"]\ +-+["examples/ThirdPartyLibs/zlib/adler32.c"]\ +-+["examples/ThirdPartyLibs/zlib/compress.c"]\ +-+["examples/ThirdPartyLibs/zlib/crc32.c"]\ +-+["examples/ThirdPartyLibs/zlib/deflate.c"]\ +-+["examples/ThirdPartyLibs/zlib/gzclose.c"]\ +-+["examples/ThirdPartyLibs/zlib/gzlib.c"]\ +-+["examples/ThirdPartyLibs/zlib/gzread.c"]\ +-+["examples/ThirdPartyLibs/zlib/gzwrite.c"]\ +-+["examples/ThirdPartyLibs/zlib/infback.c"]\ +-+["examples/ThirdPartyLibs/zlib/inffast.c"]\ +-+["examples/ThirdPartyLibs/zlib/inflate.c"]\ +-+["examples/ThirdPartyLibs/zlib/inftrees.c"]\ +-+["examples/ThirdPartyLibs/zlib/trees.c"]\ +-+["examples/ThirdPartyLibs/zlib/uncompr.c"]\ +-+["examples/ThirdPartyLibs/zlib/zutil.c"]\ + +["examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp"]\ + +["examples/Importers/ImportObjDemo/LoadMeshFromObj.cpp"]\ + +["examples/Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp"]\ +@@ -438,7 +423,7 @@ elif _platform == "darwin": + +["examples/OpenGLWindow/MacOpenGLWindowObjC.m"] + else: + print("bsd!") +- libraries = ['GL', 'GLEW', 'pthread'] ++ libraries = ['GL', 'GLEW', 'pthread', 'z'] + os.environ['LDFLAGS'] = '-L/usr/X11R6/lib' + CXX_FLAGS += '-D_BSD ' + CXX_FLAGS += '-I/usr/X11R6/include '
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102220644.11M6iSP8005970>