diff options
| author | wg <wg@FreeBSD.org> | 2015-01-20 20:05:26 +0800 |
|---|---|---|
| committer | wg <wg@FreeBSD.org> | 2015-01-20 20:05:26 +0800 |
| commit | 6b2487308048e7ebc10d5212b34654de8515d596 (patch) | |
| tree | 20334a9b934cad9220c9de8105301cd604e5094c /multimedia | |
| parent | df550e0ccf896ec93154cb031fecd3d7b121d83b (diff) | |
| download | freebsd-ports-gnome-6b2487308048e7ebc10d5212b34654de8515d596.tar.gz freebsd-ports-gnome-6b2487308048e7ebc10d5212b34654de8515d596.tar.zst freebsd-ports-gnome-6b2487308048e7ebc10d5212b34654de8515d596.zip | |
multimedia/ffmpeg0: fix build on armv6 with clang 3.5
PR: 196846
Submitted by: mikael.urankar gmail com
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg0/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S | 25 |
2 files changed, 30 insertions, 0 deletions
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index eea7767da7b0..180987879356 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -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 diff --git a/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S b/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S new file mode 100644 index 000000000000..9c259a2fc629 --- /dev/null +++ b/multimedia/ffmpeg0/files/patch-libavcodec_arm_asm.S @@ -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 |