From patchwork Thu Jun 25 19:59:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 488540 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 5BA8A140271 for ; Fri, 26 Jun 2015 06:00:58 +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=VWFxpF/9; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6CE3F95D76; Thu, 25 Jun 2015 20:00:57 +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 Hep5v1MJRjqW; Thu, 25 Jun 2015 20:00:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4F23095D5D; Thu, 25 Jun 2015 20:00:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8F7461CE50B for ; Thu, 25 Jun 2015 20:00:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 89D8AA41A0 for ; Thu, 25 Jun 2015 20:00:25 +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 8zvdMKTybQgu for ; Thu, 25 Jun 2015 20:00:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by fraxinus.osuosl.org (Postfix) with ESMTPS id AD8ADA4126 for ; Thu, 25 Jun 2015 20:00:24 +0000 (UTC) Received: by wibdq8 with SMTP id dq8so85904185wib.1 for ; Thu, 25 Jun 2015 13:00:23 -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=VlLYdU+T0EM94HlyMPTo6Q54cf9D2nAzf+frQALHiek=; b=VWFxpF/9cju0ZFccIXJ/HZ6IYl8SPkWEOXWwGCYdTDfuP76DljJx0v7JdFgUV2D354 HZOR7YT23hLf/c+TPgW1ehsH6M0CibvXlQoIiBu2+TyA+rjUMmTMFHj8LnEnGBh6l5uJ Ot9jiLKfg1vhCP5RdJOvxaqsTwyeyi1PWN/CIUVhEA37H2uo7lpm+V2OGjuvCzTwCbXx vHszvazhkEJWUsuhwceh80mSHu4UvZBRJtHf59mbAl7E7SwfyyIYgQHrzEAAPKNcca7E WzgUye3CVUni4tzi8x2ut4IN5YHnzaDAyFRLKOto0z06E7Ar5cYjopP6BbIa/hdX3tF5 /rSA== X-Received: by 10.194.71.226 with SMTP id y2mr80911802wju.34.1435262423419; Thu, 25 Jun 2015 13:00:23 -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 hn7sm47218600wjc.16.2015.06.25.13.00.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jun 2015 13:00:22 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Thu, 25 Jun 2015 21:59:56 +0200 Message-Id: <1435262397-888-16-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1435262397-888-1-git-send-email-s.martin49@gmail.com> References: <1435262397-888-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v6 15/16] 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 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 visible when Qt5 support is selected. Signed-off-by: Samuel Martin --- changes v5->v6: - update comments (Yann) changes v4->v5: - new patch --- package/opencv/Config.in | 16 ++++++++++++++++ package/opencv/opencv.mk | 7 +++++++ 2 files changed, 23 insertions(+) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index b738f71..b80c9fa 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -311,6 +311,22 @@ config BR2_PACKAGE_OPENCV_WITH_JPEG help Use shared libjpeg from the target system. +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 Qt5 and an OpenGL provider" + depends on !BR2_PACKAGE_OPENCV_WITH_QT5 || \ + !BR2_PACKAGE_QT5_GL_AVAILABLE || \ + !BR2_PACKAGE_HAS_LIBGL + config BR2_PACKAGE_OPENCV_WITH_PNG bool "png support" select BR2_PACKAGE_LIBPNG diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 986e7b4..61a3ccd 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 qt5base +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)