diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-08-12 18:22:30 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-08-12 09:22:30 -0700 |
| commit | 4fb51523e91e7a98150e3810241b83757a8d2706 (patch) | |
| tree | edcacc3aef4c1559857a110d4d162058abb955a0 /ports/zxing-cpp | |
| parent | fffcd0a5ae21d0b7ae0c8cdbd7bd1210f5a29031 (diff) | |
| download | vcpkg-4fb51523e91e7a98150e3810241b83757a8d2706.tar.gz vcpkg-4fb51523e91e7a98150e3810241b83757a8d2706.zip | |
[OpenCV] Update to v4.1.1 (#5169)
* [OpenCV] update to v4
* [OpenCV] update to v4.1
* [OpenCV] merge #6901 and #6812
* [OpenCV] port patches to v4.1
* [OpenCV] fix naming
* [OpenCV] fix regression with static linkage
* [OpenCV] fix linking to optional feature dependencies in static mode
* fix ffmpeg on some architectures
* trigger rebuild of regressions on macOS
* [zxing-cpp] fix opencv 4.1 compat
* [ogre] improve patching for static builds
* [OpenCV] fixes for extra features
* [OpenCV] drastically reduce patchset
* [OpenCV] fix regression on linux
* [OpenCV] fix regression on Windows
* [qt5] depends on qt5-activeqt only on windows
* update to v4.1.1
* [OpenCV] additional fixes for 4.1.1
* [OpenCV] fix Eigen3 feature integration
* [opencv] Fix compilation in UWP
* [opencv] Fix merge conflicts
* [ffmpeg] fix cmake module for osx
* [OpenCV] add pre-caching of optflow cuda package
* [gdcm] properly fix #6863 instead of wrong #6901
* [OpenCV] fix OpenMP feature
* [opencv] Add missing GetModuleHandle() call guard for UWP
* [freeimage] Do not depend on libwebp[all] on UWP
* [opencv] Set app container bit for UWP
* [zxing-cpp] Fail with explicit message in UWP
* [pthreads4w] fix target creation, missing dlls
* [pthreads4w] bump CONTROL
* [opencv,zxing-cpp] Fix OpenCV Video IO module
* [zxing-cpp] Revert unnecessary changes
* [opencv] Feature halide
* Fix regression in UWP
* [ffmpeg] remove unnecessary patch pointing to old OpenCV version
* [opencv] remove versioning from windows dll filenames
* [opencv] Move port to opencv4
* [opencv,opencv4] Make meta-package install OpenCV 4.1
* [opencv3] Rename old port opencv->opencv3
* Add failure messages when another OpenCV is already installed
Diffstat (limited to 'ports/zxing-cpp')
| -rw-r--r-- | ports/zxing-cpp/0001-opencv4-compat.patch | 15 | ||||
| -rw-r--r-- | ports/zxing-cpp/CONTROL | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/ports/zxing-cpp/0001-opencv4-compat.patch b/ports/zxing-cpp/0001-opencv4-compat.patch index 51cec5387..76ad1f4a0 100644 --- a/ports/zxing-cpp/0001-opencv4-compat.patch +++ b/ports/zxing-cpp/0001-opencv4-compat.patch @@ -1,5 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ccb2ba9..5ade734 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0) + + project(zxing) +- ++set(CMAKE_CXX_STANDARD 11) + option(BUILD_TESTING "Enable generation of test targets" OFF) + + set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) diff --git a/opencv-cli/src/main.cpp b/opencv-cli/src/main.cpp -index 63b6fd3..430dda6 100755 +index 63b6fd3..5900c4f 100644 --- a/opencv-cli/src/main.cpp +++ b/opencv-cli/src/main.cpp @@ -135,14 +135,14 @@ int main(int argc, char** argv) { diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL index c97ad1734..16343782d 100644 --- a/ports/zxing-cpp/CONTROL +++ b/ports/zxing-cpp/CONTROL @@ -1,4 +1,4 @@ Source: zxing-cpp -Version: 3.3.3-5 +Version: 3.3.3-6 Build-Depends: opencv Description: Barcode detection and decoding library. |