From d0a2bf8debd2803bc5e032616d4811fc004d13a6 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Wed, 2 Jan 2019 20:33:28 -0800 Subject: [PATCH] Update dependencies (#25) --- deps/01-download.sh | 2 +- deps/02-extract.sh | 1 - deps/allwpilib | 2 +- deps/pynetworktables | 2 +- deps/robotpy-cscore | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/deps/01-download.sh b/deps/01-download.sh index a6a179f..b6aacab 100755 --- a/deps/01-download.sh +++ b/deps/01-download.sh @@ -5,7 +5,7 @@ pushd 01-download # raspbian toolchain wget -nc -nv \ - https://github.com/wpilibsuite/raspbian-toolchain/releases/download/v1.1.0/Raspbian9-Linux-Toolchain-6.3.0.tar.gz + https://github.com/wpilibsuite/raspbian-toolchain/releases/download/v1.2.0/Raspbian9-Linux-Toolchain-6.3.0.tar.gz # openjdk binaries wget -nc -nv \ diff --git a/deps/02-extract.sh b/deps/02-extract.sh index 0446cdc..d6d2c6e 100755 --- a/deps/02-extract.sh +++ b/deps/02-extract.sh @@ -36,7 +36,6 @@ sed -i -e 's/javac sourcepath/javac target="1.8" source="1.8" sourcepath/' openc # toolchain setup for opencv and wpilib cp ../arm-pi-gnueabihf.toolchain.cmake . -cp -R ../thirdparty-opencv/jni . tar xzf ../01-download/jdk_11*.tar.gz jdk/include mkdir -p cmake-modules cat > cmake-modules/FindJNI.cmake << EOF diff --git a/deps/allwpilib b/deps/allwpilib index 300eeb3..6bdd7ce 160000 --- a/deps/allwpilib +++ b/deps/allwpilib @@ -1 +1 @@ -Subproject commit 300eeb330d78e2ef605d30644efbc4dd8bcdad61 +Subproject commit 6bdd7ce506793f094f267321677ee3c14e9b4c35 diff --git a/deps/pynetworktables b/deps/pynetworktables index 59b5d13..4429d43 160000 --- a/deps/pynetworktables +++ b/deps/pynetworktables @@ -1 +1 @@ -Subproject commit 59b5d1328274e78393202fe2a7e09845f5ff63a5 +Subproject commit 4429d432e7485ea72ba6ab40ce771573d6c58c57 diff --git a/deps/robotpy-cscore b/deps/robotpy-cscore index efc857a..e692c7b 160000 --- a/deps/robotpy-cscore +++ b/deps/robotpy-cscore @@ -1 +1 @@ -Subproject commit efc857aeb40168cb79e82b572fab2f051456980c +Subproject commit e692c7b7dfeefafe93a6510979d8eee3b9d27556