svn commit: r433552 - in head/multimedia/gstreamer-ffmpeg: . files
Jan Beich
jbeich at FreeBSD.org
Tue Feb 7 14:05:19 UTC 2017
Author: jbeich
Date: Tue Feb 7 14:05:17 2017
New Revision: 433552
URL: https://svnweb.freebsd.org/changeset/ports/433552
Log:
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 at gmail.com)
Tested by: mikael.urankar at gmail.com
Added:
head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h (contents, props changed)
Modified:
head/multimedia/gstreamer-ffmpeg/Makefile (contents, props changed)
head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S (contents, props changed)
Modified: head/multimedia/gstreamer-ffmpeg/Makefile
==============================================================================
--- head/multimedia/gstreamer-ffmpeg/Makefile Tue Feb 7 13:48:09 2017 (r433551)
+++ head/multimedia/gstreamer-ffmpeg/Makefile Tue Feb 7 14:05:17 2017 (r433552)
@@ -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
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 Feb 7 13:48:09 2017 (r433551)
+++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S Tue Feb 7 14:05:17 2017 (r433552)
@@ -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
Added: head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h Tue Feb 7 14:05:17 2017 (r433552)
@@ -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"
More information about the svn-ports-all
mailing list