From patchwork Mon May 19 18:49:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 350371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id E240C14008D for ; Tue, 20 May 2014 04:49:57 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0BB70321E7; Mon, 19 May 2014 18:49:57 +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 otzWs5d9ZPIV; Mon, 19 May 2014 18:49:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6B36D3212F; Mon, 19 May 2014 18:49:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 535DD1C2110 for ; Mon, 19 May 2014 18:49:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4E6BA83619 for ; Mon, 19 May 2014 18:49:53 +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 rE3xLuy1XwDv for ; Mon, 19 May 2014 18:49:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by whitealder.osuosl.org (Postfix) with ESMTPS id A60318B50B for ; Mon, 19 May 2014 18:49:51 +0000 (UTC) Received: from fwd28.aul.t-online.de (fwd28.aul.t-online.de [172.20.26.133]) by mailout09.t-online.de (Postfix) with SMTP id 4A08B2C2CBF for ; Mon, 19 May 2014 20:49:35 +0200 (CEST) Received: from fli4l.lan.fli4l (Z4QILsZLQhabqOjlspPb5sRnKThx4eRbYIjKtzZ4XWJ3mDiT7ymQM+ihftyf5Nzw3u@[79.247.175.27]) by fwd28.t-online.de with esmtp id 1WmScx-2lOPya0; Mon, 19 May 2014 20:49:35 +0200 Received: from fli4lbuild64.lan.fli4l ([192.168.1.51]:35634) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1WmScw-0007EM-PJ; Mon, 19 May 2014 20:49:35 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Mon, 19 May 2014 20:49:29 +0200 Message-Id: <1400525369-32257-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 X-ID: Z4QILsZLQhabqOjlspPb5sRnKThx4eRbYIjKtzZ4XWJ3mDiT7ymQM+ihftyf5Nzw3u X-TOI-MSGID: b8a8dbe2-c0a5-40b8-892a-c74e900af9e8 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] package/webkit: Fix OpenGL-related dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net fixes http://autobuild.buildroot.net/results/27a/27a674c6a19a729fae5cc33de0360b2a061930c1/ This patch indeed fixes two problems based on the autobuilder-defconfig used. 1) Add missing dependencies when opengl is detected by webkit to satisfy autobuilder: checking which GPU acceleration backend to use... opengl checking for XCOMPOSITE... yes checking for XDAMAGE... no configure: error: Package requirements (xdamage) were not met: 2) ... but opengl should not have been detected with the used defconfig: $ grep MESA .config BR2_PACKAGE_MESA3D=y which will lead to a link error although webkit configure found all dependencies: /home/br2/output/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/4.7.3/../../../../mips-linux-gnu/bin/ld: cannot find -lGL Signed-off-by: Bernd Kuhls --- package/webkit/webkit.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk index 21b535f..c693de7 100644 --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -48,4 +48,11 @@ WEBKIT_CONF_OPT += \ WEBKIT_CONF_OPT += --with-target=x11 WEBKIT_DEPENDENCIES += xlib_libXt +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +WEBKIT_CONF_OPT += --with-acceleration-backend=opengl +WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXdamage +else +WEBKIT_CONF_OPT += --with-acceleration-backend=none +endif + $(eval $(autotools-package))