aboutsummaryrefslogtreecommitdiff
path: root/ports/wpilib/CONTROL
diff options
context:
space:
mode:
authorThad House <ThadHouse@users.noreply.github.com>2019-08-27 16:05:04 -0700
committerCurtis J Bezault <curtbezault@gmail.com>2019-08-27 16:05:04 -0700
commit39d7ee57eb2625af524ea998306120a190786950 (patch)
tree916c79435ee5d8b7135d844b101869f4cff3a037 /ports/wpilib/CONTROL
parentcb48082e5c2afdd9355c0ff1d625cceaa29e1102 (diff)
downloadvcpkg-39d7ee57eb2625af524ea998306120a190786950.tar.gz
vcpkg-39d7ee57eb2625af524ea998306120a190786950.zip
[wpilib] Update wpilib port to allow opencv4 (#7927)
* Update WPILib to allow OpenCV 4 support The existing version only supported OpenCV 3, OpenCV 4 support has been added recently * Update wpilib port to allow opencv4 Was only compatible with opencv3, and would fail to build with 4. Also had to update to include eigen, since we now depend on that as well * Use test package to ensure PR passes * Attempt to get mac working * Revert to upstream repo
Diffstat (limited to 'ports/wpilib/CONTROL')
-rw-r--r--ports/wpilib/CONTROL6
1 files changed, 3 insertions, 3 deletions
diff --git a/ports/wpilib/CONTROL b/ports/wpilib/CONTROL
index a7542e8b8..b37784225 100644
--- a/ports/wpilib/CONTROL
+++ b/ports/wpilib/CONTROL
@@ -1,6 +1,6 @@
Source: wpilib
-Version: 2019.5.1
-Build-Depends: libuv
+Version: 2019.6.1
+Build-Depends: eigen3, libuv
Description: WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.
Feature: cameraserver
@@ -8,5 +8,5 @@ Build-Depends: opencv
Description: Enables the CameraServer and CSCore libraries for manipulating USB Cameras and HTTP Camera Streams
Feature: allwpilib
-Build-Depends: wpilib[cameraserver] opencv
+Build-Depends: wpilib[cameraserver], opencv
Description: Enables the simulation HAL, and the high level wpilibc library.