From owner-svn-ports-head@FreeBSD.ORG  Tue Jan 20 16:36:57 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 0987A878;
 Tue, 20 Jan 2015 16:36:57 +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 D115D91F;
 Tue, 20 Jan 2015 16:36:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0KGaumH002485;
 Tue, 20 Jan 2015 16:36:56 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0KGaugw002483;
 Tue, 20 Jan 2015 16:36:56 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201501201636.t0KGaugw002483@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Tue, 20 Jan 2015 16:36:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377529 - in head/multimedia/gstreamer-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.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: Tue, 20 Jan 2015 16:36:57 -0000

Author: sbruno
Date: Tue Jan 20 16:36:55 2015
New Revision: 377529
URL: https://svnweb.freebsd.org/changeset/ports/377529
QAT: https://qat.redports.org/buildarchive/r377529/

Log:
  Disable clang's integrated-as for this build.  Modify ARM assembly
  with upstream patch to handle different ARM revisions.  This fixes the build
  since the clang 3.5 import
  
  PR:		196847
  Submitted by:	mikael.urankar@gmail.com
  Reviewed by:	kwm
  Approved by:	mentor (implicit)

Modified:
  head/multimedia/gstreamer-ffmpeg/Makefile
  head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S

Modified: head/multimedia/gstreamer-ffmpeg/Makefile
==============================================================================
--- head/multimedia/gstreamer-ffmpeg/Makefile	Tue Jan 20 16:22:17 2015	(r377528)
+++ head/multimedia/gstreamer-ffmpeg/Makefile	Tue Jan 20 16:36:55 2015	(r377529)
@@ -60,6 +60,14 @@ FFMPEG_CFLAGS_OFF+=-msse
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == armv6
+CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
+CFLAGS=	-no-integrated-as
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+.endif
+
 .if ! ${PORT_OPTIONS:MFFMPEG}
 .if ${OSVERSION} < 900033 || ${ARCH} == ia64
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils

Modified: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S
==============================================================================
--- head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S	Tue Jan 20 16:22:17 2015	(r377528)
+++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S	Tue Jan 20 16:36:55 2015	(r377529)
@@ -1,12 +1,25 @@
 --- gst-libs/ext/libav/libavcodec/arm/asm.S.orig	2013-02-02 09:03:32 UTC
 +++ gst-libs/ext/libav/libavcodec/arm/asm.S
-@@ -28,6 +28,9 @@
+@@ -26,6 +26,22 @@
+ #   define ELF @
+ #endif
  
++#if   HAVE_NEON
++        .arch           armv7-a
++#elif HAVE_ARMV6T2
++        .arch           armv6t2
++#elif HAVE_ARMV6
++        .arch           armv6
++#elif HAVE_ARMV5TE
++        .arch           armv5te
++#endif
++
++#if   HAVE_NEON
++        .fpu            neon
++#elif HAVE_ARMVFP
++        .fpu            vfp
++#endif
++
          .syntax unified
  
-+        .cpu    arm1176jzf-s
-+        .fpu    vfpv2
-+
  .macro  require8 val=1
- ELF     .eabi_attribute 24, \val
- .endm