From owner-svn-ports-all@FreeBSD.ORG Fri Oct 18 07:45:49 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 84592EC7; Fri, 18 Oct 2013 07:45:49 +0000 (UTC) (envelope-from tijl@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 57D0E276B; Fri, 18 Oct 2013 07:45:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9I7jnFM085172; Fri, 18 Oct 2013 07:45:49 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9I7jnuV085170; Fri, 18 Oct 2013 07:45:49 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201310180745.r9I7jnuV085170@svn.freebsd.org> From: Tijl Coosemans Date: Fri, 18 Oct 2013 07:45:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330729 - in head/multimedia/mplayer: . 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Oct 2013 07:45:49 -0000 Author: tijl Date: Fri Oct 18 07:45:48 2013 New Revision: 330729 URL: http://svnweb.freebsd.org/changeset/ports/330729 Log: Fix build on i386 with clang. Some inline asm requires 7 registers but only 6 are available because clang assumes the stack is 4-byte aligned and there's a local variable that requires 16-byte alignment so the stack has to be realigned which requires one register to be used as frame pointer. PR: ports/180564 Submitted by: dt71@gmx.com Approved by: Thomas Zander (maintainer) Added: head/multimedia/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c (contents, props changed) Modified: head/multimedia/mplayer/Makefile.options Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Fri Oct 18 07:44:30 2013 (r330728) +++ head/multimedia/mplayer/Makefile.options Fri Oct 18 07:45:48 2013 (r330729) @@ -50,7 +50,7 @@ CFLAGS+= -O -fomit-frame-pointer .endif #DEBUG #Supported architectures for clang -.if ${ARCH} == "amd64" +.if ${ARCH} == "amd64" || ${ARCH} == "i386" MPLAYER_CLANG_SUPPORTED_ARCH= yes .endif Added: head/multimedia/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c Fri Oct 18 07:45:48 2013 (r330729) @@ -0,0 +1,11 @@ +--- ffmpeg/libavcodec/x86/ac3dsp_init.c 2013-07-03 21:34:20.000000000 +0200 ++++ ffmpeg/libavcodec/x86/ac3dsp_init.c 2013-07-03 21:34:45.000000000 +0200 +@@ -51,7 +51,7 @@ + extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs); + extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs); + +-#if ARCH_X86_32 && defined(__INTEL_COMPILER) ++#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__)) + # undef HAVE_7REGS + # define HAVE_7REGS 0 + #endif