svn commit: r377509 - in head/multimedia/ffmpeg0: . files
William Grzybowski
wg at FreeBSD.org
Tue Jan 20 12:05:28 UTC 2015
Author: wg
Date: Tue Jan 20 12:05:26 2015
New Revision: 377509
URL: https://svnweb.freebsd.org/changeset/ports/377509
QAT: https://qat.redports.org/buildarchive/r377509/
Log:
multimedia/ffmpeg0: fix build on armv6 with clang 3.5
PR: 196846
Submitted by: mikael.urankar gmail com
Added:
head/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S (contents, props changed)
Modified:
head/multimedia/ffmpeg0/Makefile
Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile Tue Jan 20 12:02:00 2015 (r377508)
+++ head/multimedia/ffmpeg0/Makefile Tue Jan 20 12:05:26 2015 (r377509)
@@ -93,6 +93,11 @@ CONFIGURE_ARGS+= --enable-x11grab
.include <bsd.port.pre.mk>
+.if ${ARCH} == armv6
+CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
+CFLAGS= -no-integrated-as
+.endif
+
CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
Added: head/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S Tue Jan 20 12:05:26 2015 (r377509)
@@ -0,0 +1,25 @@
+--- libavcodec/arm/asm.S.orig 2013-10-06 16:18:07 UTC
++++ libavcodec/arm/asm.S
+@@ -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
+
+ .macro require8 val=1
More information about the svn-ports-all
mailing list