* [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig
@ 2012-06-10 11:46 Samuel Martin
2012-06-10 11:46 ` [Buildroot] [PATCH v2 1/1] libplayer: fix cflags Samuel Martin
` (9 more replies)
0 siblings, 10 replies; 21+ messages in thread
From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw)
To: buildroot
These tools only are useful for ARM (OMAP) targets.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
diff --git a/package/omap-u-boot-utils/Config.in.host b/package/omap-u-boot-utils/Config.in.host
index 63fbdf5..87dcc06 100644
--- a/package/omap-u-boot-utils/Config.in.host
+++ b/package/omap-u-boot-utils/Config.in.host
@@ -1,5 +1,6 @@
config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
bool "host omap-u-boot-utils"
+ depends on BR2_arm || BR2_armeb
help
U-Boot Utilities for Texas Instrument's OMAP platforms.
This is a set of tools to control U-Boot from scripts, generate
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH v2 1/1] libplayer: fix cflags 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin @ 2012-06-10 11:46 ` Samuel Martin 2012-06-10 20:23 ` Peter Korsgaard 2012-06-10 11:46 ` [Buildroot] [PATCH v3 0/6] OpenCV update and CPU fetures Samuel Martin ` (8 subsequent siblings) 9 siblings, 1 reply; 21+ messages in thread From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw) To: buildroot Explicitly run pkg-config to add some include directories to the cflags when gstreamer support is enabled. This patch fixes the following unfound headers: - glib.h - glibconfig.h - gst/gst.h Signed-off-by: Samuel Martin <s.martin49@gmail.com> diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk index 093821e..643c7bb 100644 --- a/package/libplayer/libplayer.mk +++ b/package/libplayer/libplayer.mk @@ -30,8 +30,10 @@ else endif ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y) - LIBPLAYER_DEPENDENCIES += gstreamer + LIBPLAYER_DEPENDENCIES += host-pkg-config libglib2 gstreamer LIBPLAYER_CONF_OPT += --enable-gstreamer + LIBPLAYER_MAKE_OPT += \ + CFLAGS+="`$(PKG_CONFIG_HOST_BINARY) --cflags glib-2.0 gstreamer-0.10`" else LIBPLAYER_CONF_OPT += --disable-gstreamer endif -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v2 1/1] libplayer: fix cflags 2012-06-10 11:46 ` [Buildroot] [PATCH v2 1/1] libplayer: fix cflags Samuel Martin @ 2012-06-10 20:23 ` Peter Korsgaard 2012-06-12 19:27 ` Samuel Martin 0 siblings, 1 reply; 21+ messages in thread From: Peter Korsgaard @ 2012-06-10 20:23 UTC (permalink / raw) To: buildroot >>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: Samuel> Explicitly run pkg-config to add some include directories to the cflags Samuel> when gstreamer support is enabled. Samuel> This patch fixes the following unfound headers: Samuel> - glib.h Samuel> - glibconfig.h Samuel> - gst/gst.h What problem is this solving exactly? I don't recall seeing any failures on the autobuilders, and host-pkg-config + libglib2 are already dependencies of gstreamer, so it shouldn't be needed to list them explicitly. From a quick look at the (handwritten) configure script, is seem to get cflags / libs from pkg-config as well. Samuel> diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk Samuel> index 093821e..643c7bb 100644 Samuel> --- a/package/libplayer/libplayer.mk Samuel> +++ b/package/libplayer/libplayer.mk Samuel> @@ -30,8 +30,10 @@ else Samuel> endif Samuel> ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y) Samuel> - LIBPLAYER_DEPENDENCIES += gstreamer Samuel> + LIBPLAYER_DEPENDENCIES += host-pkg-config libglib2 gstreamer Samuel> LIBPLAYER_CONF_OPT += --enable-gstreamer Samuel> + LIBPLAYER_MAKE_OPT += \ Samuel> + CFLAGS+="`$(PKG_CONFIG_HOST_BINARY) --cflags glib-2.0 gstreamer-0.10`" Samuel> else Samuel> LIBPLAYER_CONF_OPT += --disable-gstreamer Samuel> endif Samuel> -- Samuel> 1.7.10.4 Samuel> _______________________________________________ Samuel> buildroot mailing list Samuel> buildroot at busybox.net Samuel> http://lists.busybox.net/mailman/listinfo/buildroot -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v2 1/1] libplayer: fix cflags 2012-06-10 20:23 ` Peter Korsgaard @ 2012-06-12 19:27 ` Samuel Martin 2012-06-13 6:41 ` Peter Korsgaard 0 siblings, 1 reply; 21+ messages in thread From: Samuel Martin @ 2012-06-12 19:27 UTC (permalink / raw) To: buildroot 2012/6/10 Peter Korsgaard <jacmet@uclibc.org>: >>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: > > ?Samuel> Explicitly run pkg-config to add some include directories to the cflags > ?Samuel> when gstreamer support is enabled. > > ?Samuel> This patch fixes the following unfound headers: > ?Samuel> - glib.h > ?Samuel> - glibconfig.h > ?Samuel> - gst/gst.h > > What problem is this solving exactly? I don't recall seeing any failures > on the autobuilders, and host-pkg-config + libglib2 are already > dependencies of gstreamer, so it shouldn't be needed to list them > explicitly. hum... the problem was not found headers (the 3 mentioned above), but actually this seems to be caused by a dirty work tree/build and staging directories... A git clean -fdx and a build from scratch fix it. So, forget about this patch. Apologize for the noise. -- Sam ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v2 1/1] libplayer: fix cflags 2012-06-12 19:27 ` Samuel Martin @ 2012-06-13 6:41 ` Peter Korsgaard 0 siblings, 0 replies; 21+ messages in thread From: Peter Korsgaard @ 2012-06-13 6:41 UTC (permalink / raw) To: buildroot >>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: Hi, Samuel> So, forget about this patch. Samuel> Apologize for the noise. Ok, no problem. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 0/6] OpenCV update and CPU fetures 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v2 1/1] libplayer: fix cflags Samuel Martin @ 2012-06-10 11:46 ` Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features Samuel Martin ` (7 subsequent siblings) 9 siblings, 0 replies; 21+ messages in thread From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw) To: buildroot This patch series add some symbols for some of these features for x86/x86_64 and PowerPC architures. These new symbols are used in this 2nd version of the OpenCV patch, as well as in some other packages. 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 (6): target: add symbols for i386/x86_64 cpu features target: add symbols for PowerPC 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 | 129 +++++++++++------ package/sdl_gfx/sdl_gfx.mk | 10 +- package/sdl_sound/sdl_sound.mk | 3 +- target/Config.in.arch | 134 ++++++++++++++++- 7 files changed, 368 insertions(+), 124 deletions(-) delete mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch -- 1.7.10.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v2 1/1] libplayer: fix cflags Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 0/6] OpenCV update and CPU fetures Samuel Martin @ 2012-06-10 11:46 ` Samuel Martin 2012-06-12 6:02 ` Arnout Vandecappelle 2012-06-12 6:05 ` Arnout Vandecappelle 2012-06-10 11:46 ` [Buildroot] [PATCH v3 2/6] target: add symbols for PowerPC " Samuel Martin ` (6 subsequent siblings) 9 siblings, 2 replies; 21+ messages in thread From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw) To: buildroot Selecting the target architecture variant automatically selects the appropriated set of features. Signed-off-by: Samuel Martin <s.martin49@gmail.com> diff --git a/target/Config.in.arch b/target/Config.in.arch index 25ff750..49c01e5 100644 --- a/target/Config.in.arch +++ b/target/Config.in.arch @@ -242,7 +242,7 @@ choice default BR2_mips_1 if BR2_mipsel help Specific CPU variant to use - + 64bit cabable: 3, 4, 64, 64r2 non-64bit capable: 1, 2, 32, 32r2 @@ -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 -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features 2012-06-10 11:46 ` [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features Samuel Martin @ 2012-06-12 6:02 ` Arnout Vandecappelle 2012-06-12 6:05 ` Arnout Vandecappelle 1 sibling, 0 replies; 21+ messages in thread From: Arnout Vandecappelle @ 2012-06-12 6:02 UTC (permalink / raw) To: buildroot On 06/10/12 13:46, Samuel Martin wrote: > Selecting the target architecture variant automatically selects the > appropriated set of features. > > Signed-off-by: Samuel Martin<s.martin49@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> -- 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 ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features 2012-06-10 11:46 ` [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features Samuel Martin 2012-06-12 6:02 ` Arnout Vandecappelle @ 2012-06-12 6:05 ` Arnout Vandecappelle 2012-06-13 22:38 ` Samuel Martin 1 sibling, 1 reply; 21+ messages in thread From: Arnout Vandecappelle @ 2012-06-12 6:05 UTC (permalink / raw) To: buildroot On 06/10/12 13:46, Samuel Martin wrote: > 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 Maybe it makes sense to have a config BR2_x86_geode_mmx ? Regards, Arnout -- 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 ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features 2012-06-12 6:05 ` Arnout Vandecappelle @ 2012-06-13 22:38 ` Samuel Martin 0 siblings, 0 replies; 21+ messages in thread From: Samuel Martin @ 2012-06-13 22:38 UTC (permalink / raw) To: buildroot Hi Arnout, 2012/6/12 Arnout Vandecappelle <arnout@mind.be>: > On 06/10/12 13:46, Samuel Martin wrote: >> >> ?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 > > > ?Maybe it makes sense to have a config BR2_x86_geode_mmx ? Actually, I made this choice after talking about it with Peter and ThomasP on IRC (that's Peter who gave me the link). BTW, packages that may take benefit from MMX features (like libevas or sdl_{gfx,sounds}) did not turn it on before, neither after this patch series. IMHO, I prefer keeping things in a safe shape like this. Regards, -- Sam ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 2/6] target: add symbols for PowerPC cpu features 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin ` (2 preceding siblings ...) 2012-06-10 11:46 ` [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features Samuel Martin @ 2012-06-10 11:46 ` Samuel Martin 2012-06-12 6:15 ` Arnout Vandecappelle 2012-06-10 11:46 ` [Buildroot] [PATCH v3 3/6] libevas: refactor *_CONF_OPT assignment with cpu-feature options Samuel Martin ` (5 subsequent siblings) 9 siblings, 1 reply; 21+ messages in thread From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> diff --git a/target/Config.in.arch b/target/Config.in.arch index 49c01e5..02aa931 100644 --- a/target/Config.in.arch +++ b/target/Config.in.arch @@ -600,6 +600,14 @@ config BR2_xtensa_core_name default "dc232b" if BR2_xtensa_dc232b # default "s5000" if BR2_xtensa_s5000 +# PowerPC cpu features +config BR2_POWERPC_CPU_G3 + bool +config BR2_POWERPC_CPU_G4 + bool +config BR2_POWERPC_CPU_G5 + bool + choice prompt "Target Architecture Variant" depends on BR2_powerpc @@ -640,12 +648,18 @@ config BR2_powerpc_630 bool "630" config BR2_powerpc_740 bool "740" + select BR2_POWERPC_CPU_G3 config BR2_powerpc_7400 bool "7400" + select BR2_POWERPC_CPU_G3 + select BR2_POWERPC_CPU_G4 config BR2_powerpc_7450 bool "7450" + select BR2_POWERPC_CPU_G3 + select BR2_POWERPC_CPU_G4 config BR2_powerpc_750 bool "750" + select BR2_POWERPC_CPU_G3 config BR2_powerpc_801 bool "801" config BR2_powerpc_821 @@ -656,6 +670,9 @@ config BR2_powerpc_860 bool "860" config BR2_powerpc_970 bool "970" + select BR2_POWERPC_CPU_G3 + select BR2_POWERPC_CPU_G4 + select BR2_POWERPC_CPU_G5 config BR2_powerpc_8540 bool "8540 / e500v1" config BR2_powerpc_8548 -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 2/6] target: add symbols for PowerPC cpu features 2012-06-10 11:46 ` [Buildroot] [PATCH v3 2/6] target: add symbols for PowerPC " Samuel Martin @ 2012-06-12 6:15 ` Arnout Vandecappelle 2012-06-12 9:48 ` Gustavo Zacarias 0 siblings, 1 reply; 21+ messages in thread From: Arnout Vandecappelle @ 2012-06-12 6:15 UTC (permalink / raw) To: buildroot On 06/10/12 13:46, Samuel Martin wrote: > +# PowerPC cpu features > +config BR2_POWERPC_CPU_G3 > + bool > +config BR2_POWERPC_CPU_G4 > + bool > +config BR2_POWERPC_CPU_G5 > + bool I was expecting Altivec here, not the PowerPC CPU generations... These CPU features are relevant mostly to allow libraries to select optimized assembly code, and I don't see much use of G5-specific assembly. And anyway, the -mcpu options for a particular CPU are already passed by buildroot. Regards, Arnout -- 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 ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 2/6] target: add symbols for PowerPC cpu features 2012-06-12 6:15 ` Arnout Vandecappelle @ 2012-06-12 9:48 ` Gustavo Zacarias 2012-06-13 22:44 ` Samuel Martin 0 siblings, 1 reply; 21+ messages in thread From: Gustavo Zacarias @ 2012-06-12 9:48 UTC (permalink / raw) To: buildroot On 2012-06-12 03:15, Arnout Vandecappelle wrote: > On 06/10/12 13:46, Samuel Martin wrote: >> +# PowerPC cpu features >> +config BR2_POWERPC_CPU_G3 >> + bool >> +config BR2_POWERPC_CPU_G4 >> + bool >> +config BR2_POWERPC_CPU_G5 >> + bool > > I was expecting Altivec here, not the PowerPC CPU generations... > These CPU > features are relevant mostly to allow libraries to select optimized > assembly > code, and I don't see much use of G5-specific assembly. And anyway, > the > -mcpu options for a particular CPU are already passed by buildroot. > > Regards, > Arnout Also the G5 is 64-bit capable so one might expect some issues down the line since we're not ppc64-capable at the moment. Regards. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 2/6] target: add symbols for PowerPC cpu features 2012-06-12 9:48 ` Gustavo Zacarias @ 2012-06-13 22:44 ` Samuel Martin 0 siblings, 0 replies; 21+ messages in thread From: Samuel Martin @ 2012-06-13 22:44 UTC (permalink / raw) To: buildroot Hi Arnout, Gustavoz, 2012/6/12 Gustavo Zacarias <gustavo@zacarias.com.ar>: > On 2012-06-12 03:15, Arnout Vandecappelle wrote: > >> On 06/10/12 13:46, Samuel Martin wrote: >>> >>> +# PowerPC cpu features >>> +config BR2_POWERPC_CPU_G3 >>> + ? ? ? bool >>> +config BR2_POWERPC_CPU_G4 >>> + ? ? ? bool >>> +config BR2_POWERPC_CPU_G5 >>> + ? ? ? bool >> >> >> ?I was expecting Altivec here, not the PowerPC CPU generations... ?These >> CPU >> features are relevant mostly to allow libraries to select optimized >> assembly >> code, and I don't see much use of G5-specific assembly. ?And anyway, the >> -mcpu options for a particular CPU are already passed by buildroot. I would expect nothing less ;-) >> >> ?Regards, >> ?Arnout > > > Also the G5 is 64-bit capable so one might expect some issues down the line > since we're not ppc64-capable at the moment. > Regards. > So, to sum up and make the relation with the question I asked on the pacth 6/6 of the serie, you suggest I always turn off the ENABLE_POWERPC option in the opencv package. That's it? BTW, I can add an Altivec symbol, and let you (or others) use it in packages that may take benefit from such optimization. Let me know... Regards, -- Sam ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 3/6] libevas: refactor *_CONF_OPT assignment with cpu-feature options 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin ` (3 preceding siblings ...) 2012-06-10 11:46 ` [Buildroot] [PATCH v3 2/6] target: add symbols for PowerPC " Samuel Martin @ 2012-06-10 11:46 ` Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 4/6] sdl_gfx: " Samuel Martin ` (4 subsequent siblings) 9 siblings, 0 replies; 21+ messages in thread From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk index e716cea..c556942 100644 --- a/package/efl/libevas/libevas.mk +++ b/package/efl/libevas/libevas.mk @@ -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 -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 4/6] sdl_gfx: refactor *_CONF_OPT assignment with cpu-feature options 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin ` (4 preceding siblings ...) 2012-06-10 11:46 ` [Buildroot] [PATCH v3 3/6] libevas: refactor *_CONF_OPT assignment with cpu-feature options Samuel Martin @ 2012-06-10 11:46 ` Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 5/6] sdl_sound: " Samuel Martin ` (3 subsequent siblings) 9 siblings, 0 replies; 21+ messages in thread From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk index 5503bbd..343c7a1 100644 --- a/package/sdl_gfx/sdl_gfx.mk +++ b/package/sdl_gfx/sdl_gfx.mk @@ -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)) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 5/6] sdl_sound: refactor *_CONF_OPT assignment with cpu-feature options 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin ` (5 preceding siblings ...) 2012-06-10 11:46 ` [Buildroot] [PATCH v3 4/6] sdl_gfx: " Samuel Martin @ 2012-06-10 11:46 ` Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 6/6] opencv: bump to version 2.4.1 Samuel Martin ` (2 subsequent siblings) 9 siblings, 0 replies; 21+ messages in thread From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk index a5d9a26..620b3b4 100644 --- a/package/sdl_sound/sdl_sound.mk +++ b/package/sdl_sound/sdl_sound.mk @@ -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 -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 6/6] opencv: bump to version 2.4.1 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin ` (6 preceding siblings ...) 2012-06-10 11:46 ` [Buildroot] [PATCH v3 5/6] sdl_sound: " Samuel Martin @ 2012-06-10 11:46 ` Samuel Martin 2012-06-10 14:41 ` Samuel Martin 2012-06-10 13:04 ` [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Thomas Petazzoni 2012-06-10 20:14 ` Peter Korsgaard 9 siblings, 1 reply; 21+ messages in thread From: Samuel Martin @ 2012-06-10 11:46 UTC (permalink / raw) To: buildroot Update Config.in and .mk according to the new features. Remove the pacth the uclibc without long double support, which seems not necessary anymore. Signed-off-by: Samuel Martin <s.martin49@gmail.com> delete mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch delete mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 961282f..6a76f6d 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -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) diff --git a/package/opencv/opencv-uclibc-optional-long-double-support.patch b/package/opencv/opencv-uclibc-optional-long-double-support.patch deleted file mode 100644 index b319849..0000000 --- a/package/opencv/opencv-uclibc-optional-long-double-support.patch +++ /dev/null @@ -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 <jacmet@sunsite.dk> ---- - 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; }; diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index ec94715..e258bf5 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -3,50 +3,98 @@ # OpenCV (Open Source Computer Vision) # ############################################################# -OPENCV_VERSION = 2.3.1a -OPENCV_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/2.3.1 +OPENCV_VERSION = 2.4.1 +OPENCV_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION) OPENCV_SOURCE = OpenCV-$(OPENCV_VERSION).tar.bz2 OPENCV_INSTALL_STAGING = YES OPENCV_CONF_OPT = \ - -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \ - -DBUILD_DOCS=$(if $(BR2_HAVE_DOCUMENTATION),ON,OFF) \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_PACKAGE=OFF \ + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \ + -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \ + -DBUILD_WITH_STATIC_CRT=OFF \ + -DBUILD_DOCS=$(if $(BR2_HAVE_DOCUMENTATION),ON,OFF) \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PACKAGE=OFF \ -DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF) \ - -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \ - -DINSTALL_C_EXAMPLES=OFF \ - -DINSTALL_PYTHON_EXAMPLES=OFF \ - -DOPENCV_BUILD_3RDPARTY_LIBS=OFF \ - -DENABLE_PROFILING=OFF \ - -DCMAKE_SKIP_RPATH=OFF \ - -DUSE_FAST_MATH=ON \ - -DUSE_OMIT_FRAME_POINTER=ON \ - -DUSE_PRECOMPILED_HEADERS=OFF \ - -DWITH_1394=OFF \ - -DWITH_CUDA=OFF \ - -DWITH_EIGEN=OFF \ - -DWITH_IPP=OFF \ - -DWITH_JASPER=OFF \ - -DWITH_OPENEXR=OFF \ - -DWITH_OPENNI=OFF \ - -DWITH_PVAPI=OFF \ - -DWITH_TBB=OFF \ - -DWITH_UNICAP=OFF \ - -DWITH_XINE=OFF + -DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS),ON,OFF) \ + -DBUILD_WITH_DEBUG_INFO=OFF \ + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_USE_RELATIVE_PATHS=OFF \ + -DENABLE_FAST_MATH=ON \ + -DENABLE_NOISY_WARNINGS=OFF \ + -DENABLE_OMIT_FRAME_POINTER=ON \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DENABLE_PROFILING=OFF \ + -DENABLE_SOLUTION_FOLDERS=OFF \ + -DENABLE_POWERPC=$(if $(BR2_POWERPC_CPU_G3),ON,OFF) \ + -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \ + -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \ + -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \ + -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE41),ON,OFF) \ + -DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \ + -DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) \ + -DBUILD_JASPER=OFF \ + -DBUILD_JPEG=OFF \ + -DBUILD_PNG=OFF \ + -DBUILD_TIFF=OFF \ + -DBUILD_ZLIB=OFF \ + -DBUILD_ANDROID_CAMERA_WRAPPER=OFF \ + -DBUILD_ANDROID_EXAMPLES=OFF \ + -DBUILD_FAT_JAVA_LIB=OFF \ + -DBUILD_JAVA_SUPPORT=OFF \ + -DBUILD_NEW_PYTHON_SUPPORT=OFF \ + -DINSTALL_ANDROID_EXAMPLES=OFF \ + -DINSTALL_C_EXAMPLES=OFF \ + -DINSTALL_PYTHON_EXAMPLES=OFF \ + -DINSTALL_TO_MANGLED_PATHS=OFF \ + -DWITH_1394=OFF \ + -DWITH_ANDROID_CAMERA=OFF \ + -DWITH_AVFOUNDATION=OFF \ + -DWITH_CARBON=OFF \ + -DWITH_CUBLAS=OFF \ + -DWITH_CUDA=OFF \ + -DWITH_CUFFT=OFF \ + -DWITH_EIGEN=OFF \ + -DWITH_IMAGEIO=OFF \ + -DWITH_IPP=OFF \ + -DWITH_JASPER=OFF \ + -DWITH_OPENEXR=OFF \ + -DWITH_OPENGL=OFF \ + -DWITH_OPENNI=OFF \ + -DWITH_PVAPI=OFF \ + -DWITH_QUICKTIME=OFF \ + -DWITH_TBB=OFF \ + -DWITH_UNICAP=OFF \ + -DWITH_VIDEOINPUT=OFF \ + -DWITH_XIMEA=OFF \ + -DWITH_XINE=OFF \ + -DBUILD_opencv_androidcamera=OFF \ + -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \ + -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \ + -DBUILD_opencv_core=$(if $(BR2_PACKAGE_OPENCV_LIB_CORE),ON,OFF) \ + -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \ + -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \ + -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \ + -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \ + -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \ + -DBUILD_opencv_java=OFF \ + -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \ + -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \ + -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \ + -DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \ + -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \ + -DBUILD_opencv_python=OFF \ + -DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \ + -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \ + -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \ + -DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB),ON,OFF) OPENCV_DEPENDENCIES += zlib -ifeq ($(BR2_PACKAGE_OPENCV_WITH_PYTHON),y) -OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=ON -OPENCV_DEPENDENCIES += python -else -OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=OFF -endif - ifeq ($(BR2_PACKAGE_OPENCV_WITH_FFMPEG),y) OPENCV_CONF_OPT += -DWITH_FFMPEG=ON -OPENCV_DEPENDENCIES += ffmpeg +OPENCV_DEPENDENCIES += ffmpeg bzip2 else OPENCV_CONF_OPT += -DWITH_FFMPEG=OFF endif @@ -80,7 +128,7 @@ OPENCV_CONF_OPT += -DWITH_PNG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y) -OPENCV_CONF_OPT += -DWITH_QT=ON -DWITH_QT_OPENGL=OFF +OPENCV_CONF_OPT += -DWITH_QT=ON OPENCV_DEPENDENCIES += qt else OPENCV_CONF_OPT += -DWITH_QT=OFF @@ -102,23 +150,22 @@ endif ifneq ($(BR2_HAVE_DOCUMENTATION),y) define OPENCV_CLEAN_INSTALL_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/opencv/doc + $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc endef - OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DOC endif -ifneq ($(BR2_PACKAGE_CMAKE),y) +ifneq ($(BR2_HAVE_DEVFILES),y) define OPENCV_CLEAN_INSTALL_CMAKE - $(RM) -f $(TARGET_DIR)/usr/share/opencv/OpenCVConfig.cmake + $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake endef OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_CMAKE endif ifneq ($(BR2_PACKAGE_OPENCV_INSTALL_DATA),y) define OPENCV_CLEAN_INSTALL_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/opencv/haarcascades \ - $(TARGET_DIR)/usr/share/opencv/lbpcascades + $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/haarcascades \ + $(TARGET_DIR)/usr/share/OpenCV/lbpcascades endef OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DATA endif -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH v3 6/6] opencv: bump to version 2.4.1 2012-06-10 11:46 ` [Buildroot] [PATCH v3 6/6] opencv: bump to version 2.4.1 Samuel Martin @ 2012-06-10 14:41 ` Samuel Martin 0 siblings, 0 replies; 21+ messages in thread From: Samuel Martin @ 2012-06-10 14:41 UTC (permalink / raw) To: buildroot 2012/6/10 Samuel Martin <s.martin49@gmail.com>: [...] > diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk > index ec94715..e258bf5 100644 > --- a/package/opencv/opencv.mk > +++ b/package/opencv/opencv.mk > @@ -3,50 +3,98 @@ > ?# OpenCV (Open Source Computer Vision) > ?# > ?############################################################# > -OPENCV_VERSION = 2.3.1a > -OPENCV_SITE ? ?= http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/2.3.1 > +OPENCV_VERSION = 2.4.1 > +OPENCV_SITE ? ?= http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION) > ?OPENCV_SOURCE ?= OpenCV-$(OPENCV_VERSION).tar.bz2 > ?OPENCV_INSTALL_STAGING = YES > > ?OPENCV_CONF_OPT = \ > - ? ? ? -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \ [...] > + ? ? ? -DENABLE_PRECOMPILED_HEADERS=OFF ? ? ? ?\ > + ? ? ? -DENABLE_PROFILING=OFF ? ? ? ? ? ? ? ? ?\ > + ? ? ? -DENABLE_SOLUTION_FOLDERS=OFF ? ? ? ? ? \ > + ? ? ? -DENABLE_POWERPC=$(if $(BR2_POWERPC_CPU_G3),ON,OFF) ?\ Note that I'm not sure about this configure options... Indeed, looking at the sources, setting ENABLE_POWERPC=ON adds '-mcpu=G3 -mtune=G5' to the cflags... I'm not sure how these may conflict with those set by Buildroot. Any inputs about this are welcome. > + ? ? ? -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) ? ? \ > + ? ? ? -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) ? \ > + ? ? ? -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) ? \ [...] Cheers, -- Sam ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin ` (7 preceding siblings ...) 2012-06-10 11:46 ` [Buildroot] [PATCH v3 6/6] opencv: bump to version 2.4.1 Samuel Martin @ 2012-06-10 13:04 ` Thomas Petazzoni 2012-06-10 20:14 ` Peter Korsgaard 9 siblings, 0 replies; 21+ messages in thread From: Thomas Petazzoni @ 2012-06-10 13:04 UTC (permalink / raw) To: buildroot Le Sun, 10 Jun 2012 13:46:45 +0200, Samuel Martin <s.martin49@gmail.com> a ?crit : > These tools only are useful for ARM (OMAP) targets. > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin ` (8 preceding siblings ...) 2012-06-10 13:04 ` [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Thomas Petazzoni @ 2012-06-10 20:14 ` Peter Korsgaard 9 siblings, 0 replies; 21+ messages in thread From: Peter Korsgaard @ 2012-06-10 20:14 UTC (permalink / raw) To: buildroot >>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: Samuel> These tools only are useful for ARM (OMAP) targets. Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2012-06-13 22:44 UTC | newest] Thread overview: 21+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-06-10 11:46 [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v2 1/1] libplayer: fix cflags Samuel Martin 2012-06-10 20:23 ` Peter Korsgaard 2012-06-12 19:27 ` Samuel Martin 2012-06-13 6:41 ` Peter Korsgaard 2012-06-10 11:46 ` [Buildroot] [PATCH v3 0/6] OpenCV update and CPU fetures Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 1/6] target: add symbols for i386/x86_64 cpu features Samuel Martin 2012-06-12 6:02 ` Arnout Vandecappelle 2012-06-12 6:05 ` Arnout Vandecappelle 2012-06-13 22:38 ` Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 2/6] target: add symbols for PowerPC " Samuel Martin 2012-06-12 6:15 ` Arnout Vandecappelle 2012-06-12 9:48 ` Gustavo Zacarias 2012-06-13 22:44 ` Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 3/6] libevas: refactor *_CONF_OPT assignment with cpu-feature options Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 4/6] sdl_gfx: " Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 5/6] sdl_sound: " Samuel Martin 2012-06-10 11:46 ` [Buildroot] [PATCH v3 6/6] opencv: bump to version 2.4.1 Samuel Martin 2012-06-10 14:41 ` Samuel Martin 2012-06-10 13:04 ` [Buildroot] [PATCH 1/1] omap-u-boot-utils: fix visibility in menuconfig Thomas Petazzoni 2012-06-10 20:14 ` Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox