OpenCV update and CPU fetures
v4 cover OpenCV update and CPU fetures
This patch series add symbols for some of the features of the x86/x86_64 architectures.
These new symbols are used in the opencv.mk file, as well as in some other packages.
Note:
MMX support is one of these CPU features.
Some variants of the Geode processor have MMX, others do not. To keep the same behavior as before, which is IMO, the safe way, selecting Geode as architecture variant does not enable MMX support.
Changes since v3:
- remove CPU features symbols for PowerPC
- opencv: fix the configure option for PowerPC and comment it.
Changes since v2:
- rename x86/x86_64 cpu feature symbols: BR2_CPU_HAS_* -> BR2_X86_CPU_HAS_*
- add CPU features symbols for PowerPC
- opencv: bump to version 2.4.1
- fix/cleanup menuconfig
- update opencv configure options
Changes since v1:
- add CPU features symbols for x86 and x86_64
- use those symbols in the opencv, sdl_gfx and sdl_sound packages
- opencv: add missing zlib dependency
Samuel Martin (5):
target: add symbols for i386/x86_64 cpu features
libevas: refactor *_CONF_OPT assignment with cpu-feature options
sdl_gfx: refactor *_CONF_OPT assignment with cpu-feature options
sdl_sound: refactor *_CONF_OPT assignment with cpu-feature options
opencv: bump to version 2.4.1
package/efl/libevas/libevas.mk | 24 ++-- package/opencv/Config.in | 152 ++++++++++++++++++--- ...pencv-uclibc-optional-long-double-support.patch | 40 ------ package/opencv/opencv.mk | 142 +++++++++++++------ package/sdl_gfx/sdl_gfx.mk | 10 +- package/sdl_sound/sdl_sound.mk | 3 +- target/Config.in.arch | 115 ++++++++++++++++ 7 files changed, 363 insertions(+), 123 deletions(-) delete mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch
--
1.7.11.1
PATCH v4 1/5 target: add symbols for i386/x86_64 cpu features
Selecting the target architecture variant automatically selects the appropriated set of features.
target/Config.in.arch +115 -0
@@ -325,6 +325,31 @@ endchoice # gcc builds libstdc++ differently depending on the # host tuplet given to it, so let people choose # + +# i386/x86_64 cpu features +config BR2_X86_CPU_HAS_MMX + bool +config BR2_X86_CPU_HAS_SSE + bool +config BR2_X86_CPU_HAS_SSE2 + bool +config BR2_X86_CPU_HAS_SSE3 + bool +config BR2_X86_CPU_HAS_SSSE3 + bool +config BR2_X86_CPU_HAS_SSE41 + bool +config BR2_X86_CPU_HAS_SSE42 + bool +config BR2_X86_CPU_HAS_SSE4 + bool +config BR2_X86_CPU_HAS_SSE4A + bool +config BR2_X86_CPU_HAS_3DNOW + bool +config BR2_X86_CPU_HAS_ABM + bool + choice prompt "Target Architecture Variant" depends on BR2_i386
@@ -344,46 +369,106 @@ config BR2_x86_pentiumpro bool "pentium pro" config BR2_x86_pentium_mmx bool "pentium MMX" + select BR2_X86_CPU_HAS_MMX config BR2_x86_pentium_m bool "pentium mobile" config BR2_x86_pentium2 bool "pentium2" + select BR2_X86_CPU_HAS_MMX config BR2_x86_pentium3 bool "pentium3" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE config BR2_x86_pentium4 bool "pentium4" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 config BR2_x86_prescott bool "prescott" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 config BR2_x86_nocona bool "nocona" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 config BR2_x86_core2 bool "core2" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 config BR2_x86_atom bool "atom" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 config BR2_x86_k6 bool "k6" + select BR2_X86_CPU_HAS_MMX config BR2_x86_k6_2 bool "k6-2" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_athlon bool "athlon" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_athlon_4 bool "athlon-4" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW + select BR2_X86_CPU_HAS_SSE config BR2_x86_opteron bool "opteron" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 config BR2_x86_opteron_sse3 bool "opteron w/ SSE3" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 config BR2_x86_barcelona bool "barcelona" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSE4A + select BR2_X86_CPU_HAS_ABM config BR2_x86_geode bool "geode" + # Don't include MMX support because there several variant of geode + # processor, some with MMX support, some without. + # See: http://en.wikipedia.org/wiki/Geode_%28processor%29 + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_c3 bool "Via/Cyrix C3 (Samuel/Ezra cores)" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_c32 bool "Via C3-2 (Nehemiah cores)" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE config BR2_x86_winchip_c6 bool "IDT Winchip C6" + select BR2_X86_CPU_HAS_MMX config BR2_x86_winchip2 bool "IDT Winchip 2" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW endchoice choice
@@ -397,16 +482,46 @@ config BR2_x86_64_generic bool "generic" config BR2_x86_64_barcelona bool "barcelona" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSE4A + select BR2_X86_CPU_HAS_ABM config BR2_x86_64_opteron_sse3 bool "opteron w/ sse3" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 config BR2_x86_64_opteron bool "opteron" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 config BR2_x86_64_nocona bool "nocona" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 config BR2_x86_64_core2 bool "core2" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 config BR2_x86_64_atom bool "atom" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 endchoice choice
Signature · 1 line
1.7.11.1
PATCH v4 1/5 target: add symbols for i386/x86_64 cpu features
On 07/06/12 00:42, Samuel Martin wrote:
[snip]
target/Config.in.arch endchoice · line 347
Quoted 8 lines
target/Config.in.arch +8
-0+config BR2_X86_CPU_HAS_SSE41 + bool +config BR2_X86_CPU_HAS_SSE42 + bool +config BR2_X86_CPU_HAS_SSE4 + bool +config BR2_X86_CPU_HAS_SSE4A + bool
I don't like these SSE4 configs which are not selected by anything. I understand
that you need them for OpenCV, but it's not ideal.
Maybe we need an extra subarchitecture config option to explicitly enable these?
They should depend on core2 || barcelona, probably.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286540 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v4 1/5 target: add symbols for i386/x86_64 cpu features
Le Tue, 10 Jul 2012 08:11:34 +0200,
Arnout Vandecappelle <[email protected]> a ?crit :
Quoted 4 lines
I don't like these SSE4 configs which are not selected by anything. I understand
that you need them for OpenCV, but it's not ideal.Maybe we need an extra subarchitecture config option to explicitly enable these?
Agreed, we should either have subarchitecture options that use those SSE4 options, or we should not add those SSE4 options, and only add them when those subarchitectures are added.
Samuel, can you take this into account and respin the patch set?
Thanks!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v4 1/5 target: add symbols for i386/x86_64 cpu features
Hi,
2012/7/13 Thomas Petazzoni <[email protected]>:
Quoted 6 lines
Le Tue, 10 Jul 2012 08:11:34 +0200,
Arnout Vandecappelle <[email protected]> a ?crit :Quoted 3 lines
I don't like these SSE4 configs which are not selected by anything. I understand
that you need them for OpenCV, but it's not ideal.
Quoted 7 lines
Quoted 1 line
Maybe we need an extra subarchitecture config option to explicitly enable these?
Agreed, we should either have subarchitecture options that use those SSE4 options, or we should not add those SSE4 options, and only add them when those subarchitectures are added.
Samuel, can you take this into account and respin the patch set?
Of course.
You prefer expressing dependencies using "depends on" keyword instead "select", is it right?
I'm not sure I got what you mean by "having subarchitecture options", could you explain?
Cheers,
Signature · 1 line
Sam
PATCH v4 1/5 target: add symbols for i386/x86_64 cpu features
Le Fri, 13 Jul 2012 23:57:15 +0200,
Samuel Martin <[email protected]> a ?crit :
Quoted 2 lines
You prefer expressing dependencies using "depends on" keyword instead "select", is it right?
It depends on the case. Which case are you talking about?
Quoted 2 lines
I'm not sure I got what you mean by "having subarchitecture options", could you explain?
The different MMX, SSE, SSE2, SSE3 options are selected by the "Architecture Variant" options. However, the SSE4 options are not selected by any "Architecture Variant" that currently exists in Buildroot. I'd prefer not to have such dead/unused code, so either the corresponding Architecture Variants should be added, or the SSE4 related options should not be added for now (until someone actually needs those Architecture Variants).
Regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v4 2/5 libevas: refactor *_CONF_OPT assignment with cpu-feature options
In reply to Samuel Martinpackage/efl/libevas/libevas.mk +12 -12
@@ -115,23 +115,23 @@ LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-s3c6410 endif # code options -ifeq ($(BR2_i386)$(BR2_x86_64),y) -# defaults -LIBEVAS_CONF_OPT += --disable-cpu-mmx --disable-cpu-sse --disable-cpu-sse3 - -# enable if cpu variant has mmx support -ifneq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y) +ifeq ($(BR2_X86_CPU_HAS_MMX),y) LIBEVAS_CONF_OPT += --enable-cpu-mmx +else +LIBEVAS_CONF_OPT += --disable-cpu-mmx +endif -ifneq ($(BR2_x86_pentium_mmx)$(BR2_x86_pentium2)$(BR2_x86_k6)$(BR2_x86_k6_2)$(BR2_x86_athlon)$(BR2_x86_c3)$(BR2_x86_winchip_c6)$(BR2_x86_winchip2),y) +ifeq ($(BR2_X86_CPU_HAS_SSE),y) LIBEVAS_CONF_OPT += --enable-cpu-sse +else +LIBEVAS_CONF_OPT += --disable-cpu-sse +endif -ifneq ($(BR2_x86_pentium3)$(BR2_x86_pentium4)$(BR2_x86_prescott)$(BR2_x86_athlon_4)$(BR2_x86_opteron)$(BR2_x86_c32)$(BR2_x86_64_opteron),y) +ifeq ($(BR2_X86_CPU_HAS_SSE3),y) LIBEVAS_CONF_OPT += --enable-cpu-sse3 -endif # sse3 -endif # sse -endif # mmx -endif # x86 +else +LIBEVAS_CONF_OPT += --disable-cpu-sse3 +endif ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) LIBEVAS_CONF_OPT += --enable-cpu-altivec
Signature · 1 line
1.7.11.1
PATCH v4 3/5 sdl_gfx: refactor *_CONF_OPT assignment with cpu-feature options
In reply to Samuel Martinpackage/sdl_gfx/sdl_gfx.mk +2 -8
@@ -11,13 +11,7 @@ SDL_GFX_DEPENDENCIES = sdl SDL_GFX_CONF_OPT = \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --disable-sdltest \ - --enable-static - -# enable mmx for newer x86's -ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y) -SDL_GFX_CONF_OPT += --enable-mmx -else -SDL_GFX_CONF_OPT += --disable-mmx -endif + --enable-static \ + $(if $(BR2_X86_CPU_HAS_MMX),--enable-mmx,--disable-mmx) $(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.11.1
PATCH v4 4/5 sdl_sound: refactor *_CONF_OPT assignment with cpu-feature options
In reply to Samuel Martinpackage/sdl_sound/sdl_sound.mk +1 -2
@@ -32,8 +32,7 @@ SDL_SOUND_CONF_OPT = \ --disable-sdltest \ --enable-static -# enable mmx for newer x86's -ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y) +ifeq ($(BR2_X86_CPU_HAS_MMX),y) SDL_SOUND_CONF_OPT += --enable-mmx else SDL_SOUND_CONF_OPT += --disable-mmx
Signature · 1 line
1.7.11.1
PATCH v4 5/5 opencv: bump to version 2.4.1
In reply to Samuel MartinUpdate Config.in and .mk according to the new features.
Remove the patch handling build with uclibc without long double support, which seems not necessary anymore.
delete mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch
delete mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch
package/opencv/Config.in +132 -20
@@ -1,4 +1,4 @@ -config BR2_PACKAGE_OPENCV +menuconfig BR2_PACKAGE_OPENCV bool "opencv" select BR2_PACKAGE_ZLIB depends on BR2_INSTALL_LIBSTDCPP
@@ -11,28 +11,124 @@ config BR2_PACKAGE_OPENCV if BR2_PACKAGE_OPENCV -config BR2_PACKAGE_OPENCV_BUILD_TESTS - bool "build tests" +comment "OpenCV modules" -config BR2_PACKAGE_OPENCV_INSTALL_DATA - bool "install extra data" +config BR2_PACKAGE_OPENCV_LIB_CALIB3D + bool "calib3d" + default y help - Install various data that is used by cv libraries and/or demo - applications, specifically for haarcascades and lbpcascades - features. + Include opencv_calib3d module into the OpenCV build. - For further information: see OpenCV documentation. +config BR2_PACKAGE_OPENCV_LIB_CONTRIB + bool "contrib" + default y + help + Include opencv_contrib module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_CORE + bool "core" + default y + help + Include opencv_core module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_FEATURES2D + bool "features2d" + default y + help + Include opencv_features2d module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_FLANN + bool "flann" + default y + help + Include opencv_flann module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_GPU + bool "gpu" + help + Include opencv_gpu module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_HIGHGUI + bool "highgui" + default y + help + Include opencv_highgui module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_IMGPROC + bool "imgproc" + default y + help + Include opencv_imgproc module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_LEGACY + bool "legacy" + default y + help + Include opencv_legacy module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_ML + bool "ml (machine learning)" + default y + help + Include opencv_ml module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_NONFREE + bool "nonfree" + help + Include opencv_nonfree module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_OBJDETECT + bool "objdetect" + default y + help + Include opencv_objdetect module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_PHOTO + bool "photo" + default y + help + Include opencv_photo module into the OpenCV build. + +comment "opencv_python module requires numpy which is not yet available." + +config BR2_PACKAGE_OPENCV_LIB_STITCHING + bool "stitching" + default y + help + Include opencv_stitching module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_TS + bool "ts (touchscreen)" + default y + help + Include opencv_ts module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_VIDEO + bool "video" + default y + help + Include opencv_video module into the OpenCV build. + +config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB + bool "videostab" + default y + help + Include opencv_videostab module into the OpenCV build. -comment "Build options" +comment "Test sets" +config BR2_PACKAGE_OPENCV_BUILD_TESTS + bool "build tests" + +config BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS + bool "build performance tests" -config BR2_PACKAGE_OPENCV_WITH_PYTHON - bool "python support" - depends on BR2_PACKAGE_PYTHON +comment "3rd party support" config BR2_PACKAGE_OPENCV_WITH_FFMPEG bool "ffmpeg support" depends on BR2_LARGEFILE depends on BR2_INET_IPV6 + select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE help
@@ -43,18 +139,17 @@ comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support" config BR2_PACKAGE_OPENCV_WITH_GSTREAMER bool "gstreamer support" + depends on BR2_USE_WCHAR select BR2_PACKAGE_GSTREAMER select BR2_PACKAGE_GST_PLUGINS_BASE select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk support" - depends on BR2_PACKAGE_LIBGTK2 - -config BR2_PACKAGE_OPENCV_WITH_QT - bool "qt backend support" - depends on BR2_PACKAGE_QT - default y + depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB + depends on BR2_USE_WCHAR + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBGTK2 config BR2_PACKAGE_OPENCV_WITH_JPEG bool "jpeg support"
@@ -68,6 +163,12 @@ config BR2_PACKAGE_OPENCV_WITH_PNG help Use shared libpng from the target system. +config BR2_PACKAGE_OPENCV_WITH_QT + bool "qt backend support" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_QT + default y + config BR2_PACKAGE_OPENCV_WITH_TIFF bool "tiff support" select BR2_PACKAGE_TIFF
@@ -84,7 +185,18 @@ config BR2_PACKAGE_OPENCV_WITH_V4L comment "v4l support requires a toolchain with LARGEFILE support" depends on !BR2_LARGEFILE +comment "Install options" + +config BR2_PACKAGE_OPENCV_INSTALL_DATA + bool "install extra data" + help + Install various data that is used by cv libraries and/or demo + applications, specifically for haarcascades and lbpcascades + features. + + For further information: see OpenCV documentation. + endif # BR2_PACKAGE_OPENCV comment "opencv requires a toolchain with C++ and WCHAR support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
package/opencv/opencv-uclibc-optional-long-double-support.patch deleted +0 -40
@@ -1,40 +0,0 @@ -Upstream: https://code.ros.org/trac/opencv/ticket/1515 - -[PATCH] Fix compile issue in flann module on uClibc without long double support - -uClibc configured without UCLIBC_HAS_LONG_DOUBLE_MATH (because of user -choice or simply that the arch doesn't provide long doubles) doesn't -provide fabsl(), breaking the build in the flann module. - -Work around it by not providing the long double template specialization. - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - modules/flann/include/opencv2/flann/dist.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -Index: opencv-2.3.1a/modules/flann/include/opencv2/flann/dist.h -=================================================================== ---- opencv-2.3.1a.orig/modules/flann/include/opencv2/flann/dist.h -+++ opencv-2.3.1a/modules/flann/include/opencv2/flann/dist.h -@@ -40,6 +40,7 @@ - #else - #include <stdint.h> - #endif -+#include <features.h> - - #include "defines.h" - -@@ -59,9 +60,11 @@ - template<> - inline double abs<double>(double x) { return fabs(x); } - -+/* uClibc configured without long double math doesn't provide fabsl */ -+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__)) - template<> - inline long double abs<long double>(long double x) { return fabsl(x); } -- -+#endif - - template<typename T> - struct Accumulator { typedef T Type; };
package/opencv/opencv.mk +101 -41
183 lines not on this page · raw message
Signature · 1 line
1.7.11.1