svn commit: r377204 - in head/multimedia: ffmpeg gstreamer1-libav libav mplayer

[Sean Bruno]

Author: sbruno
Date: Fri Jan 16 22:34:22 2015
New Revision: 377204
URL: https://svnweb.freebsd.org/changeset/ports/377204
QAT: https://qat.redports.org/buildarchive/r377204/

Log:
  These ports utilize GAS assembly and probably won't ever change.  For the ARM
  case, do not use -integrated-as.
  
  PR:	196660 196774 196775 196776
  Submitted by:	mikael.urankar at gmail.com
  Approved by:	mentor (inplicit)

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

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Fri Jan 16 21:57:41 2015	(r377203)
+++ head/multimedia/ffmpeg/Makefile	Fri Jan 16 22:34:22 2015	(r377204)
@@ -237,6 +237,14 @@ 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
+
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin

Modified: head/multimedia/gstreamer1-libav/Makefile
==============================================================================
--- head/multimedia/gstreamer1-libav/Makefile	Fri Jan 16 21:57:41 2015	(r377203)
+++ head/multimedia/gstreamer1-libav/Makefile	Fri Jan 16 22:34:22 2015	(r377204)
@@ -30,6 +30,10 @@ INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "armv6"
+CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
+.endif
+
 .if ${OSVERSION} < 900033 || ${ARCH} == ia64
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
@@ -39,6 +43,10 @@ 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 \

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Fri Jan 16 21:57:41 2015	(r377203)
+++ head/multimedia/libav/Makefile	Fri Jan 16 22:34:22 2015	(r377204)
@@ -168,6 +168,10 @@ USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "armv6"
+CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
+.endif
+
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--extra-cflags=-m32
 .endif

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Fri Jan 16 21:57:41 2015	(r377203)
+++ head/multimedia/mplayer/Makefile	Fri Jan 16 22:34:22 2015	(r377204)
@@ -60,6 +60,10 @@ CONFIGURE_ARGS+=	--disable-arts \
 
 .include "${.CURDIR}/Makefile.options"
 
+.if ${ARCH} == "armv6"
+CFLAGS_armv6+=	-no-integrated-as
+.endif
+
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false