svn commit: r377529 - in head/multimedia/gstreamer-ffmpeg: . files
Sean Bruno
sbruno at FreeBSD.org
Tue Jan 20 16:36:57 UTC 2015
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 at 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
More information about the svn-ports-all
mailing list