diff options
| author | sbruno <sbruno@FreeBSD.org> | 2015-01-20 16:36:55 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2015-01-20 16:36:55 +0000 |
| commit | 97c37df337e52da0c2728c0c4ebe8233df0c989a (patch) | |
| tree | ae0523fa85712505c232b98ded450dbd1eebab66 | |
| parent | 9456526999112852d4ff365b014c1fc32c12ebe3 (diff) | |
| download | FreeBSD-ports-97c37df337e52da0c2728c0c4ebe8233df0c989a.zip FreeBSD-ports-97c37df337e52da0c2728c0c4ebe8233df0c989a.tar.gz | |
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@gmail.com
Reviewed by: kwm
Approved by: mentor (implicit)
| -rw-r--r-- | multimedia/gstreamer-ffmpeg/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S | 25 |
2 files changed, 27 insertions, 6 deletions
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index 772503a..81f1ee6 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -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 diff --git a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S index 109c50c..fa6b314 100644 --- a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S +++ b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S @@ -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 |
