From owner-svn-ports-all@FreeBSD.ORG  Fri Nov  1 17:46:34 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 94255386;
 Fri,  1 Nov 2013 17:46:34 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 810762CFF;
 Fri,  1 Nov 2013 17:46:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1HkYJB084403;
 Fri, 1 Nov 2013 17:46:34 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1HkYuH084399;
 Fri, 1 Nov 2013 17:46:34 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201311011746.rA1HkYuH084399@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Fri, 1 Nov 2013 17:46:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332397 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 17:46:34 -0000

Author: jhale
Date: Fri Nov  1 17:46:33 2013
New Revision: 332397
URL: http://svnweb.freebsd.org/changeset/ports/332397

Log:
  - Fix build with clang on i386
  
  Reported by:	Herbert J. Skuhra <hskuhra@eumx.net>
  Approved by:	wg

Added:
  head/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h   (contents, props changed)

Added: head/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h	Fri Nov  1 17:46:33 2013	(r332397)
@@ -0,0 +1,11 @@
+--- ./libavutil/x86/asm.h.orig	2013-11-01 13:02:26.000000000 -0400
++++ ./libavutil/x86/asm.h	2013-11-01 13:03:00.000000000 -0400
+@@ -70,7 +70,7 @@
+ typedef int x86_reg;
+ #endif
+ 
+-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
++#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
+ #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
+ 
+ #if ARCH_X86_64 && defined(PIC)