Attachment 151806 Details for Bug 196847 – fix build on armv6

[patch] fix build on armv6

gstreamer-ffmpeg.patch (text/plain), 1.29 KB, created by Mikael Urankar on 2015-01-18 19:48:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2015-01-18 19:48:30 UTC

Size: 1.29 KB

patch

obsolete

>--- Makefile.orig
>+++ Makefile
>@@ -60,6 +60,14 @@ FFMPEG_CFLAGS_OFF+=-msse
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${ARCH} == armv6
>+CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
>+CFLAGS=	-no-integrated-as
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
>+CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
>+MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
>+.endif
>+
> .if ! ${PORT_OPTIONS:MFFMPEG}
> .if ${OSVERSION} < 900033 || ${ARCH} == ia64
> BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
>
>--- files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S.orig
>+++ files/patch-gst-libs_ext_libav_libavcodec_arm_asm.S
>@@ -1,12 +1,25 @@
> --- gst-libs/ext/libav/libavcodec/arm/asm.S.orig	2013-02-02 09:03:32 UTC
> +++ gst-libs/ext/libav/libavcodec/arm/asm.S
>-@@ -28,6 +28,9 @@
>+@@ -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
>  
>-+        .cpu    arm1176jzf-s
>-+        .fpu    vfpv2
>-+
>  .macro  require8 val=1
>- ELF     .eabi_attribute 24, \val
>- .endm

Actions: View | Diff

Attachments on bug 196847: 151806