From patchwork Tue Sep 18 10:58:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?I=C3=B1igo_Huguet?= X-Patchwork-Id: 971063 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=fanamoel.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42F0PZ1M7wz9s1x for ; Tue, 18 Sep 2018 20:59:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 771548842C; Tue, 18 Sep 2018 10:59:41 +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 nqAP3+poB9ZD; Tue, 18 Sep 2018 10:59:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E009187BFE; Tue, 18 Sep 2018 10:59:39 +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 D00D01D0FB5 for ; Tue, 18 Sep 2018 10:59:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CCBD4816F4 for ; Tue, 18 Sep 2018 10:59:38 +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 8VUoBbUDIJBV for ; Tue, 18 Sep 2018 10:59:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mailsrv.kernet.es (mailsrv.kernet.es [51.68.77.130]) by whitealder.osuosl.org (Postfix) with ESMTPS id 184D187977 for ; Tue, 18 Sep 2018 10:59:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailsrv.kernet.es (Postfix) with ESMTP id DC3FA1522B93; Tue, 18 Sep 2018 12:59:33 +0200 (CEST) Received: from mailsrv.kernet.es ([127.0.0.1]) by localhost (mailsrv.kernet.es [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id x1JU9cwOH4jY; Tue, 18 Sep 2018 12:59:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailsrv.kernet.es (Postfix) with ESMTP id 027041522B93; Tue, 18 Sep 2018 12:59:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at kidooerp.com Received: from mailsrv.kernet.es ([127.0.0.1]) by localhost (mailsrv.kernet.es [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id K3_plMb6lt42; Tue, 18 Sep 2018 12:59:25 +0200 (CEST) Received: from localhost.localdomain (127.red-95-125-66.dynamicip.rima-tde.net [95.125.66.127]) by mailsrv.kernet.es (Postfix) with ESMTPSA id 0AEEF1522B93; Tue, 18 Sep 2018 12:59:21 +0200 (CEST) From: =?utf-8?q?I=C3=B1igo_Huguet?= To: buildroot@buildroot.org Date: Tue, 18 Sep 2018 12:58:27 +0200 Message-Id: <1537268307-5265-1-git-send-email-inigohuguet@fanamoel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535958840-4452-1-git-send-email-inigohuguet@fanamoel.com> References: <1535958840-4452-1-git-send-email-inigohuguet@fanamoel.com> MIME-Version: 1.0 X-Kernet-MailScanner: Found to be clean, Found to be clean X-Kernet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-0.998, required 4, autolearn=not spam, ALL_TRUSTED -1.00, SURBL_BLOCKED 0.00, URIBL_BLOCKED 0.00), not spam, SpamAssassin (not cached, score=-0.998, required 4, autolearn=not spam, ALL_TRUSTED -1.00, SURBL_BLOCKED 0.00, URIBL_BLOCKED 0.00) X-Kernet-MailScanner-Information: Please contact the ISP for more information X-Kernet-MailScanner-ID: 027041522B93.A856B X-Kernet-MailScanner-From: inigohuguet@fanamoel.com Subject: [Buildroot] [PATCH v4] gst1-plugins-good: add option for qmlgl plugin (qt5 plugin) X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Seiderer , =?utf-8?q?I=C3=B1igo_Huguet?= , Thomas Petazzoni , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" gst1-plugins-good is built with --disable-qt option, so qmlgl plugin is disabled. Added option to enable it, allowing to use elements qmlglsrc and qmlglsink. Signed-off-by: Iñigo Huguet --- Dependency: this patch depends on the pkgconf bump to version 1.5.3 Changes v3 -> v4: - remove patch fo fix QT QPA detection. Instead pkgconf package must be bumped to a newer version to support --define-prefix option (suggested by Thomas Petazzoni) Changes v2 -> v3: - select qt5 widgets to enable host uic command (suggested by Peter Seiderer) - added patch to fix QT QPA detection (provided by Peter Seiderer) - fixed file formatting Changes v1 -> v2: - select packages instead of depending (suggested by Arnout Vandecappelle) - nested ifeq in makefile (suggested by Arnout Vandecappelle) Signed-off-by: Iñigo Huguet --- package/gstreamer1/gst1-plugins-good/Config.in | 17 +++++++++++++++++ .../gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 13 +++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index afb9a41..30a4876 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -283,6 +283,23 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4 help Open Sound System (OSS) version 4 support for GStreamer +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL + bool "qmlgl (qt5)" + depends on BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative-quick + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + select BR2_PACKAGE_QT5X11EXTRAS if BR2_PACKAGE_QT5BASE_XCB + help + QT5 plugin which includes elements qmlglsrc and qmlglsink + +comment "qmlgl (qt5) plugin needs an OpenGL-capable Qt5 backend" + depends on BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2 bool "v4l2" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # multi planar api diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 21a7668..4749d9a 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -20,8 +20,7 @@ GST1_PLUGINS_GOOD_CONF_OPTS = \ --disable-osx_video \ --disable-aalib \ --disable-aalibtest \ - --disable-libcaca \ - --disable-qt + --disable-libcaca # Options which require currently unpackaged libraries GST1_PLUGINS_GOOD_CONF_OPTS += \ @@ -334,6 +333,16 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss4 endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL),y) +GST1_PLUGINS_GOOD_CONF_OPTS += --enable-qt +GST1_PLUGINS_GOOD_DEPENDENCIES += qt5declarative +ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) +GST1_PLUGINS_GOOD_DEPENDENCIES += qt5x11extras +endif +else +GST1_PLUGINS_GOOD_CONF_OPTS += --disable-qt +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y) GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2 else