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

Fix macOS and Linux build #92

Merged
merged 2 commits into from
Oct 31, 2024

Conversation

amyspark
Copy link
Collaborator

Hi all,

This PR fixes two issues I was made aware of today:

  • the macOS sandbox logic was being mistakenly built on Linux
  • the event loop handler was renamed in 1931ae1, but that was not carried over to the state change handler for macOS

@MathieuDuponchelle
Copy link
Collaborator

the event loop handler was renamed in 1931ae1, but that was not carried over to the state change handler for macOS

oops :|

@MathieuDuponchelle
Copy link
Collaborator

lgtm, thanks :)

@MathieuDuponchelle MathieuDuponchelle merged commit fd79063 into centricular:master Oct 31, 2024
1 check passed
@@ -84,10 +84,14 @@ set(GSTCEF_SRCS
)
Copy link
Contributor

Choose a reason for hiding this comment

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

Just one line above there's another gstcefloader.cc

@@ -141,7 +140,7 @@ int main(int argc, char * argv[])
CefMainArgs args(argc, argv);
#endif

#ifdef GST_CEF_USE_SANDBOX
#if defined(__APPLE__) && defined(GST_CEF_USE_SANDBOX)
Copy link
Contributor

Choose a reason for hiding this comment

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

The same change has to be made also in gstcef.cc in two places

@amyspark amyspark deleted the fix-linux-includes branch October 31, 2024 13:00
amyspark added a commit to amyspark/gstcefsrc that referenced this pull request Oct 31, 2024
@amyspark
Copy link
Collaborator Author

Filed #93 for @vivia's comments

amyspark added a commit to amyspark/gstcefsrc that referenced this pull request Nov 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants