From patchwork Sun Jul 5 09:40:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 491301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 57B4114099F for ; Sun, 5 Jul 2015 19:41:00 +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=qqDUih72; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 270509509F; Sun, 5 Jul 2015 09:40:56 +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 YmxPCeqDwPaa; Sun, 5 Jul 2015 09:40:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 964DC950A1; Sun, 5 Jul 2015 09:40:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 293111C25F1 for ; Sun, 5 Jul 2015 09:40:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2643532C27 for ; Sun, 5 Jul 2015 09:40:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 96+63JUT+GAL for ; Sun, 5 Jul 2015 09:40:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by silver.osuosl.org (Postfix) with ESMTPS id A105732C24 for ; Sun, 5 Jul 2015 09:40:44 +0000 (UTC) Received: by wibdq8 with SMTP id dq8so129649077wib.1 for ; Sun, 05 Jul 2015 02:40:43 -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=Ze+EYi8f6kmBahCQVO/NX5jv9V6FNsYIBNMjfCtVY6Q=; b=qqDUih729ufhEolwT4XiYH36C9fg2dxx5hFPZp4FBd7AG2wSjXCgzPcujB1/BUisnN 5PsnXrSabm5pgiwQMoyJGbkxoTmPiMlSKkhAgBC7oOfJTAeltYy4dK5iOZvBsWsTqdVb BwnCYjXp42k1Y1iE3g+WYeWbtc46YMLF1GjdvBs4NPAoTNleafw4WVZD9umGjFpblRE7 XZ3ORu4pYfbOiFF7Kvd5RtUirSt+s5yiv8Cb6cLbMojmCvjGAmFEv2ijeCp/5wvKzdl5 O0f7J01AvZNQQdTNfwpghBAjP92PuiH9LLljyqQmTtu6jeCCQuk3pa4JughHIjbU6Q81 hHeA== X-Received: by 10.194.179.167 with SMTP id dh7mr88592834wjc.15.1436089243389; Sun, 05 Jul 2015 02:40:43 -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 z9sm41022473wiv.9.2015.07.05.02.40.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Jul 2015 02:40:42 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 5 Jul 2015 11:40:28 +0200 Message-Id: <1436089229-21103-7-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1436089229-21103-1-git-send-email-s.martin49@gmail.com> References: <1436089229-21103-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v8 6/7] package/opencv: add opengl 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" In OpenCV, OpenGL is only used by highgui module. OpenGL support is done using extensions from 3rd party framework: either Qt5OpenGL with Qt5 (with GL support only, not GLES); or gtkglext (which is not available in Buildroot) with gtk2 So, make OpenGL knob a sub-option of the Qt5 support option. Signed-off-by: Samuel Martin Reviewed-by: "Yann E. MORIN" --- changes v7->v8: - fix dependencies (Yann) - update a/r/t tags changes v6->v7: - rework comment as sugessted by Yann - move opengl option close to the gui toolkit choice changes v5->v6: - update comments (Yann) changes v4->v5: - new patch --- package/opencv/Config.in | 22 +++++++++++++++++++++- package/opencv/opencv.mk | 7 +++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 776fa6d..273b00f 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -52,9 +52,10 @@ config BR2_PACKAGE_OPENCV_LIB_HIGHGUI Include opencv_highgui (high-level gui and media i/o) module into the OpenCV build. +if BR2_PACKAGE_OPENCV_LIB_HIGHGUI + choice prompt "gui toolkit" - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI help GUI toolkit for opencv_highgui module. @@ -140,6 +141,25 @@ comment "qt5 support needs qt5" endchoice +config BR2_PACKAGE_OPENCV_WITH_OPENGL + bool "opengl support" + # OpenGL support done using Qt5OpenGL, so depends on WITH_QT5 + depends on BR2_PACKAGE_OPENCV_WITH_QT5 + # OpenGL support requires Qt5OpenGL with GL support, not GLES + depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_QT5BASE_OPENGL + help + Enable OpenGL for UI. + +comment "opengl support needs an OpenGL provider" + depends on BR2_PACKAGE_OPENCV_WITH_QT5 + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || \ + !BR2_PACKAGE_HAS_LIBGL + +endif # BR2_PACKAGE_OPENCV_LIB_HIGHGUI + + config BR2_PACKAGE_OPENCV_LIB_IMGCODECS bool "imgcodecs" select BR2_PACKAGE_OPENCV_LIB_IMGPROC diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index c788aeb..bb1bcd8 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -264,6 +264,13 @@ else OPENCV_CONF_OPTS += -DWITH_JPEG=OFF endif +ifeq ($(BR2_PACKAGE_OPENCV_WITH_OPENGL),y) +OPENCV_CONF_OPTS += -DWITH_OPENGL=ON +OPENCV_DEPENDENCIES += libgl +else +OPENCV_CONF_OPTS += -DWITH_OPENGL=OFF +endif + OPENCV_CONF_OPTS += -DWITH_OPENMP=$(if $(BR2_GCC_ENABLE_OPENMP),ON,OFF) ifeq ($(BR2_PACKAGE_OPENCV_WITH_PNG),y)