From patchwork Sun Jun 7 10:26:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 481717 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 04696140082 for ; Sun, 7 Jun 2015 20:27:48 +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=VDhQJhW7; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3660EA44A8; Sun, 7 Jun 2015 10:27:48 +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 y2eqyoBSulf1; Sun, 7 Jun 2015 10:27:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 964D2A44B2; Sun, 7 Jun 2015 10:27:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 13A7E1C2238 for ; Sun, 7 Jun 2015 10:27:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 10826961C6 for ; Sun, 7 Jun 2015 10:27:13 +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 eMYYZnMUYjGN for ; Sun, 7 Jun 2015 10:27:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by hemlock.osuosl.org (Postfix) with ESMTPS id 2005C960CA for ; Sun, 7 Jun 2015 10:27:12 +0000 (UTC) Received: by wgme6 with SMTP id e6so83044110wgm.2 for ; Sun, 07 Jun 2015 03:27:10 -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=i61Ax1mIW0V2zKOgT62ZAsBzqf9WoQnQhylaWHmJHKU=; b=VDhQJhW7p1DoVpu6o3z7riCp/c4KYeLcupV9OFgsvyRwyI4q59fNCk00KXEJRUag4j NP7Vhs7752f75qr5X5PXmzqJYtwx+JHgXJXVsIU5GQXUqnabM9kbtheXfN538OsnfLZ7 6lw019q223wKf9K/4twoB88tsbNJEB2tLyuOSzZB9g2Cmy+XobZU/oEAjAkmOE3LtuVR 1yaNaeUBLz/+fSvsMwblhSHHhv72wiHFlDYo07aAlFeD2UUHvErKAGIvn7Yck5v0y45s DBJYPbN6za8vFL6o36B4Dx0WNiH7czZNZUtfYOwFgapd2uFupPD/Fp1ouWvTBcrAHf0Q sOMg== X-Received: by 10.194.71.105 with SMTP id t9mr21769854wju.128.1433672830644; Sun, 07 Jun 2015 03:27:10 -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.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Jun 2015 03:27:09 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 7 Jun 2015 12:26:35 +0200 Message-Id: <1433672799-21387-10-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 09/13] 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 v4->v5: - new patch --- package/opencv/Config.in | 11 +++++++++++ package/opencv/opencv.mk | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 55e7580..f4072ef 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -227,6 +227,17 @@ 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 QT5_BACKEND + depends on BR2_PACKAGE_OPENCV_QT5_BACKEND + # OpenGL support requires Qt5OpenGL with GL support + depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_QT5BASE_OPENGL + help + Enable OpenGL for UI. + 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 6162d1e..2902a20 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -243,6 +243,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 + ifeq ($(BR2_PACKAGE_OPENCV_WITH_PNG),y) OPENCV_CONF_OPTS += -DWITH_PNG=ON OPENCV_DEPENDENCIES += libpng