From 79e48e929236ab79a99f29a91fc33f8c017cb08f Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 10 Mar 2025 06:55:20 +0000 Subject: [PATCH 01/10] fix undefine gluErrorString --- ports/pcl/fix-GL.patch | Bin 0 -> 2558 bytes ports/pcl/portfile.cmake | 1 + ports/pcl/vcpkg.json | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 ports/pcl/fix-GL.patch diff --git a/ports/pcl/fix-GL.patch b/ports/pcl/fix-GL.patch new file mode 100644 index 0000000000000000000000000000000000000000..0a4441f15870e5f8d14676a867b9deb28a5442de GIT binary patch literal 2558 zcmchZTTdcE5QWb(zoPX?gLsQ!H|i!5Z!wCq5pd%ZSztsXUNQ{9#Q4{BziI*lf`*MS zsZ7(=Q+29NRZlnXZw=k*8ga@YO|+Q#U#+Rl{9YZk&|>C~dhn}}>ijlYZ}U_cZ?I@6 zRHRkjJt0oDZz5!f_~22WLE8d7MBCJceiCI>d1f`gwoY`1wvObn+)~DK$<2UAMp-Yj z;IpSaGRl!@o=jKt11&qyHsR&4FqG=v1U7 zEmH^Q#omNevqL`}v%ZbfFLc8?_6VciI|KhN9lpgX#CmDOf59UdepTlR7!P%U1U$=F zzYH)e6Wd8`GOdnaSPn@}7S%e}6SHo3j&)dd(42M=r^O+z+vovRGme&v>5BtPz=jMu2-iMDs`y>d7kLN zSL|FB70LRer+Fv2{BH%mj+WFXi7=UMpLLC@g>bq1P>pFg_V`xlLOLvycp#@v>is6 V_MT4s?WB%j8u?r%-Me<9{R5S#b1VP= literal 0 HcmV?d00001 diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index f248ec0feb41c7..eb90dfb847de73 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( install-examples.patch fix-clang-cl.patch add-chrono-includes.patch + fix-GL.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index f6711c399f67f0..c71696ecc53e00 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcl", "version": "1.15.0", - "port-version": 1, + "port-version": 2, "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", "license": "BSD-3-Clause", From 3369b19dbbb138d186009d1bc210b8e817de0fed Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 10 Mar 2025 06:55:37 +0000 Subject: [PATCH 02/10] udpate version --- versions/baseline.json | 2 +- versions/p-/pcl.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5ed690f82b69a8..84fb0ce8297010 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6998,7 +6998,7 @@ }, "pcl": { "baseline": "1.15.0", - "port-version": 1 + "port-version": 2 }, "pcre": { "baseline": "8.45", diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 0ef314701c655b..cd41889f3190e9 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acaea71043ce13a7b46f7424f619a7eae2e5ee30", + "version": "1.15.0", + "port-version": 2 + }, { "git-tree": "a3842f1300f7fa0b46da6784433678e964520ddf", "version": "1.15.0", From e304a957e55b06a3a67fadfdc0d4c35e13261784 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 10 Mar 2025 07:01:58 +0000 Subject: [PATCH 03/10] fix undefine gluErrorString --- ports/pcl/fix-GL.patch | Bin 2558 -> 1278 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ports/pcl/fix-GL.patch b/ports/pcl/fix-GL.patch index 0a4441f15870e5f8d14676a867b9deb28a5442de..d7676963ddcef6c6df067383128653d388564749 100644 GIT binary patch literal 1278 zcmbW0TWi8V5QX3KE2chG(s)CxtQIP56lu(sXe@mSxvX(4w)65!PdtFfUp95fQa;yM^FFgGPBo-k?oL)M|EX zwN5i2QNxF3qtR)%HN!A2GBjP+FLUni!Dx0GH@Bdx((1xN*@g_EuL}^08Kc3W5IM3; zAvWT=ssX^rB0OCKQ3~8a%tl0h+CAm(mXr~=&i$*qL%(NZ&vYE@RAH|=0GOXh?>Hf= zJuGv6YDZc548Igsb kGWlPM%U67}C~dhn}}>ijlYZ}U_cZ?I@6 zRHRkjJt0oDZz5!f_~22WLE8d7MBCJceiCI>d1f`gwoY`1wvObn+)~DK$<2UAMp-Yj z;IpSaGRl!@o=jKt11&qyHsR&4FqG=v1U7 zEmH^Q#omNevqL`}v%ZbfFLc8?_6VciI|KhN9lpgX#CmDOf59UdepTlR7!P%U1U$=F zzYH)e6Wd8`GOdnaSPn@}7S%e}6SHo3j&)dd(42M=r^O+z+vovRGme&v>5BtPz=jMu2-iMDs`y>d7kLN zSL|FB70LRer+Fv2{BH%mj+WFXi7=UMpLLC@g>bq1P>pFg_V`xlLOLvycp#@v>is6 V_MT4s?WB%j8u?r%-Me<9{R5S#b1VP= From b894c66b00d78d14e8b5b4d6c920f7a28280bbeb Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 10 Mar 2025 07:02:16 +0000 Subject: [PATCH 04/10] udpate version --- versions/p-/pcl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index cd41889f3190e9..68dcda3cff94e4 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "acaea71043ce13a7b46f7424f619a7eae2e5ee30", + "git-tree": "250360abcd6be4c683f1e7d405fad02bfdaf1470", "version": "1.15.0", "port-version": 2 }, From 2a6e0e8eb53a0e4ab1ee1f769ef13ee2c4ad7066 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 10 Mar 2025 07:52:09 +0000 Subject: [PATCH 05/10] modify patch --- ports/pcl/fix-GL.patch | 34 ---------------------------------- ports/pcl/fix-no-gl.patch | 13 +++++++++++++ ports/pcl/portfile.cmake | 2 +- 3 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 ports/pcl/fix-GL.patch create mode 100644 ports/pcl/fix-no-gl.patch diff --git a/ports/pcl/fix-GL.patch b/ports/pcl/fix-GL.patch deleted file mode 100644 index d7676963ddcef6..00000000000000 --- a/ports/pcl/fix-GL.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/simulation/src/glsl_shader.cpp b/simulation/src/glsl_shader.cpp -index 4eed218..61bed0a 100644 ---- a/simulation/src/glsl_shader.cpp -+++ b/simulation/src/glsl_shader.cpp -@@ -160,7 +160,28 @@ pcl::simulation::gllib::getGLError() - GLenum error = glGetError(); - while (error != GL_NO_ERROR) { - last_error = error; -- std::cout << "Error: OpenGL: " << gluErrorString(error) << std::endl; -+ switch(error) { -+ case GL_INVALID_ENUM: -+ std::cout << "Error: OpenGL: GL_INVALID_ENUM" << std::endl; -+ break; -+ case GL_INVALID_VALUE: -+ std::cout << "Error: OpenGL: GL_INVALID_VALUE" << std::endl; -+ break; -+ case GL_INVALID_OPERATION: -+ std::cout << "Error: OpenGL: GL_INVALID_OPERATION" << std::endl; -+ break; -+ case GL_STACK_OVERFLOW: -+ std::cout << "Error: OpenGL: GL_STACK_OVERFLOW" << std::endl; -+ break; -+ case GL_STACK_UNDERFLOW: -+ std::cout << "Error: OpenGL: GL_STACK_UNDERFLOW" << std::endl; -+ break; -+ case GL_OUT_OF_MEMORY: -+ std::cout << "Error: OpenGL: GL_OUT_OF_MEMORY" << std::endl; -+ break; -+ default: -+ std::cout << "Error: OpenGL: Unknown error" << std::endl; -+ } - error = glGetError(); - } - return last_error; diff --git a/ports/pcl/fix-no-gl.patch b/ports/pcl/fix-no-gl.patch new file mode 100644 index 00000000000000..38fec0883c8bad --- /dev/null +++ b/ports/pcl/fix-no-gl.patch @@ -0,0 +1,13 @@ +diff --git a/simulation/src/glsl_shader.cpp b/simulation/src/glsl_shader.cpp +index 4eed218..dc85f94 100644 +--- a/simulation/src/glsl_shader.cpp ++++ b/simulation/src/glsl_shader.cpp +@@ -160,7 +160,7 @@ pcl::simulation::gllib::getGLError() + GLenum error = glGetError(); + while (error != GL_NO_ERROR) { + last_error = error; +- std::cout << "Error: OpenGL: " << gluErrorString(error) << std::endl; ++ std::cout << "Error: OpenGL: " << glewGetErrorString(error) << std::endl; + error = glGetError(); + } + return last_error; diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index eb90dfb847de73..e1d195dea4d00b 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_from_github( install-examples.patch fix-clang-cl.patch add-chrono-includes.patch - fix-GL.patch + fix-no-gl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) From 7997187bc017350b66e228174197f25a547182e6 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 10 Mar 2025 07:52:51 +0000 Subject: [PATCH 06/10] update version --- versions/p-/pcl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 68dcda3cff94e4..3c60409d247cc5 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "250360abcd6be4c683f1e7d405fad02bfdaf1470", + "git-tree": "82f837fdf576b080f3590ea67b33c36eb5637243", "version": "1.15.0", "port-version": 2 }, From e9b3741cefbaa2031124266c94221b26dbf85299 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 12 Mar 2025 01:28:38 +0000 Subject: [PATCH 07/10] modify patch --- ports/pcl/fix-no-gl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/pcl/fix-no-gl.patch b/ports/pcl/fix-no-gl.patch index 38fec0883c8bad..d86046a2710693 100644 --- a/ports/pcl/fix-no-gl.patch +++ b/ports/pcl/fix-no-gl.patch @@ -7,7 +7,7 @@ index 4eed218..dc85f94 100644 while (error != GL_NO_ERROR) { last_error = error; - std::cout << "Error: OpenGL: " << gluErrorString(error) << std::endl; -+ std::cout << "Error: OpenGL: " << glewGetErrorString(error) << std::endl; ++ std::cout << "Error: OpenGL: " << error << std::endl; error = glGetError(); } return last_error; From 0968c5de73312e9fa47352ebc342591501a9e921 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 12 Mar 2025 01:29:07 +0000 Subject: [PATCH 08/10] update version --- versions/p-/pcl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 3c60409d247cc5..5f47d82e9d368a 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "82f837fdf576b080f3590ea67b33c36eb5637243", + "git-tree": "71a4370bba4544c6cee9f301ec508fec5028ccc5", "version": "1.15.0", "port-version": 2 }, From 9198099d7d20b31ab0fa39f0f33961a72d1f6c52 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 19 Mar 2025 07:35:08 +0000 Subject: [PATCH 09/10] fix error --- ports/pcl/fix-no-gl.patch | 13 ------------- ports/pcl/portfile.cmake | 7 ++++++- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 ports/pcl/fix-no-gl.patch diff --git a/ports/pcl/fix-no-gl.patch b/ports/pcl/fix-no-gl.patch deleted file mode 100644 index d86046a2710693..00000000000000 --- a/ports/pcl/fix-no-gl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/simulation/src/glsl_shader.cpp b/simulation/src/glsl_shader.cpp -index 4eed218..dc85f94 100644 ---- a/simulation/src/glsl_shader.cpp -+++ b/simulation/src/glsl_shader.cpp -@@ -160,7 +160,7 @@ pcl::simulation::gllib::getGLError() - GLenum error = glGetError(); - while (error != GL_NO_ERROR) { - last_error = error; -- std::cout << "Error: OpenGL: " << gluErrorString(error) << std::endl; -+ std::cout << "Error: OpenGL: " << error << std::endl; - error = glGetError(); - } - return last_error; diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index e1d195dea4d00b..9d4d04b2ba9fa3 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -1,3 +1,8 @@ +vcpkg_download_distfile(NO_GLU_PATCH + URLS https://github.com/PointCloudLibrary/pcl/pull/6253/commits/011905f3387e45b66828d81dacaafdde8893fdcb.patch?full_index=1 + FILENAME fix-no-gluErrorString.patch + SHA512 8bf795a0c0da667bae38a3293643bd92817f30ab0f8a56b065bbb7cfa0b8f125210a317ee9cd868911b87546b1a05c322280f159802f820fef886109b938635b +) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PointCloudLibrary/pcl @@ -12,7 +17,7 @@ vcpkg_from_github( install-examples.patch fix-clang-cl.patch add-chrono-includes.patch - fix-no-gl.patch + "${NO_GLU_PATCH}" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) From 9258f086b62eca81a3c27cc85836342dc82a2e02 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 19 Mar 2025 07:35:34 +0000 Subject: [PATCH 10/10] update version --- versions/p-/pcl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 5f47d82e9d368a..3e58af6ca5d728 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "71a4370bba4544c6cee9f301ec508fec5028ccc5", + "git-tree": "c467cb23d16b1400ce91154ac42f7ca1031de534", "version": "1.15.0", "port-version": 2 },