fa36a6375d
Quoting Changelog: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=Changelog;h=b357f428abce2110904944c4cc066b8e297bb895;hb=3153c441e1d980ff9931ed26a0e01b4e366ac521 "- ffmpeg now requires threading to be built" Propagate threads to reserve dependencies. Rebased patches. Removed patch 0005 which is included in this release. Removed support for libavresample which was removed upstream. No legacy handling necessary for opencv3/4 because libavresample was an optional dependency. Added upstream patch 0005 to fix build error with arm. Drop configure options which were removed upstream. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 0c288853630b7b4e004774c39945d4a804afcfa8 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 6 Aug 2021 09:17:20 +0200
|
|
Subject: [PATCH] configure: add extralibs to extralibs_xxx
|
|
|
|
Add extralibs to extralibs_xxx (e.g. extralibs_avformat) to allow
|
|
applications such as motion to retrieve ffmpeg dependencies such as
|
|
-latomic through pkg-config
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: not upstreamable]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
[rebased for 6.0]
|
|
---
|
|
configure | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 0bb3a7cf2b..3bda99e415 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -7986,14 +7986,14 @@
|
|
source_path=${source_path}
|
|
LIBPREF=${LIBPREF}
|
|
LIBSUF=${LIBSUF}
|
|
-extralibs_avutil="$avutil_extralibs"
|
|
-extralibs_avcodec="$avcodec_extralibs"
|
|
-extralibs_avformat="$avformat_extralibs"
|
|
-extralibs_avdevice="$avdevice_extralibs"
|
|
-extralibs_avfilter="$avfilter_extralibs"
|
|
-extralibs_postproc="$postproc_extralibs"
|
|
-extralibs_swscale="$swscale_extralibs"
|
|
-extralibs_swresample="$swresample_extralibs"
|
|
+extralibs_avutil="$avutil_extralibs $extralibs"
|
|
+extralibs_avcodec="$avcodec_extralibs $extralibs"
|
|
+extralibs_avformat="$avformat_extralibs $extralibs"
|
|
+extralibs_avdevice="$avdevice_extralibs $extralibs"
|
|
+extralibs_avfilter="$avfilter_extralibs $extralibs"
|
|
+extralibs_postproc="$postproc_extralibs $extralibs"
|
|
+extralibs_swscale="$swscale_extralibs $extralibs"
|
|
+extralibs_swresample="$swresample_extralibs $extralibs"
|
|
EOF
|
|
|
|
for lib in $LIBRARY_LIST; do
|
|
--
|
|
2.30.2
|
|
|