From owner-dev-commits-ports-main@freebsd.org Tue Apr 6 12:01:08 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 279895CE5FA; Tue, 6 Apr 2021 12:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF5hh0fVgz4g76; Tue, 6 Apr 2021 12:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 07F313A96; Tue, 6 Apr 2021 12:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136C17SW006460; Tue, 6 Apr 2021 12:01:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136C17KZ006459; Tue, 6 Apr 2021 12:01:07 GMT (envelope-from git) Date: Tue, 6 Apr 2021 12:01:07 GMT Message-Id: <202104061201.136C17KZ006459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 21173a456111 - main - devel/godot: actually stop using builtin libpng MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21173a4561118abf9578cb0a7320651cef6ab27c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 12:01:08 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=21173a4561118abf9578cb0a7320651cef6ab27c commit 21173a4561118abf9578cb0a7320651cef6ab27c Author: Piotr Kubaj AuthorDate: 2021-04-06 12:01:29 +0000 Commit: Piotr Kubaj 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}}