package/opencv3: bump version to 3.4.2
PATCH 1/2 package/opencv3: bump version to 3.4.2
Updated license hash after copyright year update:
https://github.com/opencv/opencv/commit/e6ed853905744018d9d570fa49e3b9e33b3c6ea6#diff-9879d6db96fd29134fc802214163b95a
--- package/opencv3/opencv3.hash | 5 ++--- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
package/opencv3/opencv3.hash +2 -3
@@ -1,4 +1,3 @@ # Locally calculated -sha256 8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6 opencv3-3.3.0.tar.gz -# License files, locally calculated -sha256 e974db937899a2505f0eb43ece9d2f2eb36e8580ad88785e3ffac0d697ebaf5d LICENSE +sha256 81dbd5e7e9f8a4c936b94629bf4765745942a1d634ae38ec08bc57b73b28ffc5 opencv3-3.4.2.tar.gz +sha256 fea311907cb6271b05ff5843b238e0f2edb6f204a3432975211030d20704b321 LICENSE
package/opencv3/opencv3.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.3.0 +OPENCV3_VERSION = 3.4.2 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause
Signature · 1 line
2.18.0
PATCH 2/2 package/opencv3: fix aarch64 build
enabled CMake option ENABLE_VFPV3 in OpenCV3 for all aarch64 CPUs because for them BR2_ARM_CPU_HAS_VFPV3 is always true:
BR2_ARM_CPU_HAS_FP_ARMV8 selects BR2_ARM_CPU_HAS_VFPV4 which in turn selects BR2_ARM_CPU_HAS_VFPV3.
OpenCV3 however supports vfpv3 only on !aarch64:
https://github.com/opencv/opencv/blob/3.4/cmake/OpenCVCompilerOptimizations.cmake#L275
Fixes
http://autobuild.buildroot.net/results/d38/d38fb092cffe086f93b469d1181da77fba0994bd/
--- package/opencv3/opencv3.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
package/opencv3/opencv3.mk +7 -2
@@ -100,8 +100,13 @@ OPENCV3_CONF_OPTS += \ # adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot. OPENCV3_CONF_OPTS += \ -DENABLE_POWERPC=OFF \ - -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) \ - -DENABLE_VFPV3=$(if $(BR2_ARM_CPU_HAS_VFPV3),ON,OFF) + -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) + +ifeq ($(BR2_ARCH_IS_64):$(BR2_ARM_CPU_HAS_VFPV3),:y) +OPENCV3_CONF_OPTS += -DENABLE_VFPV3=ON +else +OPENCV3_CONF_OPTS += -DENABLE_VFPV3=OFF +endif # Cuda stuff OPENCV3_CONF_OPTS += \
Signature · 1 line
2.18.0
PATCH 2/2 package/opencv3: fix aarch64 build
Hello,
Quoted 8 lines · Bernd Kuhls
enabled CMake option
ENABLE_VFPV3in OpenCV3 for all aarch64 CPUs because for themBR2_ARM_CPU_HAS_VFPV3is always true:
BR2_ARM_CPU_HAS_FP_ARMV8selectsBR2_ARM_CPU_HAS_VFPV4which in turn selectsBR2_ARM_CPU_HAS_VFPV3.
Quoted 7 lines
OpenCV3 however supports vfpv3 only on !aarch64:
https://github.com/opencv/opencv/blob/3.4/cmake/OpenCVCompilerOptimizations.cmake#L275Fixes
http://autobuild.buildroot.net/results/d38/d38fb092cffe086f93b469d1181da77fba0994bd/Signed-off-by Bernd Kuhls <[email protected]>
So this fix is already needed with the currently packaged 3.3.0 version of OpenCV ?
If so, why is this fix patch coming *after* the version bump in the series ?
Both 2018.05.x and 2018.02.x are using 3.3.0, so I guess they are affected as well. However, this failure doesn't appear for 2018.02.x and 2018.05.x in http://autobuild.buildroot.net/?reason=opencv3%
Do you have an explanation for this ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 package/opencv3: fix aarch64 build
Hi Thomas,
Am Mon, 30 Jul 2018 23:50:01 +0200 schrieb Thomas Petazzoni:
Quoted 2 lines
So this fix is already needed with the currently packaged 3.3.0 version of OpenCV ?
yes: http://autobuild.buildroot.net/?reason=opencv3-3.3.0
Please note that the aarch64 build errors started on June 9th, 2018.
Quoted 2 lines
If so, why is this fix patch coming *after* the version bump in the series ?
OpenCV 3.4.2 is also affected by the problem, because of that I think that patch order does not matter. My first try to fix the build error was to bump package version, seeing that this did not fix the problem I investigated further and found the VFPV3 problem.
Quoted 5 lines
Both 2018.05.x and 2018.02.x are using 3.3.0, so I guess they are affected as well. However, this failure doesn't appear for 2018.02.x and 2018.05.x in http://autobuild.buildroot.net/?reason=opencv3%
Do you have an explanation for this ?
The bug was introduced by https://git.buildroot.net/buildroot/commit/
package/opencv3?id=a17402e42d8c996af239cfdb536e74188d6c6245 on June 7th, 2018. This patch was only committed to the master branch.
Regards, Bernd
PATCH 2/2 package/opencv3: fix aarch64 build
Hello,
Quoted 7 lines · Bernd Kuhls
Am Mon, 30 Jul 2018 23:50:01 +0200 schrieb Thomas Petazzoni:
Quoted 2 lines
So this fix is already needed with the currently packaged 3.3.0 version of OpenCV ?
Quoted 7 lines
Please note that the aarch64 build errors started on June 9th, 2018.
Quoted 2 lines
If so, why is this fix patch coming *after* the version bump in the series ?
OpenCV 3.4.2 is also affected by the problem, because of that I think that patch order does not matter.
The patch order does matter in this case. Having the fix first makes it clear that it fixes the problem with the existing 3.3.0 version, and that the bump is unrelated.
Quoted 3 lines
My first try to fix the build error was
to bump package version, seeing that this did not fix the problem I investigated further and found the VFPV3 problem.
Right, but then you can use git rebase to invert the two patches :-)
Quoted 9 lines
Quoted 5 lines
Both 2018.05.x and 2018.02.x are using 3.3.0, so I guess they are affected as well. However, this failure doesn't appear for 2018.02.x and 2018.05.x in http://autobuild.buildroot.net/?reason=opencv3%
Do you have an explanation for this ?
The bug was introduced by https://git.buildroot.net/buildroot/commit/
package/opencv3?id=a17402e42d8c996af239cfdb536e74188d6c6245 on June 7th, 2018. This patch was only committed to the master branch.
Right, indeed. Thanks for the explanation!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 2/2 package/opencv3: fix aarch64 build
In reply to Bernd KuhlsHello,
Quoted 11 lines · Bernd Kuhls
enabled CMake option
ENABLE_VFPV3in OpenCV3 for all aarch64 CPUs because for themBR2_ARM_CPU_HAS_VFPV3is always true:
BR2_ARM_CPU_HAS_FP_ARMV8selectsBR2_ARM_CPU_HAS_VFPV4which in turn selectsBR2_ARM_CPU_HAS_VFPV3.OpenCV3 however supports vfpv3 only on !aarch64:
https://github.com/opencv/opencv/blob/3.4/cmake/OpenCVCompilerOptimizations.cmake#L275
Quoted 7 lines
Fixes
http://autobuild.buildroot.net/results/d38/d38fb092cffe086f93b469d1181da77fba0994bd/Signed-off-by Bernd Kuhls <[email protected]>--- package/opencv3/opencv3.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Applied to master with an improved commit log. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/2 package/opencv3: bump version to 3.4.2
In reply to Bernd KuhlsHello,
Quoted 8 lines · Bernd Kuhls
Updated license hash after copyright year update:
https://github.com/opencv/opencv/commit/e6ed853905744018d9d570fa49e3b9e33b3c6ea6#diff-9879d6db96fd29134fc802214163b95aSigned-off-by Bernd Kuhls <[email protected]>--- package/opencv3/opencv3.hash | 5 ++--- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com