From patchwork Sun Jun 7 10:26:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 481720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 73824140082 for ; Sun, 7 Jun 2015 20:28:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=FACGTbVN; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 01784A44CC; Sun, 7 Jun 2015 10:28:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zAo4lkp03eW5; Sun, 7 Jun 2015 10:28:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7FBE9A44CB; Sun, 7 Jun 2015 10:27:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 48C4B1C2238 for ; Sun, 7 Jun 2015 10:27:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 449FB91FC7 for ; Sun, 7 Jun 2015 10:27:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qc6N0rfnoFZS for ; Sun, 7 Jun 2015 10:27:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by whitealder.osuosl.org (Postfix) with ESMTPS id 18FAB9208C for ; Sun, 7 Jun 2015 10:27:15 +0000 (UTC) Received: by wibdq8 with SMTP id dq8so56531875wib.1 for ; Sun, 07 Jun 2015 03:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dcqbmODGC5fWu9tEx/bGPgu/dtECmMwYa1j/UyMwyNg=; b=FACGTbVN+DQ536HBS4WvpLq77Z+sT7pZ2UrRlk9LlJbt27XGPJtRy0jQISR4qutiho Zp+7l4NBwVBv8E0cJB0c3E8bnzakyAsMyd/+C6zNPYGcZ7rPiSepZmh6SUqbARP+9oG1 9YaW34c+eqihPP9s8vwvRjiM5YxP5T2bvkSW1Vx0PxM813AvuAZ4k7jQjoturziRIK2R 83KEnBRnVeUFTH9KFQbSnLwRwGlmpJPD7qCJejW3hSZSiEU4a5YqlJV/eVzMb3Sxk8M7 /QG9eMjCZxAZ+fhILkgeXeG8V+jYXSPfY6nrU3vE+yqoodkow2usUYpJYVtH/v3CZoJ7 meVw== X-Received: by 10.194.250.98 with SMTP id zb2mr22504535wjc.90.1433672833743; Sun, 07 Jun 2015 03:27:13 -0700 (PDT) Received: from bobook.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id cd9sm10498089wjc.34.2015.06.07.03.27.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Jun 2015 03:27:12 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 7 Jun 2015 12:26:38 +0200 Message-Id: <1433672799-21387-13-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1433672799-21387-1-git-send-email-s.martin49@gmail.com> References: <1433672799-21387-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v5 12/13] package/vlc: add opencv support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This change adds 2 patches (backported from upstream) to vlc fixing the build against opencv2 APIs. This allows to select the minimal set of opencv modules when opencv support is enabled. Signed-off-by: Samuel Martin Reviewed-by: "Yann E. MORIN" --- changes v4->v5: - new patch --- ...opencv_wrapper-use-opencv2-style-includes.patch | 34 ++++++++++++++++++++++ ...cv_example-add-missing-include-statements.patch | 27 +++++++++++++++++ package/vlc/Config.in | 2 ++ package/vlc/vlc.mk | 8 ++++- 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.patch create mode 100644 package/vlc/0009-opencv_example-add-missing-include-statements.patch diff --git a/package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.patch b/package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.patch new file mode 100644 index 0000000..c8a3e02 --- /dev/null +++ b/package/vlc/0008-opencv_wrapper-use-opencv2-style-includes.patch @@ -0,0 +1,34 @@ +From cc236e4652255902f2c2cee3b18f83367f35a8c7 Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Sun, 24 May 2015 14:30:09 +0200 +Subject: [PATCH 8/9] opencv_wrapper: use opencv2-style includes + +If old opencv1-style legacy include directory is available, this change +becomes purely cosmetic (maybe will compile a bit faster). +It becomes an FTBFS fix when opencv1-style include directory is missing +(i.e. from opencv-3.0). + +Signed-off-by: Samuel Martin +Signed-off-by: Jean-Baptiste Kempf +--- + modules/video_filter/opencv_wrapper.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c +index e36e1a5..5d74241 100644 +--- a/modules/video_filter/opencv_wrapper.c ++++ b/modules/video_filter/opencv_wrapper.c +@@ -39,8 +39,8 @@ + #include + #include "filter_picture.h" + +-#include +-#include ++#include ++#include + + /***************************************************************************** + * Local prototypes +-- +2.4.2 + diff --git a/package/vlc/0009-opencv_example-add-missing-include-statements.patch b/package/vlc/0009-opencv_example-add-missing-include-statements.patch new file mode 100644 index 0000000..1754066 --- /dev/null +++ b/package/vlc/0009-opencv_example-add-missing-include-statements.patch @@ -0,0 +1,27 @@ +From b82416d7000a993b33e903095a590fe32212a85e Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Sun, 24 May 2015 14:30:10 +0200 +Subject: [PATCH 9/9] opencv_example: add missing #include statements + +Signed-off-by: Samuel Martin +Signed-off-by: Jean-Baptiste Kempf +--- + modules/video_filter/opencv_example.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp +index ae3af05..998f286 100644 +--- a/modules/video_filter/opencv_example.cpp ++++ b/modules/video_filter/opencv_example.cpp +@@ -41,6 +41,8 @@ + + #include + #include ++#include ++#include + #include + + /***************************************************************************** +-- +2.4.2 + diff --git a/package/vlc/Config.in b/package/vlc/Config.in index b030a56..471f4a7 100644 --- a/package/vlc/Config.in +++ b/package/vlc/Config.in @@ -11,6 +11,8 @@ config BR2_PACKAGE_VLC depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS + select BR2_PACKAGE_OPENCV_LIB_IMGPROC if BR2_PACKAGE_OPENCV + select BR2_PACKAGE_OPENCV_LIB_OBJDETECT if BR2_PACKAGE_OPENCV help VLC is a free and open source cross-platform multimedia player and framework that plays most multimedia files as well as DVD, diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index acd67ee..f609041 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -41,7 +41,6 @@ VLC_CONF_OPTS += \ --disable-projectm \ --disable-vsxu \ --disable-mtp \ - --disable-opencv \ --disable-mmal-codec \ --disable-mmal-vout \ --disable-dvdnav \ @@ -145,6 +144,13 @@ else VLC_CONF_OPTS += --disable-gles2 endif +ifeq ($(BR2_PACKAGE_OPENCV),y) +VLC_CONF_OPTS += --enable-opencv +VLC_DEPENDENCIES += opencv +else +VLC_CONF_OPTS += --disable-opencv +endif + ifeq ($(BR2_PACKAGE_OPUS),y) VLC_CONF_OPTS += --enable-opus VLC_DEPENDENCIES += libvorbis opus