The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Update wpilib port to allow opencv4 (#7927)

Browse Source 
* 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
This commit is contained in:
Thad House 2019-08-27 16:05:04 -07:00 committed by Curtis J Bezault
parent cb48082e5c
commit 39d7ee57eb
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/wpilib/CONTROL
View File

@ -1,6 +1,6 @@
Source: wpilib Source: wpilib
Version: 2019.5.1 Version: 2019.6.1
Build-Depends: libuv 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. 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 Feature: cameraserver
@ -8,5 +8,5 @@ Build-Depends: opencv
Description: Enables the CameraServer and CSCore libraries for manipulating USB Cameras and HTTP Camera Streams Description: Enables the CameraServer and CSCore libraries for manipulating USB Cameras and HTTP Camera Streams
Feature: allwpilib Feature: allwpilib
Build-Depends: wpilib[cameraserver] opencv Build-Depends: wpilib[cameraserver], opencv
Description: Enables the simulation HAL, and the high level wpilibc library. Description: Enables the simulation HAL, and the high level wpilibc library.

5
ports/wpilib/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO wpilibsuite/allwpilib REPO wpilibsuite/allwpilib
REF 3dfb01d45b971ffdfeea50ce58653eff592807d9 REF d10a1a797720014197c21dee38fdced73454dca4
SHA512 188923cbe166f5812a24a06d8af56bda289aaed38231d45583d423e51e9cd23bb257ade02fdc26e8d0fdd6cdcb793282c04ac80ebad76f29fdbd0a3c1a10f05c SHA512 a76e8652b6d6a921d466e08bcf162ee1b28c06af031b616b2333f8a9479ffd12d1c301182dac86e5d7d59909a21cbee4e551028393df80671336546c14ecf606
) )
set(WITHOUT_JAVA ON) set(WITHOUT_JAVA ON)
@ -28,6 +28,7 @@ vcpkg_configure_cmake(
-DWITHOUT_CSCORE=${WITHOUT_CSCORE} -DWITHOUT_CSCORE=${WITHOUT_CSCORE}
-DWITHOUT_ALLWPILIB=${WITHOUT_ALLWPILIB} -DWITHOUT_ALLWPILIB=${WITHOUT_ALLWPILIB}
-DUSE_VCPKG_LIBUV=ON -DUSE_VCPKG_LIBUV=ON
-DUSE_VCPKG_EIGEN=ON
-DFLAT_INSTALL_WPILIB=ON -DFLAT_INSTALL_WPILIB=ON
) )
vcpkg_install_cmake() vcpkg_install_cmake()