From owner-svn-ports-head@FreeBSD.ORG  Sun Jan 18 18:05:16 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E7A4DA2A;
 Sun, 18 Jan 2015 18:05:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D3DBFAEA;
 Sun, 18 Jan 2015 18:05:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0II5G6s066031;
 Sun, 18 Jan 2015 18:05:16 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0II5GT5066030;
 Sun, 18 Jan 2015 18:05:16 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201501181805.t0II5GT5066030@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 18 Jan 2015 18:05:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377341 - head/multimedia/ffmpeg25
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2015 18:05:17 -0000

Author: riggs
Date: Sun Jan 18 18:05:15 2015
New Revision: 377341
URL: https://svnweb.freebsd.org/changeset/ports/377341
QAT: https://qat.redports.org/buildarchive/r377341/

Log:
  Merge armv6 ASFLAGS fix from multimedia/ffmpeg in r377205

Modified:
  head/multimedia/ffmpeg25/Makefile   (contents, props changed)

Modified: head/multimedia/ffmpeg25/Makefile
==============================================================================
--- head/multimedia/ffmpeg25/Makefile	Sun Jan 18 18:04:33 2015	(r377340)
+++ head/multimedia/ffmpeg25/Makefile	Sun Jan 18 18:05:15 2015	(r377341)
@@ -244,6 +244,10 @@ CONFIGURE_ARGS+=	--enable-x11grab
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "armv6"
+CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
+.endif
+
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin