svn commit: r377205 - in head/multimedia: ffmpeg gstreamer1-libav

[Sean Bruno]

Author: sbruno
Date: Fri Jan 16 22:50:42 2015
New Revision: 377205
URL: https://svnweb.freebsd.org/changeset/ports/377205
QAT: https://qat.redports.org/buildarchive/r377205/

Log:
  Remove duplicate armv6 conditional introduced in r377204
  
  Submitted by:	antoine

Modified:
  head/multimedia/ffmpeg/Makefile
  head/multimedia/gstreamer1-libav/Makefile

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Fri Jan 16 22:34:22 2015	(r377204)
+++ head/multimedia/ffmpeg/Makefile	Fri Jan 16 22:50:42 2015	(r377205)
@@ -237,10 +237,6 @@ CONFIGURE_ARGS+=	--enable-x11grab
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == armv6
-CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
-.endif
-
 .if ${ARCH} == "armv6"
 CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
 .endif

Modified: head/multimedia/gstreamer1-libav/Makefile
==============================================================================
--- head/multimedia/gstreamer1-libav/Makefile	Fri Jan 16 22:34:22 2015	(r377204)
+++ head/multimedia/gstreamer1-libav/Makefile	Fri Jan 16 22:50:42 2015	(r377205)
@@ -43,10 +43,6 @@ MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 CFLAGS+=	-mstack-alignment=16 -mstackrealign
 .endif
 
-.if ${ARCH} == armv6
-CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \
 		${WRKSRC}/gst-libs/ext/libav/Makefile \