diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | boost_1.70_fixes.patch | 24 |
3 files changed, 3 insertions, 32 deletions
@@ -1,6 +1,6 @@ pkgbase = aasdk-git pkgdesc = Library to build AndroidAuto headunit - pkgver = r80.1d91dec + pkgver = r90.a483733 pkgrel = 1 url = https://github.com/f1xpl/aasdk arch = x86_64 @@ -16,10 +16,8 @@ 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 = 51f3434c41fde193fa7b6d7137bda150 - md5sums = 8cf4611220f7144872ba1967f328e414 pkgname = aasdk-git @@ -1,7 +1,7 @@ # Maintainer: Parker Reed <parker.l.reed@gmail.com> pkgname=aasdk-git _pkgname=aasdk -pkgver=r80.1d91dec +pkgver=r90.a483733 pkgrel=1 pkgdesc="Library to build AndroidAuto headunit" arch=('x86_64') @@ -14,11 +14,9 @@ makedepends=('cmake' 'boost' 'git') source=( "$pkgname::git+https://github.com/opencardev/aasdk#branch=development" promise.patch - boost_1.70_fixes.patch ) md5sums=('SKIP' - '51f3434c41fde193fa7b6d7137bda150' - '8cf4611220f7144872ba1967f328e414') + '51f3434c41fde193fa7b6d7137bda150') pkgver() { cd $pkgname @@ -28,7 +26,6 @@ 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 deleted file mode 100644 index df0643003ef9..000000000000 --- a/boost_1.70_fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -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)); - } - }); |