Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[directxmesh, directxtex, directxtk, uvatlas] update ports for Dec 2022 releases #28482

Merged
merged 5 commits into from
Jan 4, 2023

Conversation

walbourn
Copy link
Member

directxmesh, directxtex, directxtk, directxtk12, and uvatlas ports have new December 2022 releases on GitHub.

This includes updating the upstream CMake files to require CMake 3.20, support for CTest, and a Spectre-mitigated library build option.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 44b540607036e0587f6564c91f93663b0212ab98 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 557f156..35569f9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1945,7 +1945,7 @@
       "port-version": 0
     },
     "directxmesh": {
-      "baseline": "2022-10-17",
+      "baseline": "2022-12-15",
       "port-version": 0
     },
     "directxsdk": {
@@ -1953,15 +1953,15 @@
       "port-version": 5
     },
     "directxtex": {
-      "baseline": "2022-10-17",
+      "baseline": "2022-12-15",
       "port-version": 0
     },
     "directxtk": {
-      "baseline": "2022-10-17",
+      "baseline": "2022-12-15",
       "port-version": 0
     },
     "directxtk12": {
-      "baseline": "2022-10-17",
+      "baseline": "2022-12-15",
       "port-version": 0
     },
     "dirent": {
@@ -7781,7 +7781,7 @@
       "port-version": 2
     },
     "uvatlas": {
-      "baseline": "2022-10-17",
+      "baseline": "2022-12-15",
       "port-version": 0
     },
     "uvw": {
diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json
index fc123be..689d97c 100644
--- a/versions/d-/directxmesh.json
+++ b/versions/d-/directxmesh.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bd91052caa19a0a0a99a2918109b247efe659285",
+      "version-date": "2022-12-15",
+      "port-version": 0
+    },
     {
       "git-tree": "f2254f431933140ed94dc8aa57109322a212217c",
       "version-date": "2022-10-17",
diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json
index c3a5c79..969bd72 100644
--- a/versions/d-/directxtex.json
+++ b/versions/d-/directxtex.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f323dea497f45d485399e4f2fce37029736a3bdd",
+      "version-date": "2022-12-15",
+      "port-version": 0
+    },
     {
       "git-tree": "e6122779b24211d1cc9fe1a8c8ea36c81ceb4179",
       "version-date": "2022-10-17",
diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json
index eb45e6d..ab7ecb0 100644
--- a/versions/d-/directxtk.json
+++ b/versions/d-/directxtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c562456d423e0821f50b8ad2ea94b1ecd7c52b8d",
+      "version-date": "2022-12-15",
+      "port-version": 0
+    },
     {
       "git-tree": "29b7fdf1ce9b66105a1bfa329e5309afe8505dc7",
       "version-date": "2022-10-17",
diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json
index fbaea88..e28d690 100644
--- a/versions/d-/directxtk12.json
+++ b/versions/d-/directxtk12.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "22ad8a540d14d9dc839320be0a2fb55d53874e81",
+      "version-date": "2022-12-15",
+      "port-version": 0
+    },
     {
       "git-tree": "ab664013d6d38eec729d66e97dc9c60490725186",
       "version-date": "2022-10-17",
diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json
index 09cfa86..774bc63 100644
--- a/versions/u-/uvatlas.json
+++ b/versions/u-/uvatlas.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4d02aa17c59fd47dc0bdc0affc02d58ba0e5d84c",
+      "version-date": "2022-12-15",
+      "port-version": 0
+    },
     {
       "git-tree": "d2385783dc5930f93f8ef1eea64a8818f301e3ae",
       "version-date": "2022-10-17",

@JonLiu1993 JonLiu1993 self-assigned this Dec 22, 2022
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Dec 22, 2022
@JonLiu1993
Copy link
Member

@walbourn, Thanks for your pr, please run command "./vcpkg x-add-version --all --overwrite-version" and commit again.

@walbourn
Copy link
Member Author

@walbourn, Thanks for your pr, please run command "./vcpkg x-add-version --all --overwrite-version" and commit again.

Fixed.

@walbourn walbourn closed this Dec 22, 2022
@walbourn walbourn reopened this Dec 22, 2022
github-actions[bot]
github-actions bot previously approved these changes Dec 22, 2022
@walbourn
Copy link
Member Author

walbourn commented Dec 24, 2022

Requires some upstream fixes

microsoft/DirectXTex#299

microsoft/UVAtlas#93

@JonLiu1993 JonLiu1993 added the depends:upstream-changes Waiting on a change to the upstream project label Dec 26, 2022
@walbourn
Copy link
Member Author

walbourn commented Jan 2, 2023

Took a number of days to get approvals with folks out for the holidays, but the two fixes are approved. Working on an update after some testing.

@JonLiu1993 JonLiu1993 removed depends:upstream-changes Waiting on a change to the upstream project requires:author-response labels Jan 3, 2023
@JonLiu1993
Copy link
Member

Feature spectre tested successfully in the following triplet:

  • x86-windows
  • x64-windows

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Jan 3, 2023
@Neumann-A
Copy link
Contributor

Why is spectre a feature? Shouldnt that be a toolchain setting?
Does it make sense to build a single lib with mitigations and the rest not?
Doesn't this fall into the polyfill rule?

@walbourn
Copy link
Member Author

walbourn commented Jan 4, 2023

There does not seem to be a VCPKG support for building /Qspectre or not globally. The one case I found a reference to it in the vcpkg issues, the recommendation was to make it a feature and support it upstream. See issue #18986.

Related PR: #28713

@vicroms vicroms merged commit aa45329 into microsoft:master Jan 4, 2023
@walbourn walbourn deleted the directxdec2022 branch January 6, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants