Updated upstream patch

2 files changed, 18 insertions, 18 deletions

diff --git a/0001-artf4155-Move-Port.h-from-hal-lib-Athena-to-hal-incl.patch b/0001-artf4155-Move-Port.h-from-hal-lib-Athena-to-hal-incl.patch
index 40e36ade72bd..d425f90c1d51 100644
--- a/0001-artf4155-Move-Port.h-from-hal-lib-Athena-to-hal-incl.patch
+++ b/0001-artf4155-Move-Port.h-from-hal-lib-Athena-to-hal-incl.patch
@@ -1,4 +1,4 @@
-From 10034e1bb965cc1874d977668c0b7d3dbced8e22 Mon Sep 17 00:00:00 2001
+From 6388a1ed50a0cc1b5c72bfa7da98edfa49e9e801 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Thu, 25 Jun 2015 18:38:44 -0700
 Subject: [PATCH] artf4155: Move Port.h from hal/lib/Athena to hal/include/HAL
@@ -30,20 +30,20 @@ index 0000000..8679c26
 +	uint8_t module;
 +} Port;
 diff --git a/hal/lib/Athena/Analog.cpp b/hal/lib/Athena/Analog.cpp
-index 9461ebb..b3aea54 100644
+index ab18ad3..17ad209 100644
 --- a/hal/lib/Athena/Analog.cpp
 +++ b/hal/lib/Athena/Analog.cpp
-@@ -1,7 +1,7 @@
- 
+@@ -2,7 +2,7 @@
  #include "HAL/Analog.hpp"
  
+ #include "HAL/cpp/priority_mutex.h"
 -#include "Port.h"
 +#include "HAL/Port.h"
  #include "HAL/HAL.hpp"
  #include "ChipObject.h"
- #include "HAL/cpp/Synchronized.hpp"
+ #include "HAL/cpp/Resource.hpp"
 diff --git a/hal/lib/Athena/Digital.cpp b/hal/lib/Athena/Digital.cpp
-index f117216..ba43abf 100644
+index 9324144..dcdad9b 100644
 --- a/hal/lib/Athena/Digital.cpp
 +++ b/hal/lib/Athena/Digital.cpp
 @@ -1,7 +1,7 @@
@@ -54,7 +54,7 @@ index f117216..ba43abf 100644
 +#include "HAL/Port.h"
  #include "HAL/HAL.hpp"
  #include "ChipObject.h"
- #include "HAL/cpp/Synchronized.hpp"
+ #include "HAL/cpp/Resource.hpp"
 diff --git a/hal/lib/Athena/HAL.cpp b/hal/lib/Athena/HAL.cpp
 index b24f8dc..185f2be 100644
 --- a/hal/lib/Athena/HAL.cpp
@@ -81,7 +81,7 @@ index 8679c26..0000000
 -	uint8_t module;
 -} Port;
 diff --git a/hal/lib/Athena/Solenoid.cpp b/hal/lib/Athena/Solenoid.cpp
-index c545106..dde205e 100644
+index db699ff..c94fcc2 100644
 --- a/hal/lib/Athena/Solenoid.cpp
 +++ b/hal/lib/Athena/Solenoid.cpp
 @@ -1,7 +1,7 @@
@@ -92,20 +92,20 @@ index c545106..dde205e 100644
 +#include "HAL/Port.h"
  #include "HAL/Errors.hpp"
  #include "ChipObject.h"
- #include "HAL/cpp/Synchronized.hpp"
+ #include "NetworkCommunication/LoadOut.h"
 diff --git a/wpilibc/wpilibC++Devices/include/SolenoidBase.h b/wpilibc/wpilibC++Devices/include/SolenoidBase.h
-index 0a51be6..16ba181 100644
+index 2732e86..f11ab2d 100644
 --- a/wpilibc/wpilibC++Devices/include/SolenoidBase.h
 +++ b/wpilibc/wpilibC++Devices/include/SolenoidBase.h
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
+ #include "Resource.h"
  #include "SensorBase.h"
  #include "HAL/HAL.hpp"
- #include "HAL/cpp/Synchronized.hpp"
 -#include "Port.h"
 +#include "HAL/Port.h"
  
- /**
-  * SolenoidBase class is the common base class for the Solenoid and
+ #include <memory>
+ 
 -- 
-2.4.5
+2.4.6
 
diff --git a/PKGBUILD b/PKGBUILD
index c22fac7fb81c..14d99c4b1e35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tyler Veness <calcmogul at gmail dot com>
 
 pkgname=arm-frc-linux-gnueabi-wpilib-git
-pkgver=1073.7f5ee01
+pkgver=1081.eb7d55f
 pkgrel=1
 pkgdesc="The WPI FIRST Robotics Competition C/C++ library for the arm-frc-linux-gnueabi toolchain"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ options=('!strip' 'libtool' 'staticlibs')
 source=("git+https://usfirst.collab.net/gerrit/allwpilib"
         "0001-artf4155-Move-Port.h-from-hal-lib-Athena-to-hal-incl.patch")
 sha512sums=('SKIP'
-            '18a6e1f492b28eaa913b7aebe168ce349824092c3ce6792fad569ea5604a8382bb69e2a0a17732291f8f5bd25270bff19890f5af8b918d55025d3730dd76590a')
+            '3dbf006ccf7c96a58c6b5a0ad446b40d60b6cc1962b876c7cbc0ed041f34a4f17dc3848bfff183ee9258466103940e80935ccfdc3f6d0da762c01f0be023e338')
 
 pkgver() {
   cd allwpilib
@@ -34,7 +34,7 @@ build() {
   make ${MAKEFLAGS} || return 1
 }
 
-package () {
+package() {
   cd "$srcdir/allwpilib/build"
   make ${MAKEFLAGS} DESTDIR="${pkgdir}" install || return 1
   mv $pkgdir/usr/local $pkgdir/usr/arm-frc-linux-gnueabi