microsoft · BillyONeal · Oct 20, 2020 · Jul 28, 2020 · Jul 31, 2020 · Aug 6, 2020
diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL
@@ -1,6 +1,6 @@
 Source: opencv2
 Version: 2.4.13.7
-Port-Version: 2
+Port-Version: 3
 Build-Depends: zlib
 Description: computer vision library, version 2
 Default-Features: eigen, jpeg, opengl, png, tiff

diff --git a/ports/opencv2/FindCUDA.cmake b/ports/opencv2/FindCUDA.cmake
diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake
@@ -30,7 +30,6 @@ vcpkg_from_github(
 
 file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
 file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA")
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCUDA.cmake DESTINATION ${SOURCE_PATH}/cmake/)  #contains fixes for CUDA 11 compat, remove when CMake has support for it
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "cuda"     WITH_CUDA

diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL
@@ -1,5 +1,6 @@
 Source: opencv3
 Version: 3.4.10
+Port-Version: 1
 Build-Depends: protobuf, zlib
 Homepage: https://github.com/opencv/opencv
 Description: computer vision library

diff --git a/ports/opencv3/FindCUDA.cmake b/ports/opencv3/FindCUDA.cmake
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
@@ -22,9 +22,6 @@ vcpkg_from_github(
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake")
-file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
-file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA")
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCUDA.cmake DESTINATION ${SOURCE_PATH}/cmake/)    # backported from CMake 3.18, remove when released
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
 
@@ -252,7 +249,6 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
-        -DOPENCV_CUDA_FORCE_BUILTIN_CMAKE_MODULE=ON  #to use custom module with fixes for CUDA 11 compat, waiting for CMake support
         ###### ocv_options
         -DOpenCV_INSTALL_BINARIES_PREFIX=
         -DOPENCV_BIN_INSTALL_PATH=bin

diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL
@@ -1,5 +1,6 @@
 Source: opencv4
 Version: 4.3.0
+Port-Version: 1
 Build-Depends: protobuf, zlib
 Homepage: https://github.com/opencv/opencv
 Description: computer vision library

diff --git a/ports/opencv4/FindCUDA.cmake b/ports/opencv4/FindCUDA.cmake
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
@@ -23,9 +23,6 @@ vcpkg_from_github(
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake")
-file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
-file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA")
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCUDA.cmake DESTINATION ${SOURCE_PATH}/cmake/)  # backported from CMake 3.18, remove when released
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
 
@@ -283,7 +280,6 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
-        -DOPENCV_CUDA_FORCE_BUILTIN_CMAKE_MODULE=ON  #to use custom module with fixes for CUDA 11 compat, waiting for CMake support
         ###### ocv_options
         -DOpenCV_INSTALL_BINARIES_PREFIX=
         -DOPENCV_BIN_INSTALL_PATH=bin

diff --git a/ports/sentry-native/CONTROL b/ports/sentry-native/CONTROL
@@ -1,5 +1,6 @@
 Source: sentry-native
 Version: 0.4.0
+Port-Version: 1
 Homepage: https://sentry.io/
 Description: Sentry SDK for C, C++ and native applications.
 Build-Depends: curl (!windows)

diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake
@@ -12,12 +12,19 @@ vcpkg_extract_source_archive_ex(
     NO_REMOVE_ONE_LEVEL
 )
 
+if (VCPKG_TARGET_IS_WINDOWS)
+    set(SENTRY_NATIVE_C_STANDARD 99)
+else()
+    set(SENTRY_NATIVE_C_STANDARD 11)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DSENTRY_BUILD_TESTS=OFF
         -DSENTRY_BUILD_EXAMPLES=OFF
+        -DCMAKE_C_STANDARD=${SENTRY_NATIVE_C_STANDARD}
 )
 
 vcpkg_install_cmake()

diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh
@@ -10,7 +10,7 @@ APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \
   build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \
   libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev \
   libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \
-  flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \
+  flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libtool-bin libxrandr-dev \
   xutils-dev dh-autoreconf libgles2-mesa-dev ruby-full pkg-config"
 
 # Additionally required by qt5-base

diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -28,6 +28,7 @@ jobs:
       brew list gfortran || brew cask install gfortran
       brew list mono || brew install mono
       brew list yasm || brew install yasm
+      brew list gettext || brew install gettext
     displayName: 'Install brew dependencies'
   - bash: |
       sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} || 0

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -209,7 +209,9 @@ fetchTool()
 selectCXX()
 {
     if [ "x$CXX" = "x" ]; then
-        if which g++-9 >/dev/null 2>&1; then
+        if which g++-10 >/dev/null 2>&1; then
+            CXX=g++-10
+        elif which g++-9 >/dev/null 2>&1; then
             CXX=g++-9
         elif which g++-8 >/dev/null 2>&1; then
             CXX=g++-8

diff --git a/scripts/cmake/vcpkg_configure_gn.cmake b/scripts/cmake/vcpkg_configure_gn.cmake
@@ -13,7 +13,7 @@
 ## ```
 ##
 ## ## Parameters:
-## ### SOURCE_PATH (required)
+## ### SOURCE_PATH
 ## The path to the GN project.
 ##
 ## ### OPTIONS
@@ -55,4 +55,4 @@ function(vcpkg_configure_gn)
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         generate(${TARGET_TRIPLET}-rel "--args=${_vcg_OPTIONS} ${_vcg_OPTIONS_RELEASE}")
     endif()
-endfunction()
+endfunction()