aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorMatthew Oliver <protogonoi@gmail.com>2021-04-08 03:06:55 +1000
committerGitHub <noreply@github.com>2021-04-07 10:06:55 -0700
commit85a48c1ed558210cab67a03209510c4bf6e5e285 (patch)
treea09d9080713e8979579d35e8540eb59bbafeadb0 /versions
parent4278a5f9eafbdadfaa65d7aafd914964841cba42 (diff)
downloadvcpkg-85a48c1ed558210cab67a03209510c4bf6e5e285.tar.gz
vcpkg-85a48c1ed558210cab67a03209510c4bf6e5e285.zip
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig. * [libxml2] Correct pkgconfig lib name. * [libwebp] Use vcpkg_fixup_pkgconfig. * [libssh] Export pkgconfig on windows. Also move to using git to get source. * [modplug] Export pkgconfig on windows. * [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies. * [openjpeg] Correct required static link libs in pkgconfig. * [modplug] Combine vcpkg_from_github using variable. * Update ports/libssh/CONTROL * Improve portfile.cmake * update version records. * [openjpeg] Update libs in pkgcfg. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * update version records * [libssh] Add pthread to pkgconfig when using mbedtls. * [libssh] Correct pthread naming on windows. * [fontconfig] Add libintl to pkgconfig on windows. * update version records * [ffmpeg] Fixup FindFFmpeg. * [ffmpeg] speex now supports non-windows. * [ffmpeg] Add feature libass. * [ffmpeg] Add dav1d feature. * [ffmpeg] Add feature ilbc. * [ffmpeg] Add tensorflow feature. * [ffmpeg] update version record. * [ffmpeg] Add CI feature test. * [ffmpeg] Limit features based on CI failures. * [ffmpeg] Update version record. * [ffmpeg] limit features based on ci.baseline. * [various ports] Update supports field. * [ffmpeg] Limit features more based on CI. * update version records. * [ffmpeg] Add detection of additional non target deps.. select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set. * [aubio] Silence warning about FindFFMPEG. * [pangolin] Use vcpkg supplied FindFFMPEG. * update version files. * [ffnvcodec] Set as not supporting uwp. ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading. * [ffmpeg] Update feature all. * update version records * [tesseract] Wrap debug pkgcfg update. * [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets. * [libssh] Correct port version after merge. * [ffmpeg] Fixup after merge. * Update version files. * [ffmpeg] Add opengl support. * [ffmpeg] Update package version. * [ffmpeg] Fix ffnvcodec support. * [ffmpeg] Fix x265 detection on osx. * [libvpx] Enable arm-uwp build. * [ffmpeg] Fixup x265 patch. * trigger sdl rebuild * [ffmpeg] Disable opengl on osx. * Revert "trigger sdl rebuild" This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b. * [ffmpeg] Disable failing features on osx. * Update ports/ffmpeg/FindFFMPEG.cmake.in Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com> * [ffmpeg] Add ass dependencies to FindFFmpeg. * Update ports/ffmpeg/FindFFMPEG.cmake.in Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com> * update version * [fontconfig] disable pthread/json as they are not needed for lib builds. Only used for tests. * [ffmpeg] Enable fontconfig on static+windows. * update versions * update versions. * Fix incorrectly included commits * revert pangolin commit Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108 * update versions * Correct port version after merge. * update versions. * [ffmpeg] Fix cmake dependency detection on non-windows. * Revert "revert pangolin commit" This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f. * [ffmpeg] Fix dependency loading that does not define separate debug/release libs. * update versions. * [ffmpeg] set CMP0072 policy. * [wavpack] Fix cmake config export. * [ffmpeg] Add optional system dependent libraries. * update versions after merge. * update versions. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json34
-rw-r--r--versions/f-/fdk-aac.json5
-rw-r--r--versions/f-/ffmpeg.json5
-rw-r--r--versions/f-/ffnvcodec.json5
-rw-r--r--versions/f-/fontconfig.json5
-rw-r--r--versions/f-/fribidi.json5
-rw-r--r--versions/l-/libmodplug.json5
-rw-r--r--versions/l-/libssh.json5
-rw-r--r--versions/l-/libvpx.json5
-rw-r--r--versions/l-/libwebp.json5
-rw-r--r--versions/l-/libxml2.json5
-rw-r--r--versions/o-/opencl.json5
-rw-r--r--versions/o-/openjpeg.json5
-rw-r--r--versions/p-/pangolin.json5
-rw-r--r--versions/t-/tesseract.json5
-rw-r--r--versions/w-/wavpack.json5
-rw-r--r--versions/x-/x265.json5
17 files changed, 97 insertions, 17 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index c8ec96e3c..c126a99d2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1929,8 +1929,8 @@
"port-version": 0
},
"fdk-aac": {
- "baseline": "2018-07-08-2",
- "port-version": 0
+ "baseline": "2018-07-08",
+ "port-version": 3
},
"fdlibm": {
"baseline": "5.3-4",
@@ -1938,11 +1938,11 @@
},
"ffmpeg": {
"baseline": "4.3.2",
- "port-version": 1
+ "port-version": 2
},
"ffnvcodec": {
"baseline": "10.0.26.0",
- "port-version": 0
+ "port-version": 1
},
"fftw3": {
"baseline": "3.3.8-7",
@@ -2022,7 +2022,7 @@
},
"fontconfig": {
"baseline": "2.13.1",
- "port-version": 4
+ "port-version": 5
},
"foonathan-memory": {
"baseline": "2019-07-21-1",
@@ -2078,7 +2078,7 @@
},
"fribidi": {
"baseline": "1.0.10",
- "port-version": 1
+ "port-version": 2
},
"frozen": {
"baseline": "1.0.0",
@@ -3250,7 +3250,7 @@
},
"libmodplug": {
"baseline": "0.8.9.0",
- "port-version": 6
+ "port-version": 7
},
"libmorton": {
"baseline": "0.2",
@@ -3486,7 +3486,7 @@
},
"libssh": {
"baseline": "0.9.5",
- "port-version": 1
+ "port-version": 2
},
"libssh2": {
"baseline": "1.9.0",
@@ -3586,7 +3586,7 @@
},
"libvpx": {
"baseline": "1.9.0",
- "port-version": 6
+ "port-version": 7
},
"libwandio": {
"baseline": "4.2.1",
@@ -3598,7 +3598,7 @@
},
"libwebp": {
"baseline": "1.1.0",
- "port-version": 1
+ "port-version": 2
},
"libwebsockets": {
"baseline": "4.1.6",
@@ -3614,7 +3614,7 @@
},
"libxml2": {
"baseline": "2.9.10",
- "port-version": 3
+ "port-version": 4
},
"libxmlmm": {
"baseline": "0.6.0",
@@ -4398,7 +4398,7 @@
},
"opencl": {
"baseline": "2.2",
- "port-version": 6
+ "port-version": 7
},
"opencolorio": {
"baseline": "1.1.1",
@@ -4458,7 +4458,7 @@
},
"openjpeg": {
"baseline": "2.3.1",
- "port-version": 3
+ "port-version": 4
},
"openmama": {
"baseline": "6.3.1",
@@ -4606,7 +4606,7 @@
},
"pangolin": {
"baseline": "0.5",
- "port-version": 13
+ "port-version": 14
},
"pangomm": {
"baseline": "2.40.1",
@@ -5890,7 +5890,7 @@
},
"tesseract": {
"baseline": "4.1.1",
- "port-version": 6
+ "port-version": 7
},
"tfhe": {
"baseline": "1.0.1-1",
@@ -6338,7 +6338,7 @@
},
"wavpack": {
"baseline": "5.3.0",
- "port-version": 0
+ "port-version": 1
},
"websocketpp": {
"baseline": "0.8.2",
@@ -6426,7 +6426,7 @@
},
"x265": {
"baseline": "3.4",
- "port-version": 2
+ "port-version": 3
},
"xalan-c": {
"baseline": "1.11-12",
diff --git a/versions/f-/fdk-aac.json b/versions/f-/fdk-aac.json
index ba737a95d..d6a76e6b9 100644
--- a/versions/f-/fdk-aac.json
+++ b/versions/f-/fdk-aac.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "671b0954f5fe51fd11991f77f710901c26a8bd8b",
+ "version-string": "2018-07-08",
+ "port-version": 3
+ },
+ {
"git-tree": "4652092e7f7d8dc6578db286c7ce4ef7f5aebafd",
"version-string": "2018-07-08-2",
"port-version": 0
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 42b7421a3..5f9ff52e6 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "95a584d785f17bb9158d505bedfda26aa1c52db1",
+ "version-string": "4.3.2",
+ "port-version": 2
+ },
+ {
"git-tree": "8d581e93ca7ee374d63bae07dff49356c79dee8c",
"version-string": "4.3.2",
"port-version": 1
diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json
index fb611ffb3..7c8d62c35 100644
--- a/versions/f-/ffnvcodec.json
+++ b/versions/f-/ffnvcodec.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "a8340b2c8379d1a6e0bbf5ae3ef2270074a2da2e",
+ "version-string": "10.0.26.0",
+ "port-version": 1
+ },
+ {
"git-tree": "85f47c87ba8461e3fddb5dfb28e4a89af683a989",
"version-string": "10.0.26.0",
"port-version": 0
diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json
index 319fc75ea..b5bb4c3ad 100644
--- a/versions/f-/fontconfig.json
+++ b/versions/f-/fontconfig.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "de83a21d912d9b87d8ad069d94dffcca201830a3",
+ "version-string": "2.13.1",
+ "port-version": 5
+ },
+ {
"git-tree": "2b49a3ee02b25efc3101d849a0df38280a1ca299",
"version-string": "2.13.1",
"port-version": 4
diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json
index 343c1c72a..7f6553ab7 100644
--- a/versions/f-/fribidi.json
+++ b/versions/f-/fribidi.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "197340b9f9db2c444b70c27b54cfbe0ce3601c0b",
+ "version-string": "1.0.10",
+ "port-version": 2
+ },
+ {
"git-tree": "cfd7b4f4b0342721b50ef5eab54510351797e343",
"version-string": "1.0.10",
"port-version": 1
diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json
index 1fcfa21d1..f5cfdf03d 100644
--- a/versions/l-/libmodplug.json
+++ b/versions/l-/libmodplug.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "974a84bd910a82a86d2e27d2bb9416d0672390c4",
+ "version-string": "0.8.9.0",
+ "port-version": 7
+ },
+ {
"git-tree": "0a5fabb8c35482c3d20e2f207305fd233614c59f",
"version-string": "0.8.9.0",
"port-version": 6
diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json
index 117d34e07..a28238b24 100644
--- a/versions/l-/libssh.json
+++ b/versions/l-/libssh.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "a9b49412296a9eec38c564afa33555a92898a11f",
+ "version-string": "0.9.5",
+ "port-version": 2
+ },
+ {
"git-tree": "bf1fb5ae9324823a60784a5ed0ecbca8a3325214",
"version-string": "0.9.5",
"port-version": 1
diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json
index 5f1f268e0..facc4c153 100644
--- a/versions/l-/libvpx.json
+++ b/versions/l-/libvpx.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "09c64743d3dc62d2fa0ef55ef52b7bdad45cea0c",
+ "version-string": "1.9.0",
+ "port-version": 7
+ },
+ {
"git-tree": "017466933d1b0a427b79b86b61129fb5cf12f05f",
"version-string": "1.9.0",
"port-version": 6
diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json
index 4e8d19547..1ecc51c0d 100644
--- a/versions/l-/libwebp.json
+++ b/versions/l-/libwebp.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "8e1a0ef8ea8d864f10f3ad1604f3d0e920534ecd",
+ "version-string": "1.1.0",
+ "port-version": 2
+ },
+ {
"git-tree": "de60c0060bd08d336b79bf5676c28394e81bf1b8",
"version-string": "1.1.0",
"port-version": 1
diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json
index e7a5c70f7..40b026f1c 100644
--- a/versions/l-/libxml2.json
+++ b/versions/l-/libxml2.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "98c48a2d0545e6d392084260abc6411eb44f0577",
+ "version-semver": "2.9.10",
+ "port-version": 4
+ },
+ {
"git-tree": "7aa5a9ea1742082d57eb67708f107ade65f94c12",
"version-semver": "2.9.10",
"port-version": 3
diff --git a/versions/o-/opencl.json b/versions/o-/opencl.json
index 960118c38..68c1b983f 100644
--- a/versions/o-/opencl.json
+++ b/versions/o-/opencl.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "9f93abeb8cc37eb7d67dc0c5f526ec264735de56",
+ "version-string": "2.2",
+ "port-version": 7
+ },
+ {
"git-tree": "c886ba756e6871aa46eeca3d34cb9ca852fcb3e9",
"version-string": "2.2",
"port-version": 6
diff --git a/versions/o-/openjpeg.json b/versions/o-/openjpeg.json
index a556f81fc..e0acda96d 100644
--- a/versions/o-/openjpeg.json
+++ b/versions/o-/openjpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "a11a593758d57ee96493bd2cb667ac1aa88e972c",
+ "version-semver": "2.3.1",
+ "port-version": 4
+ },
+ {
"git-tree": "55220d839365c2134574acc4e9b43b8adc2e20ab",
"version-semver": "2.3.1",
"port-version": 3
diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json
index 0b309bc7d..0569731e8 100644
--- a/versions/p-/pangolin.json
+++ b/versions/p-/pangolin.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b93d201ff49c7b409349f6322d8f23cb630da0e5",
+ "version-string": "0.5",
+ "port-version": 14
+ },
+ {
"git-tree": "e746f01a619539fbbb0aae9b0edb9df733e555d7",
"version-string": "0.5",
"port-version": 13
diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json
index 6c8124580..6fa7f4fa6 100644
--- a/versions/t-/tesseract.json
+++ b/versions/t-/tesseract.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "486def9d5e02e287825fb8a27227f2b965a3e109",
+ "version-string": "4.1.1",
+ "port-version": 7
+ },
+ {
"git-tree": "46aa8d12c08674f4518e9b74b32826bbb380cac9",
"version-string": "4.1.1",
"port-version": 6
diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json
index 28ee22579..f52c3c1b8 100644
--- a/versions/w-/wavpack.json
+++ b/versions/w-/wavpack.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "73e8b55fed24b05b9c0b9f84d1bc85196c241ca3",
+ "version-string": "5.3.0",
+ "port-version": 1
+ },
+ {
"git-tree": "ab00fac3cf38ba1104e6365183fe6f7bef09f46d",
"version-string": "5.3.0",
"port-version": 0
diff --git a/versions/x-/x265.json b/versions/x-/x265.json
index f40e2500f..2ed2d26cd 100644
--- a/versions/x-/x265.json
+++ b/versions/x-/x265.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "aa119fefeb5d57dd2b34ec63ea94942f868f1d94",
+ "version-string": "3.4",
+ "port-version": 3
+ },
+ {
"git-tree": "6323296cab664ff847a474065dd4ba983c742781",
"version-string": "3.4",
"port-version": 2
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-23 23:36:01 +0000