From patchwork Tue Oct 9 22:08:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 981541 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="J9Sc8k00"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42VBL01G5cz9s8r for ; Wed, 10 Oct 2018 09:12:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1A18C868D9; Tue, 9 Oct 2018 22:12:21 +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 5VNlSYMduh3S; Tue, 9 Oct 2018 22:12:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E789E8682C; Tue, 9 Oct 2018 22:12:15 +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 51F2F1BF48E for ; Tue, 9 Oct 2018 22:12:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4AA3B23CC4 for ; Tue, 9 Oct 2018 22:12:14 +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 P7xluuCKgBGP for ; Tue, 9 Oct 2018 22:12:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from fanzine.igalia.com (fanzine.igalia.com [91.117.99.155]) by silver.osuosl.org (Postfix) with ESMTPS id 4C93123938 for ; Tue, 9 Oct 2018 22:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=KfWgokR6WwBpE5FUakYsBHvU0O5gkgShIxZhdHuroVc=; b=J9Sc8k00KlGiuPI7PGhUUqCUWqKePjVLpomU85AG5Rwj7gk0WTZhQh8I/yyWbCLb2Hm4Tib90WEWiUNUZbhQ92g6rMgmKKw51rFRz2WmIn7ZtGMdaBlNISSEzHkq0bB2zYTvQQtcAKZB+r/vNtUthgsUySWbwnkw4XoB+Xz7GHZ7gnqtOLweqTwvrFGn6ybxFwNoyE0WAia23hLYjg6JORBoNJGM/r/xU13gsyT5SVHViEOxMKikkC/oAtqWo4MpYpLSuE99V859uPsd5Lui0xdpLBNy7ggtlEc0ghsaN/xLfovhw9Bms7gcAkSRG3TrBtTnRBhPgS0oRC4y0cjsSQ==; Received: from [194.100.51.2] (helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gA0EY-0004Tg-Df; Wed, 10 Oct 2018 00:12:06 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 6ce68ed1; Tue, 9 Oct 2018 22:08:52 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Wed, 10 Oct 2018 01:08:52 +0300 Message-Id: <20181009220852.4309-5-aperez@igalia.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181009220852.4309-1-aperez@igalia.com> References: <20181009220852.4309-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/4] webkitgtk: explicitly set USE_GSTREAMER_GL build option X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Perez de Castro Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This covers the case where GL/GLES is available (so -DENABLE_OPENGL=ON gets passed), which makes the webkitgtk build system assume GStreamer-GL is available, while actually it is not. Also, use "imply" to select the needed GStreamer-GL component, because in general it is preferred due to better performance. This fixes some autobuilder failures like the following: http://autobuild.buildroot.net/results/187796535af53ece426641ff7d88aabada281674 Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/Config.in | 1 + package/webkitgtk/webkitgtk.mk | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index bf0a150251..7a83b08b60 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -101,6 +101,7 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP select BR2_PACKAGE_GST1_LIBAV + imply BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL help This option pulls in all of the required dependencies to enable multimedia (video/audio) support. diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 39d681b1d4..499715ebfe 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -95,4 +95,11 @@ WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON endif endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL),y) +WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=ON +WEBKITGTK_DEPENDENCIES += gst1-plugins-bad +else +WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF +endif + $(eval $(cmake-package))