Attachment 233583 Details for Bug 258720 – multimedia/avidemux: fix build on armv7

[patch] multimedia/avidemux: fix build on armv7

0001-multimedia-avidemux-fix-build-on-armv7.patch (text/plain), 2.04 KB, created by Robert Clausecker on 2022-04-29 12:18:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-04-29 12:18:37 UTC

Size: 2.04 KB

patch

obsolete

>From 20f674d1e0c5297ae3c341cf158b219c5b225d20 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Mon, 29 Nov 2021 17:34:44 +0100
>Subject: [PATCH] multimedia/avidemux: fix build on armv7
>
>The build on ARMv7 failed because the ffmpeg version bundled
>with avidemux supplied a -march=armv7-a directive to gcc, making
>it assume that the CPU has no FPU while also having to fulfil the
>hard float ABI of the target.  Gcc cannot do that and refuses
>compilation.
>
>This is fixed by applying an upstream patch to leave out the -march
>argument unless specifically requested, making the build succeed.
>
>https://patchwork.ffmpeg.org/project/ffmpeg/patch/20210920100040.3359213-1-martin@martin.st/#67025
>---
> ...ore-ffmpeg_package-patches-configure.patch | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
>diff --git a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch b/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
>index e3d8bccc1312..8726076bf6d8 100644
>--- a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
>+++ b/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
>@@ -1,7 +1,7 @@
>---- avidemux_core/ffmpeg_package/patches/configure.patch.orig	2021-09-06 18:01:37 UTC
>+--- avidemux_core/ffmpeg_package/patches/configure.patch.orig	2021-11-29 16:28:06 UTC
> +++ avidemux_core/ffmpeg_package/patches/configure.patch
>-@@ -0,0 +1,11 @@
>-+--- configure.orig
>+@@ -0,0 +1,24 @@
>++--- configure.orig	2020-07-09 11:17:46.000000000 +0200
> ++++ configure
> +@@ -3671,6 +3671,8 @@
> +     arch_default=$(uname -p)
>@@ -12,3 +12,16 @@
> + else
> +     arch_default=$(uname -m)
> + fi
>++@@ -4861,9 +4863,11 @@
>++         fi
>++     }
>++ 
>++-    [ "$cpu" = generic ] && cpu=$(probe_arm_arch)
>++ 
>++     case $cpu in
>+++        generic)
>+++            subarch=$(probe_arm_arch | sed 's/[^a-z0-9]//g')
>+++        ;;
>++         armv*)
>++             cpuflags="-march=$cpu"
>++             subarch=$(echo $cpu | sed 's/[^a-z0-9]//g')
>-- 
>2.35.2
>

Actions: View | Diff

Attachments on bug 258720: 228173 | 228905 | 229928 | 233533 | 233552 | 233583 | 233729 | 233780