diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 91e065ecf6..b0f9d372a0 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", + "port-version": 1, "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." @@ -128,6 +129,14 @@ ], "platform": "!(uwp | arm)" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "dav1d" + ], + "platform": "!(uwp | arm | x86 | osx)" + }, { "name": "ffmpeg", "default-features": false, @@ -144,14 +153,6 @@ ], "platform": "!uwp & !(windows & arm)" }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "dav1d" - ], - "platform": "!(uwp | arm | x86 | osx)" - }, { "name": "ffmpeg", "default-features": false, diff --git a/ports/io2d/vcpkg.json b/ports/io2d/vcpkg.json index 876616dd94..79570f44ba 100644 --- a/ports/io2d/vcpkg.json +++ b/ports/io2d/vcpkg.json @@ -1,13 +1,9 @@ { "name": "io2d", "version-date": "2020-09-14", - "port-version": 2, + "port-version": 3, "description": "a lightweight, cross platform drawing library", "dependencies": [ - { - "name": "cairo", - "platform": "!osx" - }, { "name": "cairo", "features": [ @@ -15,6 +11,10 @@ ], "platform": "linux" }, + { + "name": "cairo", + "platform": "!osx" + }, { "name": "graphicsmagick", "platform": "!osx" diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index a78ace278e..a2a869987c 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2021-11-15' +$versionDate = '2021-11-24' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index d36f7ef1f0..10df7f4573 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -124,23 +124,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2021-11-15" +vcpkgToolReleaseTag="2021-11-24" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="2dc3b9fc8dde1eebdc76e1d40c4e9078d7a892487552349ac75df8e9c33d601830ab06b2283a7ba163de0d70f441574501de6cc1198930a346a3a642e677f93f" + vcpkgToolReleaseSha="29048053a148156759476f85829dfe3f4377eb93be540d4a363446061dd04c34d7a4820bba58fada065cfc277c5a9ec5d0fc0cc978588df58a8f49a1be0254d4" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="4e5e349c608f7263cbed38f800051ea0165966d472f697a47225183e00f7e09791f5663f8f6ec87f9b00803f91ddbd8c716e45e718fc2987ba03070671deaf21" + vcpkgToolReleaseSha="641a3f232c2ca38012a16779967bbc06ae47301265e28c406e8edaaf8f7379f71c27dc17fff3077a9b123fc1a9bfa138c5e6673c02ac6804db14e9df61564876" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="c574ca0978a7a5a1b7ea636c4c9b201fb7446a5b413820e0d08e7934818a2041e53b8caefa32317d4c6f81d872c90f09463f0952861593e3f1e0c47239cf766b" + vcpkgToolReleaseSha="cfcd81ec9d15049f417a7071aec25ba52da102d855c8c4de92bfa0e4960212a85940fcde22a4a73b6bba0afa827e13cf7f25d0d51d67bd78b8b7fa8230c3306d" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="d94b00fd8d0b3abb0379390fc12c9103f209621e899df11c1ccfd9d15558908dbe0cd3e61cf7fe89a28a6a2b42eeb311d74cf1ebcb0f8e8debc671e9be123ec7" + vcpkgToolReleaseSha="dde72d4317273013702a889326974a6c915522d0917766dc4228aaad8e8b157be4957a52298997e98dfa7774d43aa8eafd5932f5b9785ae7a1f7816f185e82cb" fi # Do the download or build. diff --git a/versions/baseline.json b/versions/baseline.json index 8aa7557e76..e7be1c8a66 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2142,7 +2142,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -2890,7 +2890,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 2 + "port-version": 3 }, "irrlicht": { "baseline": "1.8.4", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index fa79715efb..053d53caa6 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c73820dc30c5ade90b5ae3da082420669b78d953", + "version": "4.4.1", + "port-version": 1 + }, { "git-tree": "e39b9e35530239498574713a75bd9160f23e1d20", "version": "4.4.1", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index 2d2a519c96..a6c53b3c83 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "281370843416f78e7c715a85db1b5754253b38ed", + "version-date": "2020-09-14", + "port-version": 3 + }, { "git-tree": "b2307aa077fedc3960898d59e9512416be69d25f", "version-date": "2020-09-14",