From 3fdbcc20796e0b7486447ebd41d38898db735032 Mon Sep 17 00:00:00 2001
From: Nathan Olson <nathanmolson@gmail.com>
Date: Sun, 10 Aug 2025 12:45:09 -0700
Subject: [PATCH] use upstream pdal-python

---
 SuperBuild/cmake/External-PDALPython.cmake | 10 +++++++---
 snap/snapcraft24.yaml                      |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/SuperBuild/cmake/External-PDALPython.cmake b/SuperBuild/cmake/External-PDALPython.cmake
index 60ff0df2..59be02e9 100644
--- a/SuperBuild/cmake/External-PDALPython.cmake
+++ b/SuperBuild/cmake/External-PDALPython.cmake
@@ -13,8 +13,8 @@ ExternalProject_Add(${_proj_name}
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  GIT_REPOSITORY    https://github.com/NathanMOlson/pdal-python
-  GIT_TAG           79ec1264533fdffb1b08a46aed3d0a0ead2a98e8
+  GIT_REPOSITORY    https://github.com/PDAL/python
+  GIT_TAG           6791a880a87e95f7318e99acfb4a10186379c5dd
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------
@@ -29,8 +29,12 @@ ExternalProject_Add(${_proj_name}
   BINARY_DIR        ${_SB_BINARY_DIR}
   #--Install step---------------
   INSTALL_DIR       ${SB_INSTALL_DIR}
+  INSTALL_COMMAND   ${CMAKE_COMMAND} --build <BINARY_DIR> --target install
+                    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SB_SOURCE_DIR}/${_proj_name}/src/pdal/__init__.py ${SB_INSTALL_DIR}/lib/python3.12/dist-packages/pdal
+                    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SB_SOURCE_DIR}/${_proj_name}/src/pdal/pipeline.py ${SB_INSTALL_DIR}/lib/python3.12/dist-packages/pdal
+                    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SB_SOURCE_DIR}/${_proj_name}/src/pdal/drivers.py ${SB_INSTALL_DIR}/lib/python3.12/dist-packages/pdal
   #--Output logging-------------
   LOG_DOWNLOAD      OFF
   LOG_CONFIGURE     OFF
   LOG_BUILD         OFF
-)
\ No newline at end of file
+)
diff --git a/snap/snapcraft24.yaml b/snap/snapcraft24.yaml
index 9b389084..04315894 100644
--- a/snap/snapcraft24.yaml
+++ b/snap/snapcraft24.yaml
@@ -44,6 +44,7 @@ parts:
       - libusb-1.0-0-dev
       - ninja-build
       - pkg-config
+      - pybind11-dev
       - python3-dev
       - python3-gdal
       - python3-pip