From owner-svn-ports-all@freebsd.org Sun Nov 17 01:38:15 2019 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 BE7171B2D8A; Sun, 17 Nov 2019 01:38:15 +0000 (UTC) (envelope-from pkubaj@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 47FvqW4883z4ZPX; Sun, 17 Nov 2019 01:38:15 +0000 (UTC) (envelope-from pkubaj@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 41DBEA5E7; Sun, 17 Nov 2019 01:38:15 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAH1cEK5095102; Sun, 17 Nov 2019 01:38:14 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAH1cEKw095101; Sun, 17 Nov 2019 01:38:14 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201911170138.xAH1cEKw095101@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 17 Nov 2019 01:38:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517790 - head/devel/godot X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/devel/godot X-SVN-Commit-Revision: 517790 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: Sun, 17 Nov 2019 01:38:15 -0000 Author: pkubaj Date: Sun Nov 17 01:38:14 2019 New Revision: 517790 URL: https://svnweb.freebsd.org/changeset/ports/517790 Log: devel/godot: fix build on powerpc64 Use system libvpx on architectures which break with included libvpx. PR: 241762 Approved by: FreeBSD@ShaneWare.Biz (maintainer), linimon (mentor) Modified: head/devel/godot/Makefile Modified: head/devel/godot/Makefile ============================================================================== --- head/devel/godot/Makefile Sun Nov 17 01:10:40 2019 (r517789) +++ head/devel/godot/Makefile Sun Nov 17 01:38:14 2019 (r517790) @@ -15,9 +15,6 @@ LICENSE_COMB= multi LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LOGO_LICENSE.md LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt -BROKEN_armv6= tries to build NEON files without -march=armv7-a -mfpu=neon -BROKEN_powerpc64= fails to compile: inv_txfm_sse2.h:14:32: emmintrin.h: No such file or directory - BUILD_DEPENDS= yasm:devel/yasm LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png @@ -77,6 +74,13 @@ PLIST_FILES= bin/${GODOTFILE} .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE= .endif +.include + +.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != armv6 && ${ARCH} != armv7 +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 @@ -109,4 +113,4 @@ do-install-TOOLS-on: ${INSTALL_DATA} ${WRKSRC}/icon.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg -.include +.include