diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-02-07 14:05:17 +0000 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-02-07 14:05:17 +0000 |
| commit | ef7663e3c1562a9a2740997ff20e4cc1ba6b7b36 (patch) | |
| tree | 02438982ec7894f7cc1c33f5e9e8bd48874f86d4 | |
| parent | 1f8631c10a9e6780b05b61bb1be956b4c51e4432 (diff) | |
| download | FreeBSD-ports-ef7663e3c1562a9a2740997ff20e4cc1ba6b7b36.zip FreeBSD-ports-ef7663e3c1562a9a2740997ff20e4cc1ba6b7b36.tar.gz | |
multimedia/gstreamer-ffmpeg: unbreak on armv6
CC libavdevice/alldevices.o
/tmp/alldevices-d7c3b8.s: Assembler messages:
/tmp/alldevices-d7c3b8.s:215: Error: inconsistent uses of .cfi_sections
cc: error: assembler command failed with exit code 1 (use -v to see invocation)
PR: 216880
Reported by: pkg-fallout
Submitted by: mmel (via mikael.urankar@gmail.com)
Tested by: mikael.urankar@gmail.com
3 files changed, 38 insertions, 30 deletions
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index a5937e0..db24c35 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -63,14 +63,6 @@ FFMPEG_CFLAGS_OFF+=-msse .include <bsd.port.pre.mk> -.if ${ARCH} == aarch64 || ${ARCH} == armv6 -CONFIGURE_ENV+= ASFLAGS=-no-integrated-as -CFLAGS+= -no-integrated-as -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif - .if ! ${PORT_OPTIONS:MFFMPEG} .if ${ARCH} == powerpc64 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 fa6b314..59fc64a 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,25 +1,21 @@ --- gst-libs/ext/libav/libavcodec/arm/asm.S.orig 2013-02-02 09:03:32 UTC +++ gst-libs/ext/libav/libavcodec/arm/asm.S -@@ -26,6 +26,22 @@ - # define ELF @ - #endif +@@ -39,7 +39,6 @@ ELF .eabi_attribute 25, \val + .macro function name, export=0 + .macro endfunc + ELF .size \name, . - \name +- .endfunc + .purgem endfunc + .endm + .text +@@ -48,8 +47,9 @@ ELF .size \name, . - \name + EXTERN_ASM\name: + .endif + ELF .type \name, %function +- .func \name ++ .if \export == 0 + \name: ++ .endif + .endm -+#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 + .macro const name, align=2 diff --git a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h new file mode 100644 index 0000000..b50974b --- /dev/null +++ b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h @@ -0,0 +1,20 @@ +--- gst-libs/ext/libav/libavcodec/arm/vp56_arith.h.orig 2017-01-23 16:31:45 UTC ++++ gst-libs/ext/libav/libavcodec/arm/vp56_arith.h +@@ -33,7 +33,7 @@ static inline int vp56_rac_get_prob_armv + + __asm__ ("adds %3, %3, %0 \n" + "cmpcs %7, %4 \n" +- "ldrcsh %2, [%4], #2 \n" ++ "ldrhcs %2, [%4], #2 \n" + "rsb %0, %6, #256 \n" + "smlabb %0, %5, %6, %0 \n" + "rev16cs %2, %2 \n" +@@ -65,7 +65,7 @@ static inline int vp56_rac_get_prob_bran + + __asm__ ("adds %3, %3, %0 \n" + "cmpcs %7, %4 \n" +- "ldrcsh %2, [%4], #2 \n" ++ "ldrhcs %2, [%4], #2 \n" + "rsb %0, %6, #256 \n" + "smlabb %0, %5, %6, %0 \n" + "rev16cs %2, %2 \n" |
