diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-10-11 20:03:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 11:03:50 -0700 |
| commit | 1d4128f08e30cec31b94500840c7eca8ebc579cb (patch) | |
| tree | aaca2568a99d89d6a6992085ae3d0eccc9aea7f9 /versions | |
| parent | 694b757525e36c8b3bcaf1b913b23c812d2fd211 (diff) | |
| download | vcpkg-1d4128f08e30cec31b94500840c7eca8ebc579cb.tar.gz vcpkg-1d4128f08e30cec31b94500840c7eca8ebc579cb.zip | |
[qt] Fix qtmultimedia with gstreamer on windows (#20555)
* apply patches to make qtmultimedia work with gestreamer on windows
* version stuff
* remove libnice from ci.baseline
* move gstreamer on osx as fail to baseline
* add supports field to qtmultimedia. Qt does not officially support x86 on windows
* version stuff
* remove duplicated patch
* version stuff
* add upstream patch to fix x86-windows
* [skip actions] version stuff
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/q-/qtbase.json | 5 | ||||
| -rw-r--r-- | versions/q-/qtmultimedia.json | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index f50c2f5fd..074755bb4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5562,7 +5562,7 @@ }, "qtbase": { "baseline": "6.2.0", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.2.0", @@ -5610,7 +5610,7 @@ }, "qtmultimedia": { "baseline": "6.2.0", - "port-version": 0 + "port-version": 1 }, "qtnetworkauth": { "baseline": "6.2.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 657fa7a5e..c7b1a0fa7 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e7c78fd7fe6600eb96712f151670efc765bf5c31", + "version-semver": "6.2.0", + "port-version": 2 + }, + { "git-tree": "01075dfd8097c54bd832400553958c2ff9bebf31", "version-semver": "6.2.0", "port-version": 1 diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 7d485febd..91d75b2b4 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e632d54bc7aea99a619c091cd43ea42e16ccefc2", + "version-semver": "6.2.0", + "port-version": 1 + }, + { "git-tree": "3ddc9abc52e8df720dd1799b3ecaabe36bb5b7f3", "version-semver": "6.2.0", "port-version": 0 |