[pcl] Add feature and fix find libusb, fix pkgconfig #21276
Conversation
JackBoosY
added
category:port-bug
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
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 4df8c6d7f0468264576f1d17401277b3d401b27f -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a9e2bc1..479240e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5118,7 +5118,7 @@
},
"pcl": {
"baseline": "1.12.0",
- "port-version": 0
+ "port-version": 1
},
"pcre": {
"baseline": "8.45",
diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json
index bd9ea8b..8b40f86 100644
--- a/versions/p-/pcl.json
+++ b/versions/p-/pcl.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "20853dcf1ac094103f8d6ec2d8d7c3011da42713",
+ "version": "1.12.0",
+ "port-version": 1
+ },
{
"git-tree": "6a65773e049bbdfef835781a6a61ee6a3a94dd27",
"version": "1.12.0",
|
@AlexLeungZ @weibingrong @raahilsha-z @LOVELESSYI Can you please test this PR? Thanks. |
|
What about this bug? |
I can't reproduce this, can you provide the repro step? |
Just the same as #21241, maybe it is some bugs on my side, I am not sure |
|
@AlexLeungZ Can you provide the file list in /mnt/d/Git/GitHub/robocon-test-code/vcpkg/packages/pcl_x64-linux/bin? |
I rebuild the whole thing with this fix #21241 (comment) , so they are all gone. |
Yeah I know that, but I need to know which file you deleted in that folder first, It may be unreasonable. |
There is no |
It fails to build on my x64-linux wsl machine /mnt/d/Git/GitHub/vcpkg-playground/build/vcpkg-manifest-install.log /mnt/d/Git/GitHub/vcpkg-playground/vcpkg/buildtrees/pcl/config-x64-linux-dbg-out.log /mnt/d/Git/GitHub/vcpkg-playground/vcpkg/buildtrees/pcl/config-x64-linux-dbg-err.log |
It works for me! Thank you very much! |
|
@JackBoosY do you mind fixing PointCloudLibrary/pcl#4422 as well? The problem is that target A quick and dirty fix I did was removing the |
|
Can you please revert your custom changes, rebuild pcl and provide the file list? |
The arm64-linuxvcpkg.json /media/robocon/nvme/vcpkg-playground/build/vcpkg-manifest-install.log /media/robocon/nvme/vcpkg-playground/vcpkg/buildtrees/pcl/config-arm64-linux-dbg-out.log /media/robocon/nvme/vcpkg-playground/vcpkg/buildtrees/pcl/config-arm64-linux-dbg-err.log config-arm64-linux-dbg-err.log x64-linuxvcpkg.json /mnt/d/Git/GitHub/vcpkg-playground/build/vcpkg-manifest-install.log /mnt/d/Git/GitHub/vcpkg-playground/vcpkg/buildtrees/pcl/config-x64-linux-dbg-out.log /mnt/d/Git/GitHub/vcpkg-playground/vcpkg/buildtrees/pcl/config-x64-linux-dbg-err.log config-x64-linux-dbg-err.log |
|
@AlexLeungZ Can you please make sure your vcpkg is latest? There should have a file |
|
Will update |
JackBoosY
removed
the
depends:upstream-changes
|
The upstream approved all the 2 PRs. |
|
Is it normal that arm device can not install pcl[openni2] as it is has dependencies on kinectsdk1 which is not supported for arm?? |
Hm, changing |
This comment has been minimized.
This comment has been minimized.
|
Base on |
This comment has been minimized.
This comment has been minimized.
|
This comment has been minimized.
This comment has been minimized.
|
@AlexLeungZ I think this is not related to my changes. |
|
Thanks for the fixes @JackBoosY and thanks for the testing @AlexLeungZ :D |
|
@JackBoosY Hi, I was wondering if you remember why you added |
Maybe there have some issues when enabling this feature. |
@JackBoosY But you don't remember anything specific? I am currently testing with different triplets and OpenMP enabled, and so far everything works fine. If I don't find any problem, I will probably create a pull request to remove |
Feel free to reopen this feature in another PR : ) |
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. Updated io_ply.patch so that it applies cleanly. Additionally, the setting `-DWITH_OPENMP=OFF` is removed because there does not seem to be a specific reason for it, and in my tests PCL still built fine if it was removed, see #21276 (comment) <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) -->
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. Updated io_ply.patch so that it applies cleanly. Additionally, the setting `-DWITH_OPENMP=OFF` is removed because there does not seem to be a specific reason for it, and in my tests PCL still built fine if it was removed, see microsoft#21276 (comment) <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) -->
This PR will fix 2 issues:
pcl-cuda-commonpkgconfig (upstream PR [pcl_cuda_common] Export the pkgconfig file PointCloudLibrary/pcl#5026).libusband fix the condition of finding libusb (upstream PR [pcl_io] Set libusb as a required dependency of openni in non-Windows PointCloudLibrary/pcl#5028).Fixes #21223 #21241