summaryrefslogtreecommitdiffstats
path: root/package/opencv
Commit message (Collapse)AuthorAgeFilesLines
* package/opencv: remove qt backend optionPeter Korsgaard2019-02-062-19/+1
| | | | | | | | 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/opencv: bump version to 2.4.13.7Bernd Kuhls2018-07-313-34/+2
| | | | | | | Removed patch applied upstream. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* package/*/Config.in: fix consecutive lines check-package warningsThomas Petazzoni2017-12-181-1/+0
| | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/*/Config.in: fix help text check-package warningsThomas Petazzoni2017-12-181-5/+6
| | | | | | | | | | | | | This commit fixes the warnings reported by check-package on the help text of all package Config.in files, related to the formatting of the help text: should start with a tab, then 2 spaces, then at most 62 characters. The vast majority of warnings fixed were caused by too long lines. A few warnings were related to spaces being used instead of a tab to indent the help text. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* gstreamer: needs dynamic librariesArnout Vandecappelle (Essensium/Mind)2017-11-051-2/+5
| | | | | | | | | | | | | | | | | Fixes: http://autobuild.buildroot.net/results/49d/49dcec0bd2f3bb78c18675a9fa5c9c53cc183fd2/ g_cclosure_marshal_VOID__VOID is defined both in libgobject.a and libgstreamer.a. It is probably possible to fix this, but gstreamer0.10 has been deprecated for a long time now and is anyway unlikely to be used in static-only situations, so let's just require dynamic linking. Propagate to the reverse dependencies. opencv3 already did depend on dynamic libs. [Peter: add autobuild reference] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/opencv: add hash for license fileSamuel Martin2017-11-021-0/+1
| | | | | Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: fix build failureSamuel Martin2017-11-021-0/+32
| | | | | | | | | | | | Backport fix from upstream. Fixes: http://autobuild.buildroot.net/results/b27d324331f6e351e95dd4742f4d0a50af60c590 http://autobuild.buildroot.net/results/44ed0be0bd94028b7b37e7bf21233adc1753d94b Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: bump version to 2.4.13.3Bernd Kuhls2017-09-224-63/+3
| | | | | | | | | | | | | | | | | | | Removed 0002-avoid-sysctl_h.patch, applied upstream: https://github.com/opencv/opencv/commit/61936eb1a43e732e4bc1c75b63e6cab85c6f9e94#diff-f3b4393df86251f502cee9ba1da034a5 This bump includes https://github.com/opencv/opencv/commit/70489b1e2232ead1701519e35d151670b74c3f70#diff-9076fba682f6d51a018b6de8648e1cdb which fixes ffmpeg static linking http://autobuild.buildroot.net/results/544/5444b0c5556a42923e3fcdae782811a805e51b1f/ http://autobuild.buildroot.net/results/44d/44d53e4c5d4570507c7e8856fb9dd0a477dcdf63/ In-source-builds are not allowed anymore: https://github.com/opencv/opencv/commit/777a0080cbdb98761853519b3f45136727a855c2 Re-numbered remaining patches. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* opencv: enable NEON optimizations if possibleAndre Renaud2017-07-091-1/+2
| | | | | Signed-off-by: Andre Renaud <andre@ignavus.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: fix build with old glibc versionsBernd Kuhls2017-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | Prior to glibc 2.18, definitions like SIZE_MAX or INT_FAST32_MAX from <stdint.h> were only made available for C code, or in C++ if __STDC_LIMIT_MACROS was defined. The code from jasper uses such definitions, without defining __STDC_LIMIT_MACROS. Unfortunately, defining __STDC_LIMIT_MACROS in the jasper headers doesn't work, since <stdint.h> has already been included before, at a point where __STDC_LIMIT_MACROS was not defined. So to solve this problem, we simply pass -D__STDC_LIMIT_MACROS in CXXFLAGS when building opencv with jasper support. This patch uses the same solution used for libraw: https://git.buildroot.net/buildroot/commit/package/libraw?id=d246cf5fd01bb0d20a0e64194ffed514ea8dd0aa Fixes: http://autobuild.buildroot.net/results/095/095f7574afdb633c59a625cd063de03644b6d3a7/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Revert "toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405"Romain Naour2017-05-071-7/+0
| | | | | | | | | | | An autobuilder exception has been added to avoid testing qt gui module with the CodeSourcery NiosII toolchain. This allow to remove the BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 symbol. This reverts commit 5dce3c05b5ea38539f6ee6efc24c13db936260dc. Signed-off-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: bump version to 2.4.13.2Bernd Kuhls2017-05-024-39/+2
| | | | | | | | | | Removed patch applied upstream: https://github.com/opencv/opencv/commit/c7045184ce220a04796d8e9072ac42d2d362dc71 Renumbered remaining patches. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/o*/Config.in: fix ordering of statementsAdam Duskett2017-05-011-2/+2
| | | | | | | | | | | | | The check-package script when ran gives warnings on ordering issues on all of these Config files. This patch cleans up all warnings related to the ordering in the Config files for packages starting with the letter o in the package directory. The appropriate ordering is: type, default, depends on, select, help See http://nightly.buildroot.org/#_config_files for more information. Signed-off-by: Adam Duskett <Adamduskett@outlook.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot, package: use SPDX short identifier for BSD-3cRahul 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/opencv: convert diff patch to git patchSamuel Martin2016-11-011-52/+82
| | | | | Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: update sysctl patchSamuel Martin2016-11-011-9/+39
| | | | | | | | Fixes: http://autobuild.buildroot.net/results/845/845f5e906fda3e87a2fc439a62baede44842283b/ Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: Do not add libdl to LINKER_LIBS for static buildsBernd Kuhls2016-10-261-0/+39
| | | | | | | | Fixes http://autobuild.buildroot.net/results/765/7657e01481995a4f0d725467e935a83928a59a04/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: Fix compiling VFP assembler codeBernd Kuhls2016-09-061-0/+37
| | | | | | | | | Fixes build errors in ffmpeg http://autobuild.buildroot.net/results/c32/c32a21240a9933796ee850349a62ff3c2314f25c/ http://autobuild.buildroot.net/results/22a/22a9769d83d2a398bb6b264d342b2077c41c9cc5/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: bump to version 2.4.13Bernd Kuhls2016-06-265-640/+2
| | | | | | | | Removed 0001-ffmpeg30.patch after being applied upstream. Renumbered remaining patches. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* opencv: add .hash filePeter Korsgaard2016-06-151-0/+2
| | | | | | | | | | | Fixes: http://autobuild.buildroot.org/results/e06/e06f0e6edd5d8013ff5e12e2b7253e99a1d1fa2e/ Similar to jquery-keyboard, it seems the opencv tarball on the autobuilder is corrupt. Fix it by adding a .hash file so it falls back to our s.b.o mirror. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* ffmpeg: add BR2_PACKAGE_FFMPEG_ARCH_SUPPORTSVicente Olivert Riera2016-05-261-1/+1
| | | | | | Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: gpu module depends on !BR2_STATIC_LIBSSamuel Martin2016-05-151-0/+12
| | | | | | | | | | | | | | | GPU support and related features (GL and CL) are detected and loaded at runtime, so it requires libdl which is only available on !BR2_STATIC_LIBS builds. Because the OpenCV tests sets use these modules, they also requires libdl, so they cannot be built when BR2_STATIC_LIBS is enable. Fixes: http://autobuild.buildroot.net/results/570/57007a8d22d20b2fc5cd64154f5ec674b0842afa/ Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: disable toolchains affected by PR19405Romain Naour2016-05-151-0/+3
| | | | | | | | | | | | opencv libphoto fail to link with the following error: nios2-linux-gnu/bin/ld: BFD (Sourcery CodeBench Lite 2015.11-130) 2.25.51 assertion fail binutils-src-2015.11-130-nios2-linux-gnu-i686-pc-linux-gnu/bfd/elf32-nios2.c:1908 Fixes: http://autobuild.buildroot.net/results/fd0cc1cb09d07be94770d984efb28eea7c6f25b7 Signed-off-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* opencv: fix compile issuesWaldemar Brodkorb2016-05-012-0/+260
| | | | | | | | | | | | | | The first patch from Debian fixes following autobuild failure: http://autobuild.buildroot.net/results/eda5c6c43da40a342e0f545a348d2f865eb5ccf2/ Tested with ARM build without a regression. The second patch fixes musl arm autobuild failure: http://autobuild.buildroot.net/results/6a397de789c809984b851a304078e26b2ac58974/ Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: define modules inter-dependenciesSamuel Martin2016-04-211-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | OpenCV allows to enable/disable the selection of modules (a.k.a. opencv libraries). These modules depend one on the others; these dependencies are already handled by the build-system (CMake). However, the way we handled them in Buildroot was not really clean. For each opencv module, there is a kconfig option, but we forced the corresponding CMake config option without checking for the modules' dependencies. For further details about the issues this situation was causing, refer to this discussion [1]. This patch replicates the modules' dependency relations in the Config.in, so that the selection of the user will actually be built. This changes completes this work [2]. [1] http://lists.busybox.net/pipermail/buildroot/2016-April/159017.html [2] https://git.buildroot.org/buildroot/commit/?id=3bd5025038a9ecfb2c19a2450a68ae3b0888b440 Signed-off-by: Samuel Martin <s.martin49@gmail.com> Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405Romain Naour2016-04-201-0/+4
| | | | | | | | | | | | | | | See bug report https://sourceware.org/bugzilla/show_bug.cgi?id=19405 Fixes: http://autobuild.buildroot.net/results/ee562524c5b12191e584ceae89006c5a5103e700 Signed-off-by: Romain Naour <romain.naour@gmail.com> [Thomas: - rename BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 to BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - propagate to the qwt package, which is now selecting BR2_PACKAGE_QT_GUI_MODULE.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add inter-module dependenciesBernd Kuhls2016-04-191-0/+15
| | | | | | | | | | | As stated by Samuel the opencv2 package lacks inter-module dependencies: http://lists.busybox.net/pipermail/buildroot/2016-April/158902.html This patch adds the necessary code for freeswitch's mod_cv to compile. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: bump version to 2.4.12.3Bernd Kuhls2016-03-295-246/+639
| | | | | | | | | | | | Removed patches applied upstream: https://github.com/Itseez/opencv/commit/ea50be0529c248961e1b66293f8a9e4b807294a6 https://github.com/Itseez/opencv/commit/2e393ab83362743ba1825ad4b31d4a2925c606b4 https://github.com/Itseez/opencv/commit/eceada586bbf18fc267e437522ec4f1f23ddc656 Added upstream patch to support ffmpeg 3.0. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* cairo, harfbuzz: rework atomic dependenciesThomas Petazzoni2016-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit handles the reverse dependency tree of cairo in terms of atomic dependencies. There are two main changes: - cairo in fact no longer needs atomic operations. It can perfectly build without any __sync built-in, as was tested using an ARC toolchain without atomics, and a SPARC toolchain. Optionally, Cairo can use the __atomic builtins provided by gcc >= 4.7, so support for this is added as well. Thanks to this change, the BR2_ARCH_HAS_ATOMICS dependency is removed from cairo and all its reverse dependencies. - harfbuzz does require the __sync built-in for 4 bytes integers, so we add a dependency on BR2_TOOLCHAIN_HAS_SYNC_4 to harfbuzz and all its reverse dependency, the main one being the pango package. Due to this, the vast majority of gtk-related packages are moved to a dependency on BR2_ARCH_HAS_ATOMICS (which used to be due to cairo) to a dependency on BR2_TOOLCHAIN_HAS_SYNC_4 (due to pango -> harfbuzz). In detail: - cairo Remove BR2_ARCH_HAS_ATOMICS dependency, link against -latomic when gcc >= 4.8 in order to use the __atomic functions. - harfbuzz Add dependency on BR2_TOOLCHAIN_HAS_SYNC_4 - cairomm, gst-plugins-good, gst1-plugins-good, libgdiplus, libsvg-cairo, weston Remove BR2_ARCH_HAS_ATOMICS dependency (since cairo no longer needs atomics) - enlightenment, cwiid, gst-plugins-bad, gst-plugins-base, gst1-plugins-bad, gst1-plugins-base, gtkmm3, libevas-generic-loaders, libfm, libgail, libgtk2, libgtk3, librsvg, openbox, opencv, opencv3, pango, pangomm, pcmanfm, pinentry, rrdtool, webkit, webkitgtk24, xscreensaver Switch from a BR2_ARCH_HAS_ATOMICS dependency to a BR2_TOOLCHAIN_HAS_SYNC_4 (they depend on pango, harfbuzz, gtk, or some other related package) - directfb Remove BR2_ARCH_ATOMICS dependency of the BR2_PACKAGE_DIRECTFB_SVG (since cairo can build without atomics), but add a BR2_TOOLCHAIN_HAS_SYNC_4 dependency on BR2_PACKAGE_DIRECTFB itself since it does use __sync built-ins. This replaces the !BR2_sparc dependency. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* opencv: use the same logic as opencv3 for gstreamer supportVicente Olivert Riera2015-11-282-3/+33
| | | | | | | | | | | | | | The logic for enabling gstreamer support in opencv is not correct. We select gstreamer-0.10 packages but then we enable gstreamer1 support in the opencv.mk file. opencv3 has the correct logic, so let's use it in opencv as well. Fixes: http://autobuild.buildroot.net/results/f6d/f6d0a4ffe347cbb868998856aca674ba8bc2e281/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* ffmpeg: mark as not available on nios2Thomas Petazzoni2015-11-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffmpeg was already marked as not available for the NIOS2 Sourcery toolchains, but it could still be built with the internal toolchain backend or a custom external toolchain. However, an inspection of the latest glibc source code indicates that FE_INVALID, FE_OVERFLOW and FE_UNDERFLOW and indeed not available in the nios2 variant of <fenv.h>. Consequently, this patch makes ffmpeg not available on nios2, which allows to simplify a bit the dependencies. It propagates this dependency to: - minidlna (and at the same time makes sure the minidlna comment is not displayed on nios2, which wasn't properly taken into account until now) - mpd - opencv - opencv3 - squeezelite - tovid Even if it selects ffmpeg, Kodi does not need an update since Kodi is only available on a limited number of architectures (which don't include nios2, obviously). Other packages only make use of ffmpeg when available. Fixes: http://autobuild.buildroot.org/results/921/9212f5a6432c5e695ac0630695405cea05e28610/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: re-introduce opencv for opencv-2.4Samuel Martin2015-08-255-0/+718
| | | | | | | | | | | | | | | | | | | | | | | | As Jonathan noticed in [1], users' applications may depend on opencv-2.4 APIs removed in opencv-3.0. So, re-introduce opencv package as it was right before the bump to opencv-3.0 (i.e.: commit bf00b5a9ea1ab4189fe5c7dea05f40d0bbbf2082). We do not support both OpenCV-2.4 and OpenCV-3 at the same time, so make OpenCV-3 depend on !OpenCV-2.4. [1] http://lists.busybox.net/pipermail/buildroot/2015-August/135270.html 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: - remove legacy symbols, now - make opencv3 depends on !opencv, not the other way around - slitghly reword the commit log (opencv/opencv3 dependency) ] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package: rename opencv -> opencv3Samuel Martin2015-08-254-980/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* opencv: mark as not available on XtensaThomas Petazzoni2015-08-081-0/+3
| | | | | | | | | | | | | | | OpenCV currently does not build on Xtensa due to compiler/assembler issues: Error: operand 2 of 'l32r' has out of range value '4294632228' Until this gets fixed, let's disable OpenCV on Xtensa. Temporarily works around: http://autobuild.buildroot.net/results/0be/0bed0779685d9ed83466a4d29a0281ca93043a2e/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add opengl supportSamuel Martin2015-07-062-1/+28
| | | | | | | | | | | | | | | | | | | | | In OpenCV, OpenGL is only used by highgui module. OpenGL support is done using extensions from 3rd party framework: either Qt5OpenGL with Qt5 (with GL support only, not GLES); or gtkglext (which is not available in Buildroot) with gtk2 So, make OpenGL knob a sub-option of the Qt5 support option. Note: we enclose both the GUI toolkit choice and the GL option in an if-block, so that the GL option gets properly indented; having it depend on WITH_QT5 is not enough, because it does not directly follow it, so kconfig would not consider it for indenting. Signed-off-by: Samuel Martin <s.martin49@gmail.com> [yann.morin.1998@free.fr: tweak commit log about the if-block] Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add gtk3 supportSamuel Martin2015-07-062-2/+18
| | | | | | | | | | | | | | OpenCV now also supports gtk3 as a GUI toolkit, in addition to gtk2, but only one may be enabled at a time. So, add gtk3 in the choice to select the GUI toolkit. Signed-off-by: Samuel Martin <s.martin49@gmail.com> [yann.morin.1998@free.fr: drop the superfluous depends-on for the kconfig symbol, since they're no longer needed now we depend-on rather than select] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add qt5 supportSamuel Martin2015-07-062-3/+24
| | | | | | | | | | | | | | | | | | | | | | Starting with the 2.4.6 release, OpenCV supports either Qt4 or Qt5 as GUI toolkit, so add Qt5 in the GUI toolkit choice. When Qt4 is enabled (and thus Qt5 is hidden and disabled), no need to show a comment stating "Qt5 support needs Qt5", because Qt5 is not selectable. Conversely, when Qt5 is enabled and Qt4 is not, then no need to show a comment stating "Qt4 support needs Qt4", because enabling Qt4 would disable Qt5. So, we only show the comments when neither toolkit is enabled. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> [yann.morin.1998@free.fr: split-out the Qt5 hunk from the switch-selects-to-depends hunk] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: depends on GUI toolkits, rather than select themSamuel Martin2015-07-061-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we only support either Qt4 or gtk2, but OpenCV also additionally supports Qt5 or gtk3, making for a choice of four toolkits, one of: Qt4, Qt5, gtk3, gtk2 (and obviously, none). Since Buildroot does not support coexistence of Qt4 and Qt5, we can no longer select one and depend on the other, like so: config BR2_PKG_OCV_WITH_QT4 bool "Qt4" depends on !BR2_PKG_QT5 select BR2_PKG_QT config BR2_PKG_OCV_WITH_QT5 bool "Qt5" depends on !BR2_PKG_QT select BR2_PKG_QT5 otherwise, we'd get a circular dependency chain in Kconfig, which would complain with: package/opencv/Config.in:57:error: recursive dependency detected! package/opencv/Config.in:57: choice <choice> contains symbol BR2_PKG_OCV_WITH_QT5 package/opencv/Config.in:111: symbol BR2_PKG_OCV_WITH_QT5 depends on BR2_PKG_QT package/qt/Config.in:5: symbol BR2_PKG_QT is selected by BR2_PKG_OCV_WITH_QT package/opencv/Config.in:98: symbol BR2_PKG_OCV_WITH_QT is part of choice <choice> Instead, we need to depend on either Qt version. So, to have a consistent choice, we make all support for GUI toolkits actually depend on the toolkit, rather than select it. Signed-off-by: Samuel Martin <s.martin49@gmail.com> [yann.morin.1998@free.fr: split-out the switch-selects-to-depends hunk from the add-qt5 hunk] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add a choice for selecting the gui toolkitSamuel Martin2015-07-061-23/+44
| | | | | | | | | | | | | In OpenCV, only one GUI toolkit may be used at any one time, so group the two existing options into a choice to make this situation explicit. This will also be useful when we later add support for Qt5 and gtk3. Suggested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Samuel Martin <s.martin49@gmail.com> [yann.morin.1998@free.fr: tweak commit log] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add gstreamer-1.x supportSamuel Martin2015-07-052-2/+24
| | | | | | | | | | | Starting with the 2.4.10 release, OpenCV supports both Gstreamer-0.10 and Gstreamer-1, but only one can be enabled at the same time (OpenCV chooses Gstreamer-1 over Gstreamer-0.10 when both are available). Signed-off-by: Samuel Martin <s.martin49@gmail.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add a choice for selecting gstreamer supportSamuel Martin2015-07-051-2/+10
| | | | | | | | | | | | OpenCV 3.0 support both gstreamer-0.10 and gstreamer-1.x, but only one is used at the time. This patch turns the gstreamer support into a choice, in order to prepare adding the support for gstreamer-1 in a following patch. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add openmp supportSamuel Martin2015-06-261-0/+2
| | | | | | | | | | | Note that this situation is not ideal because it only add openmp support to the Buildroot toolchain, not the external ones; but a couple of packages already are in this situation. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: add python supportSamuel Martin2015-06-262-3/+42
| | | | | | | | | | | | | | | | | | opencv_python module needs python-numpy because it uses some numpy headers in this wrapper. >From its 2.4 release, OpenCV offers python bindings, but they required most of the OpenCV modules to be enabled. Since OpenCV-3.0.0, python bindings have been reworked: - it now supports both python2 and python3 - only built modules supporting wrapped in python will be included in the bindings. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: disable all modules by defaultSamuel Martin2015-06-261-5/+0
| | | | | | | | | | | | | This change allows to reduce the size of the default OpenCV package, so the final root filesystem. However, this will break any existing defconfig enabling OpenCV. Indeed, a minimal OpenCV package will be built, whereas, prior to applying this patches, a full-featured one would have been built instead. Cc: "Yann E. Morin" <yann.morin.1998@free.fr> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: reduce modules on by defaultSamuel Martin2015-06-261-11/+0
| | | | | | | | | | | | | | | | | Since its integration into Buildroot, OpenCV always enables all modules by default because the inter-module denpedency were not supported. Now that OpenCV inter-module dependencies are correctly set at the Buildroot configuration level, it is possible to reduce the enabled module list to its minimal set, letting kconfig enable the other modules. This change will not change anything WRT a defconfig build with opencv. Cc: "Yann E. Morin" <yann.morin.1998@free.fr> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: reword modules' prompt and help textSamuel Martin2015-06-261-20/+26
| | | | | | | | This patch is mostly cosmetic changes improving the human interface. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: define modules inter-dependenciesSamuel Martin2015-06-261-1/+38
| | | | | | | | | | | | | | | | | | | | OpenCV allows to enable/disable the selection of modules (a.k.a. opencv libraries). These modules depend one on the others; these dependencies are already handled by the build-system (CMake). However, the way we handled them in Buildroot was not really clean. For each opencv module, there is a kconfig option, but we forced the corresponding CMake config option without checking for the modules' dependencies. This patch replicates the modules' dependency relations in the Config.in, so that the selection of the user will actually be built. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: bump to version 3.0Samuel Martin2015-06-267-286/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This major version bump is in fact a bump from 2.4.10 to 2.4.11, then to 3.0. OpenCV-2.4.11 improves a lot the Buildroot integration, including a couple of patches that are no longer needed: - x86 PIC code compilation fix in core module [1]; - return type fix in superes module [2]; - opencv.pc generation [3]. It also improves the gstreamer-0.10/1.x detection [4], that will be needed in a follow-up patch. OpenCV-3.0 still requires 2 patches (backported from upstream fixing pthread support [5,6]. The OpenCV-3.0 does some major changes, for which a transition guide has been published [7]. Among these changes coming with OpenCV-3.0, some new modules have been introduced and others got removed; leading to a bunch of configure option updates (to keep as much as possible an iso-functional-perimeter) and the legacy menu has been updated too. The worth noticing removals being: - the opencv_legacy and opencv_nonfree modules no longer exist; - the opencv_contrib module has moved out of the opencv base tree and now has its own repository [8]. There is currently no plan to support it. Some 3rd-party supports have been improved or added; their integrations in Buildroot will be addressed in follow-up patches. [1] https://github.com/Itseez/opencv/commit/ea50be0529c248961e1b66293f8a9e4b807294a6 [2] https://github.com/Itseez/opencv/commit/2e393ab83362743ba1825ad4b31d4a2925c606b4 [3] https://github.com/Itseez/opencv/commit/eceada586bbf18fc267e437522ec4f1f23ddc656 [4] https://github.com/Itseez/opencv/commit/38bb0db9dbec08666c8a64b3e4ead8fadf15c980 [5] https://github.com/Itseez/opencv/commit/1f983ec39c97298b0c8ce409a1cc229ecf14e55c [6] https://github.com/Itseez/opencv/commit/a482dcce464acbd5368fb93c6c3d52ba8401776a [7] http://docs.opencv.org/master/db/dfa/tutorial_transition_guide.html [8] https://github.com/itseez/opencv_contrib [Thomas: - address most contents made by Yann E. Morin on the Config.in file.] 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>
* package/opencv: alphabetically sorted each _CONF_OPTS groupSamuel Martin2015-06-261-15/+15
| | | | | | | | No new option added nor removed. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/opencv: cleanup spaces at ends of lineSamuel Martin2015-06-091-56/+56
| | | | | | | | | Nothing more than removing white spaces before '\' characters. Of course, 'git diff -w' shows no change at all. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
OpenPOWER on IntegriCloud