From f01d90a69276a21c5dc40896a0dd805a190a01e0 Mon Sep 17 00:00:00 2001
From: Jason Wenger <jcwenger@gmail.com>
Date: Tue, 12 May 2020 21:53:21 -0500
Subject: [PATCH 1/2] Fixes for newer boost

---
 include/f1x/aasdk/IO/Promise.hpp    | 1 +
 src/Channel/ServiceChannel.cpp      | 5 +++++
 src/USB/AccessoryModeQueryChain.cpp | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/include/f1x/aasdk/IO/Promise.hpp b/include/f1x/aasdk/IO/Promise.hpp
index 9f5e222..646b258 100644
--- a/include/f1x/aasdk/IO/Promise.hpp
+++ b/include/f1x/aasdk/IO/Promise.hpp
@@ -20,6 +20,7 @@
 
 #include <functional>
 #include <boost/asio.hpp>
+#include <boost/core/noncopyable.hpp>
 #include <f1x/aasdk/Error/Error.hpp>
 #include <f1x/aasdk/IO/IOContextWrapper.hpp>
 
diff --git a/src/Channel/ServiceChannel.cpp b/src/Channel/ServiceChannel.cpp
index 74b3a5b..78a7cc1 100644
--- a/src/Channel/ServiceChannel.cpp
+++ b/src/Channel/ServiceChannel.cpp
@@ -38,7 +38,12 @@ ServiceChannel::ServiceChannel(boost::asio::io_service::strand& strand,
 
 void ServiceChannel::send(messenger::Message::Pointer message, SendPromise::Pointer promise)
 {
+#if BOOST_VERSION < 106600
     auto sendPromise = messenger::SendPromise::defer(strand_.get_io_service());
+#else
+    auto sendPromise = messenger::SendPromise::defer(strand_.context());
+#endif
+
     io::PromiseLink<>::forward(*sendPromise, std::move(promise));
     messenger_->enqueueSend(std::move(message), std::move(sendPromise));
 }
diff --git a/src/USB/AccessoryModeQueryChain.cpp b/src/USB/AccessoryModeQueryChain.cpp
index 5b4b4fe..b594f5e 100644
--- a/src/USB/AccessoryModeQueryChain.cpp
+++ b/src/USB/AccessoryModeQueryChain.cpp
@@ -57,9 +57,15 @@ void AccessoryModeQueryChain::start(DeviceHandle handle, Promise::Pointer promis
                     promise_.reset();
                 });
 
+#if BOOST_VERSION < 106600
             this->startQuery(AccessoryModeQueryType::PROTOCOL_VERSION,
                              std::make_shared<USBEndpoint>(usbWrapper_, strand_.get_io_service(), std::move(handle)),
                              std::move(queryPromise));
+#else
+            this->startQuery(AccessoryModeQueryType::PROTOCOL_VERSION,
+                             std::make_shared<USBEndpoint>(usbWrapper_, strand_.context(), std::move(handle)),
+                             std::move(queryPromise));
+#endif
         }
     });
 }

From 4486455f17b60b47fd32731dec80aa7241a6c882 Mon Sep 17 00:00:00 2001
From: Jason Wenger <jcwenger@gmail.com>
Date: Wed, 13 May 2020 01:22:01 -0500
Subject: [PATCH 2/2] Support installation

---
 CMakeLists.txt             | 3 +++
 aasdk_proto/CMakeLists.txt | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 672bf23..abc9226 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,9 @@ target_link_libraries(aasdk
                         ${OPENSSL_LIBRARIES}
                         ${WINSOCK2_LIBRARIES})
 
+install(TARGETS aasdk DESTINATION lib)
+install(DIRECTORY include/f1x DESTINATION include)
+
 if(AASDK_TEST)
     add_executable(aasdk_ut
                     ${tests_source_files}
diff --git a/aasdk_proto/CMakeLists.txt b/aasdk_proto/CMakeLists.txt
index c54aca7..e89a348 100644
--- a/aasdk_proto/CMakeLists.txt
+++ b/aasdk_proto/CMakeLists.txt
@@ -7,3 +7,7 @@ protobuf_generate_cpp(proto_sources proto_headers ${proto_files})
 add_library(aasdk_proto SHARED ${proto_headers} ${proto_sources})
 target_link_libraries(aasdk_proto ${PROTOBUF_LIBRARIES})
 
+install(TARGETS aasdk_proto DESTINATION lib)
+install(DIRECTORY . DESTINATION include/aasdk_proto
+	FILES_MATCHING PATTERN *.h
+	PATTERN CMakeFiles EXCLUDE )