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

[vcpkg baseline][gstreamer] Fix interference with libx11 on Windows #26574

Merged
merged 5 commits into from
Aug 31, 2022

Conversation

Thomas1664
Copy link
Contributor

@Thomas1664 Thomas1664 commented Aug 28, 2022

Describe the pull request

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 e85b5bb95a14ff7e014601e88a8dc2fea6798e33 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 85d6b83..dbb23b3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2738,7 +2738,7 @@
     },
     "gstreamer": {
       "baseline": "1.19.2",
-      "port-version": 6
+      "port-version": 7
     },
     "gtest": {
       "baseline": "1.12.1",
diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json
index f475f0a..75c5cb3 100644
--- a/versions/g-/gstreamer.json
+++ b/versions/g-/gstreamer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0b02acdb7e1404739f8dcf3b1ad16c0847d4b1a1",
+      "version": "1.19.2",
+      "port-version": 7
+    },
     {
       "git-tree": "245207bd8010181848ffaad5822f2492f2cb2b38",
       "version": "1.19.2",

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider replacing the deprecated license identifiers in the following files:

  • ports/gstreamer/vcpkg.json (has deprecated license GPL-2.0)

Deprecated and non deprecated license identifiers can be found here

@Thomas1664 Thomas1664 changed the title [gstreamer] Fix interference with libx11 on Windows [vcpkg baseline][gstreamer] Fix interference with libx11 on Windows Aug 28, 2022
@Cheney-W Cheney-W added category:port-bug The issue is with a library, which is something the port should already support requires:author-response labels Aug 29, 2022
@Cheney-W
Copy link
Contributor

Don't forget run vcpkg x-add-version gstreamer.

@JackBoosY
Copy link
Contributor

Any process? We need to fix this quickly.

@Thomas1664
Copy link
Contributor Author

Any process? We need to fix this quickly.

I can add this feature but I'm against manual configure to use x11 as we might interfere with the auto configuration for which windowing system should be used. We might end up with an alternative which is not what we want. Technically there is support for multiple windowing systems at the same time but we would have to replicate what is behind auto. Because it picked up x11 on Windows automatically, I think it is enough if we just add the dependency on x11.

github-actions[bot]
github-actions bot previously approved these changes Aug 31, 2022
@Thomas1664 Thomas1664 marked this pull request as ready for review August 31, 2022 08:58
@Neumann-A
Copy link
Contributor

No. Add a meson option and deactivate it for windows for now. Dont add a depenency on libx11 on windows. (Other platforms might need it however)

@Thomas1664
Copy link
Contributor Author

@JackBoosY Please also note that our port will be empty on OSX

@Thomas1664
Copy link
Contributor Author

No. Add a meson option and deactivate it for windows for now.

Would this replace/ overwrite the default OSX window system?
If yes, this is an alternative to the OSX window system and we therefore can't implement this feature.

Dont add a depenency on libx11 on windows. (Other platforms might need it however)

I'm not adding a dependency on x11 on Windows.

@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Aug 31, 2022
@JavierMatosD
Copy link
Contributor

Thanks!

@JavierMatosD JavierMatosD merged commit dd66c57 into microsoft:master Aug 31, 2022
@Thomas1664 Thomas1664 deleted the gstreamer branch August 31, 2022 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants