3 files changed, 70 insertions, 14 deletions
diff --git a/ports/liblas/CONTROL b/ports/liblas/CONTROL
index a08401448..f44192537 100644
--- a/ports/liblas/CONTROL
+++ b/ports/liblas/CONTROL
@@ -1,5 +1,5 @@
 Source: liblas
-Version: 1.8.1-3
+Version: 1.8.1-4
 Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, libgeotiff
 Description: A C/C++ library for reading and writing the very common LAS LiDAR format.
 
diff --git a/ports/liblas/fix-boost-headers.patch b/ports/liblas/fix-boost-headers.patch
new file mode 100644
index 000000000..4725a6ceb
--- /dev/null
+++ b/ports/liblas/fix-boost-headers.patch
@@ -0,0 +1,55 @@
+diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp
+index d3116a1..ab20e06 100644
+--- a/include/liblas/detail/binary.hpp
++++ b/include/liblas/detail/binary.hpp
+@@ -17,6 +17,8 @@
+ #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ 
++#include <liblas/detail/endian.hpp>
++
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
+@@ -25,7 +27,6 @@
+ 
+ #include <boost/config.hpp>
+ #include <boost/static_assert.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/type_traits/is_signed.hpp>
+ 
+ #if CHAR_BIT != 8
+@@ -43,7 +44,7 @@ namespace detail { namespace binary {
+ struct big_endian_tag {};
+ struct little_endian_tag {};
+ 
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef LIBLAS_BIG_ENDIAN
+ typedef big_endian_tag native_endian_tag;
+ #else
+ typedef little_endian_tag native_endian_tag;
+diff --git a/src/c_api.cpp b/src/c_api.cpp
+index a70fe74..e8be785 100644
+--- a/src/c_api.cpp
++++ b/src/c_api.cpp
+@@ -96,6 +96,7 @@ using namespace liblas;
+ #endif
+ 
+ #include <boost/lambda/lambda.hpp>
++#include <boost/bind.hpp>
+ 
+ bool IsReprojectionTransform(liblas::TransformPtr const& p)
+ {
+diff --git a/src/header.cpp b/src/header.cpp
+index 9987ce1..a5c8f7d 100644
+--- a/src/header.cpp
++++ b/src/header.cpp
+@@ -54,7 +54,7 @@
+ // boost
+ #include <boost/cstdint.hpp>
+ #include <boost/lambda/lambda.hpp>
+-
++#include <boost/bind.hpp>
+ //std
+ #include <algorithm>
+ #include <fstream>
diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake
index 32fdd7c7e..f1416ec93 100644
--- a/ports/liblas/portfile.cmake
+++ b/ports/liblas/portfile.cmake
@@ -3,31 +3,32 @@ include(vcpkg_common_functions)
 set(VERSION 1.8.1)
                                               
 vcpkg_download_distfile(ARCHIVE
-	URLS "http://download.osgeo.org/liblas/libLAS-${VERSION}.tar.bz2"
-	FILENAME "libLAS-${VERSION}-src.tar.bz2"
+    URLS "http://download.osgeo.org/liblas/libLAS-${VERSION}.tar.bz2"
+    FILENAME "libLAS-${VERSION}-src.tar.bz2"
     SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf  
-	HEAD_REF master
+    HEAD_REF master
 )
 
 vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     OUT_SOURCE_PATH SOURCE_PATH
-    PATCHES fix-BuildError.patch
+    PATCHES
+        fix-BuildError.patch
+        fix-boost-headers.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake)
 file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake)
 
 vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
-  OPTIONS 
-  
-	-DBUILD_OSGEO4W=OFF # Disable osgeo4w
-	-DWITH_TESTS=OFF
-	-DWITH_UTILITIES=OFF
-	-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB}
-	-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG}
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS 
+        -DBUILD_OSGEO4W=OFF # Disable osgeo4w
+        -DWITH_TESTS=OFF
+        -DWITH_UTILITIES=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB}
+        -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG}
 )
 
 vcpkg_install_cmake()