Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Apr 2021 12:01:07 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 21173a456111 - main - devel/godot: actually stop using builtin libpng
Message-ID:  <202104061201.136C17KZ006459@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=21173a4561118abf9578cb0a7320651cef6ab27c

commit 21173a4561118abf9578cb0a7320651cef6ab27c
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-04-06 12:01:29 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-04-06 12:01:29 +0000

    devel/godot: actually stop using builtin libpng
    
    platform/x11/detect.py actually forces builtin libpng if builtin freetype or zlib is used.
    
    Use the system ones.
    
    This also fixes build on powerpc64le, since builtin libpng is not built with VSX.
    
    PR:     254703
    Approved by: FreeBSD@ShaneWare.Biz (maintainer)
---
 devel/godot/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index 69fe4bf8a4c4..a1b34f32fb6b 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	godot
 DISTVERSION=	3.2.3
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	devel games
 
@@ -28,7 +29,8 @@ USE_GL=		gl glew glu
 USE_GITHUB=	yes
 GH_ACCOUNT=	godotengine
 
-MAKE_ARGS+=		platform=x11 builtin_libpng=False verbose=True
+MAKE_ARGS+=		platform=x11 builtin_libpng=False \
+			builtin_freetype=False builtin_zlib=False verbose=True
 MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 MAKE_ARGS_clang=	use_llvm=True use_lld=True
 CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}



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