Updated with path for boost 1.70+. Thanks mbromilow

3 files changed, 33 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8dde8da1be1f..737da2b037f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aasdk-git
 	pkgdesc = Library to build AndroidAuto headunit
-	pkgver = r77.95617c2
+	pkgver = r80.1d91dec
 	pkgrel = 1
 	url = https://github.com/f1xpl/aasdk
 	arch = x86_64
@@ -16,8 +16,10 @@ pkgbase = aasdk-git
 	conflicts = aasdk
 	source = aasdk-git::git+https://github.com/opencardev/aasdk#branch=development
 	source = promise.patch
+	source = boost_1.70_fixes.patch
 	md5sums = SKIP
-	md5sums = SKIP
+	md5sums = 51f3434c41fde193fa7b6d7137bda150
+	md5sums = 8cf4611220f7144872ba1967f328e414
 
 pkgname = aasdk-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 380975258f19..2fc96e8db20f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Parker Reed <parker.l.reed@gmail.com>
 pkgname=aasdk-git
 _pkgname=aasdk
-pkgver=r77.95617c2
+pkgver=r80.1d91dec
 pkgrel=1
 pkgdesc="Library to build AndroidAuto headunit"
 arch=('x86_64')
@@ -14,9 +14,11 @@ makedepends=('cmake' 'boost' 'git')
 source=(
   "$pkgname::git+https://github.com/opencardev/aasdk#branch=development"
   promise.patch
+  boost_1.70_fixes.patch
 )
 md5sums=('SKIP'
-         'SKIP')
+         '51f3434c41fde193fa7b6d7137bda150'
+         '8cf4611220f7144872ba1967f328e414')
 
 pkgver() {
   cd $pkgname
@@ -26,6 +28,7 @@ pkgver() {
 prepare() {
   cd $pkgname
   patch --forward --strip=1 --input="${srcdir}/promise.patch"
+  patch -N -p 1 -i "${srcdir}/boost_1.70_fixes.patch"
 }
 
 build() {
diff --git a/boost_1.70_fixes.patch b/boost_1.70_fixes.patch
new file mode 100644
index 000000000000..df0643003ef9
--- /dev/null
+++ b/boost_1.70_fixes.patch
@@ -0,0 +1,24 @@
+diff --unified --recursive --text aasdk-git/src/Channel/ServiceChannel.cpp aasdk-git.new/src/Channel/ServiceChannel.cpp
+--- aasdk-git/src/Channel/ServiceChannel.cpp
++++ aasdk-git.new/src/Channel/ServiceChannel.cpp
+@@ -38,7 +38,7 @@
+
+ void ServiceChannel::send(messenger::Message::Pointer message, SendPromise::Pointer promise)
+ {
+-    auto sendPromise = messenger::SendPromise::defer(strand_.get_io_service());
++    auto sendPromise = messenger::SendPromise::defer(strand_.context());
+     io::PromiseLink<>::forward(*sendPromise, std::move(promise));
+     messenger_->enqueueSend(std::move(message), std::move(sendPromise));
+ }
+diff --unified --recursive --text aasdk-git/src/USB/AccessoryModeQueryChain.cpp aasdk-git.new/src/USB/AccessoryModeQueryChain.cpp
+--- aasdk-git/src/USB/AccessoryModeQueryChain.cpp
++++ aasdk-git.new/src/USB/AccessoryModeQueryChain.cpp
+@@ -58,7 +58,7 @@
+                 });
+
+             this->startQuery(AccessoryModeQueryType::PROTOCOL_VERSION,
+-                             std::make_shared<USBEndpoint>(usbWrapper_, strand_.get_io_service(), std::move(handle)),
++                             std::make_shared<USBEndpoint>(usbWrapper_, strand_.context(), std::move(handle)),
+                              std::move(queryPromise));
+         }
+     });