Index: head/multimedia/gstreamer-ffmpeg/Makefile
===================================================================
--- head/multimedia/gstreamer-ffmpeg/Makefile	(revision 377528)
+++ head/multimedia/gstreamer-ffmpeg/Makefile	(revision 377529)
@@ -1,96 +1,104 @@
 # Created by: Koop Mast <kwm@rainbow-runner.nl>
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer-ffmpeg/Makefile,v 1.14 2006/07/20 13:40:27 ahze Exp $
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.10.13
 PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-ffmpeg/:ffmpeg \
 		http://libav.org/releases/:libav
 PKGNAMESUFFIX=	-ffmpeg
 DISTFILES=	gst-ffmpeg-${PORTVERSION}.tar.bz2:ffmpeg
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	GStreamer plug-in for manipulating MPEG video streams
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc
 
 LIBAV_VERSION=	0.7.7
 WRKSRC=		${WRKDIR}/gst-ffmpeg-${PORTVERSION}
 USES=		compiler:features gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
 OPTIONS_DEFINE=	FFMPEG
 FFMPEG_DESC?=	Use system ffmpeg instead of internal libav
 
 FFMPEG_LIB_DEPENDS=libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
 FFMPEG_CONFIGURE_WITH=system-ffmpeg
 
 FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav
 FFMPEG_BUILD_DEPENDS_OFF=yasm:${PORTSDIR}/devel/yasm
 FFMPEG_LDFLAGS_OFF=-Wl,-Bsymbolic
 FFMPEG_CONFIGURE_OFF=--with-ffmpeg-extra-configure="${FFMPEG_CONFIG}"
 FFMPEG_CONFIG=	--cc=${CC} \
 		--enable-runtime-cpudetect \
 		--enable-pic
 
 # sse hardware vector support
 .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
 WITH_BUILTIN_VECTOR=	yes
 .else
 FFMPEG_CONFIG+=	--disable-sse
 .endif
 
 # mmx support
 .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
 FFMPEG_CONFIG+=	--disable-mmx
 WITHOUT_BUILTIN_VECTOR=	yes
 .endif
 
 # builtin vector, requires mmx and sse
 .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
 FFMPEG_CFLAGS_OFF+=-msse
 .endif
 
 .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
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
 .if ${ARCH} == powerpc64
 FFMPEG_CONFIG+=	--arch=ppc64
 .endif
 
 .if ${COMPILER_TYPE} == "gcc"
 CFLAGS+=	-fno-force-addr
 .endif
 
 post-extract:
 	@${MV} ${WRKSRC}/gst-libs/ext/libav ${WRKSRC}/gst-libs/ext/libav.old
 	@${MV} ${WRKDIR}/libav-${LIBAV_VERSION} ${WRKSRC}/gst-libs/ext/libav
 	@${CP} ${WRKSRC}/gst-libs/ext/libav.old/config.* \
 		${WRKSRC}/gst-libs/ext/libav/
 .endif # FFMPEG
 
 post-patch:
 	@${REINPLACE_CMD} -Ee '/sleep 15/d; /PKG_CONFIG/\
 		s/lib(av(format|codec|util)|postproc|swscale)/&0/g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \
 		${WRKSRC}/gst-libs/ext/libav/Makefile \
 		${WRKSRC}/gst-libs/ext/libav/common.mak \
 		${WRKSRC}/gst-libs/ext/libav/configure \
 		${WRKSRC}/gst-libs/ext/libav/libavcodec/Makefile \
 		${WRKSRC}/gst-libs/ext/libav/libavfilter/Makefile
 
 .include <bsd.port.post.mk>
Index: 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	(revision 377528)
+++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S	(revision 377529)
@@ -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