Skip to content

Javacpp dependency fix #22

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Javacpp dependency fix #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0db10ff
Revert "Fix some bullshit (#21)"
ds58 Nov 1, 2024
678bd8f
Add openblas dependency
ds58 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,22 @@ mainDependencies {
api("com.hierynomus:sshj:0.31.0")
api("us.ihmc:scs2-definition:17-0.28.1")

api("org.bytedeco:javacv:1.5.9")
api("org.bytedeco:javacpp:1.5.9")
api("org.bytedeco:javacv-platform:1.5.9")
val opencvVersion = "4.7.0-1.5.9"
api("org.bytedeco:opencv:$opencvVersion")
api("org.bytedeco:opencv:$opencvVersion:linux-x86_64")
api("org.bytedeco:opencv:$opencvVersion:linux-arm64")
api("org.bytedeco:opencv:$opencvVersion:windows-x86_64")
val ffmpegVersion = "6.0-1.5.9"
api("org.bytedeco:ffmpeg:$ffmpegVersion")
api("org.bytedeco:ffmpeg:$ffmpegVersion:linux-x86_64")
api("org.bytedeco:ffmpeg:$ffmpegVersion:linux-arm64")
api("org.bytedeco:ffmpeg:$ffmpegVersion:windows-x86_64")
val openblasVersion = "0.3.23-1.5.9" // TODO: This can probably be removed in 1.5.10
Copy link
Contributor Author

@ds58 ds58 Nov 1, 2024

Choose a reason for hiding this comment

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

This should be brought in transitively but specifically declaring it fixes the issue

Copy link
Collaborator

@PotatoPeeler3000 PotatoPeeler3000 Nov 1, 2024

Choose a reason for hiding this comment

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

Sweet!

api("org.bytedeco:openblas:$openblasVersion")
api("org.bytedeco:openblas:$openblasVersion:linux-x86_64")
api("org.bytedeco:openblas:$openblasVersion:linux-arm64")
api("org.bytedeco:openblas:$openblasVersion:windows-x86_64")

api("org.freedesktop.gstreamer:gst1-java-core:1.4.0")

var javaFXVersion = "17.0.2"
Expand Down
Loading
Loading