mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-11-14 16:52:08 -10:00
package/ffmpeg: remove patch 0004
Buildroot commitf30bd1eb69added patch 0004 to "add -latomic to pkg-config files". A patch addressing the same problem was committed to ffmpeg 5.1 several months later:2f0a214a62so we can remove patch 0004. Buildroot commitfa36a6375dbumped the package from 4.4.4 to 6.1.1. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
b922ae9198
commit
aa1cdae741
@@ -322,7 +322,6 @@ package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch li
|
||||
package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch lib_patch.Upstream
|
||||
package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch lib_patch.Upstream
|
||||
package/ffmpeg/0003-libavutil-Fix-mips-build.patch lib_patch.Upstream
|
||||
package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch lib_patch.Upstream
|
||||
package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch lib_patch.Upstream
|
||||
package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch lib_patch.Upstream
|
||||
package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch lib_patch.Upstream
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user