Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Nov 2019 01:38:14 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r517790 - head/devel/godot
Message-ID:  <201911170138.xAH1cEKw095101@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>



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