From patchwork Sun Jul 7 18:44:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 257378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3B7B32C009D for ; Mon, 8 Jul 2013 04:46:34 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 37646A749A; Sun, 7 Jul 2013 18:46:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A0Vx5yitBRo8; Sun, 7 Jul 2013 18:46:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5A11DA0171; Sun, 7 Jul 2013 18:46:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2378B8F753 for ; Sun, 7 Jul 2013 18:46:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2E0EA83A76 for ; Sun, 7 Jul 2013 18:46:19 +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 9tUSd287ckry for ; Sun, 7 Jul 2013 18:46:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by whitealder.osuosl.org (Postfix) with ESMTPS id 273628AA63 for ; Sun, 7 Jul 2013 18:46:16 +0000 (UTC) Received: by mail-wi0-f178.google.com with SMTP id k10so3331768wiv.11 for ; Sun, 07 Jul 2013 11:46:15 -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:x-mailer:in-reply-to:references; bh=G6YqxND/s5M9OUMCQ+oHzJeWs2LUJOYOPMItOQjIAbs=; b=ehrt2nGFIiXOgxLedS/ZyIZrj4AKVus3ZZLbBW1YB/C/hc+OHPJPgxicdTiD7og0I1 6yuT+KK0Dxt4uPV4ft+IlezYWapIIhVhWQ2Gofpyo3Bbf5BQqvRLXLxcdkri4lTKXE0o lRRRZH1H9i8I7Vd0X3LbsVYJeTLYL0M530VBGWk4QziS8vUDYo3Q6CLpYg5o7BVegE7J /WNXVdprXP3mWj3fo6dP2GZ8kUrTTRRdqa0aOR/3plIzrWTTPsem4ZbRUA4PrOOg785d dwD/Hp7/qHL0gR4p4zDaEHr/7rNwc0R1M4UpLcVhpT0FrC+7mZ0WNWCGg9VggwbJ9W6Q Pr7Q== X-Received: by 10.180.210.132 with SMTP id mu4mr10093069wic.5.1373222774943; Sun, 07 Jul 2013 11:46:14 -0700 (PDT) Received: from laptop.aldebaran.lan (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id z6sm19675790wiv.11.2013.07.07.11.46.14 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 07 Jul 2013 11:46:14 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Sun, 7 Jul 2013 20:44:55 +0200 Message-Id: <1373222695-9148-3-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1373222695-9148-1-git-send-email-s.martin49@gmail.com> References: <1373222695-9148-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH 3/3] opencv: bump version to 2.4.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Also: - add license details; - add new modules option; - explicitly disable python support to avoid being confuse by the one from the host; - update qt support (now handle qt4/qt5) Signed-off-by: Samuel Martin --- package/opencv/Config.in | 34 ++++++++++++++++++++++++++-------- package/opencv/opencv.mk | 18 +++++++++++++----- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 26bf5e7..553a0a5 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -97,6 +97,13 @@ config BR2_PACKAGE_OPENCV_LIB_STITCHING help Include opencv_stitching module into the OpenCV build. +config BR2_PACKAGE_OPENCV_LIB_SUPERRES + bool "superres" + default y + help + Include opencv_superres "super resolution" - module into the OpenCV + build. + config BR2_PACKAGE_OPENCV_LIB_TS bool "ts (touchscreen)" default y @@ -164,15 +171,26 @@ config BR2_PACKAGE_OPENCV_WITH_PNG help Use shared libpng from the target system. +if BR2_INSTALL_LIBSTDCPP && (!BR2_avr32 || (BR2_USE_WCHAR && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS)) # qt{4,5} dependencies + +if !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 +comment "Qt support not available." +comment "Enable one of the Qt libraries before enabling Qt support in OpenCV" +endif + config BR2_PACKAGE_OPENCV_WITH_QT - bool "qt backend support" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_avr32 # qt - select BR2_PACKAGE_QT - select BR2_PACKAGE_QT_STL - default y - help - Use Qt with STL support + bool "Qt support" + #prompt "Qt4 support" if BR2_PACKAGE_QT + #prompt "Qt5 support" if BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5BASE if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_TEST if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 + +endif # qt{4,5} dependencies config BR2_PACKAGE_OPENCV_WITH_TIFF bool "tiff support" diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index b9ed8cb..aa64c33 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -4,11 +4,13 @@ # ################################################################################ -OPENCV_VERSION = 2.4.2 +OPENCV_VERSION = 2.4.6 OPENCV_SITE = http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION) -OPENCV_SOURCE = OpenCV-$(OPENCV_VERSION).tar.bz2 OPENCV_INSTALL_STAGING = YES +OPENCV_LICENSE = BSD-3c +OPENCV_LICENSE_FILES = doc/license.txt +OPENCV_CONF_ENV = PATH="$(TARGET_PATH)" OPENCV_CONF_OPT += \ -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \ -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \ @@ -47,13 +49,19 @@ OPENCV_CONF_OPT += \ -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_superres=$(if $(BR2_PACKAGE_OPENCV_LIB_SUPERRES),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) \ -DBUILD_opencv_world=OFF +# Explicitly disable python to avoid confusing OpenCV, which comes with its +# own implementation of the Python detection CMake module. +OPENCV_CONF_OPT += \ + -DBUILD_opencv_python=OFF \ + -DPYTHON_EXECUTABLE=OFF + # Hardware support options. # # * PowerPC support is turned off since its only effect is altering CFLAGS, @@ -141,8 +149,8 @@ OPENCV_CONF_OPT += -DWITH_PNG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y) -OPENCV_CONF_OPT += -DWITH_QT=ON -OPENCV_DEPENDENCIES += qt +OPENCV_CONF_OPT += -DWITH_QT=$(if $(BR2_PACKAGE_QT),4,5) +OPENCV_DEPENDENCIES += $(if $(BR2_PACKAGE_QT),qt,qt5base) else OPENCV_CONF_OPT += -DWITH_QT=OFF endif