public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
Date: Tue, 04 Feb 2025 16:54:19 +0000 (UTC)	[thread overview]
Message-ID: <1738688004.92f863b8e648714a7ed67a1ef70e2185112ebc83.sam@gentoo> (raw)

commit:     92f863b8e648714a7ed67a1ef70e2185112ebc83
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 16:52:29 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 16:53:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f863b8

media-video/ffmpeg: fix build on arm w/ binutils-2.43

Closes: https://bugs.gentoo.org/942790
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild          |  3 +-
 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild          |  3 +-
 media-video/ffmpeg/ffmpeg-6.1.2.ebuild             |  3 +-
 media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild          |  3 +-
 .../files/ffmpeg-4.4.5-binutils-2.43-arm.patch     | 60 ++++++++++++++++++++++
 5 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild
index b3e8636dea1f..64172ff012fe 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -349,6 +349,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.4.4-amd-av1-vaapi.patch
 	"${FILESDIR}"/${PN}-4.4.5-incmptbl-pntr-types.patch
 	"${FILESDIR}"/${PN}-4.4.5-wint-inconversion-libgcrypt.patch
+	"${FILESDIR}"/${PN}-4.4.5-binutils-2.43-arm.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index a2ffb7f3e263..5cfea3a43329 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -387,6 +387,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch
 	"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-vulkan.patch
 	"${FILESDIR}"/${PN}-6.1.1-incmptbl-pntr-types.patch
+	"${FILESDIR}"/${PN}-4.4.5-binutils-2.43-arm.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
index cc483e695fca..d5343a312a24 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -385,6 +385,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch
 	"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-vulkan.patch
 	"${FILESDIR}"/${PN}-6.1.1-incmptbl-pntr-types.patch
+	"${FILESDIR}"/${PN}-4.4.5-binutils-2.43-arm.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
index aa31d2b98eb0..c00ae501a01e 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -382,6 +382,7 @@ RESTRICT="
 PATCHES=(
 	"${FILESDIR}"/chromium-r2.patch
 	"${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch
+	"${FILESDIR}"/${PN}-4.4.5-binutils-2.43-arm.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.5-binutils-2.43-arm.patch b/media-video/ffmpeg/files/ffmpeg-4.4.5-binutils-2.43-arm.patch
new file mode 100644
index 000000000000..7ce8e0a038be
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.5-binutils-2.43-arm.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/942790
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/654bd47716c4f36719fb0f3f7fd8386d5ed0b916
+
+From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Fri, 9 Aug 2024 11:32:00 +0100
+Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
+ binutils 2.43
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+binutils 2.43 has stricter validation for labels[1] and results in errors
+when building ffmpeg for armv5:
+
+src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
+
+Remove the leading zero in the "01" label to resolve this error.
+
+[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
+
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+Signed-off-by: Martin Storsjö <martin@martin.st>
+---
+ libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
+index 4f9aa485fd..d31568611c 100644
+--- a/libavcodec/arm/mlpdsp_armv5te.S
++++ b/libavcodec/arm/mlpdsp_armv5te.S
+@@ -229,7 +229,7 @@ A .endif
+   .endif
+ 
+         // Begin loop
+-01:
++1:
+   .if TOTAL_TAPS == 0
+         // Things simplify a lot in this case
+         // In fact this could be pipelined further if it's worth it...
+@@ -241,7 +241,7 @@ A .endif
+         str     ST0, [PST, #-4]!
+         str     ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
+         str     ST0, [PSAMP], #4 * MAX_CHANNELS
+-        bne     01b
++        bne     1b
+   .else
+     .if \fir_taps & 1
+       .set LOAD_REG, 1
+@@ -333,7 +333,7 @@ T       orr     AC0, AC0, AC1
+         str     ST3, [PST, #-4]!
+         str     ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
+         str     ST3, [PSAMP], #4 * MAX_CHANNELS
+-        bne     01b
++        bne     1b
+   .endif
+         b       99f
+ 
+-- 
+2.25.1


             reply	other threads:[~2025-02-04 16:54 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-04 16:54 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-28  4:27 [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/ Ionen Wolkens
2025-01-06  2:16 Sam James
2024-11-25 20:42 Sam James
2024-09-26  7:17 Joonas Niilola
2024-07-20  4:09 Sam James
2024-07-20  4:09 Sam James
2024-05-02  5:21 Sam James
2024-04-10  1:47 Sam James
2024-03-12  3:37 Sam James
2024-03-09 22:17 James Le Cuirot
2024-02-29  5:44 Sam James
2024-02-17 14:53 James Le Cuirot
2024-02-06  4:02 Sam James
2024-02-06  4:00 Sam James
2024-01-24 10:58 Sam James
2023-12-18  4:51 Sam James
2023-07-24  2:00 Sam James
2023-05-31 18:43 Sam James
2023-04-23  7:05 Sam James
2023-02-13 22:43 Craig Andrews
2022-07-21  2:53 Matt Turner
2022-03-26 14:20 Joonas Niilola
2020-12-25  2:35 Sam James
2019-09-02 12:00 Alexis Ballier
2019-07-07 18:58 Thomas Deutschmann
2019-02-13 15:19 Alexis Ballier
2018-11-15 16:37 Craig Andrews
2018-07-19 11:08 Alexis Ballier
2018-07-17  7:33 Alexis Ballier
2018-01-18 22:01 James Le Cuirot
2017-08-27 19:23 James Le Cuirot
2017-08-26 13:41 Alexis Ballier
2017-02-07  9:46 Alexis Ballier
2016-12-24 10:33 Alexis Ballier
2016-09-29 16:33 Alexis Ballier
2015-11-12 11:46 Alexis Ballier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1738688004.92f863b8e648714a7ed67a1ef70e2185112ebc83.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox