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

[sdl2] Update to 2.0.16 #19509

Merged
merged 13 commits into from
Aug 19, 2021
Merged

[sdl2] Update to 2.0.16 #19509

merged 13 commits into from
Aug 19, 2021

Conversation

RT2Code
Copy link
Contributor

@RT2Code RT2Code commented Aug 12, 2021

Update the SDL2 port from 2.0.14 to 2.0.16 :
https://github.com/libsdl-org/SDL/releases/tag/release-2.0.16

I removed three files :

I was able to build with the Vulkan feature with success on Windows.

@JonLiu1993 JonLiu1993 self-assigned this Aug 12, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Aug 12, 2021
ports/sdl2/vcpkg.json Outdated Show resolved Hide resolved
@BillyONeal
Copy link
Member

Pushed merge with master because the VMs for the running validation build are being removed.

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 e22f9d7d70e61b8b0cfe1c0adacee69bf6f8365b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json
index 6609a08..5efb1b2 100644
--- a/versions/s-/sdl2.json
+++ b/versions/s-/sdl2.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "fec1e07ad2ee9d71c23fc559f37031206ef1577c",
-      "version-semver": "2.0.16",
+      "git-tree": "e4023279ca9be302f9425b24f2a5eacad1c003ad",
+      "version": "2.0.16",
       "port-version": 0
     },
     {

@RT2Code
Copy link
Contributor Author

RT2Code commented Aug 14, 2021

Finally, the commit history is a mess, but I think I got it right. On UWP, I had to remove the static libs definition in the pkgconfig file and to disable the SDL2main target lookup in SDL2Config.cmake because we don't ship the sdl2main on this platform.

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Aug 16, 2021
@JonLiu1993
Copy link
Member

FeATURE vulkan tested successfully in the following triplet:

  • x86-windows
  • x64-windows
  • x64-windows-static

@dan-shaw dan-shaw merged commit 25382e3 into microsoft:master Aug 19, 2021
@RT2Code RT2Code deleted the sdl2 branch August 19, 2021 00:27
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.

None yet

6 participants