* [PATCH 1/2] protobuf: Update to latest version 3.1.0
@ 2016-12-29 13:35 Ricardo Ribalda Delgado
2016-12-29 13:35 ` [PATCH 2/2] opencv: Update to version 3.2 Ricardo Ribalda Delgado
2016-12-29 16:00 ` [PATCH 1/2] protobuf: Update to latest version 3.1.0 Khem Raj
0 siblings, 2 replies; 6+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-29 13:35 UTC (permalink / raw)
To: openembedded-devel, martin.jansa, raj.khem
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
.../protobuf/{protobuf_2.6.1.bb => protobuf_3.1.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-devtools/protobuf/{protobuf_2.6.1.bb => protobuf_3.1.0.bb} (83%)
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
similarity index 83%
rename from meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
index 7b8f62986a41..18210b1e5c8f 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
@@ -12,11 +12,11 @@ DEPENDS = "zlib"
RDEPENDS_${PN}-compiler = "${PN}"
RDEPENDS_${PN}-dev += "${PN}-compiler"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=af6809583bfde9a31595a58bb4a24514"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095"
-SRCREV = "bba83652e1be610bdb7ee1566ad18346d98b843c"
+SRCREV = "a428e42072765993ff674fda72863c9f1aa2d268"
-PV = "2.6.1+git${SRCPV}"
+PV = "3.1.0+git${SRCPV}"
SRC_URI = "git://github.com/google/protobuf.git"
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] opencv: Update to version 3.2
2016-12-29 13:35 [PATCH 1/2] protobuf: Update to latest version 3.1.0 Ricardo Ribalda Delgado
@ 2016-12-29 13:35 ` Ricardo Ribalda Delgado
2017-01-19 11:45 ` Martin Jansa
2016-12-29 16:00 ` [PATCH 1/2] protobuf: Update to latest version 3.1.0 Khem Raj
1 sibling, 1 reply; 6+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-12-29 13:35 UTC (permalink / raw)
To: openembedded-devel, martin.jansa, raj.khem
-Only enable protobuf as dependency if dnn module is enabled
-Download manually xfeatures from 3rd party repo
-Remove uneeded fixgcc60patch
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 2 +-
.../recipes-support/opencv/opencv/fixgcc60.patch | 30 ----------------------
.../opencv/opencv/uselocalxfeatures.patch | 12 +++++++++
.../opencv/opencv/useoeprotobuf.patch | 13 ++++++++++
.../opencv/{opencv_3.1.bb => opencv_3.2.bb} | 27 +++++++++++--------
5 files changed, 43 insertions(+), 41 deletions(-)
delete mode 100644 meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
create mode 100644 meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
create mode 100644 meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
rename meta-oe/recipes-support/opencv/{opencv_3.1.bb => opencv_3.2.bb} (87%)
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
index d568018b8d91..1077d05be5c6 100644
--- a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
+++ b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
@@ -17,7 +17,7 @@ index a6016dbe10bc..af4062c8e95e 100644
endif()
+ if(NOT DEFINED OPENCV_ICV_PATH)
- set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack")
+ set(OPENCV_ICV_UNPACK_PATH "${CMAKE_BINARY_DIR}/3rdparty/ippicv")
set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}")
+ endif()
diff --git a/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch b/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
deleted file mode 100644
index 5d0bf97cab63..000000000000
--- a/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
-index 28ccc1c6be4f..b0e1cbf77287 100644
---- a/cmake/OpenCVPCHSupport.cmake
-+++ b/cmake/OpenCVPCHSupport.cmake
-@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE gcc_compiler_version)
- #MESSAGE("GCC Version: ${gcc_compiler_version}")
-- IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
-+ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
- SET(PCHSupport_FOUND TRUE)
- ENDIF()
-
-diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
-index 3a23cd73633d..1fea1578b1d9 100644
---- a/cmake/OpenCVUtils.cmake
-+++ b/cmake/OpenCVUtils.cmake
-@@ -76,7 +76,11 @@ function(ocv_include_directories)
- if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
- list(APPEND __add_before "${dir}")
- else()
-- include_directories(AFTER SYSTEM "${dir}")
-+ if (gcc_compiler_version VERSION_LESS "6.0.0")
-+ include_directories(AFTER SYSTEM "${dir}")
-+ else()
-+ include_directories(AFTER "${dir}")
-+ endif()
- endif()
- endforeach()
- include_directories(BEFORE ${__add_before})
diff --git a/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
new file mode 100644
index 000000000000..a2db48d7c907
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt
+index f295bddaed66..6086e75ec37b 100644
+--- a/modules/xfeatures2d/CMakeLists.txt
++++ b/modules/xfeatures2d/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection")
+ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml
+ OPTIONAL opencv_cudaarithm WRAP python java)
+-include(cmake/download_vgg.cmake)
+-include(cmake/download_boostdesc.cmake)
++#include(cmake/download_vgg.cmake)
++#include(cmake/download_boostdesc.cmake)
diff --git a/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch b/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
new file mode 100644
index 000000000000..3068bd44d878
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
+index eb2a729cc2eb..8717736484de 100644
+--- a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
++++ b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
+@@ -24,7 +24,7 @@ if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF
+ find_package(Protobuf QUIET)
+ endif()
+
+-if(PROTOBUF_FOUND)
++if(PROTOBUF_FOUND OR (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES))
+ # nothing
+ else()
+ include(${CMAKE_CURRENT_LIST_DIR}/download_protobuf.cmake)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb
similarity index 87%
rename from meta-oe/recipes-support/opencv/opencv_3.1.bb
rename to meta-oe/recipes-support/opencv/opencv_3.2.bb
index 17805f7a017a..f18aa796f9aa 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb
@@ -3,33 +3,40 @@ HOMEPAGE = "http://opencv.org/"
SECTION = "libs"
LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544"
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
-DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native"
+DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp"
-SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
-SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
-SRCREV_party3 = "81a676001ca8075ada498583e4166079e5744668"
+SRCREV_opencv = "70bbf17b133496bd7d54d034b0f94bd869e0e810"
+SRCREV_contrib = "86342522b0eb2b16fa851c020cc4e0fef4e010b7"
+SRCREV_ipp = "81a676001ca8075ada498583e4166079e5744668"
+SRCREV_bootdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
+SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
IPP_MD5 = "808b791a6eac9ed78d32a7666804320e"
SRCREV_FORMAT = "opencv"
SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \
- git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \
+ git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=ipp;name=ipp \
+ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=bootdesc;name=bootdesc \
+ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \
file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
- file://fixgcc60.patch \
file://fixpkgconfig.patch \
+ file://uselocalxfeatures.patch;patchdir=../contrib/ \
+ file://useoeprotobuf.patch;patchdir=../contrib/ \
"
-PV = "3.1+git${SRCPV}"
+PV = "3.2+git${SRCPV}"
S = "${WORKDIR}/git"
do_unpack_extra() {
- tar xzf ${WORKDIR}/party3/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR}
+ tar xzf ${WORKDIR}/ipp/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR}
+ cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
+ cp ${WORKDIR}/bootdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
}
addtask unpack_extra after do_unpack before do_patch
@@ -52,7 +59,7 @@ PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb
PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
-PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON,-DBUILD_opencv_dnn=OFF,lapack,"
+PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DUPDATE_PROTO_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,lapack protobuf protobuf-native,"
PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog,"
PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] protobuf: Update to latest version 3.1.0
2016-12-29 13:35 [PATCH 1/2] protobuf: Update to latest version 3.1.0 Ricardo Ribalda Delgado
2016-12-29 13:35 ` [PATCH 2/2] opencv: Update to version 3.2 Ricardo Ribalda Delgado
@ 2016-12-29 16:00 ` Khem Raj
1 sibling, 0 replies; 6+ messages in thread
From: Khem Raj @ 2016-12-29 16:00 UTC (permalink / raw)
To: Ricardo Ribalda Delgado, martin.jansa, openembedded-devel
What changed in license that resulted in md5 checksums change
On Thu, Dec 29, 2016 at 5:35 AM Ricardo Ribalda Delgado <
ricardo.ribalda@gmail.com> wrote:
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>
> ---
>
> .../protobuf/{protobuf_2.6.1.bb => protobuf_3.1.0.bb} | 6
> +++---
>
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> rename meta-oe/recipes-devtools/protobuf/{protobuf_2.6.1.bb =>
> protobuf_3.1.0.bb} (83%)
>
>
>
> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
> b/meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
>
> similarity index 83%
>
> rename from meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
>
> rename to meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
>
> index 7b8f62986a41..18210b1e5c8f 100644
>
> --- a/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
>
> +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
>
> @@ -12,11 +12,11 @@ DEPENDS = "zlib"
>
> RDEPENDS_${PN}-compiler = "${PN}"
>
> RDEPENDS_${PN}-dev += "${PN}-compiler"
>
>
>
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=af6809583bfde9a31595a58bb4a24514"
>
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095"
>
>
>
> -SRCREV = "bba83652e1be610bdb7ee1566ad18346d98b843c"
>
> +SRCREV = "a428e42072765993ff674fda72863c9f1aa2d268"
>
>
>
> -PV = "2.6.1+git${SRCPV}"
>
> +PV = "3.1.0+git${SRCPV}"
>
>
>
> SRC_URI = "git://github.com/google/protobuf.git"
>
>
>
> --
>
> 2.11.0
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] opencv: Update to version 3.2
2016-12-29 13:35 ` [PATCH 2/2] opencv: Update to version 3.2 Ricardo Ribalda Delgado
@ 2017-01-19 11:45 ` Martin Jansa
2017-01-19 14:21 ` Ricardo Ribalda Delgado
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2017-01-19 11:45 UTC (permalink / raw)
To: Ricardo Ribalda Delgado; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 9353 bytes --]
On Thu, Dec 29, 2016 at 02:35:08PM +0100, Ricardo Ribalda Delgado wrote:
> -Only enable protobuf as dependency if dnn module is enabled
> -Download manually xfeatures from 3rd party repo
> -Remove uneeded fixgcc60patch
Fails to build now:
http://errors.yoctoproject.org/Errors/Details/117456/
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
> ...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 2 +-
> .../recipes-support/opencv/opencv/fixgcc60.patch | 30 ----------------------
> .../opencv/opencv/uselocalxfeatures.patch | 12 +++++++++
> .../opencv/opencv/useoeprotobuf.patch | 13 ++++++++++
> .../opencv/{opencv_3.1.bb => opencv_3.2.bb} | 27 +++++++++++--------
> 5 files changed, 43 insertions(+), 41 deletions(-)
> delete mode 100644 meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
> create mode 100644 meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
> create mode 100644 meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
> rename meta-oe/recipes-support/opencv/{opencv_3.1.bb => opencv_3.2.bb} (87%)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
> index d568018b8d91..1077d05be5c6 100644
> --- a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
> +++ b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
> @@ -17,7 +17,7 @@ index a6016dbe10bc..af4062c8e95e 100644
> endif()
>
> + if(NOT DEFINED OPENCV_ICV_PATH)
> - set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack")
> + set(OPENCV_ICV_UNPACK_PATH "${CMAKE_BINARY_DIR}/3rdparty/ippicv")
> set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}")
> + endif()
>
> diff --git a/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch b/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
> deleted file mode 100644
> index 5d0bf97cab63..000000000000
> --- a/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
> -index 28ccc1c6be4f..b0e1cbf77287 100644
> ---- a/cmake/OpenCVPCHSupport.cmake
> -+++ b/cmake/OpenCVPCHSupport.cmake
> -@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
> - ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
> - OUTPUT_VARIABLE gcc_compiler_version)
> - #MESSAGE("GCC Version: ${gcc_compiler_version}")
> -- IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
> -+ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
> - SET(PCHSupport_FOUND TRUE)
> - ENDIF()
> -
> -diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
> -index 3a23cd73633d..1fea1578b1d9 100644
> ---- a/cmake/OpenCVUtils.cmake
> -+++ b/cmake/OpenCVUtils.cmake
> -@@ -76,7 +76,11 @@ function(ocv_include_directories)
> - if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
> - list(APPEND __add_before "${dir}")
> - else()
> -- include_directories(AFTER SYSTEM "${dir}")
> -+ if (gcc_compiler_version VERSION_LESS "6.0.0")
> -+ include_directories(AFTER SYSTEM "${dir}")
> -+ else()
> -+ include_directories(AFTER "${dir}")
> -+ endif()
> - endif()
> - endforeach()
> - include_directories(BEFORE ${__add_before})
> diff --git a/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
> new file mode 100644
> index 000000000000..a2db48d7c907
> --- /dev/null
> +++ b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
> @@ -0,0 +1,12 @@
> +diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt
> +index f295bddaed66..6086e75ec37b 100644
> +--- a/modules/xfeatures2d/CMakeLists.txt
> ++++ b/modules/xfeatures2d/CMakeLists.txt
> +@@ -1,5 +1,5 @@
> + set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection")
> + ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml
> + OPTIONAL opencv_cudaarithm WRAP python java)
> +-include(cmake/download_vgg.cmake)
> +-include(cmake/download_boostdesc.cmake)
> ++#include(cmake/download_vgg.cmake)
> ++#include(cmake/download_boostdesc.cmake)
> diff --git a/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch b/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
> new file mode 100644
> index 000000000000..3068bd44d878
> --- /dev/null
> +++ b/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
> @@ -0,0 +1,13 @@
> +diff --git a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
> +index eb2a729cc2eb..8717736484de 100644
> +--- a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
> ++++ b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
> +@@ -24,7 +24,7 @@ if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF
> + find_package(Protobuf QUIET)
> + endif()
> +
> +-if(PROTOBUF_FOUND)
> ++if(PROTOBUF_FOUND OR (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES))
> + # nothing
> + else()
> + include(${CMAKE_CURRENT_LIST_DIR}/download_protobuf.cmake)
> diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb
> similarity index 87%
> rename from meta-oe/recipes-support/opencv/opencv_3.1.bb
> rename to meta-oe/recipes-support/opencv/opencv_3.2.bb
> index 17805f7a017a..f18aa796f9aa 100644
> --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb
> @@ -3,33 +3,40 @@ HOMEPAGE = "http://opencv.org/"
> SECTION = "libs"
>
> LICENSE = "BSD-3-Clause"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544"
>
> ARM_INSTRUCTION_SET_armv4 = "arm"
> ARM_INSTRUCTION_SET_armv5 = "arm"
>
> -DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native"
> +DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp"
>
> -SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
> -SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
> -SRCREV_party3 = "81a676001ca8075ada498583e4166079e5744668"
> +SRCREV_opencv = "70bbf17b133496bd7d54d034b0f94bd869e0e810"
> +SRCREV_contrib = "86342522b0eb2b16fa851c020cc4e0fef4e010b7"
> +SRCREV_ipp = "81a676001ca8075ada498583e4166079e5744668"
> +SRCREV_bootdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
> +SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
> IPP_MD5 = "808b791a6eac9ed78d32a7666804320e"
>
> SRCREV_FORMAT = "opencv"
> SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
> git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \
> - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \
> + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=ipp;name=ipp \
> + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=bootdesc;name=bootdesc \
> + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \
> file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
> - file://fixgcc60.patch \
> file://fixpkgconfig.patch \
> + file://uselocalxfeatures.patch;patchdir=../contrib/ \
> + file://useoeprotobuf.patch;patchdir=../contrib/ \
> "
>
> -PV = "3.1+git${SRCPV}"
> +PV = "3.2+git${SRCPV}"
>
> S = "${WORKDIR}/git"
>
> do_unpack_extra() {
> - tar xzf ${WORKDIR}/party3/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR}
> + tar xzf ${WORKDIR}/ipp/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR}
> + cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
> + cp ${WORKDIR}/bootdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
> }
> addtask unpack_extra after do_unpack before do_patch
>
> @@ -52,7 +59,7 @@ PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb
>
> PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
> PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
> -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON,-DBUILD_opencv_dnn=OFF,lapack,"
> +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DUPDATE_PROTO_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,lapack protobuf protobuf-native,"
> PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog,"
> PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
> PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
> --
> 2.11.0
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] opencv: Update to version 3.2
2017-01-19 11:45 ` Martin Jansa
@ 2017-01-19 14:21 ` Ricardo Ribalda Delgado
2017-01-25 14:55 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Ricardo Ribalda Delgado @ 2017-01-19 14:21 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembeded-devel
Hi Martin
On Thu, Jan 19, 2017 at 12:45 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Dec 29, 2016 at 02:35:08PM +0100, Ricardo Ribalda Delgado wrote:
>> -Only enable protobuf as dependency if dnn module is enabled
>> -Download manually xfeatures from 3rd party repo
>> -Remove uneeded fixgcc60patch
>
> Fails to build now:
> http://errors.yoctoproject.org/Errors/Details/117456/
>
I have not been able to replicate it in for qemux86. By looking at the
error message it looks like something on the freetype module. Until we
figure out what is going on, maybe we could pakcageconfig that module
and disable it by default (it is part of contrib)
What do you think?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] opencv: Update to version 3.2
2017-01-19 14:21 ` Ricardo Ribalda Delgado
@ 2017-01-25 14:55 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2017-01-25 14:55 UTC (permalink / raw)
To: Ricardo Ribalda Delgado; +Cc: openembeded-devel
[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]
On Thu, Jan 19, 2017 at 03:21:15PM +0100, Ricardo Ribalda Delgado wrote:
> Hi Martin
>
>
>
> On Thu, Jan 19, 2017 at 12:45 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Thu, Dec 29, 2016 at 02:35:08PM +0100, Ricardo Ribalda Delgado wrote:
> >> -Only enable protobuf as dependency if dnn module is enabled
> >> -Download manually xfeatures from 3rd party repo
> >> -Remove uneeded fixgcc60patch
> >
> > Fails to build now:
> > http://errors.yoctoproject.org/Errors/Details/117456/
> >
>
>
> I have not been able to replicate it in for qemux86. By looking at the
> error message it looks like something on the freetype module. Until we
> figure out what is going on, maybe we could pakcageconfig that module
> and disable it by default (it is part of contrib)
>
> What do you think?
Yes, it could also be caused by freetype upgrade in oe-core, fine with
me to disable it with packageconfig until the issue is resolved.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-25 14:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-29 13:35 [PATCH 1/2] protobuf: Update to latest version 3.1.0 Ricardo Ribalda Delgado
2016-12-29 13:35 ` [PATCH 2/2] opencv: Update to version 3.2 Ricardo Ribalda Delgado
2017-01-19 11:45 ` Martin Jansa
2017-01-19 14:21 ` Ricardo Ribalda Delgado
2017-01-25 14:55 ` Martin Jansa
2016-12-29 16:00 ` [PATCH 1/2] protobuf: Update to latest version 3.1.0 Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.