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

8257895: Allow building of JavaFX media libs for Apple Silicon #412

Closed
wants to merge 2 commits into from

Conversation

sashamatveev
Copy link
Member

@sashamatveev sashamatveev commented Feb 26, 2021

  • Added support to compile media on arm.
  • libffi is based on 3.3.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8257895: Allow building of JavaFX media libs for Apple Silicon

Reviewers

Contributors

  • Johan Vos <jvos@openjdk.org>

Download

$ git fetch https://git.openjdk.java.net/jfx pull/412/head:pull/412
$ git checkout pull/412

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 26, 2021

👋 Welcome back almatvee! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Ready for review label Feb 26, 2021
@mlbridge
Copy link

mlbridge bot commented Feb 26, 2021

Webrevs

@kevinrushforth
Copy link
Member

/reviewers 2

@openjdk
Copy link

openjdk bot commented Feb 26, 2021

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@johanvos
Copy link
Collaborator

johanvos commented Mar 8, 2021

I didn't test it on real hardware, but it looks good and doesn't cause regression.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

This breaks the build on Windows.

cl.exe -DFFI_BUILDING -DGSTREAMER_LITE -I../../../3rd_party/libffi/include -I../../../3rd_party/libffi/include/win/x64 -nologo -W3 -WX- -EHsc -GS -fp:precise -Gm- -Zc:wchar_t -Zc:forScope -Gd -wd"4430" -analyze- -errorReport:queue -O1 -Oy -MD -Gy -GF -DX86_WIN64 -TC -c -Fo.../jfx/modules/javafx.media/build/native/win/Release/obj/3rd_party/libffi/src/java_raw_api.obj ../../../3rd_party/libffi/src/java_raw_api.c
../../../3rd_party/libffi/include/win/x64\ffi.h(58): fatal error C1083: Cannot open include file: 'ffitarget.h': No such file or directory
make[1]: *** [Makefile.ffi:79: .../jfx/modules/javafx.media/build/native/win/Release/obj/3rd_party/libffi/src/closures.obj] Error 2
make[1]: *** Waiting for unfinished jobs....
java_raw_api.c
../../../3rd_party/libffi/include/win/x64\ffi.h(58): fatal error C1083: Cannot open include file: 'ffitarget.h': No such file or directory
make[1]: *** [Makefile.ffi:79: .../jfx/modules/javafx.media/build/native/win/Release/obj/3rd_party/libffi/src/java_raw_api.obj] Error 2
make[1]: Leaving directory '.../jfx/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite'
make: *** [Makefile:60: .../jfx/modules/javafx.media/build/native/win/Release/libffi.lib] Error 2
make: Leaving directory '.../jfx/modules/javafx.media/src/main/native/gstreamer/projects/win/glib-lite'

FAILURE: Build failed with an exception.

* Where:
Build file '...\jfx\build.gradle' line: 3284

* What went wrong:
Execution failed for task ':media:buildWinGlib'.
> Process 'command 'make'' finished with non-zero exit value 2

@sashamatveev
Copy link
Member Author

Windows build should be fixed.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

Looks good. I did a sanity build on all three platforms (using the default x86_64 arch for macOS) and that passed.

I then did a macOS aarch64 build, and verified that it runs and can play media files.

@sashamatveev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 11, 2021

@sashamatveev This PR has not yet been marked as ready for integration.

@kevinrushforth
Copy link
Member

@johanvos can you re-review?

@sashamatveev since you started with Johan's patch, can you add him as a contributor?

@sashamatveev
Copy link
Member Author

/contributor add @johanvos

@openjdk
Copy link

openjdk bot commented Mar 11, 2021

@sashamatveev
Contributor Johan Vos <jvos@openjdk.org> successfully added.

@openjdk
Copy link

openjdk bot commented Mar 13, 2021

@sashamatveev This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8257895: Allow building of JavaFX media libs for Apple Silicon

Co-authored-by: Johan Vos <jvos@openjdk.org>
Reviewed-by: jvos, kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 15 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Mar 13, 2021
@sashamatveev
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Mar 15, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Mar 15, 2021
@openjdk
Copy link

openjdk bot commented Mar 15, 2021

@sashamatveev Since your change was applied there have been 15 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit 8adbc67.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
3 participants