From owner-svn-ports-head@freebsd.org  Sun Oct  9 12:19:33 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1F4FC07B25;
 Sun,  9 Oct 2016 12:19:33 +0000 (UTC)
 (envelope-from riggs@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 mx1.freebsd.org (Postfix) with ESMTPS id 924AF6E1;
 Sun,  9 Oct 2016 12:19:33 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u99CJWc5010737;
 Sun, 9 Oct 2016 12:19:32 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u99CJWk1010735;
 Sun, 9 Oct 2016 12:19:32 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201610091219.u99CJWk1010735@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 9 Oct 2016 12:19:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423592 - in head/multimedia/ffmpeg: . files
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Oct 2016 12:19:33 -0000

Author: riggs
Date: Sun Oct  9 12:19:32 2016
New Revision: 423592
URL: https://svnweb.freebsd.org/changeset/ports/423592

Log:
  Fix runtime crashes on i386: enforce stack-alignment=16
  
  PR:		205958
  Submitted by:	dim (patch via ports mailing list)
  Reported by:	otacilio.neto@bsd.com.br
  MFH:		2016Q4 (ports-secteam fix blanket)

Modified:
  head/multimedia/ffmpeg/Makefile
  head/multimedia/ffmpeg/files/patch-configure

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Sun Oct  9 12:10:02 2016	(r423591)
+++ head/multimedia/ffmpeg/Makefile	Sun Oct  9 12:19:32 2016	(r423592)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.8.8
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/

Modified: head/multimedia/ffmpeg/files/patch-configure
==============================================================================
--- head/multimedia/ffmpeg/files/patch-configure	Sun Oct  9 12:10:02 2016	(r423591)
+++ head/multimedia/ffmpeg/files/patch-configure	Sun Oct  9 12:19:32 2016	(r423592)
@@ -14,6 +14,19 @@
  cpu="generic"
  intrinsics="none"
  
+@@ -5682,7 +5677,11 @@ elif enabled gcc; then
+ elif enabled llvm_gcc; then
+     check_cflags -mllvm -stack-alignment=16
+ elif enabled clang; then
+-    check_cflags -mllvm -stack-alignment=16
++    if enabled x86_32; then
++        check_cflags -mllvm -stack-alignment=16
++        check_cflags -mstack-alignment=16
++        check_cflags -mstackrealign
++    fi
+     check_cflags -Qunused-arguments
+     check_cflags -Werror=implicit-function-declaration
+     check_cflags -Werror=missing-prototypes
 @@ -5823,7 +5818,7 @@ ifndef MAIN_MAKEFILE
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif