aboutsummaryrefslogtreecommitdiff
path: root/package/opencv3/opencv3.mk
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next'Gravatar Peter Korsgaard2019-06-021-1/+1
|\ | | | | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| * package/opencv3: bump to version 3.4.6Gravatar Fabrice Fontaine2019-05-311-1/+1
| | | | | | | | | | | | | | | | | | - Remove patch (already in version) - Update hash of license file (update in year: https://github.com/opencv/opencv/commit/14d943f588474cee3cdb8f91e8f7fb7e8af7ad8b) Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* | package/opencv3: fix build due to gcc bug 68485Gravatar Fabrice Fontaine2019-05-311-0/+4
|/ | | | | | | | | | | | | | | With Microblaze Gcc version <= 9.x the build fails due to gcc bug 68485: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485. The bug show up when building opencv3 with optimization but not when building with -O0. To work around this, if BR2_TOOLCHAIN_HAS_GCC_BUG_68458=y, we force using -O0. Fixes: - http://autobuild.buildroot.org/results/c78eac84d1c5a6702e7759cd5364da1c3e399b4b Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package: use BR2_TOOLCHAIN_HAS_OPENMPGravatar Ed Blake2019-03-261-1/+1
| | | | | | | | | | | | Switch from using BR2_GCC_ENABLE_OPENMP to BR2_TOOLCHAIN_HAS_OPENMP to determine OpenMP support in the following packages: fftw flann opencv3 Signed-off-by: Ed Blake <ed.blake@sondrel.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/opencv3: remove qt backend optionGravatar Peter Korsgaard2019-02-061-9/+2
| | | | | | | | The qt backend option uses the obsolete qt4 package, which we are about to remove, so remove the qt backend option as well. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/opencv3: bump version to 3.4.3Gravatar Bernd Kuhls2018-09-301-1/+1
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/opencv3: fix build with gcc bug 64735Gravatar Bernd Kuhls2018-08-051-1/+9
| | | | | | | | | | | OpenCV3 allows to disable the usage of std::exception_ptr: https://github.com/opencv/opencv/issues/11878#issuecomment-402099255 Fixes http://autobuild.buildroot.net/results/5ca/5ca221792c72c0a19f8b0e8303c0603d28f3c48e/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/opencv3: bump version to 3.4.2Gravatar Bernd Kuhls2018-07-311-1/+1
| | | | | | | | Updated license hash after copyright year update: https://github.com/opencv/opencv/commit/e6ed853905744018d9d570fa49e3b9e33b3c6ea6#diff-9879d6db96fd29134fc802214163b95a Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/opencv3: fix aarch64 buildGravatar Bernd Kuhls2018-07-311-2/+7
| | | | | | | | | | | | | | | | | | | | Commit a17402e42d8c996af239cfdb536e74188d6c6245 ("opencv3: conditionally enable NEON and VFPv3 optimizations") broke the build on AArch64, because the VFPv3 optimizations are not supported by OpenCV on this architecture: https://github.com/opencv/opencv/blob/3.4/cmake/OpenCVCompilerOptimizations.cmake#L275 However BR2_ARM_CPU_HAS_VFPV3 is always true on AArch64, causing this build failure for every AArch64 build of OpenCV 3. This commit fixes that by enabling VFPV3 only on ARM, and not on AArch64. Fixes: http://autobuild.buildroot.net/results/d38fb092cffe086f93b469d1181da77fba0994bd/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* opencv3: conditionally enable NEON and VFPv3 optimizationsGravatar Mathieu Maret2018-06-071-1/+3
| | | | | Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* opencv3: fix Python module build for Python 3.xGravatar Sasha Shyrokov2018-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the OpenCV3 Python support is enabled with Python 3.x, it builds properly, and the resulting .so file is built for the target architecture, but its name is wrong: output/target/usr/lib/python3.6/site-packages/cv2.cpython-36m-x86_64-linux-gnu.so This prevents Python 3.x from importing the module: >>> import cv2 Traceback (most recent call last): File "<stdin>", line 1, in <module> ModuleNotFoundError: No module named 'cv2' In order to fix this, we simply need to pass PKG_PYTHON_DISTUTILS_ENV in the environment. The Python module then gets named: output/target/usr/lib/python3.6/site-packages/cv2.cpython-36m-arm-linux-gnueabi.so And can be imported properly: >>> import cv2 >>> This solution was suggested by Arnout Vandecappelle in https://stackoverflow.com/questions/49059035/buildroot-opencv3-python-package-builds-for-the-wrong-target. With Python 2.x, the module is named just cv2.so so this problem isn't visible. However, for consistency, we also pass PKG_PYTHON_DISTUTILS_ENV when building against Python 2.x, by putting the OPENCV3_CONF_ENV assignment inside the BR2_PACKAGE_OPENCV3_LIB_PYTHON condition, but outside the BR2_PACKAGE_PYTHON3/BR2_PACKAGE_PYTHON condition. Signed-off-by: Sasha Shyrokov <alexander-shyrokov@idexx.com> [Thomas: extend the commit log, apply the solution to Python 2.x.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* opencv3: enable pthreads parallel for loopsGravatar bradford barr2017-10-121-1/+0
| | | | | | | | | | The WITH_PTHREADS_PF option was errantly categorized as a Windows only option. WITH_PTHREADS_PF actually enables a parallelization framework that utilizes pthreads to optimize some inner for loops of different OpenCV operations. This optimization is available on any platform that has pthreads. Signed-off-by: bradford barr <bradford@density.io> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv3: bump version to 3.3.0Gravatar Bernd Kuhls2017-09-241-1/+2
| | | | | | | | | | | Removed patch applied upstream: https://github.com/opencv/opencv/commit/e16227b53cabab1caa4b7aba8ff59a630528348f In-source-builds are not allowed anymore: https://github.com/opencv/opencv/commit/a07d8a89b6b38b1a1f35ac808955dab97985becb Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/binGravatar Arnout Vandecappelle2017-07-051-2/+2
| | | | | | | | | | | Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv3: disable explicitly lapack supportGravatar Romain Naour2017-05-141-0/+1
| | | | | | | | | | | | lapack support is enabled by default but the opencv3.mk doesn't handle this dependency yet. Fixes: http://autobuild.buildroot.net/results/c8a/c8a25af38c405594722b44aef34e5e4c549639db Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv3: fix build for x86_64 targetGravatar Samuel Martin2017-05-111-15/+1
| | | | | | | | | | | | | | | | This change backports a fix from upstream fixing missing symbols due to wrong compiler optimization flags. On Buildroot side, also remove deprecated options passed on the configure command. Fixes: http://autobuild.buildroot.net/results/af950c6172a578c4eeeb9440b6990ceb48263fa6/ http://autobuild.buildroot.net/results/e8832302cd4f30cec076f67965f6aacbaca5b955/ Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* opencv3: bump version to 3.2.0Gravatar Vicente Olivert Riera2017-04-301-2/+2
| | | | | | | Also switch to the official GitHub. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot, package: use SPDX short identifier for BSD-3cGravatar Rahul Bedarkar2017-04-011-1/+1
| | | | | | | | | | | We want to use SPDX identifier for license string as much as possible. SPDX short identifier for BSD-3c is BSD-3-Clause. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/BSD-3c/BSD-3-Clause/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv3: fix CMAKE_CXX_FLAGSGravatar Max Filippov2016-10-221-1/+1
| | | | | | | | | | | | | | | | | | | The commit 4904c4c "package/opencv3: use BR2_TOOLCHAIN_HAS_LIBATOMIC" overrides CMAKE_CXX_FLAGS with the single -latomic, losing all ABI CFLAGS that are passed there by default. This breaks build on xtensa where ABI CFLAGS contain important code generation options. Append $(TARGET_CXXFLAGS) to CMAKE_CXX_FLAGS along with -latomic. Fixes: http://autobuild.buildroot.net/results/7f1c96abd8fbb5b358a07100ab623316e9bb9dcd http://autobuild.buildroot.net/results/e0c93d0f6d1da0d62d4dbba211a275bfe75e9645 http://autobuild.buildroot.net/results/53e7e4b4b6a7b48b8012799d7507f7594dbf01b2 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv3: use BR2_TOOLCHAIN_HAS_LIBATOMICGravatar Bernd Kuhls2016-09-061-0/+5
| | | | | | | | | It uses __atomic_fetch_add_4 so libatomic must be pulled in if necessary. Fixes http://autobuild.buildroot.net/results/652/6521223b426c3cb4dfefab27bc6021900db6910e/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv3: bump version to 3.1.0Gravatar Bernd Kuhls2016-03-291-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed patches applied upstream. This version bump is needed to provide support for ffmpeg 3.0: https://github.com/Itseez/opencv/commit/278747ba458c9097aa72bf664c7a8df96d3a56fa Use BR2_PACKAGE_FFMPEG_AVRESAMPLE by default because OpenCV can use it after https://github.com/Itseez/opencv/commit/2b2e3ee93c6788b892b084cc04d0ead5ab75c197 Before this patch: -- FFMPEG: YES -- codec: YES (ver 57.24.103) -- format: YES (ver 57.25.100) -- util: YES (ver 55.17.103) -- swscale: YES (ver 4.0.100) -- resample: NO After this patch: -- FFMPEG: YES -- codec: YES (ver 57.24.103) -- format: YES (ver 57.25.100) -- util: YES (ver 55.17.103) -- swscale: YES (ver 4.0.100) -- resample: YES (ver 3.0.0) Disabled new options: WITH_MATLAB, WITH_VA, WITH_VA_INTEL, DOWNLOAD_EXTERNAL_TEST_DATA Removed obsolete option BUILD_opencv_hal Removed options WITH_OPENGL & WITH_OPENMP from the "Disabled features" block because they have their own ifeq-block later on. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package: rename opencv -> opencv3Gravatar Samuel Martin2015-08-251-0/+363
Since there is a couple of API breaks between OpenCV 2.4 and 3.0, two distinct packages mutually exclusive will be integrated in the package tree. So, this change prepares the re-introduction of the OpenCV-2.4 package by renaming the current opencv package (which provides OpenCV-3.0) to opencv3. Reverse dependencies (vlc) is fixed to use the new symbols. Cc: Jonathan Ben Avraham <yba@tkos.co.il> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> [yann.morin.1998@free.fr: - fix missed usage in vlc.mk - don't remove legacy OpenCV symbols - fix 'endif' comment - slightly reword commit log (reverse deps) ] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>