Skip to content

Conversation

@Scranoid
Copy link
Contributor

@Scranoid Scranoid commented Dec 5, 2025

Update realsense2 port to version 2.56.5.

Refresh upstream source tarball and updated SHA512 hash.

Update firmware download SHA to match new release contents.

Regenerate version entry using vcpkg x-add-version.

Ensured all existing patches remain compatible with the new version.

@Scranoid
Copy link
Contributor Author

Scranoid commented Dec 5, 2025

I give up , I gave it my all , hours of debugging understanding of CI/CD pipelines were for nothing I guess.

@dg0yt
Copy link
Contributor

dg0yt commented Dec 5, 2025

-- Applying patch fix-rsutils-includes.patch
CMake Error at scripts/cmake/z_vcpkg_apply_patches.cmake:34 (message):
  Applying patch failed: error: corrupt patch at line 9

Do you need help with this?

@Scranoid
Copy link
Contributor Author

Scranoid commented Dec 5, 2025

-- Applying patch fix-rsutils-includes.patch
CMake Error at scripts/cmake/z_vcpkg_apply_patches.cmake:34 (message):
  Applying patch failed: error: corrupt patch at line 9

Do you need help with this?

Yes I do need but also when I didn't patch rsutils the arm64-ox builds were compiling just fine but after adding the patch fix for rsutils other components broke but some were working just fine , I'm confused I dont know how to even do this???

@vicroms vicroms marked this pull request as draft December 5, 2025 20:43
Copy link
Contributor

@dg0yt dg0yt left a comment

Choose a reason for hiding this comment

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

The patch is clearly malformed. It looks like you manually edited the previous patch by removing some context lines. But this needs more work. I would recommed using tools:

  • unpack the sources,
  • make the a git repo,
  • apply patches with git apply (strict) or patch -p1 (relaxed)
  • fix the issues
  • produce an update diff e.g. with git diff.

@@ -0,0 +1,21 @@
--- a/third-party/rsutils/src/control-c-handler.cpp
+++ b/third-party/rsutils/src/control-c-handler.cpp
@@ -1,4 +1,5 @@
Copy link
Contributor

Choose a reason for hiding this comment

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

2 original lines, 3 lines after the change.

Suggested change
@@ -1,4 +1,5 @@
@@ -1,2 +1,3 @@


--- a/third-party/rsutils/src/special-folder.cpp
+++ b/third-party/rsutils/src/special-folder.cpp
@@ -1,6 +1,7 @@
Copy link
Contributor

Choose a reason for hiding this comment

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

4 original lines, 5 lines after the change.

Suggested change
@@ -1,6 +1,7 @@
@@ -1,4 +1,5 @@


--- a/third-party/rsutils/src/network-adapter-watcher.cpp
+++ b/third-party/rsutils/src/network-adapter-watcher.cpp
@@ -1,6 +1,8 @@
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
@@ -1,6 +1,8 @@
@@ -1,2 +1,4 @@

#include <chrono>
#include <regex>
+#include <thread>
+#include <cstring> No newline at end of file
Copy link
Contributor

Choose a reason for hiding this comment

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

No line break at end of the file. Bad editor, e.g. VS Code.

Suggested change
+#include <cstring>
+#include <cstring>

@Scranoid
Copy link
Contributor Author

Scranoid commented Dec 6, 2025

Ok , I'll check and implement the changes as you've requested.

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.

2 participants