aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias C. M. Troffaes <matthias.troffaes@gmail.com>2021-05-04 07:14:55 +0100
committerGitHub <noreply@github.com>2021-05-03 23:14:55 -0700
commite8dbfcf6797a270ed5be8550248f7fe4fe5dec79 (patch)
tree4158c1b08a1ade1c5b9f6c56aa12b0c7d6a2337f
parent95836f4883ffb481b7dd5f89569bc6ef55c31a7e (diff)
downloadvcpkg-e8dbfcf6797a270ed5be8550248f7fe4fe5dec79.tar.gz
vcpkg-e8dbfcf6797a270ed5be8550248f7fe4fe5dec79.zip
[ffmpeg] soxr dependency fix (#17299)
* [ffmpeg] soxr only makes sense with swresample, so add as dependency * [ffmpeg] bump port version * [ffmpeg] x-add-version
-rw-r--r--ports/ffmpeg/CONTROL4
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/f-/ffmpeg.json5
3 files changed, 8 insertions, 3 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index ebf6d8dcb..8813cfb73 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
Source: ffmpeg
Version: 4.3.2
-Port-Version: 7
+Port-Version: 8
Homepage: https://ffmpeg.org
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
@@ -155,7 +155,7 @@ Build-Depends: snappy
Description: Snappy compression, needed for hap encoding
Feature: soxr
-Build-Depends: soxr
+Build-Depends: soxr, ffmpeg[core,swresample]
Description: Include libsoxr resampling
Feature: speex
diff --git a/versions/baseline.json b/versions/baseline.json
index 46f07f90e..036d9aa38 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1954,7 +1954,7 @@
},
"ffmpeg": {
"baseline": "4.3.2",
- "port-version": 7
+ "port-version": 8
},
"ffnvcodec": {
"baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 1c98dce16..530ab8ec1 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "297aff4ad5a5110a5cb3cf6a118152722f2239ec",
+ "version-string": "4.3.2",
+ "port-version": 8
+ },
+ {
"git-tree": "bb3d01a7b00d6fe90592750d48e18049eb93215d",
"version-string": "4.3.2",
"port-version": 7