mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-30 14:59:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
63aa65e65b
vcpkg/ports/ffmpeg/0016-configure-dnn-needs-avformat.patch

26 lines
665 B
Diff
Raw Normal View History

[ffmpeg] update to upstream version 4.4 (#17735) * [ffmpeg] update to version 4.4 * [ffmpeg] format-manifest * [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5) * [ffmpeg] x-add-version * [ffmpeg] add avresample under the all feature * [ffmpeg] x-add-version * [ffmpeg] remove unused patch * [ffmpeg] x-add-version * [ffmpeg] remove wavpack from FindFFMPEG * [ffmpeg] x-add-version * [ffmpeg] fix compile cuda issue * [ffmpeg] x-add-version * [ffmpeg] only apply cuda compile patch on windows targets * [ffmpeg] x-add-version
2021-05-18 14:18:50 +08:00
From 7ca15b7f337b00a71384f748d05fce89fcf15a8d Mon Sep 17 00:00:00 2001
[ffmpeg] fix dnn dependency (#17659) * [ffmpeg] fix dnn dependency The source file "libavfilter/dnn/dnn_backend_native.h" includes "libavformat/avio.h", so avformat needs to be declared as a dependency. This fixes the build of ffmpeg[core,avfilter]:x64-windows. Posted upstream here: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html Whilst at it, I've also added a link to the other avfilter patch: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279927.html * [ffmpeg] version bump * [ffmpeg] x-add-version * [openimageio] revert accidentally committed change that is meant for other PR
2021-05-06 04:09:30 +08:00
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
[ffmpeg] update to upstream version 4.4 (#17735) * [ffmpeg] update to version 4.4 * [ffmpeg] format-manifest * [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5) * [ffmpeg] x-add-version * [ffmpeg] add avresample under the all feature * [ffmpeg] x-add-version * [ffmpeg] remove unused patch * [ffmpeg] x-add-version * [ffmpeg] remove wavpack from FindFFMPEG * [ffmpeg] x-add-version * [ffmpeg] fix compile cuda issue * [ffmpeg] x-add-version * [ffmpeg] only apply cuda compile patch on windows targets * [ffmpeg] x-add-version
2021-05-18 14:18:50 +08:00
Date: Tue, 4 May 2021 13:03:17 +0100
[ffmpeg] fix dnn dependency (#17659) * [ffmpeg] fix dnn dependency The source file "libavfilter/dnn/dnn_backend_native.h" includes "libavformat/avio.h", so avformat needs to be declared as a dependency. This fixes the build of ffmpeg[core,avfilter]:x64-windows. Posted upstream here: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html Whilst at it, I've also added a link to the other avfilter patch: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279927.html * [ffmpeg] version bump * [ffmpeg] x-add-version * [openimageio] revert accidentally committed change that is meant for other PR
2021-05-06 04:09:30 +08:00
Subject: [PATCH] configure: dnn needs avformat
---
[ffmpeg] update to upstream version 4.4 (#17735) * [ffmpeg] update to version 4.4 * [ffmpeg] format-manifest * [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5) * [ffmpeg] x-add-version * [ffmpeg] add avresample under the all feature * [ffmpeg] x-add-version * [ffmpeg] remove unused patch * [ffmpeg] x-add-version * [ffmpeg] remove wavpack from FindFFMPEG * [ffmpeg] x-add-version * [ffmpeg] fix compile cuda issue * [ffmpeg] x-add-version * [ffmpeg] only apply cuda compile patch on windows targets * [ffmpeg] x-add-version
2021-05-18 14:18:50 +08:00
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[ffmpeg] fix dnn dependency (#17659) * [ffmpeg] fix dnn dependency The source file "libavfilter/dnn/dnn_backend_native.h" includes "libavformat/avio.h", so avformat needs to be declared as a dependency. This fixes the build of ffmpeg[core,avfilter]:x64-windows. Posted upstream here: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html Whilst at it, I've also added a link to the other avfilter patch: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279927.html * [ffmpeg] version bump * [ffmpeg] x-add-version * [openimageio] revert accidentally committed change that is meant for other PR
2021-05-06 04:09:30 +08:00
diff --git a/configure b/configure
[ffmpeg] update to upstream version 4.4 (#17735) * [ffmpeg] update to version 4.4 * [ffmpeg] format-manifest * [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5) * [ffmpeg] x-add-version * [ffmpeg] add avresample under the all feature * [ffmpeg] x-add-version * [ffmpeg] remove unused patch * [ffmpeg] x-add-version * [ffmpeg] remove wavpack from FindFFMPEG * [ffmpeg] x-add-version * [ffmpeg] fix compile cuda issue * [ffmpeg] x-add-version * [ffmpeg] only apply cuda compile patch on windows targets * [ffmpeg] x-add-version
2021-05-18 14:18:50 +08:00
index 9e45c0822c..8725a94f8a 100755
[ffmpeg] fix dnn dependency (#17659) * [ffmpeg] fix dnn dependency The source file "libavfilter/dnn/dnn_backend_native.h" includes "libavformat/avio.h", so avformat needs to be declared as a dependency. This fixes the build of ffmpeg[core,avfilter]:x64-windows. Posted upstream here: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html Whilst at it, I've also added a link to the other avfilter patch: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279927.html * [ffmpeg] version bump * [ffmpeg] x-add-version * [openimageio] revert accidentally committed change that is meant for other PR
2021-05-06 04:09:30 +08:00
--- a/configure
+++ b/configure
[ffmpeg] update to upstream version 4.4 (#17735) * [ffmpeg] update to version 4.4 * [ffmpeg] format-manifest * [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5) * [ffmpeg] x-add-version * [ffmpeg] add avresample under the all feature * [ffmpeg] x-add-version * [ffmpeg] remove unused patch * [ffmpeg] x-add-version * [ffmpeg] remove wavpack from FindFFMPEG * [ffmpeg] x-add-version * [ffmpeg] fix compile cuda issue * [ffmpeg] x-add-version * [ffmpeg] only apply cuda compile patch on windows targets * [ffmpeg] x-add-version
2021-05-18 14:18:50 +08:00
@@ -2660,7 +2660,7 @@ cbs_vp9_select="cbs"
[ffmpeg] fix dnn dependency (#17659) * [ffmpeg] fix dnn dependency The source file "libavfilter/dnn/dnn_backend_native.h" includes "libavformat/avio.h", so avformat needs to be declared as a dependency. This fixes the build of ffmpeg[core,avfilter]:x64-windows. Posted upstream here: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html Whilst at it, I've also added a link to the other avfilter patch: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279927.html * [ffmpeg] version bump * [ffmpeg] x-add-version * [openimageio] revert accidentally committed change that is meant for other PR
2021-05-06 04:09:30 +08:00
dct_select="rdft"
dirac_parse_select="golomb"
[ffmpeg] update to upstream version 4.4 (#17735) * [ffmpeg] update to version 4.4 * [ffmpeg] format-manifest * [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5) * [ffmpeg] x-add-version * [ffmpeg] add avresample under the all feature * [ffmpeg] x-add-version * [ffmpeg] remove unused patch * [ffmpeg] x-add-version * [ffmpeg] remove wavpack from FindFFMPEG * [ffmpeg] x-add-version * [ffmpeg] fix compile cuda issue * [ffmpeg] x-add-version * [ffmpeg] only apply cuda compile patch on windows targets * [ffmpeg] x-add-version
2021-05-18 14:18:50 +08:00
dnn_suggest="libtensorflow libopenvino"
-dnn_deps="swscale"
+dnn_deps="avformat swscale"
[ffmpeg] fix dnn dependency (#17659) * [ffmpeg] fix dnn dependency The source file "libavfilter/dnn/dnn_backend_native.h" includes "libavformat/avio.h", so avformat needs to be declared as a dependency. This fixes the build of ffmpeg[core,avfilter]:x64-windows. Posted upstream here: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html Whilst at it, I've also added a link to the other avfilter patch: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279927.html * [ffmpeg] version bump * [ffmpeg] x-add-version * [openimageio] revert accidentally committed change that is meant for other PR
2021-05-06 04:09:30 +08:00
error_resilience_select="me_cmp"
faandct_deps="faan"
faandct_select="fdctdsp"
--
2.25.1
Reference in New Issue Copy Permalink