Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Jun 2021 15:22:43 GMT
From:      Kevin Bowling <kbowling@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 4c97793261f2 - 2021Q2 - devel/godot2: disable internal libs
Message-ID:  <202106151522.15FFMhcx001278@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4c97793261f24c42244f904b4dbfe50bbb734fb4

commit 4c97793261f24c42244f904b4dbfe50bbb734fb4
Author:     Shane <FreeBSD@ShaneWare.Biz>
AuthorDate: 2021-06-15 15:17:41 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2021-06-15 15:22:06 +0000

    devel/godot2: disable internal libs
    
    Remove use of python2 for scons, builds fine with py3 scons
    
    Disable use of internal png, freetype and zlib.
    
    This matches ports for godot v3 and fixes build on powerpc64le.
    
    PR:             254867
    Approved by:    maintainer
    MFH:            2021Q2
    
    (cherry picked from commit 56c603914f70b67f04164958ab80f7a0ebd2c0e0)
---
 devel/godot2/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/devel/godot2/Makefile b/devel/godot2/Makefile
index 2203e4b3e134..2a8a2733dd6a 100644
--- a/devel/godot2/Makefile
+++ b/devel/godot2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	godot
 DISTVERSION=	2.1.6
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	devel games
 PKGNAMESUFFIX?=	2
@@ -22,14 +23,16 @@ RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
 		xdg-open:devel/xdg-utils \
 		xmessage:x11/xmessage
 
-USES=		compiler:c++11-lib gl pkgconfig scons:python2 ssl xorg
+USES=		compiler:c++11-lib gl pkgconfig scons ssl xorg
 USE_XORG=	x11 xcursor xi xinerama xrandr
 USE_GL=		gl glu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	godotengine
 
-MAKE_ARGS+=		platform=x11 builtin_speex=no builtin_libmpcdec=no verbose=yes
+MAKE_ARGS+=		platform=x11 builtin_freetype=no builtin_libmpcdec=no \
+			builtin_libpng=no builtin_openssl=no builtin_speex=no \
+			builtin_zlib=no verbose=yes
 MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 MAKE_ARGS_clang=	use_llvm=yes
 CXXFLAGS+=		-DGLEW_NO_GLU -DRTAUDIO_ENABLED -DCRIOGET_NOT_NEEDED



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106151522.15FFMhcx001278>