mirror of https://github.com/microsoft/vcpkg.git
Update wpilib port to custom build
This commit is contained in:
parent
73a99865b1
commit
8e50af6ff7
|
|
@ -1,57 +0,0 @@
|
|||
From afa930371f3b297a1846cd1892576a20ec7e6ece Mon Sep 17 00:00:00 2001
|
||||
From: Thad House <thadhouse1@gmail.com>
|
||||
Date: Thu, 11 Apr 2019 22:37:46 -0700
|
||||
Subject: [PATCH 6/6] Fix GUID comparison creating weird symbol
|
||||
|
||||
---
|
||||
cscore/build.gradle | 4 ++--
|
||||
cscore/src/main/native/windows/UsbCameraImpl.cpp | 10 +++++-----
|
||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/cscore/build.gradle b/cscore/build.gradle
|
||||
index 3162c8804..40cb97daf 100644
|
||||
--- a/cscore/build.gradle
|
||||
+++ b/cscore/build.gradle
|
||||
@@ -98,11 +98,11 @@ model {
|
||||
x86ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure',
|
||||
'_CT??_R0?AVbad_cast',
|
||||
'_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure',
|
||||
- '_TI5?AVfailure', '==']
|
||||
+ '_TI5?AVfailure']
|
||||
x64ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure',
|
||||
'_CT??_R0?AVbad_cast',
|
||||
'_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure',
|
||||
- '_TI5?AVfailure', '==']
|
||||
+ '_TI5?AVfailure']
|
||||
}
|
||||
cscoreJNI(ExportsConfig) {
|
||||
x86SymbolFilter = { symbols ->
|
||||
diff --git a/cscore/src/main/native/windows/UsbCameraImpl.cpp b/cscore/src/main/native/windows/UsbCameraImpl.cpp
|
||||
index e45f361d4..3a6446554 100644
|
||||
--- a/cscore/src/main/native/windows/UsbCameraImpl.cpp
|
||||
+++ b/cscore/src/main/native/windows/UsbCameraImpl.cpp
|
||||
@@ -413,16 +413,16 @@ LRESULT UsbCameraImpl::PumpMain(HWND hwnd, UINT uiMsg, WPARAM wParam,
|
||||
|
||||
static cs::VideoMode::PixelFormat GetFromGUID(const GUID& guid) {
|
||||
// Compare GUID to one of the supported ones
|
||||
- if (guid == MFVideoFormat_NV12) {
|
||||
+ if (IsEqualGUID(guid, MFVideoFormat_NV12)) {
|
||||
// GrayScale
|
||||
return cs::VideoMode::PixelFormat::kGray;
|
||||
- } else if (guid == MFVideoFormat_YUY2) {
|
||||
+ } else if (IsEqualGUID(guid, MFVideoFormat_YUY2)) {
|
||||
return cs::VideoMode::PixelFormat::kYUYV;
|
||||
- } else if (guid == MFVideoFormat_RGB24) {
|
||||
+ } else if (IsEqualGUID(guid, MFVideoFormat_RGB24)) {
|
||||
return cs::VideoMode::PixelFormat::kBGR;
|
||||
- } else if (guid == MFVideoFormat_MJPG) {
|
||||
+ } else if (IsEqualGUID(guid, MFVideoFormat_MJPG)) {
|
||||
return cs::VideoMode::PixelFormat::kMJPEG;
|
||||
- } else if (guid == MFVideoFormat_RGB565) {
|
||||
+ } else if (IsEqualGUID(guid, MFVideoFormat_RGB565)) {
|
||||
return cs::VideoMode::PixelFormat::kRGB565;
|
||||
} else {
|
||||
return cs::VideoMode::PixelFormat::kUnknown;
|
||||
--
|
||||
2.18.0.windows.1
|
||||
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
Source: wpilib
|
||||
Version: 2019.4.1
|
||||
Build-Depends: 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
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@ include(vcpkg_common_functions)
|
|||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO wpilibsuite/allwpilib
|
||||
REF v2019.4.1
|
||||
SHA512 8a79e55cd5f3aaf60eb8c0a952d33c82b5e5c997e72d7ad1cf3a99165a0057dfc5d3fc742d7dcefc7a1d3031bfc185b107968545159d7d5177a601df85df271e
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0006-Fix-GUID-comparison-creating-weird-symbol.patch
|
||||
REPO thadhouse/allwpilib
|
||||
REF v2019.42.42
|
||||
SHA512 fd8d1030bffe67912c09e6dd9aedd71be10a5994aae9d371eb7a0b0faa67bc2743a16d9c31a4472f933819d3d109c676d506df7ca6df46ca68ec92290d3a8a47
|
||||
HEAD_REF vcpkgrelease
|
||||
)
|
||||
|
||||
set(WITHOUT_JAVA ON)
|
||||
|
|
@ -30,7 +28,7 @@ vcpkg_configure_cmake(
|
|||
-DWITHOUT_JAVA=${WITHOUT_JAVA}
|
||||
-DWITHOUT_CSCORE=${WITHOUT_CSCORE}
|
||||
-DWITHOUT_ALLWPILIB=${WITHOUT_ALLWPILIB}
|
||||
-DFLAT_INSTALL_HEADERS=ON
|
||||
-DUSE_VCPKG_LIBUV=ON
|
||||
)
|
||||
vcpkg_install_cmake()
|
||||
|
||||
|
|
@ -56,7 +54,6 @@ file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAG
|
|||
file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib")
|
||||
file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib")
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/wpilib)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/wpilib)
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wpilib RENAME copyright)
|
||||
|
|
|
|||
Loading…
Reference in New Issue