gentoo-ebuilds/media-video/handbrake/files/handbrake-1.9.2-set-ffmpeg-toolchain-explicitly.patch
Alfred Wingate 5768e02999
media-video/handbrake: add 1.9.2
* Set tools explicitly for ffmpeg. bug #946831
* Take this as a chance to remove potential footguns with complicated seds.

Closes: https://bugs.gentoo.org/946831
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41950
Signed-off-by: Sam James <sam@gentoo.org>
2025-05-06 19:39:53 +01:00

36 lines
1.3 KiB
Diff

From 7e670380373eb5be0c977f467c102eb1210951b5 Mon Sep 17 00:00:00 2001
From: Alfred Wingate <parona@protonmail.com>
Date: Wed, 25 Dec 2024 19:49:40 +0200
Subject: [PATCH 1/2] Set toolchain explicitly for ffmpeg
Signed-off-by: Alfred Wingate <parona@protonmail.com>
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -76,7 +76,13 @@ FFMPEG.CONFIGURE.extra = \
--enable-filter=hwdownload \
--enable-filter=hwmap \
--enable-filter=hwupload \
- --cc="$(FFMPEG.GCC.gcc)"
+ --cc="$(FFMPEG.GCC.gcc)" \
+ --cxx="$(FFMPEG.GCC.gxx)" \
+ --ar="$(AR.exe)" \
+ --nm="$(NM.exe)" \
+ --strip="$(STRIP.exe)" \
+ --ranlib="$(RANLIB.exe)" \
+ --pkg-config="$(PKGCONFIG.exe)"
ifeq (size-aggressive,$(GCC.O))
FFMPEG.CONFIGURE.extra += \
--- a/make/configure.py
+++ b/make/configure.py
@@ -1665,6 +1665,7 @@ try:
strip = ToolProbe( 'STRIP.exe', 'strip', 'strip', abort=True )
tar = ToolProbe( 'TAR.exe', 'tar', 'gtar', 'tar', abort=True )
python = ToolProbe( 'PYTHON.exe', 'python', os.path.basename(sys.executable), abort=True )
+ nm = ToolProbe( 'NM.exe', 'nm', 'nm', abort=True )
gcc_tools = ['GCC.gcc',
'cc',
--
2.47.1