Attachment 179701 Details for Bug 216880 – armv6 fix

[patch] armv6 fix

multimedia_gstreamer-ffmpeg.patch (text/plain), 3.39 KB, created by Mikael Urankar on 2017-02-07 12:17:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2017-02-07 12:17:44 UTC

Size: 3.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433490)
>+++ Makefile	(working copy)
>@@ -63,14 +63,6 @@
> 
> .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
>Index: files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S
>===================================================================
>--- files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S	(revision 433490)
>+++ files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S	(working copy)
>@@ -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
>Index: files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h
>===================================================================
>--- files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h	(nonexistent)
>+++ files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h	(working copy)
>@@ -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"
>
>Property changes on: files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

jbeich: maintainer-approval+

Actions: View | Diff

Attachments on bug 216880: 179701 | 179702