From owner-svn-ports-all@freebsd.org Wed Jan 22 18:48:13 2020 Return-Path: Delivered-To: svn-ports-all@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 58C971F9980; Wed, 22 Jan 2020 18:48:13 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 482vYT1gKvz4NX6; Wed, 22 Jan 2020 18:48:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 346A11DCC; Wed, 22 Jan 2020 18:48:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00MImCCl090334; Wed, 22 Jan 2020 18:48:12 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00MImCCM090331; Wed, 22 Jan 2020 18:48:12 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202001221848.00MImCCM090331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Wed, 22 Jan 2020 18:48:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523834 - in head/devel/godot2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/devel/godot2: . files X-SVN-Commit-Revision: 523834 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 18:48:13 -0000 Author: tcberner Date: Wed Jan 22 18:48:12 2020 New Revision: 523834 URL: https://svnweb.freebsd.org/changeset/ports/523834 Log: devel/godot2: Update to 2.1.6 PR: 243498 Submitted by: Shane (maintainer) Modified: head/devel/godot2/Makefile head/devel/godot2/distinfo head/devel/godot2/files/patch-SConstruct Modified: head/devel/godot2/Makefile ============================================================================== --- head/devel/godot2/Makefile Wed Jan 22 18:42:55 2020 (r523833) +++ head/devel/godot2/Makefile Wed Jan 22 18:48:12 2020 (r523834) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= godot -PORTVERSION= 2.1.5 +DISTVERSION= 2.1.6 DISTVERSIONSUFFIX= -stable -PORTREVISION= 3 CATEGORIES= devel games PKGNAMESUFFIX?= 2 @@ -37,6 +36,10 @@ MAKE_ARGS_clang= use_llvm=yes CXXFLAGS+= -DGLEW_NO_GLU -DRTAUDIO_ENABLED CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_i386_gcc= -march=i586 +CXXFLAGS_aarch64= -DNO_THREADS +CXXFLAGS_sparc64= -DNO_THREADS +CXXFLAGS_mips= -DNO_THREADS +CXXFLAGS_mips64= -DNO_THREADS LDFLAGS+= -lspeex -lmpcdec OPTIONS_DEFINE= EXAMPLES TOOLS @@ -74,6 +77,14 @@ EXAMPLESDIR= ${PREFIX}/share/examples/godot2 .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE= .endif +.include + +.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != armv6 && ${ARCH} != armv7 +# use system libvpx on archs that break with built-in +LIB_DEPENDS+= libvpx.so:multimedia/libvpx +MAKE_ARGS+= builtin_libvpx=False +.endif + post-patch: @${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \ ${WRKSRC}/methods.py @@ -97,4 +108,4 @@ do-install-TOOLS-on: ${INSTALL_DATA} ${WRKSRC}/icon.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg -.include +.include Modified: head/devel/godot2/distinfo ============================================================================== --- head/devel/godot2/distinfo Wed Jan 22 18:42:55 2020 (r523833) +++ head/devel/godot2/distinfo Wed Jan 22 18:48:12 2020 (r523834) @@ -1,5 +1,5 @@ -TIMESTAMP = 1536385697 -SHA256 (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 74179c08bcc20cc89b4ac2785a31f201d81eb4aa875c80ffcb82d9fb80e8e187 -SIZE (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 15026226 +TIMESTAMP = 1579663149 +SHA256 (godotengine-godot-2.1.6-stable_GH0.tar.gz) = 5bfc57f2ee24dccfdcefe491a3be1a07b39299f2fcfa03202b8b4c6c2dd5122b +SIZE (godotengine-godot-2.1.6-stable_GH0.tar.gz) = 15043275 SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75 SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045 Modified: head/devel/godot2/files/patch-SConstruct ============================================================================== --- head/devel/godot2/files/patch-SConstruct Wed Jan 22 18:42:55 2020 (r523833) +++ head/devel/godot2/files/patch-SConstruct Wed Jan 22 18:48:12 2020 (r523834) @@ -21,17 +21,16 @@ - CFLAGS = env.get('CFLAGS', '') - env['CFLAGS'] = '' - -- env.Append(CFLAGS=str(CFLAGS).split()) + env['CC'] = os.environ['CC'] + env['CXX'] = os.environ['CXX'] + + CFLAGS = os.environ['CFLAGS'] + env['CFLAGS'] = [] -+ env.Append(CFLAGS=string.split(str(CFLAGS))) + env.Append(CFLAGS=str(CFLAGS).split()) + + CCFLAGS = os.environ['CXXFLAGS'] + env['CCFLAGS'] = [] -+ env.Append(CCFLAGS=string.split(str(CCFLAGS))) ++ env.Append(CCFLAGS=str(CCFLAGS).split()) LINKFLAGS = env.get('LINKFLAGS', '') env['LINKFLAGS'] = ''