From patchwork Sat Jul 21 16:27:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142503 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4234666ljj; Sat, 21 Jul 2018 09:30:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcfkGdghU9eNHUeQJqUermBUtV7fTMJr/tha1ezwH9EO+k/p6MTWqi7IXItBbEWwDdZgaQ1 X-Received: by 2002:a62:789:: with SMTP id 9-v6mr6627434pfh.213.1532190629964; Sat, 21 Jul 2018 09:30:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190629; cv=none; d=google.com; s=arc-20160816; b=ZkQx1oB5JsPPmWj07LM3Y4GxIrXNK/cM7VFucN1sQl1VhO/Ww803zySOjCgo37+Ld2 a4jE4vSjZ8n/a8SawEX6uHpVxSD/dteetE/Eb2xMyJtMMOlZbjdoRtcyev4mN1T9WbFV vMmwY2rzutdj5Q6BHYMxdEJfD16uN/8OFD9AAzP4MS36rtKFEw7YPW5peHJGYMtivc50 E6TE7S5OZWovCLYSxKL7GCAW7lw3wJDid88/CcfjrO2XqcyWaQHKuM6t7BgHiRtyTRJK UsoWPKvADM201cgO7/Q7vNtPf2q2CesNCiZmoAupt/WeZlqn+AQX6cw0En7COyKNVE8v u3vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=1GlXeuYfWz8BDBDUpXOQJGSRumxxqTCBxYvcO3vy8Hw=; b=kAR7GU9+fItuKiTqNA4JAG4O5BIrvxLE8cf0G/S8Pz0dK4KOhUrP1rwx69b5CTDULq CY5v+XhM/kBWnGGNtY3L132Mz6yBlf09LnXWUXLUGmw2RkDQFC+jyuuGSoLGAaajUiKB 9iBTe6GGcv4bV2mErwQ2RP2Cvc6E3fFWOFuG4ztUdTiqQxWpXlyD37rMZIivQpVtw1vy xlK03Fh6y4sHPvaxHdftuDuzl9gNmkQlFDic9ShpMs+uxlfoqdCejvCLw6poAy22zSAQ uz67mDIpItEv6R+Ry6QnMUSpONLz2oB/6GoC8pJ9TQTjANw+AMxAdeeXaLP5pKOcfWNc OKNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=I1AkL+Ib; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 186-v6si4541233pff.270.2018.07.21.09.30.29; Sat, 21 Jul 2018 09:30:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=I1AkL+Ib; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A3EE878B6B; Sat, 21 Jul 2018 16:30:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mail.openembedded.org (Postfix) with ESMTP id 709E16E688 for ; Sat, 21 Jul 2018 16:27:30 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id b17-v6so256392pfi.0 for ; Sat, 21 Jul 2018 09:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RXfqmrIe2VjT9MghBPraX/wDlUY7AhFJEaQeyuFGUB4=; b=I1AkL+IbEnBEH/WhjvgBQOCpGP8sBgbQMwxe2WrP6+vJzcqcVaRg7yCiQZZMYToUlM Jb2tglF//uPLWRSozwKr/53DJ+/vTTbkBmzSxdnXUqjxU+2+Ibe2MwO9FVwRuMuODF9W 6SJR8IIzJ26faWAD4WwI9FAXCHMuSTAjWMCYhygUUqJXy8hbzMx9qS7ZvID/Gxx9USN2 ige4XJ3UF1gEJLMSKmwCsEmLrd4Yd7eDdLPSVsHg5R8WfJhvfTvS7sQllhhcazBAs4/T Gk3InzfUAXyhjtzMex5S0KYvYdHaTADrDzeUyuo0XuYqEdf1PnELvklzteQCs5DW9G09 x+eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RXfqmrIe2VjT9MghBPraX/wDlUY7AhFJEaQeyuFGUB4=; b=OPR3DpSRgxmZIUd6u7Q5x58vq4l4TPzabXTmCki/plfy0j0Rvja6jFN6h9Wq+ZdcLd SSCD0Ctl4kRLxgCmpksy1lG1CMGW/HfDuVv1USi3rXZKZa2YvLdJ6FJlBcxO6wvW8wrY 5f69txLyJ4EHE9pxP4VWGzoi5j2182cCV+yNtEJB/mXsIg/9z7venFRU2ETYPFiAKtXU J7J7KMNnYsEcMN4PgUPH4nJJvmsWpV43pE22PRJF6ZFR5cNMP7vBD6Cp+qO+/r1q6anI 75KMymxNbDAwGdPBNKmF0xo58aDdanGxM1/GWEUCvHdpl59MoWnxf5R5eVzx6DsdUOMH kzNQ== X-Gm-Message-State: AOUpUlESC2YH0Bp8K8DnKKSoxMQ2sysWQEq50j6FRDbQ/lYl2KAIIdM+ QK/ja4rOuKF1RyBqtd5XKhyS/Qb8 X-Received: by 2002:a63:af14:: with SMTP id w20-v6mr6349738pge.47.1532190451204; Sat, 21 Jul 2018 09:27:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:30 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:14 -0700 Message-Id: <20180721162715.12611-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721162715.12611-1-raj.khem@gmail.com> References: <20180721162715.12611-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 6/7] xserver-xorg: Find wayland-protocol files in proper location during cross compile X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixes | make[2]: *** No rule to make target '//usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml', needed by 'relative-pointer-unstable-v1-client-protocol.h'. Stop. | make[2]: *** Waiting for unfinished jobs.... Signed-off-by: Khem Raj --- ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.19.6.bb | 3 ++ 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch new file mode 100644 index 0000000000..caad2781a8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch @@ -0,0 +1,31 @@ +From 03b856b08a2a9403dbd556c48ab4a94338f7893b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Jul 2018 23:29:35 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DATADIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 14dfc2e..3bd18a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2530,7 +2530,8 @@ if test "x$XWAYLAND" = xyes; then + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, + [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) + +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) ++ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) ++ AC_SUBST([WAYLAND_PROTOCOLS_DATADIR]) + fi + + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb index c680cf9e89..27d4e75b1e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb @@ -5,10 +5,13 @@ SRC_URI += "file://musl-arm-inb-outb.patch \ file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ file://0003-Remove-check-for-useSIGIO-option.patch \ file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ " SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8" SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197" +EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols" + # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades.