From 9b850a81497be8981a32e2c8f31c68a8dc94a696 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 13 Dec 2018 11:44:01 +0100 Subject: [OpenCV3] fix protobuf patch --- ports/opencv/0005-remove-custom-protobuf-find-package.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/opencv/0005-remove-custom-protobuf-find-package.patch b/ports/opencv/0005-remove-custom-protobuf-find-package.patch index 2944810e5..91ac137f9 100644 --- a/ports/opencv/0005-remove-custom-protobuf-find-package.patch +++ b/ports/opencv/0005-remove-custom-protobuf-find-package.patch @@ -1,11 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -633,7 +633,7 @@ include(cmake/OpenCVFindLibsGUI.cmake) +@@ -633,7 +633,10 @@ include(cmake/OpenCVFindLibsGUI.cmake) include(cmake/OpenCVFindLibsVideo.cmake) include(cmake/OpenCVFindLibsPerf.cmake) include(cmake/OpenCVFindLAPACK.cmake) -include(cmake/OpenCVFindProtobuf.cmake) +find_package(protobuf) ++if(Protobuf_LIBRARIES) ++ set(HAVE_PROTOBUF TRUE) ++endif() # ---------------------------------------------------------------------------- # Detect other 3rd-party libraries/tools @@ -16,7 +19,7 @@ set(include_dirs ${fw_inc}) set(sources_options "") -set(libs libprotobuf ${LAPACK_LIBRARIES}) -+set(libs protobuf ${LAPACK_LIBRARIES}) ++set(libs protobuf::libprotobuf ${LAPACK_LIBRARIES}) if(OPENCV_DNN_OPENCL AND HAVE_OPENCL) list(APPEND include_dirs ${OPENCL_INCLUDE_DIRS}) else() -- cgit v1.2.3 From 6d15819fdde0d52ce29c6922d3615ab22a9fbf33 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 13 Dec 2018 14:13:05 +0100 Subject: [opencv] bump version --- ports/opencv/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 5f012d80e..41e73b195 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-4 +Version: 3.4.3-5 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann -- cgit v1.2.3