View | Details | Raw Unified | Return to bug 216880
Collapse All | Expand All

(-)Makefile (-8 lines)
Lines 63-76 Link Here
63
63
64
.include <bsd.port.pre.mk>
64
.include <bsd.port.pre.mk>
65
65
66
.if ${ARCH} == aarch64 || ${ARCH} == armv6
67
CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
68
CFLAGS+=	-no-integrated-as
69
BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
70
CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
71
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
72
.endif
73
74
.if ! ${PORT_OPTIONS:MFFMPEG}
66
.if ! ${PORT_OPTIONS:MFFMPEG}
75
67
76
.if ${ARCH} == powerpc64
68
.if ${ARCH} == powerpc64
(-)files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S (-22 / +18 lines)
Lines 1-25 Link Here
1
--- gst-libs/ext/libav/libavcodec/arm/asm.S.orig	2013-02-02 09:03:32 UTC
1
--- gst-libs/ext/libav/libavcodec/arm/asm.S.orig	2013-02-02 09:03:32 UTC
2
+++ gst-libs/ext/libav/libavcodec/arm/asm.S
2
+++ gst-libs/ext/libav/libavcodec/arm/asm.S
3
@@ -26,6 +26,22 @@
3
@@ -39,7 +39,6 @@ ELF     .eabi_attribute 25, \val
4
 #   define ELF @
4
 .macro  function name, export=0
5
 #endif
5
     .macro endfunc
6
 ELF     .size   \name, . - \name
7
-        .endfunc
8
         .purgem endfunc
9
     .endm
10
         .text
11
@@ -48,8 +47,9 @@ ELF     .size   \name, . - \name
12
 EXTERN_ASM\name:
13
     .endif
14
 ELF     .type   \name, %function
15
-        .func   \name
16
+    .if \export == 0
17
 \name:
18
+    .endif
19
 .endm
6
 
20
 
7
+#if   HAVE_NEON
21
 .macro  const   name, align=2
8
+        .arch           armv7-a
9
+#elif HAVE_ARMV6T2
10
+        .arch           armv6t2
11
+#elif HAVE_ARMV6
12
+        .arch           armv6
13
+#elif HAVE_ARMV5TE
14
+        .arch           armv5te
15
+#endif
16
+
17
+#if   HAVE_NEON
18
+        .fpu            neon
19
+#elif HAVE_ARMVFP
20
+        .fpu            vfp
21
+#endif
22
+
23
         .syntax unified
24
 
25
 .macro  require8 val=1
(-)files/patch-gst-libs_ext_libav_libavcodec_arm_vp56__arith.h (+20 lines)
Line 0 Link Here
1
--- gst-libs/ext/libav/libavcodec/arm/vp56_arith.h.orig	2017-01-23 16:31:45 UTC
2
+++ gst-libs/ext/libav/libavcodec/arm/vp56_arith.h
3
@@ -33,7 +33,7 @@ static inline int vp56_rac_get_prob_armv
4
 
5
     __asm__ ("adds    %3,  %3,  %0           \n"
6
              "cmpcs   %7,  %4                \n"
7
-             "ldrcsh  %2,  [%4], #2          \n"
8
+             "ldrhcs  %2,  [%4], #2          \n"
9
              "rsb     %0,  %6,  #256         \n"
10
              "smlabb  %0,  %5,  %6,  %0      \n"
11
              "rev16cs %2,  %2                \n"
12
@@ -65,7 +65,7 @@ static inline int vp56_rac_get_prob_bran
13
 
14
     __asm__ ("adds    %3,  %3,  %0           \n"
15
              "cmpcs   %7,  %4                \n"
16
-             "ldrcsh  %2,  [%4], #2          \n"
17
+             "ldrhcs  %2,  [%4], #2          \n"
18
              "rsb     %0,  %6,  #256         \n"
19
              "smlabb  %0,  %5,  %6,  %0      \n"
20
              "rev16cs %2,  %2                \n"

Return to bug 216880