svn commit: r394522 - branches/2015Q3/multimedia/ffmpeg

[Thomas Zander]

Author: riggs
Date: Mon Aug 17 18:58:18 2015
New Revision: 394522
URL: https://svnweb.freebsd.org/changeset/ports/394522

Log:
  MFH: r394414
  
  Fix SIGBUS crashes on several popular ARM SoCs
  
  PR:		200609
  Submitted by:	rwestlun at gmail.com
  Approved by:	ports-secteam (delphij)

Modified:
  branches/2015Q3/multimedia/ffmpeg/Makefile
Directory Properties:
  branches/2015Q3/   (props changed)

Modified: branches/2015Q3/multimedia/ffmpeg/Makefile
==============================================================================
--- branches/2015Q3/multimedia/ffmpeg/Makefile	Mon Aug 17 18:49:42 2015	(r394521)
+++ branches/2015Q3/multimedia/ffmpeg/Makefile	Mon Aug 17 18:58:18 2015	(r394522)
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
-USES=		cpe gmake pkgconfig perl5 tar:bzip2
+USES=		compiler cpe gmake pkgconfig perl5 tar:bzip2
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 WANT_SDL=	yes
@@ -245,8 +245,11 @@ CONFIGURE_ARGS+=	--enable-memalign-hack
 .endif
 
 .if ${ARCH} == "armv6"
+CONFIGURE_ARGS+=	--disable-fast-unaligned
+.if ${CHOSEN_COMPILER_TYPE} == "clang"
 CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
 .endif
+.endif
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}