From patchwork Fri May 26 13:37:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 100574 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp224725obb; Fri, 26 May 2017 06:37:19 -0700 (PDT) X-Received: by 10.98.217.21 with SMTP id s21mr2460462pfg.43.1495805839380; Fri, 26 May 2017 06:37:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495805839; cv=none; d=google.com; s=arc-20160816; b=nEISnV/ZzSaQAv/P+f0ZjCsUdrs676S+pYDgwNfU6dBy95+J+opW0Fv7LEblI9Av9Q 7TDa/pzIBxHrumdiKFOVN41Sp91QZV9vRA/EDqoSRweaMTarP/jh5KyAmsk23d84DIjJ hh4ntRI/LDELlb5UZdHLXLgsBDlEZdhTH6p2+0CLg2g7iIKeA42W9xNdXkL6sLGgsjEC qQmXYWAY6hm/1nzbvrZuRcJc5SUjWAEDxhbLgPg2fXvbFfWG35b0Tz9B19a0PVPqbjNb oJ/Y+3w5X13yct94LgjPw1lXGVvE+5uWRvbQgcl25+a6vRkU84bEYj0z+v4pfofVqyLk OnFQ== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=ql6hd5E6ymOsw/OmXw2KZDbtNnuJKz3JOemhHJRdoTA=; b=pnwxZCzXSpKpbYlpGvV7n3Rd3pNOGPHWJ8fWZA436ThTNzw61TwVlhJmubj7qWM5zm 7V/z/ow2JnKsaQ1QmRgmlYMBZWZ5RoLuI62uaSJbHWf66CVRpzj1qLCTIOvtIuc4K6uE Qv9gIPYy9v6IRbNJho9qZ0QOLUlrIK2gVpxfYj1cie3DnSkJLL0/g/aWSD3+LjvaP2sB USg2g78lL7ggzpWKviw87tlotXqxNGFD+7nk+uICtErHubH1+lzyN3g1j9gLY6djbKv+ j9CE5jKGf12HZNPY7SM0b5HTq6jRhcCoQpt594qz2w2gKff4jm7KJeNibZjjIjjJgSQm zXpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y64si922377pgy.385.2017.05.26.06.37.18; Fri, 26 May 2017 06:37:19 -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=@intel-com.20150623.gappssmtp.com; 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 Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2E8197829B; Fri, 26 May 2017 13:37:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by mail.openembedded.org (Postfix) with ESMTP id 42E3C7827A for ; Fri, 26 May 2017 13:37:14 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id 7so127988814wmo.1 for ; Fri, 26 May 2017 06:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=5dabaFz0ygt1TRmRpI7uEWNeCXa6mX/t+JheIr19EW0=; b=gVUJkcq3DoNN0Zesn3VzAsFXy5r45eARCN6GyarlYD8ca/iBkTJcOnxZl/2NTYiL+u I0HEyYnV6UpqSHuthDHVBD1ZZmdfCnNIS5sigu0yhFTSnTMADvsC8kzU0SMjvoepa6Xs Yl2GF2rFkq41XY/wFIzKmANS8ki5fm/ctdd05eW2qDuE+c708M3LCFp16TX6MCTYuxuw SCGJkvIrMOX4sms1RShFgq58dlkdjzheEVuwYgXYuwypc5/THivFyTlOwGHlyLeNoIkl RNRbOktOsQ3t8rkaDjBlARmWA8y7LQNsLWINv2dGFFlt7wz/oM2eBX/KY5j4M3FrYvhh Vxaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=5dabaFz0ygt1TRmRpI7uEWNeCXa6mX/t+JheIr19EW0=; b=QKzcqecF7dn6PYsMZwSMNDRQL0yBFjzS1ei2hLDUjlpmBO8+xckDauKcY3udnnGxri BksfXkEUFyyFuzbXIOyjgre+QD4tXeUke1rj7AZn2rLMc6TpINUemJmSCHZXnHFrX2C9 1v58O0s6EJk++bJTHTCl4NyDPoy/Bqu4FdqTOLA4N2qsE+ThekTDJSkpSlVZ82Wz+7Xx Or7KBTlgQpjWTBg5ZaxsZNsNCDEHnjUpfc6C5U/df43d+AE/hbVecqolFCOAU9PLRrFm aXCtnpykhmgD6Fq1i/P+ajcjhAXARqpspF0zqzTIH+cCS1th3iI7/bMyd9kgFRYNchVO PUeQ== X-Gm-Message-State: AODbwcCEdicHw+ygLkdRlbFiGJ4TxRspcGCqF0JwfcTWZU02Uu0Xa8XF D0kBuMes0MC9OxL3WzM= X-Received: by 10.28.224.135 with SMTP id x129mr2048354wmg.45.1495805835556; Fri, 26 May 2017 06:37:15 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id 4sm1078185wry.31.2017.05.26.06.37.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 May 2017 06:37:15 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 26 May 2017 14:37:13 +0100 Message-Id: <1495805833-413-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Subject: [OE-core] [PATCH] gstreamer1.0-omx: delete broken m4 files 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 These m4 files need to be deleted so that the versions in the sysroot that we've patched are used. Specifically, building documentation fails as the gtk-doc checks fail. Signed-off-by: Ross Burton --- meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc index 05562b1..5d92351 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc @@ -29,10 +29,17 @@ python __anonymous () { d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH")) } +delete_pkg_m4_file() { + # Delete m4 files which we provide patched versions of but will be ignored + # if these exist + rm -f "${S}/common/m4/pkg.m4" + rm -f "${S}/common/m4/gtk-doc.m4" +} +do_configure[prefuncs] += "delete_pkg_m4_file" + set_omx_core_name() { sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf" } - do_install[postfuncs] += " set_omx_core_name " FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"