diff mbox

[1/1] package/freeswitch: mod_cv needs BR2_PACKAGE_OPENCV_LIB_OBJDETECT

Message ID 1460953338-15043-1-git-send-email-bernd.kuhls@t-online.de
State Superseded
Headers show

Commit Message

Bernd Kuhls April 18, 2016, 4:22 a.m. UTC
Fixes
http://autobuild.buildroot.net/results/ffd/ffd572d7bb68d8ed46ce76b2af824503c587449f/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/freeswitch/freeswitch.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Samuel Martin April 18, 2016, 5:23 a.m. UTC | #1
Hi Bernd,

On Mon, Apr 18, 2016 at 6:22 AM, Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Fixes
> http://autobuild.buildroot.net/results/ffd/ffd572d7bb68d8ed46ce76b2af824503c587449f/
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/freeswitch/freeswitch.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk
> index fdfdbf0..11b77e8 100644
> --- a/package/freeswitch/freeswitch.mk
> +++ b/package/freeswitch/freeswitch.mk
> @@ -269,7 +269,7 @@ FREESWITCH_DEPENDENCIES += libsoundtouch
>  FREESWITCH_ENABLED_MODULES += applications/mod_soundtouch
>  endif
>
> -ifeq ($(BR2_PACKAGE_OPENCV),y)
> +ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),yy)

The condition should also check for improc module since it is a
dependency of objdetect [1], and the opencv-2 package does not have
(yet) inter-module dependency select.

>  FREESWITCH_DEPENDENCIES += opencv
>  FREESWITCH_ENABLED_MODULES += applications/mod_cv
>  endif
> --
> 2.8.0.rc3
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[1] https://github.com/Itseez/opencv/blob/2.4.12.3/modules/objdetect/CMakeLists.txt#L2

Regards,
Thomas Petazzoni April 18, 2016, 7:30 a.m. UTC | #2
Hello,

On Mon, 18 Apr 2016 06:22:18 +0200, Bernd Kuhls wrote:

> -ifeq ($(BR2_PACKAGE_OPENCV),y)
> +ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),yy)

Another option is to:

	select BR2_PACKAGE_OPENCV_LIB_OBJDETECT if BR2_PACKAGE_OPENCV

in the Config.in file. I don't know which one is preferred.

Thomas
diff mbox

Patch

diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk
index fdfdbf0..11b77e8 100644
--- a/package/freeswitch/freeswitch.mk
+++ b/package/freeswitch/freeswitch.mk
@@ -269,7 +269,7 @@  FREESWITCH_DEPENDENCIES += libsoundtouch
 FREESWITCH_ENABLED_MODULES += applications/mod_soundtouch
 endif
 
-ifeq ($(BR2_PACKAGE_OPENCV),y)
+ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),yy)
 FREESWITCH_DEPENDENCIES += opencv
 FREESWITCH_ENABLED_MODULES += applications/mod_cv
 endif