From patchwork Fri Aug 2 20:37:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170454 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1261757ile; Fri, 2 Aug 2019 13:37:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNDA4yUREuaTNOvnnXf8iBpYvK/8qSM9FcHMOzPPtFTsy/4uSNWd1edrd0j2mYzGhdu1XB X-Received: by 2002:a17:90a:cb18:: with SMTP id z24mr5877974pjt.108.1564778250002; Fri, 02 Aug 2019 13:37:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564778249; cv=none; d=google.com; s=arc-20160816; b=n2QlB/qzIo0/CpebyjzzDywy8oYfQAQCePdmRGawjZBejxJfPWMzVbRKfUvgA6z3AS fdq6EMNF6G+4uAWPCQvG/Jilcm7sNJ1eatlb0KyGJ72rXiHX51W6ovuR5sK+D2fY9P/x UMoyQcLVN0NBKrOazbJydzaOROJtqTwgxva2upr4MXxgLcI2rBQEsNpIiZvFHK9vqYAP W5ORDESrvhU0TmcCCCcWesroZcADr5SxjpaUWjw94TLlgrQoIS30kyrEikOrQr6av0gz EEWtTtKlLI2MjRRDcOlHBvVdfhGppLsmQnnpAkj1TtHxEqABg46d1jJY+nEOhW8h8ZTJ tgzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=c9p1ay6Nb6UOQmz9uWF+Cc7cMcNuqqixUaB1GOgCQHE=; b=nDcISlZrjJfZ6xRdDBKAlJpSwZithJgJhjt9ZDv9w6Brz10pWZ3MO8HtI9BdiI5y31 /3mxBffF78PEdMaFXaeBb45aRqI8Jpdrf3jaTtdt9kfyP+JjjsMot66iWGxZdu+uu3OK ZoaHStVGOwRSbfAEObfCQ4nyVO/MeIjbwfSzDUl3xPheRxUQ0Z9zFKWqClYve67lp8mI UCvjbuJ3hlMEtoupCYe+JthpM/6y139ylBhytaIUR/y7NazmStYSuMsupSGPwe4AjxAQ 9jtc6A1J56iuGsOEAqZD7XuBLN0flR3+/4W40BYicv4gRJ3R8VDlDmpsZuQyJ9D0rFHC 9x9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=phAp5dIm; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 31si35237872plc.356.2019.08.02.13.37.29; Fri, 02 Aug 2019 13:37: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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=phAp5dIm; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7B9237F391; Fri, 2 Aug 2019 20:37:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id 1EF187D25F for ; Fri, 2 Aug 2019 20:37:23 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id x4so25261462wrt.6 for ; Fri, 02 Aug 2019 13:37:24 -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:mime-version :content-transfer-encoding; bh=5P8h/mXX7ooqN5jlfbnt7JM5t7QF1Pw67m4BbIlOJj8=; b=phAp5dImtfo10eJOfa9zSnEVHH0LC2VxK/ELIWdCfsxqzKYBVp9aYG9H9SYWGd5II+ SIW1Pq72Zewxq3mvWOY5wVOoKUpuWsvj3QlRLQNalULxxxAxJ5a3T26IBBgRjVbK/ACH qjE082AcVHv5mqevH8RcGn0Hg9mrTKgkCjFiHaMvxB1W8eDWCsIlL2oGhW1VZXjZSztb HCKkFFnN0UEvrSFLdDylPV+Q+RuzndHNtQ02lgUqrMTz+cuPztX0RtabjgiclNDLy4/8 qbbzJbZxxl6QaT0dvDYTymEvfGnhbws4ipfC0AORKM4K4tqMrRmMjSrdr0vzvBBpZG+m IW6w== 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:mime-version :content-transfer-encoding; bh=5P8h/mXX7ooqN5jlfbnt7JM5t7QF1Pw67m4BbIlOJj8=; b=Bo4quewb2UVx/QoJqjtejY4ajKm91QdVW4HIpwxZf3y8wdqkUMxiU4JAatPtTOcLFd n+Tg9KaPXgoSH86Y8ndBmKKxqqJdZ9/m977mdbZPGEo4yVSyMtYI98DkKGgD30bzr0mG pS4Jmfnsc/D2FFLsqJ7WW0CcPuogTGN7Cy275mGQVDBMATLhstp6pocAQo6eubK30vW+ USvZCPtPylTNMNATDw1FcG4Axmn3/hGogHw0Q3YUYPDaly6PBd6cyohGb3KcCtSViyu3 O5zNORfkjqioIDQSVAexsiRHPNkUj/JqvIZW4Fc0AJBYQNMHUrYuo+69E+KVh0b1XzhP xbjA== X-Gm-Message-State: APjAAAUIMPVYR1OfPDn7SOkUFKU+0BLIpfs2g5sYLt77AojL3Pphmx7y 1fe7yshxmzJkcZY8XanCSYaazB3BDH0= X-Received: by 2002:adf:cd04:: with SMTP id w4mr100021614wrm.230.1564778243514; Fri, 02 Aug 2019 13:37:23 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.21 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:22 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:11 +0100 Message-Id: <20190802203719.20437-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/9] libxx86misc: remove this now redundant library 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The extension this client library is for was removed from the X server over a decade ago: commit 22e64108ec63ba77779891f8df237913ef9ca731 Author: Daniel Stone Date: Wed Jul 16 06:25:26 2008 +0300 XFree86: Remove XFree86-Misc extension Its last remaining purpose in life has been destroyed by input properties. Au revoir: it's been fun, by which I mean awful. Remove the obsolete dependencies from xset and xdpyinfo, and delete libxx86misc entirely. Signed-off-by: Ross Burton enter the commit message for your changes. Lines starting --- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/distro/include/maintainers.inc | 1 - .../xorg-app/xdpyinfo_1.3.2.bb | 2 +- meta/recipes-graphics/xorg-app/xset_1.2.4.bb | 2 +- .../xorg-lib/libxxf86misc_1.0.4.bb | 19 ------------------- 5 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index b0656953eb3..ab6ebdb899a 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -195,7 +195,6 @@ DISTRO_PN_ALIAS_pn-libxft = "Mandriva=libxft Debian=libxft2 Ubuntu=libxft2" DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi" DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon Debian=libxkbcommon" DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver" -DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc" DISTRO_PN_ALIAS_pn-linux-dummy = "Intel" DISTRO_PN_ALIAS_pn-linux-firmware = "Fedora=linux-firmware Ubuntu=linux-firmware" DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 77af8b6dad8..0bb4a57248f 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -443,7 +443,6 @@ RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster " RECIPE_MAINTAINER_pn-libxv = "Armin Kuster " RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster " RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxxf86misc = "Armin Kuster " RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster " RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin " RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin " diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb index af04bb6e3ab..a09e220f9d0 100644 --- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb +++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb @@ -9,7 +9,7 @@ clients and the server, and the different types of screens and visuals \ that are available." LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" -DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau libxcomposite" +DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxi libxrender libxinerama libdmx libxau libxcomposite" PE = "1" SRC_URI += "file://disable-xkb.patch" diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb b/meta/recipes-graphics/xorg-app/xset_1.2.4.bb index 5748837fd5b..e21120e7886 100644 --- a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb +++ b/meta/recipes-graphics/xorg-app/xset_1.2.4.bb @@ -7,7 +7,7 @@ preference options of the display." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" -DEPENDS += "libxext libxxf86misc libxmu libxau" +DEPENDS += "libxext libxmu libxau" PE = "1" SRC_URI += "file://disable-xkb.patch" diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb deleted file mode 100644 index 45b0673e732..00000000000 --- a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension library" - -DESCRIPTION = "The XFree86-Misc extension, provides a means to access \ -input device configuration settings specific to the XFree86/Xorg DDX." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45" - -DEPENDS += "libxext" -PROVIDES = "xxf86misc" - -PE = "1" - -XORG_PN = "libXxf86misc" - -SRC_URI[md5sum] = "37ad70f8b53b94b550f9290be97fbe2d" -SRC_URI[sha256sum] = "a89c03e2b0f16239d67a2031b9003f31b5a686106bbdb3c797fb88ae472af380" From patchwork Fri Aug 2 20:37:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170455 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1271998ile; Fri, 2 Aug 2019 13:51:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqwbFWr40h8JXsXixmHnPLh2DtQ1a/fSmlVc85J3Z9a4POPVwsh09HWauq7YMyLB3oagyAp4 X-Received: by 2002:a17:90a:30aa:: with SMTP id h39mr6153251pjb.32.1564779072411; Fri, 02 Aug 2019 13:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564779072; cv=none; d=google.com; s=arc-20160816; b=peuGmM+iUehA6iy1I3XcQjEgHDqrhMSWcqbZfynof56/FuqjZu6V12fEtbDzfCSFM2 JFWTlTdzuXTsziuGqHy60tZUF59crDvsTgDwbFPQNB163lTxINywSEm5NuKIH6Dz97lf dvs+QoQ9AEu3DxGyozsNftepIobiHrWglilYVl3fRo/h9urMT0JchNVZzQGx3agr/xOo UbADUap3xiukNR5g87aKk2NfbIL8OGGmlTJJrzgOOt7MCx51/+3DM9t5bHBS1dpWMSDe CIO9zJ++WkFxhAqKO07vAaxahRVIWAQdjVlNwzr5HUw15ap4MmWRBl+tZMRadg0t642o AYvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=JoQ/YL8YAIp4qst2Qc4q3CpFipHp0sBr9lYx8/4ztc0=; b=WFRLhbAvzIwbKaATVmF5DG3TH1k+iUcsDV3dh6SxPMkjL4vz+iwMmNYGUeOBjAurYD JsR0PT2RXwrJURvzTqUdLSK9C9g8i7We9CTcgNqf9ANwMWpdwihPlhuIxn+jLL78aPLr 6KDh+03/bp6FcfSSeQoW89bQ9r/dsB9A+x3x0PgR09GG3BUjRZYobJ2UNXgkfWnrVaHb JXkbSISy+VubzM46VqfVQfAbae4zKj43Cr3sPoBJjO2rE8Mdi0K0K5l88OnL6918my35 MhhGEeK0XkuniL1gacSTFT7YReXHnSyc2+W5TcyNKkp4XuCBQlZgNktm8f4giqrPLIyG aEzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=hLTKSqQA; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 85si42109351pgb.583.2019.08.02.13.51.11; Fri, 02 Aug 2019 13:51:12 -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 header.s=20150623 header.b=hLTKSqQA; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2A60F7F38A; Fri, 2 Aug 2019 20:51:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mail.openembedded.org (Postfix) with ESMTP id CC3A77F38C for ; Fri, 2 Aug 2019 20:37:23 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id n9so53354791wrr.4 for ; Fri, 02 Aug 2019 13:37:25 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=cIXrF9ReRQHppjAHZes2R0u30ua4h2c842AzdX9/dCM=; b=hLTKSqQAeBcagXc8B7aYJn19ino1MINf5/OJUVubmdbSxZ0d52BUOYgmWw/UWXMyLv jzw2Rtd6ExALNRbWmqL/kaKlzdZ8FzhhhQpV/vQd9chF8zv2EIvYSDL4ozDiIfvKiJX2 jQm/Eqp+6plDPS0GS0gfXs3q0aXfRGLAIgGZfSVjNRnNFAnShaypKcLduJP7m2uDQ5De VVwKQg2+6quU/KEnUHYCG4DkIVdHe2YkNdJqfVM3AWZBQdvqoT2y6mdM729ee7m0HycQ rXQuGpilPPpbYivfRuXexwhn+tQBAg0wNLlj7v/vL/DbZeXfmMKAUU7TbmbXm6JGNOrW 5V+Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=cIXrF9ReRQHppjAHZes2R0u30ua4h2c842AzdX9/dCM=; b=WEgQRKOT+2aiYphaETsKtR+K83oIhSylOxR+gKYJDcsJi15Yjgp1VQcL4ybvvi2W6h WbN8Wolhe8XV2/5GZeoP0XbYeUGeIMUgL6GKMwVcGvlt9LQ67/AIdaA5EMdj3YTmWmNF 3HRnZtzsyxzjJOM878JAEIKOlTxShaTW402yDrXoKIDAO6ERjbKUVmM0LJdRCZMq82ln Mgv4aXdS6QFrhbqfdG1hma9n+dBYp5uZ7st2jqgpPrXY+rG1/GO5wUZv5W3FgchYdtqb Dj5yJjl80bJsYQflxYtoKmhCtkJTyDllAXWWLj0uXP7uvtB3aqYD9BFR4cC5bagmj+fu jm4g== X-Gm-Message-State: APjAAAVvjXs3IT7UmgohCI1T9OY9bq9v/7RhpLAf8Ap4HveMX9Cov5GU Z8IAyzsMtBbXTKRLeytNIZk+D96CmrM= X-Received: by 2002:a5d:51c8:: with SMTP id n8mr9764980wrv.46.1564778244449; Fri, 02 Aug 2019 13:37:24 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.23 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:23 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:12 +0100 Message-Id: <20190802203719.20437-2-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802203719.20437-1-ross.burton@intel.com> References: <20190802203719.20437-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/9] xserver-xorg: clean up xorgproto dependencies 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org xorgproto is mentioned in the PACKAGECONFIG build dependencies because in the past it was many separate *proto recipes. Now they're all in one recipe, which is in DEPENDS, so we don't need to depend on it several times. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.20.1 -- _______________________________________________ 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.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 615ad6d9bda..fc05c6a76ea 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -27,9 +27,8 @@ inherit autotools pkgconfig inherit distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -PROTO_DEPS = "xorgproto" LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" +DEPENDS = "xorgproto ${LIB_DEPS} font-util" # Split out some modules and extensions from the main package # These aren't needed for basic operations and only take up space: @@ -128,18 +127,18 @@ PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ " PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xorgproto virtual/mesa" -PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,xorgproto" +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa" +PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2" # DRI3 requires xshmfence to also be enabled -PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,xorgproto" -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,xorgproto virtual/libgl virtual/libx11" +PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3" +PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11" PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl" PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" -PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xorgproto" +PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama" PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy" # Xorg requires a SHA1 implementation, pick one From patchwork Fri Aug 2 20:37:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170456 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1272118ile; Fri, 2 Aug 2019 13:51:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqzUlp9mwasJXIW9OIDqFpVxbjs8eyhnt7+quoeIVYRSU5ugn5T3msRmu+MLmWgWtv3WuJf3 X-Received: by 2002:a17:90a:374a:: with SMTP id u68mr6092506pjb.4.1564779085456; Fri, 02 Aug 2019 13:51:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564779085; cv=none; d=google.com; s=arc-20160816; b=Tg9ePc5VBTZ+cbvZqQHrX0ikcLKp/EjmqachOl54xrxQJNr6NeiW6MUp5bPynMg8pK NV0bbq68D1Sp7Qe3wBvzFsrOh4dWLk+LTnWL4J6AtCB7lmNP3xac5FEGIOmdPThFtPR0 DUDAwdMN7WDP1LxafYg4gDpUIzFWZspNWKW1SJehG1x4cKuNheJayRNpK1onSiljOmeQ JbqiU2f/k/tRNasbHvOA5kZAlsUaP7JZIiEgt2Rt4LgdEeCRuuWWoDn10qD3esTrxxpg zFgl+zJpEUImwC6yid5V/FhUkkcWKJk2pCbrUjlx8mcjRyD6cTGc8KQt/wmSuA0rH7qB wseg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=7M6yckcuiUHJ3SGT0CaBkgEhd9mpNySFgVkhpKbyQXs=; b=S5T9lNUHmhOq8Zx9uQ7lfbpApq7OVxaIJkOGzXT/BSY9AGTQgVs+9x9RDvNPEyteEg q6ouzPbjNr9gVFV2O9DEzcYWs436uJ6aGHmRjE+UnAIB5U1Bn13rqNbU8dbAxQ7sT1Yc qXFQ4hQbIs1YeOqnUUAcemMQiUVzpN51hPYTF58aa7EtJvArxCAIaRbpiPrTt9lnRHxe dC4wZ6Dm0uGNVveMrRk3eJKhkF+Gip07U4uBtiZXsKzBij44HawIezTwv4Rde9Hn5hL7 bxMFnuuAmVKzpphlmq4COdIpKxNM1CZnC8CiJp76Aa8KTAbQ0TW71CHe/aiRJNwiWbyJ Gt5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="DBi/7EzL"; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 205si10795188pge.295.2019.08.02.13.51.25; Fri, 02 Aug 2019 13:51:25 -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 header.s=20150623 header.b="DBi/7EzL"; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 892B57F3A4; Fri, 2 Aug 2019 20:51:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id F1B337F38A for ; Fri, 2 Aug 2019 20:37:24 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id v19so67506961wmj.5 for ; Fri, 02 Aug 2019 13:37:26 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=stYe8Q5cM5KVsHvOzcKRoFBdGb0Ve2ZybgapCyA6B/U=; b=DBi/7EzL9VR1kfJnfOrHpDQKLiclDbmM7Qrizl31QQOBhZo92orCkvUpeOEGR9z6fy 1AVlIUfxBHiFpqlusuJtCsbBxJiyq2jgLIy5+2aGuctgFotVchFBHJYRugleyQhobU0Q 9uU+9onPLIvJq6RDzhPR19SQklrqyD5NmEg3yP5X6mkrcJCfP6GwryU/vfCFlb/sriOw wIPgsaDfpS2aqDBhEgizUQ+IvI3NP282p1frz+YYiFkHbCR7NXO5+JLJRD06sBWyrnIo Is1rmyosrJHkzMSaeHAC6T/pAmCI4Snq9ClYKe/RGiOxG+AKS7aLb78EXipl8moPwSO+ 0vWw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=stYe8Q5cM5KVsHvOzcKRoFBdGb0Ve2ZybgapCyA6B/U=; b=Ogei5pJbjR/KTWDQ1E8uVaPupj/CZBSEP+0YyjXwvkXjX0wqXfs5bKff/BXO5jVfaF 5zC7mRY1p4g8y/HlzJQLCJCPDz8ni7mviJ0rvkKoz+YSXjUTYPLZBNze2IRp8Rqm77k0 uEby219PbaGfjLEgG0hbE3ArY3oikzhq8nDjFcUewtZzQMPziRNxp4nnrs34z3c9Ni+I kptdyqKsMEn40lyKbBHPbE+KUOO5oZ4YYEqcc98r9Oy8znFDmCR9Oa/IGcyUrZoEuBFb OzmT5CPaFzWetlMEL/2j8a+vJXn2ivyUIoeFdkFkFuxbNldegp0guhpfWUXyYDIg5wie 6qcw== X-Gm-Message-State: APjAAAUmM3yj347ghOxbgnUpQ6Jx7fF4aD0poo7JZ9mhfZYuf2zysC7C vBus4ZQgyCE20megnenqTtgf/tVzIZs= X-Received: by 2002:a7b:c455:: with SMTP id l21mr5845819wmi.114.1564778245370; Fri, 02 Aug 2019 13:37:25 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.24 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:24 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:13 +0100 Message-Id: <20190802203719.20437-3-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802203719.20437-1-ross.burton@intel.com> References: <20190802203719.20437-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 3/9] xserver-xorg: add PACKAGECONFIG for DGA 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Ideally we'd disable this as no real world client applications actually use DGA these days, but some drivers (for example fbdev and cirrus) still need DGA enabled in the server to build. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 -- _______________________________________________ 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.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index fc05c6a76ea..44315f59dc0 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -120,13 +120,14 @@ EXTRA_OECONF += "--with-fop=no \ " OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" -PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ +PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \ " PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" +PACKAGECONFIG[dga] = "--enable-dga,--disable-dga" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa" PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2" # DRI3 requires xshmfence to also be enabled From patchwork Fri Aug 2 20:37:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170457 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1272197ile; Fri, 2 Aug 2019 13:51:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqyk9elVrlifx2lBvrKDCT45hiJOV4Bd65Ug+xoRKmor1xZ9n8QTA0h0z+lYtaBGSy437Wrr X-Received: by 2002:a17:902:f082:: with SMTP id go2mr139515384plb.25.1564779091825; Fri, 02 Aug 2019 13:51:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564779091; cv=none; d=google.com; s=arc-20160816; b=gb7CIiQ7XDBzH0I1gpD2vWGeWWZ2YM8Y6kSw2DYtpcNmSf28+xegPXg2VOxE4l1+ec P38XMtQ9GpbhRk5mWRaWHb2PmRqjvEivu/lPCmTZfwkGTUyVx5xc3pcrpAQ1O3rxXn0Z 1B1W7v5r8k9tnhXaAHGUc01U86qx25qP43EIMt+fX3vA6GRONqbkSpmhe8NeA0X6xaac FbFSk6GV8SxNgdoX2TU9+ttxmDlpXYEmeLBLdx3K8K9kkETk6P4ANh48Bz7u3Csgt2lC FVgje/MuftkKoRHYEbCIT6dGQ79M/tILsS9kNTBrPN0YqHAJOSGmAn0N3R4KHw5hoXz7 NuNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=1e4KxBTKXrPTeYDAc83Tt6LskOzm0NY0qiCWC7ntOAU=; b=sNgPAkU+pGsWGDUKHO9qlZwqPxLqbe2t5MfxuEaHSaTb4iBT6AcPzkyP/5LwCQ2Cuy Vqabq3mJGGFFXCql8NDlg2D/yQBfvpSYtmNZcqA+E/MRVmulEMirmv8MQyAxdeecg0cr VXqQzqkqJVp77rJDG0dV8/JldBCw152FsqfSe9QUGYLi8dYjRN5wvPWQMX8b/Jzl27V2 dGJH4Xdh7sTS9rIASLTeCH4BLV70MNpO+b29C9wobb4TyjjC6AnCFn9MrzWLiyIAXZ65 YnAHWeXQiQwzWr43bsZl6IlXjHyU/8IwVP4Ekh8d+ifRo3QHnv/71xZ6XP0UAC/0uNBn EzEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=vXcBJxvH; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g12si5823517pgs.249.2019.08.02.13.51.31; Fri, 02 Aug 2019 13:51:31 -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 header.s=20150623 header.b=vXcBJxvH; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C43FD7F3AA; Fri, 2 Aug 2019 20:51:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mail.openembedded.org (Postfix) with ESMTP id BAAB67F394 for ; Fri, 2 Aug 2019 20:37:25 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id s15so46133787wmj.3 for ; Fri, 02 Aug 2019 13:37:27 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=clocniWax+N9fQmgQc3cuLSgPsP4Xm2vobtBRX/YtR0=; b=vXcBJxvH4eH0t5SPlBffqW+D6hyFFRaPDKjMeMIVw+G4ssJz//HQy/j4KuMH3lR4TC H1ZgmMUJI54xvLAHXnQlZ+cQM3LyaPtPFC/Ie5U+fCTacfVLpW4koG2n9qwSBx2dk4zg pYAHj6HWLoo6q7VAp6F0GycdMOECrHMB9258MQMDFXVDXFkp6R10SiU2AVhfdJO1NhfY 3bacJLBlcywJqw/dacMTLjIoFpsWBJOuj0i0BWEIGJll8qBeuhDO5dDf4zOJCnR8MeuB 5OhW+4ng7Ws+J7qwJlckSUW/kBlcUxQgrAPTBOQ4tcplYA8hDxCjS+W3CA7Rqh08uf/B xGWg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=clocniWax+N9fQmgQc3cuLSgPsP4Xm2vobtBRX/YtR0=; b=n/lZgLDyz01p7bCoKGd+LO1nnUFHPW9I7I0gQuUOEu0XIVa9GtTXkOwrDjbPCBlLjA i7TGtn3WVwknw4ze5kWc4pJVkgsbHcEDnrceKAs/jUm4jelLJMi2lcjcz6de+m3X9Inn KcLRHJ8HAnipmb3T65t61uNbHnPGGuSeAp6p302wKhSu+nsIeGMA+1jtjxb6Bf5xBXqy qy+j7BREMT4mjQKk4jTST5z1eEHUaBl2hqDOnOxsFJgbvKe4xqQmYFjKmMXVe2qBkyU5 1thIC5jqwbGS1Sie8RSskL0MJfbmzom8ayD4654iRCLFFsf9a/ZNEFIqYj0lZwOV0/Vk dEUA== X-Gm-Message-State: APjAAAVD8xFauQbMoyA+rPAxiNDHLuZi1n2X2a5SDplPEQlm8iNRYCvJ tfcqlJ8/wOaopeS2QIZlxXUe0Pu3FNg= X-Received: by 2002:a1c:345:: with SMTP id 66mr5826889wmd.8.1564778246354; Fri, 02 Aug 2019 13:37:26 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.25 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:25 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:14 +0100 Message-Id: <20190802203719.20437-4-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802203719.20437-1-ross.burton@intel.com> References: <20190802203719.20437-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 4/9] xdpyinfo: don't depend on DGA 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org DGA (Direct Graphics Access) is an obsolete extension that neither modern X drivers nor applications support. We'll remove the client library, so remove the optional dependency on DGA in xdpyinfo. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb index a09e220f9d0..2d10b7acca7 100644 --- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb +++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb @@ -9,7 +9,7 @@ clients and the server, and the different types of screens and visuals \ that are available." LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" -DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxi libxrender libxinerama libdmx libxau libxcomposite" +DEPENDS += "libxtst libxext libxxf86vm libxi libxrender libxinerama libdmx libxau libxcomposite" PE = "1" SRC_URI += "file://disable-xkb.patch" From patchwork Fri Aug 2 20:37:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170458 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1272275ile; Fri, 2 Aug 2019 13:51:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4FXkt+/HJe9Zrt0cIMOS+osx9iUvfIK5YaxykaHV4zzFHRkQmAeAf64RMeb83o9kAbiG0 X-Received: by 2002:a63:d04e:: with SMTP id s14mr119957832pgi.189.1564779098857; Fri, 02 Aug 2019 13:51:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564779098; cv=none; d=google.com; s=arc-20160816; b=y8L+jgJ+I/St80stIgfS/BfN+DDYUi7XgpWsCw+b/kTT/pCq2NzFW4r1j6aR7YRG7c lT3uPJg46qXEaehXjfZH6KaQco5R8B7HJ2o8C/qvwmSvtofq9m/sMmqu4j8sW/tSWxR3 uID/sp3BZV6PHKYve+tXqIfXbZ35Gs3OcabfMhAA2Ip5nZvSWU9XuRz91e4udhlnMBph ul3h9orCK7aKtw3CsZYHkpiLDYmtlEB1hpQsruMsYuI5A/nStoPnxfsRtQaJLzMzi4IH LpbP3rIyhIUkOMGN0zoH/IwmGIipJAOaduIg3OqxlAqFKLLsenIAibZG59CaDopmb98O 8Rbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=oCTHFo2hzvEOWz/+sy1Lp6pCNsiBdYvdEKuba7IRPeI=; b=BWOUfKn0l3HpAdGjbpA69vwJZO/pzFg0RSWtpiTZo5HOaGQqGyupC9Oih1UeWOfKnv D5uiwVpLaRKjXYSSI+sANKGJWpb4BMPy6nACFPIcarwaQKElDUtk3Zw0syZevHUHihUf qurotHhXyT/bvOD0IGa+caX8tgQyZWVUzAl/nylr7yULUWBJWIfCSZKTskmdT4uPdn/q 2/h7hxZlqrPVpXdn7mTk/X4aTKfflDrKWiXo12bnfnbPKLGbSMOARVyC0WtlusxwGLvL QO0VUwU7xQBMK3cvlmgnx/jt7ILZgW4ZKCKUOMj5D792mpTJhLg4nnEUzA8K9CbNyGjE ajfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=C2BDn3mX; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 131si37693217pfu.165.2019.08.02.13.51.38; Fri, 02 Aug 2019 13:51:38 -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 header.s=20150623 header.b=C2BDn3mX; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 17F617F3B2; Fri, 2 Aug 2019 20:51:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mail.openembedded.org (Postfix) with ESMTP id F24927D25F for ; Fri, 2 Aug 2019 20:37:26 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id p74so69093393wme.4 for ; Fri, 02 Aug 2019 13:37:28 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=BMhusBfw3tIi/kpPIZYLpU9etaPIkof40VIYukrx0eg=; b=C2BDn3mXmJ6aOs1YqDlcsGeFpCJlwuB7skc0eHIxLj9sKq8/7gaNWEumAoOdUIKYE7 wwU260QdbYrsFMAWQMb3mSupADq2H+af2MFAfBNDhAJVsjcZtaPovnfhYgu6eJw3iJ7t o6TGA8Oz+qXr5iAbQVNeP1ZBbD8a8UrDGeHa7C5qkTjfwE9Vk7BPbL3UyHrTa5504F/a dAmm2FqWPVbH1ZteOuFQ7XYtr5Tj2rni1B074zMjANcJqAWFAch3AM+QRY/lBVMttC3v eyaAbN2xxCWUbhCpnI61KZX/otbl163Vm8Vc7wsantkhVYc3CB/P1g9v5hI+GlpKyk3C dfRw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=BMhusBfw3tIi/kpPIZYLpU9etaPIkof40VIYukrx0eg=; b=T7b4NEonH3RkfVvKHL9GPksAAo81FupzXCiYkY4JEYF1RJrbYCkf9mqEPgtXbPb2fp MGZUw/la9wmRKc1WQGlJYpsCKdbQlGDkLbGXW2R2r9MtB9SeFWyHMkTkO0uhORLN222R swJ06okTjs26gJk8OakP0gw3yRZR2HtG6fBngidAqQCjUJxWOmEy6I9ETe1hyc0pR1c/ M2Io6kS8+pD9tTKJSB8sS6XBhx3WKgpaRQeDTsfSR6kAvynTH9WoAR+hnnT2Esa1KtCe tUp4TwSpmvdrN5StoM/sTA7Zcb4MrXpY+A/93wD/ogg7mc+eaR6iOc6UrMD16wtiUxKq Fb1w== X-Gm-Message-State: APjAAAVgggc7njNYaeRAFoMqtDWipVugCTc/SHyLpIUUYlWgHIFgDfRM RdKJl5wLlZossVc29ZvNzZGnoMKkdHA= X-Received: by 2002:a7b:cbc6:: with SMTP id n6mr5967240wmi.14.1564778247472; Fri, 02 Aug 2019 13:37:27 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.26 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:26 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:15 +0100 Message-Id: <20190802203719.20437-5-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802203719.20437-1-ross.burton@intel.com> References: <20190802203719.20437-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 5/9] libxx86dga: remove obsolete client libary 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org No modern drivers nor applications use DGA, so remove the client library. Signed-off-by: Ross Burton --- meta/conf/distro/include/maintainers.inc | 1 - .../xorg-lib/libxxf86dga_1.1.5.bb | 19 ------------------- 2 files changed, 20 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.5.bb -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 0bb4a57248f..d9ef9bf1fdb 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -442,7 +442,6 @@ RECIPE_MAINTAINER_pn-libxt = "Armin Kuster " RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster " RECIPE_MAINTAINER_pn-libxv = "Armin Kuster " RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster " RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster " RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin " RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin " diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.5.bb deleted file mode 100644 index e1cb3456588..00000000000 --- a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.5.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension library" - -DESCRIPTION = "libXxf86dga provides the XFree86-DGA extension, which \ -allows direct graphics access to a framebuffer-like region, and also \ -allows relative mouse reporting, et al. It is mainly used by games and \ -emulators for games." - -LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" - -DEPENDS += "libxext" - -PE = "1" - -SRC_URI[md5sum] = "0ddeafc13b33086357cfa96fae41ee8e" -SRC_URI[sha256sum] = "2b98bc5f506c6140d4eddd3990842d30f5dae733b64f198a504f07461bdb7203" - -XORG_PN = "libXxf86dga" From patchwork Fri Aug 2 20:37:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170459 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1272336ile; Fri, 2 Aug 2019 13:51:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXP7/BJIfd65x7trNO2specq98PIaebl1fUEBgJf8rtm3X7nI8w2Df263FEePMefcdGMbu X-Received: by 2002:a17:90a:2768:: with SMTP id o95mr6067910pje.37.1564779104971; Fri, 02 Aug 2019 13:51:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564779104; cv=none; d=google.com; s=arc-20160816; b=ncrVmpg2lqKP6HJoHPjfxv7f3t2HVsppVyybE/PeoMCDqmsUPtDqgKdjWGzdZwZ1XI xY1JgBidR/ZODKDJ+1gdv+EamA2VTfAUFmHcjwnTaPBMTic/qRLxMOCVY8Q2GtIYfsto fGGeFRbsv6EnqiQTOAiTvsmrxSrvbPN1DFVxekx1A08GvxdbXXmQXs7WETNj1oakpcZD ZLzfOw8218rA9fS2qHpvdp6OthnRJ22y+10cXw4O4ohtzR1yj+MQgyO1mmD1RQriAYTm RA+0l4HsJi/zjzTz9pbCdNTMfbZFKoNxl3x1avSW0kGshaCNhkm0cUXPc6gy6jAhHJxo npfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=edykZFykbPvzodZd8ibUWfObkHgTN1DfvoZC0sixo7I=; b=xsd4ZReHWW0705xoUIM3TCtIYypx+uBjJ7ukjt6o8f98VulNw9Pi3Eev5hPlp1AV03 4SdjGgda8We9CMGHRlG/s1lATqS1QN1Y6JVTIg+SkatLrCpNeqObguQM7uqhWk6eTRyX pugVZC9iwV9DFkGZ1RxhevT4LlfxEzmMEhWE5muW3ZeGAJJKNjU2EkwNgVJkOZDF/O0W 2bc26JVuPpO/aMpM9Vhn0HDdQ9QFcOITpvzJQd2Au0fHdhKcEzfkNPsrteW9m9nrjl0A EAy0kCeB0jqHABrc4+crz5fQ+AWcX9jokItU6+M4SQhv1BOpLdyRltRVqHOvT8APTPM9 hYfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=s9GZ0fKb; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a190si40754911pfb.127.2019.08.02.13.51.44; Fri, 02 Aug 2019 13:51:44 -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 header.s=20150623 header.b=s9GZ0fKb; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3B5B87F3B7; Fri, 2 Aug 2019 20:51:26 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mail.openembedded.org (Postfix) with ESMTP id F240E7F394 for ; Fri, 2 Aug 2019 20:37:27 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id v15so69130804wml.0 for ; Fri, 02 Aug 2019 13:37:29 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=soS5yJnuADZ4XIV07wkNfzS+WhoZ/W7MVGb6h35ym9U=; b=s9GZ0fKbRHqPb0YMKufJKj8t1rhjbEAIX1b5QjJOfwd/Z/5Lt/BrgVczXwpGPvhhJo I8MrSHQbxJV5+ryovaB4iBuqh7KrtC5SPOqREy5Wv7Ui7t52sPiF99frf35444ARK9qp h+iokCPRb37yGSxKfqs3W/5cfmPXEIOACu1BU8E8r3RzF2D92drxPDchxYu37flOVre6 xiJHMYJPnv3nu7j0A5lIrqlsBdZjLZeQ78d5L1d3EmjL6k1OZcWxzF+7i0aJrH1z89tt 3IHLOHOmA3HUSjdvDbGquJi5jbDKnXPDqx8ajUTjRNeUz+Wy6m+iMsbPsCyNRKK7GkSX gheA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=soS5yJnuADZ4XIV07wkNfzS+WhoZ/W7MVGb6h35ym9U=; b=iiU+7mjJvIVa1DUe9MEbGdoJ0W2lXET8SnGZERiRwN93uwUhj81TsZGg1SYten5YVa 3Zp9RF/P3xU3c3yE/DheJ0NS/+UaXes8x2CyeSX5V7GCYIlxTRsD3bVhXtLMaL6cIecf ZkT6HXL4i7kFgLFFw3FHu2NT40M9qxcSYM3uh5LTZwrdf/ZFfvxHYf3pyIAAyaMP4WCL /cdnXHu8ws7Z39EQ00omZk/n6LqJeVesaXTOF3PBXSmEbFfJTb0th8funz6YfgHOcZav gpjZUyn0/kkNG7yCMoPxzovf8BZV3S9zQfQtHxK0VCzX0WGjH1iUeO/JR2reaq8rTs41 21fg== X-Gm-Message-State: APjAAAWbCfcDnC4mCa3OEouqkI04uOepnmIi+4fHd9nnvgDIWxiVJotR cEEsRw5IL4l3ReKxnESgy4s660Mmy1c= X-Received: by 2002:a1c:f61a:: with SMTP id w26mr6050826wmc.75.1564778248398; Fri, 02 Aug 2019 13:37:28 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.27 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:27 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:16 +0100 Message-Id: <20190802203719.20437-6-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802203719.20437-1-ross.burton@intel.com> References: <20190802203719.20437-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 6/9] xserver-xorg: remove embedded build path in the source 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The generated source file sdksyms.c has a comment with the absolute build path, which means xserver-xorg-src contains this build path. This is both potential build information leakage and a source of unreproducibility, so remove the comment. Signed-off-by: Ross Burton --- .../xserver-xorg/sdksyms-no-build-path.patch | 22 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.20.4.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch -- 2.20.1 -- _______________________________________________ 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/sdksyms-no-build-path.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch new file mode 100644 index 00000000000..54d128cb39e --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch @@ -0,0 +1,22 @@ +sdksyms.sh: don't embed the build path + +This script generates a header that has a comment containing the build path for +no real reason. As this source can end up deployed on targets in debug packages +this means there is both potentially sensitive information leakage about the +build environment, and a source of change for reproducible builds. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253] +Signed-off-by: Ross Burton + +diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +index 39e33711d..cdb3794b9 100755 +--- a/hw/xfree86/sdksyms.sh ++++ b/hw/xfree86/sdksyms.sh +@@ -308,7 +308,6 @@ BEGIN { + print(" * These symbols are referenced to ensure they"); + print(" * will be available in the X Server binary."); + print(" */"); +- printf("/* topdir=%s */\n", topdir); + print("_X_HIDDEN void *xorg_symbols[] = {"); + + printf("sdksyms.c:") > "sdksyms.dep"; diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb index d7c5e6b3550..abc4656b0f8 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb @@ -4,6 +4,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://pkgconfig.patch \ file://0001-test-xtest-Initialize-array-with-braces.patch \ file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ + file://sdksyms-no-build-path.patch \ " SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650" SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee" From patchwork Fri Aug 2 20:37:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170460 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1272406ile; Fri, 2 Aug 2019 13:51:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqzNjaSj9YqmmyXDbeq5y2jeMg1uucT5Wgjj9u4hePm4MgGUwLdDyZHjRwSlpUZEsXUY5sdM X-Received: by 2002:a17:902:4222:: with SMTP id g31mr59227827pld.41.1564779112911; Fri, 02 Aug 2019 13:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564779112; cv=none; d=google.com; s=arc-20160816; b=BiNxxAqSANHJ1YSdeMS07IvmVm2C7Ka8CEGxDHA1IPneo6e2sJXKRFwAznrE+FqZbn KMVh17pcXar+ia5ebFSD2e7G88YUM2AMx2PusGow/+4fsY1EeK7j6Ikq0k0ajbfiaryC X6WV29FzIV/RsYxr/gHjVlkD6pEd673L4gTy2UXrN53MLaR400bEcVcfyQWR5IkVwzAc G/h7Y7Q84ck20k/68lMC4vdUecJvZO0ibXbYtjC3I2GyBU67GPN+HGQHyXiD96CvrC2i f3Qvulbo+IOHuDenW0eKU4KWoB6192Hb5p2Fn6LBhYxOqRyhQhq1c7N08BLxtuFp+t2U zp0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=QHa/bLr8PAYWBKDcAMKe1NfG8AeqjoIoSezvi6vy5IQ=; b=pQGZT4j2uUp4/EhBoHL8W/YUF9knk9x4fbgMpvzKvQw1oprZYnqPZjeD/MtovTyhX4 /UqRU1UqLJsAoJ3iA6bIWeBXjS1eU58fvQZYeuRhTKKSc2N+c/ithGvGG8NhNqNwuUwS ZapBsehsj2ajCsEGE5/fBaElWHHtwnPL8O1H+UptQAtZ0mc5FVL/xMmRF4WvMZmqebxb JExENQdth0w25JjKg90YSrJ69ShDJxx55HY2IlqZDGXWN6kNOq/eU0Tem6ZLT2MDjd/n 9jogPOjbrEZeqW1mKxGwyOhyWEVYGmyracMSncM8r0lNu1koEVr0sMRK7eTwOfZcqOAs Wubw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=XcOITN7O; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a15si40889368pfi.48.2019.08.02.13.51.52; Fri, 02 Aug 2019 13:51:52 -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 header.s=20150623 header.b=XcOITN7O; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AD6047F38E; Fri, 2 Aug 2019 20:51:28 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mail.openembedded.org (Postfix) with ESMTP id 58AF87F394 for ; Fri, 2 Aug 2019 20:37:29 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id x15so69139040wmj.3 for ; Fri, 02 Aug 2019 13:37:30 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=6jFClr709M0mgzoiwmjJD4hZWlsPC4Y3LsuiUh+I7lg=; b=XcOITN7OUo1bAy5etHwa3k20LqvnPonWzORqBBVGBVGEF+KcgUD50JxR29a8/E1X/Q mrPa5Oo2HHK29bXvsqy3v3+DBlK43O+6xNvANpqk04Yed+Ob0ZCQ6QyZGj70BnK9PbKj WJxkxAR+IxpxtsS3BCKrlVdQDmz3VN25V77XtQmNnydBGjzBbDhnBnaOMmbVYXtxgg+s C020CPVdCq469Fc/1LorTnpEPIXqfQnbXKnWAJRv5hf3s04THU/fuvjr3kf/5YCxlks0 c0oCQja2YwINW5KBHtx3UKh87kfKBlwJ18X8glX4Dp3rBKj0vckC9Ott0mgXfmCneekO Hf2Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=6jFClr709M0mgzoiwmjJD4hZWlsPC4Y3LsuiUh+I7lg=; b=U3LRKfUkf5MzYpcf3X6KlZPoGMCkgZABdcecJxsLABf0YF5ld24eZCOsjK/TH2zcgk pfiXXzjN0nDBptlx+1BsztavFmZpR3zaoRNjB+50+PNYaLF7hd1O8fLZm8F87l6OIvwy /Rf4pFTMgFRgpoApDZG9zR/DF6z85SQ5bUWFjM/NMeOPNmw6uR1hZOahQeesWVBz6Tuj XTccpZAP7dwh1Py5oAsfcFf7ULE5beMa6mYZi8uxW2d6qqrMfrNFjgr1GKL49oGwjCW6 n8I/rCLm9aiZNF9V/YbE3AlhaQqFRAw4sHtd1MTol00loSlIWGgnJXyNRNHhBHKw79bi o0Ww== X-Gm-Message-State: APjAAAVH9Z/5HKeNiuGVqBcce/OOPd1gsjJABxx4YZFwzF5voljgw7H0 RysX4ZzuUcSAAiSyPKN7bXB5FSQx9ag= X-Received: by 2002:a7b:c251:: with SMTP id b17mr5904857wmj.143.1564778249631; Fri, 02 Aug 2019 13:37:29 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.28 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:17 +0100 Message-Id: <20190802203719.20437-7-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802203719.20437-1-ross.burton@intel.com> References: <20190802203719.20437-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 7/9] xorgproto: update to 2019.1 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Oleksandr Kravchuk Signed-off-by: Oleksandr Kravchuk Signed-off-by: Ross Burton --- .../0001-Remove-libdir-specification.patch | 468 ------------------ ...orgproto_2018.4.bb => xorgproto_2019.1.bb} | 6 +- 2 files changed, 2 insertions(+), 472 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch rename meta/recipes-graphics/xorg-proto/{xorgproto_2018.4.bb => xorgproto_2019.1.bb} (65%) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch b/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch deleted file mode 100644 index 48296f7844e..00000000000 --- a/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch +++ /dev/null @@ -1,468 +0,0 @@ -Upstream-Status: Submitted - -https://cgit.freedesktop.org/xorg/proto/xorgproto/commit/?id=91c1c8e1490c970379efb16784003426faec806e - -From 6feb974e0deb3355908c30e07293d82a3f6996ed Mon Sep 17 00:00:00 2001 -From: Jeremy Puhlman -Date: Mon, 11 Jun 2018 16:42:43 +0000 -Subject: [PATCH] Remove libdir specification. - -Currently the pc files define libdir, however they are installed into -/usr/share, which means they should be architecture agnostic. In a -multilib system, xorg-proto built for each multilib abi, the value of -libdir is going to be different. These should either be installed in -/pkgconfig or they shouldn't define libdir, espeically since -they don't actually use the definition. This specifically causes an -issue when trying to install both abis at the same time, since they are -not binary identical, something like rpm will complain that they - ---- - applewmproto.pc.in | 1 - - bigreqsproto.pc.in | 1 - - compositeproto.pc.in | 1 - - damageproto.pc.in | 1 - - dmxproto.pc.in | 1 - - dri2proto.pc.in | 1 - - dri3proto.pc.in | 1 - - evieproto.pc.in | 1 - - fixesproto.pc.in | 1 - - fontcacheproto.pc.in | 1 - - fontsproto.pc.in | 1 - - glproto.pc.in | 1 - - inputproto.pc.in | 1 - - kbproto.pc.in | 1 - - lg3dproto.pc.in | 1 - - presentproto.pc.in | 1 - - printproto.pc.in | 1 - - randrproto.pc.in | 1 - - recordproto.pc.in | 1 - - renderproto.pc.in | 1 - - resourceproto.pc.in | 1 - - scrnsaverproto.pc.in | 1 - - trapproto.pc.in | 1 - - videoproto.pc.in | 1 - - windowswmproto.pc.in | 1 - - xcalibrateproto.pc.in | 1 - - xcmiscproto.pc.in | 1 - - xextproto.pc.in | 1 - - xf86bigfontproto.pc.in | 1 - - xf86dgaproto.pc.in | 1 - - xf86driproto.pc.in | 1 - - xf86miscproto.pc.in | 1 - - xf86rushproto.pc.in | 1 - - xf86vidmodeproto.pc.in | 1 - - xineramaproto.pc.in | 1 - - xproto.pc.in | 1 - - xproxymngproto.pc.in | 1 - - 37 files changed, 37 deletions(-) - -diff --git a/applewmproto.pc.in b/applewmproto.pc.in -index 17841ac..3227b21 100644 ---- a/applewmproto.pc.in -+++ b/applewmproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: AppleWMProto -diff --git a/bigreqsproto.pc.in b/bigreqsproto.pc.in -index 94577ed..e21bb59 100644 ---- a/bigreqsproto.pc.in -+++ b/bigreqsproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: BigReqsProto -diff --git a/compositeproto.pc.in b/compositeproto.pc.in -index da429c7..b0dada1 100644 ---- a/compositeproto.pc.in -+++ b/compositeproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: CompositeExt -diff --git a/damageproto.pc.in b/damageproto.pc.in -index 6fd9ef1..bfd5244 100644 ---- a/damageproto.pc.in -+++ b/damageproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: DamageProto -diff --git a/dmxproto.pc.in b/dmxproto.pc.in -index e82ee7d..d140e1c 100644 ---- a/dmxproto.pc.in -+++ b/dmxproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: DMXProto -diff --git a/dri2proto.pc.in b/dri2proto.pc.in -index cb5b171..fa9d24d 100644 ---- a/dri2proto.pc.in -+++ b/dri2proto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: DRI2Proto -diff --git a/dri3proto.pc.in b/dri3proto.pc.in -index e42d60e..20da358 100644 ---- a/dri3proto.pc.in -+++ b/dri3proto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: DRI3Proto -diff --git a/evieproto.pc.in b/evieproto.pc.in -index 64e0ec4..fd5442b 100644 ---- a/evieproto.pc.in -+++ b/evieproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: EvIEExt -diff --git a/fixesproto.pc.in b/fixesproto.pc.in -index f8258e2..c7fcb81 100644 ---- a/fixesproto.pc.in -+++ b/fixesproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: FixesProto -diff --git a/fontcacheproto.pc.in b/fontcacheproto.pc.in -index eb4238b..8ffffe9 100644 ---- a/fontcacheproto.pc.in -+++ b/fontcacheproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: FontcacheProto -diff --git a/fontsproto.pc.in b/fontsproto.pc.in -index 9d22354..ebb61a4 100644 ---- a/fontsproto.pc.in -+++ b/fontsproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: FontsProto -diff --git a/glproto.pc.in b/glproto.pc.in -index b951db5..e97bfc9 100644 ---- a/glproto.pc.in -+++ b/glproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: GLProto -diff --git a/inputproto.pc.in b/inputproto.pc.in -index 1eb6619..270b95c 100644 ---- a/inputproto.pc.in -+++ b/inputproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: InputProto -diff --git a/kbproto.pc.in b/kbproto.pc.in -index bdd39f1..32a172d 100644 ---- a/kbproto.pc.in -+++ b/kbproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: KBProto -diff --git a/lg3dproto.pc.in b/lg3dproto.pc.in -index 3930ad7..43fba29 100644 ---- a/lg3dproto.pc.in -+++ b/lg3dproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: Lg3dProto -diff --git a/presentproto.pc.in b/presentproto.pc.in -index 6ec4b7d..55b84dc 100644 ---- a/presentproto.pc.in -+++ b/presentproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: PresentProto -diff --git a/printproto.pc.in b/printproto.pc.in -index 8a2e2d6..a2da66d 100644 ---- a/printproto.pc.in -+++ b/printproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: PrintProto -diff --git a/randrproto.pc.in b/randrproto.pc.in -index 5a5edb2..6d60cbb 100644 ---- a/randrproto.pc.in -+++ b/randrproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: RandrProto -diff --git a/recordproto.pc.in b/recordproto.pc.in -index 0ff4c0b..a87aa82 100644 ---- a/recordproto.pc.in -+++ b/recordproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: RecordProto -diff --git a/renderproto.pc.in b/renderproto.pc.in -index e6028ac..34b15e0 100644 ---- a/renderproto.pc.in -+++ b/renderproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: RenderProto -diff --git a/resourceproto.pc.in b/resourceproto.pc.in -index a409db9..f927cbb 100644 ---- a/resourceproto.pc.in -+++ b/resourceproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: ResourceProto -diff --git a/scrnsaverproto.pc.in b/scrnsaverproto.pc.in -index 6556a2c..fd9d368 100644 ---- a/scrnsaverproto.pc.in -+++ b/scrnsaverproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: ScrnSaverProto -diff --git a/trapproto.pc.in b/trapproto.pc.in -index 8cb0aa8..8a220b9 100644 ---- a/trapproto.pc.in -+++ b/trapproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: TrapProto -diff --git a/videoproto.pc.in b/videoproto.pc.in -index 14b907a..5c22f7a 100644 ---- a/videoproto.pc.in -+++ b/videoproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: VideoProto -diff --git a/windowswmproto.pc.in b/windowswmproto.pc.in -index 0a2ec0b..ec56e82 100644 ---- a/windowswmproto.pc.in -+++ b/windowswmproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: WindowsWMProto -diff --git a/xcalibrateproto.pc.in b/xcalibrateproto.pc.in -index 40b6fd0..f1ea5de 100644 ---- a/xcalibrateproto.pc.in -+++ b/xcalibrateproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XCalibrate -diff --git a/xcmiscproto.pc.in b/xcmiscproto.pc.in -index 0dfbf21..b72bbc6 100644 ---- a/xcmiscproto.pc.in -+++ b/xcmiscproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XCMiscProto -diff --git a/xextproto.pc.in b/xextproto.pc.in -index f66eeae..9419c91 100644 ---- a/xextproto.pc.in -+++ b/xextproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XExtProto -diff --git a/xf86bigfontproto.pc.in b/xf86bigfontproto.pc.in -index 18c5647..4a67be6 100644 ---- a/xf86bigfontproto.pc.in -+++ b/xf86bigfontproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XF86BigFontProto -diff --git a/xf86dgaproto.pc.in b/xf86dgaproto.pc.in -index 5c5f8b1..e029cd4 100644 ---- a/xf86dgaproto.pc.in -+++ b/xf86dgaproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XF86DGAProto -diff --git a/xf86driproto.pc.in b/xf86driproto.pc.in -index 93df292..c8faf14 100644 ---- a/xf86driproto.pc.in -+++ b/xf86driproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XF86DRIProto -diff --git a/xf86miscproto.pc.in b/xf86miscproto.pc.in -index af73fa3..05d5d9e 100644 ---- a/xf86miscproto.pc.in -+++ b/xf86miscproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XF86MiscProto -diff --git a/xf86rushproto.pc.in b/xf86rushproto.pc.in -index fc5f63b..1c7ff1b 100644 ---- a/xf86rushproto.pc.in -+++ b/xf86rushproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XF86RushProto -diff --git a/xf86vidmodeproto.pc.in b/xf86vidmodeproto.pc.in -index fcb74f2..ef062b3 100644 ---- a/xf86vidmodeproto.pc.in -+++ b/xf86vidmodeproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XF86VidModeProto -diff --git a/xineramaproto.pc.in b/xineramaproto.pc.in -index 1ffd37d..9172f1e 100644 ---- a/xineramaproto.pc.in -+++ b/xineramaproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XineramaProto -diff --git a/xproto.pc.in b/xproto.pc.in -index 8ff2d3d..899316a 100644 ---- a/xproto.pc.in -+++ b/xproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - includex11dir=@includedir@/X11 - -diff --git a/xproxymngproto.pc.in b/xproxymngproto.pc.in -index 5c6fad6..1a81e28 100644 ---- a/xproxymngproto.pc.in -+++ b/xproxymngproto.pc.in -@@ -1,6 +1,5 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ - includedir=@includedir@ - - Name: XProxyManagementProtocol --- -2.11.1 - diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2019.1.bb similarity index 65% rename from meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb rename to meta/recipes-graphics/xorg-proto/xorgproto_2019.1.bb index cec6e875593..2c7ce2a56c0 100644 --- a/meta/recipes-graphics/xorg-proto/xorgproto_2018.4.bb +++ b/meta/recipes-graphics/xorg-proto/xorgproto_2019.1.bb @@ -8,9 +8,7 @@ the core protocol and (many) extensions for the X Window System" LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676" -SRC_URI += "file://0001-Remove-libdir-specification.patch" - -SRC_URI[md5sum] = "81557ca47ee66a4e54590fcdadd28114" -SRC_URI[sha256sum] = "fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0" +SRC_URI[md5sum] = "802ccb9e977ba3cf94ba798ddb2898a4" +SRC_URI[sha256sum] = "a6daaa7a6cbc8e374032d83ff7f47d41be98f1e0f4475d66a4da3aa766a0d49b" BBCLASSEXTEND = "native nativesdk" From patchwork Fri Aug 2 20:37:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170461 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1272511ile; Fri, 2 Aug 2019 13:52:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqymx6Eqv6jL+mCEmuo/FpWCfZXmfc1ootHzQO2swcDjPf2c6bxeX5yies+DWp4fj2QAuttY X-Received: by 2002:a63:3407:: with SMTP id b7mr14115159pga.143.1564779120471; Fri, 02 Aug 2019 13:52:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564779120; cv=none; d=google.com; s=arc-20160816; b=oF7VxnaoVzUpEFg2jhLzYV9DJSJdRmKLXqoFdTRxrTnL8GAp8QG2+HsMARIZOmr6Hn hkMrS86pV+4PZtD/kAtcNss22IWG3fighEdYGafpAxTsHU+QGGhTN96aFUJ7i77+ZrfR SQbO0Rj0L2ltkvuzMJgD4Hb/LxjIuBVb+pAq8KvVKSlF+VrDCclrhUBwdLzolEd+KUwJ 3zAQnJaN0UgUMC//83Q68jMqFbcI1f6qFtaWOansoiDT2980cQ7quYNNqsQ0m2hqVWFE HnlH5HwR+2ZV3Id2EzVWQ4KmClixQUPLsYzur9gJj5CJvDQQ7OG0q732efvo2EcML5iW CYDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=LtjjKFBFjPzT1Z+JvNB+ayD1QM0anqRS2VuaatVc9fk=; b=LrElxL0+L6a7QdMJygariBaHUiz2TZi3OrybArbO5cPktFqt+b48pWAQh/Ain3rdRp JIDBRiJdCLyMFUhgr4sI7fIr0sOftuMYsz25rZVN3ZbHmbKvKvlqg3RglhRI19i3RFhe +c3dsUp7Q8DMbQMBpg3e2mbJsOxgw0PruXxzm0pNpBOVjMc41fM2yd7tMHW6zMlUcNm1 A1zPAUezhXJpzDniJu743DK4KptZEIUw7IDPT4ra5LYNpPrYDOnw+ir61QS+QqGnEOYW m6B1O50Px1lK76/BbwKhngyWy+kjptdaiy2BSodu+QNcZY0XFgC/osKiKM8k+/5sskd/ APug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=k0lbyGLk; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 39si34536173pla.73.2019.08.02.13.52.00; Fri, 02 Aug 2019 13:52:00 -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 header.s=20150623 header.b=k0lbyGLk; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D8BFC7F3C4; Fri, 2 Aug 2019 20:51:29 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mail.openembedded.org (Postfix) with ESMTP id 219377F38D for ; Fri, 2 Aug 2019 20:37:31 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id n9so78542188wru.0 for ; Fri, 02 Aug 2019 13:37:32 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=5OESrkCxyflK1aLfUunLaFZYXlNGrdWhez93xpcQ2Iw=; b=k0lbyGLkAAQG7Pu/fsOqFUOu6eZX7F7hPnZJZk0A1sLRMtG3+gu6DOfYq5rxMAAkAg zp8V9WEla0lFFkL3UXzdmU/VHFFVUFQjTV1h7Pq1OvkqF27+l/OvxrrgVbdiBMTMA0mu tNV4PcAo7KEYSr+J2WL1gkJldeqqtK3yYRaRvtcoEy5+LwN4R0VZha9ACKabtSUQdQ2A 3yr1EE9Si6uLzoIiiNG9vXljXRKtYBH8zx3bU6crFNsLqIyzj81wLPgSXi+fOqNDqGnc 6D2WNoywj5pUmKX3Df9i1s0gBemDX5rdw/KHzsiV2Ixp0mA+vph8qig2hS3BDq63EDdH Z8Sg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=5OESrkCxyflK1aLfUunLaFZYXlNGrdWhez93xpcQ2Iw=; b=SyA1S7afbCjchljg/sXlvy2tMwxnGXHDXwZrZSh+cyyrGGIYiw8of2gpUCsGNfA/vr RnFgsQ7fM369i4IlD/0VXhmUvEx/4NIy5v0D0cc6SbEzN3DGE/Q2H3skD7IPJ8tPKChC VMwjr+ud+YXu56EGeEBcaZc3/F9b6qYCHqia2JTEBsw6gwOigEAygJNo12U4/zoq99Dn kH17Degzqck4BOjRIKrE6QwSL2uVjI2BT8mkfTjOiw6XVc9E7OUi3dAC3IhdawVdbdpx CAXWcJhHI2PnfgfMRm12rbS8wG5fM2xbM24ANzFfjiXth7kClzoMonzjxSEISHS9G5i1 FhiQ== X-Gm-Message-State: APjAAAXybhIrjfThGkotln5Rh7JlNpYh6WH4b2ouw86enAblpjiqZBjN jnpRX1QsaMg0aqTv+WxcbBW/Ay0uEm8= X-Received: by 2002:a5d:628d:: with SMTP id k13mr21452217wru.69.1564778251701; Fri, 02 Aug 2019 13:37:31 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.29 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:18 +0100 Message-Id: <20190802203719.20437-8-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802203719.20437-1-ross.burton@intel.com> References: <20190802203719.20437-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 8/9] xserver-xorg: update to 1.20.5 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Oleksandr Kravchuk Signed-off-by: Oleksandr Kravchuk Signed-off-by: Ross Burton --- .../{xserver-xorg_1.20.4.bb => xserver-xorg_1.20.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.4.bb => xserver-xorg_1.20.5.bb} (89%) -- 2.20.1 -- _______________________________________________ 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_1.20.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb similarity index 89% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb index abc4656b0f8..3de6d22e573 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb @@ -6,8 +6,8 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ file://sdksyms-no-build-path.patch \ " -SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650" -SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee" +SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" +SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. From patchwork Fri Aug 2 20:37:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170462 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1272623ile; Fri, 2 Aug 2019 13:52:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqyVz6Kvfmrm+QmbG8oYb38fY9eHWSx7BblPXzJtY90TjtjgHMMRAjOAIaoY+AsQfTJxOGl8 X-Received: by 2002:a17:90a:9301:: with SMTP id p1mr6079360pjo.22.1564779127867; Fri, 02 Aug 2019 13:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564779127; cv=none; d=google.com; s=arc-20160816; b=thqxgDcJC+UP3GUW6DVmVfCUO5XUnrkqALOQT4VmsyE+taiEBgrmy5DTzCVD4baXCf Kjt/uMvLkPq7iGy3E3bBj3bcstyoTL3XTlhl3SrVxCcQYcCBA/3hAFaL3cqfOoLHKpe9 X4qsXSpF5PqVPIqJvOxhORrzEWDR66Wc7Khb2Ey8eYLUq1ob9xExf82oIoHfmdW3kAAK iofO4xpGcFV7zvxwUk9YsQRPIjSPUkYV+47WeuZxU5QLVifvm3q2/sowm88M+UoFpU9s 00l9Qv6wq0X5Dw6bVstgxvWOdmeeMHIw0tfP9jW9ADt/7HTc9c6kHXOH+BBvD/ZCbj5T U5mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=GwX+BNQMkox/v8Wulkp4m6vHtVTt/coGB+GKLFqLjik=; b=sfcPFBWx7btmn04hTlrJPEivXvcni4PpuzhqoIjAXIq7PPwU/F4koQPf4DNDQxGKrd 95RTZGYPFr/Z3GtTtrmKIAhKTbv2sq4AXynyuEIKDxANm4Epg9Ivliksd8Hvr75iYkiD SDLm5G3H6XcmMYX+Qlh54wFTMEciZH6jlaNo/ER8CX09Fz/vN7EW8Dk7k/muxmmm7BWh LM5tbXlJlxpOxe4KfIzrPZUc97ttYLhkC4XfeHuoQxQ3kF1+vZ7suIIPzI34Z8fbv9Rx WwMuG11NJN7lXuD5tfhk+EbxFf49kJL4gBrR8wTXpl6AWHbzySmmIwXxoEXgsfFUDWo8 8hlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=c3lWqG8M; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n10si44884070pgr.27.2019.08.02.13.52.07; Fri, 02 Aug 2019 13:52:07 -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 header.s=20150623 header.b=c3lWqG8M; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0F0D17F3CB; Fri, 2 Aug 2019 20:51:31 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 4D5887F394 for ; Fri, 2 Aug 2019 20:37:32 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id p13so3877797wru.10 for ; Fri, 02 Aug 2019 13:37:33 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=ts0tfaVME95+oggQgUhhoIV/4j+MqRNnnvtbgwvdlTE=; b=c3lWqG8MF38qBIDJ+uKk9DyyEsEC2O89qaLrMJwRuAU4oZE6RJGNddk0SsRQr/JorO 5iMDgHlN/eSGXygvKqHKgoVmWL8KJJL7PaWZ19JWGNi9Gc9RNJUDvXnCNr+4KoA9UZjh IIo3IuwcBJO2KG+dzBZB2vpGI6ofQ/MAjr3NnAtJQeqUwmWlW6H3kpZKLkcmk877o312 qZnd3+w9vA367Gq0f31EeTxvkdq3GRyp9iqJWV22Lv6na4dku9+jdjibO0+xm1wEvBZl toidcAFAtjZt6vjEGZXhp2YQhRVv1nz8fnLgphu1b7IeQ4rnWD35IIvHCiDx5yYYvasu uVRw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ts0tfaVME95+oggQgUhhoIV/4j+MqRNnnvtbgwvdlTE=; b=PuBWH4i5ZCKgYnq1mHVyCkL6sdTQBqmnisvuExvpJHp0TQZaXrnK+abkeJ6u4WLzJJ 2J5kBN9esCZiRJ9BQQuJHXZwgf+NUeq/JAS/3bEXSHTluWeDTMvrkS+8X/TQ8HcguXAC 0ihQbXroYe1ZhRHswxLfzFZvUVilOgX5FlMB9Dnf65R8FQzH7DCLOFKlVrxGGyPOiCP7 uVDHhltgnTOfKL2Y67cc3wHiAdzpTy4FMN199zgYcg2xIhH/880P4l/OFFY3cA5Pr/qs ZKoq8ipgomWlYl4w4hJlN1hMSryFX6NDjhVckyotBMDSpn3M4SYDFVoW74oCEZ9YmRfA LZYw== X-Gm-Message-State: APjAAAUPv0dtTrszMfpOEcGQ3aDtZSzni+4yQgxcMTIy15Awd7x23lYA F3jTlMzGi257YQSTe9+hbMJAmM0idNo= X-Received: by 2002:adf:c508:: with SMTP id q8mr15791975wrf.148.1564778252786; Fri, 02 Aug 2019 13:37:32 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n1sm59083910wrx.39.2019.08.02.13.37.31 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 13:37:32 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 2 Aug 2019 21:37:19 +0100 Message-Id: <20190802203719.20437-9-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802203719.20437-1-ross.burton@intel.com> References: <20190802203719.20437-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 9/9] libx11: update to 1.6.8 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fix the build when the host doesn't have libc.a installed by reverting an upstream commit, and cherry-pick a build fix from master. Drop a redundant sed, the expression it removes doesn't exist anymore. Move most patches to libx11.inc so that they're applied to both libx11 and libx11-diet. Signed-off-by: Ross Burton --- ...x11-diet_1.6.7.bb => libx11-diet_1.6.8.bb} | 0 meta/recipes-graphics/xorg-lib/libx11.inc | 8 +++- .../xorg-lib/libx11/fix-libtool.patch | 35 ++++++++++++++++ .../xorg-lib/libx11/no-host-x.patch | 40 +++++++++++++++++++ .../recipes-graphics/xorg-lib/libx11_1.6.7.bb | 13 ------ .../recipes-graphics/xorg-lib/libx11_1.6.8.bb | 7 ++++ 6 files changed, 88 insertions(+), 15 deletions(-) rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.7.bb => libx11-diet_1.6.8.bb} (100%) create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index ea2ebfb8b95..994c33a8efc 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -10,8 +10,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" PE = "1" -SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162" -SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348" +SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ + file://fix-libtool.patch \ + file://no-host-x.patch" + +SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" +SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" PROVIDES = "virtual/libx11" diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch new file mode 100644 index 00000000000..678b7aff445 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch @@ -0,0 +1,35 @@ +Passing -all-static to libtool is done to avoid libtool wrappers on Windows, but +it means that the build host needs to have libc.a installed. This isn't the +case for a lot of distributions out of the box, so revert this commit. + +Filed a bug upstream to get a proper fix: https://gitlab.freedesktop.org/xorg/lib/libx11/issues/100 + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton + +From b9f74dc5e714115057a5a1789b4de202d6f58547 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 2 Aug 2019 00:39:39 +0100 +Subject: [PATCH 2/2] Revert "Avoid using libtool wrapper for makekeys" + +This reverts commit 4645e219133458781e3fb48eaea6a74cccb1b9aa. +--- + src/util/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/Makefile.am b/src/util/Makefile.am +index 37314370..a051567a 100644 +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -10,7 +10,7 @@ AM_CPPFLAGS = \ + CC = @CC_FOR_BUILD@ + CPPFLAGS = @CPPFLAGS_FOR_BUILD@ + CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static ++LDFLAGS = @LDFLAGS_FOR_BUILD@ + LIBS = + EXEEXT = @EXEEXT_FOR_BUILD@ + +-- +2.20.1 + diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch new file mode 100644 index 00000000000..803f8b408cb --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch @@ -0,0 +1,40 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From cf2ef27831173c5ed6f98be3c39caff18fd4e7f1 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 17 Jun 2019 13:36:08 -0400 +Subject: [PATCH 1/2] makekeys: Detach ourselves from X headers entirely + +Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer +building makekeys with enough -I/foo/bar to find the X11 headers, so if +they're not in a system include path, things fail. Since this utility is +only needed at build time, there's no real reason to demand the X +headers be installed for both the build and target machines if cross- +compiling, we can just assume a vaguely ANSI environment instead. + +Tested-by: Niclas Zeising +Reviewed-by: Keith Packard +Reviewed-by: Matt Turner +--- + src/util/makekeys.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/util/makekeys.c b/src/util/makekeys.c +index bcb5b7d5..07563315 100644 +--- a/src/util/makekeys.c ++++ b/src/util/makekeys.c +@@ -35,8 +35,10 @@ from The Open Group. + #include + #include + #include ++#include ++#include + +-#include "../Xresinternal.h" ++typedef uint32_t Signature; + + #define KTNUM 4000 + +-- +2.20.1 diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb deleted file mode 100644 index 6141f571c5a..00000000000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb +++ /dev/null @@ -1,13 +0,0 @@ -require libx11.inc - -SRC_URI += "file://disable_tests.patch \ - file://Fix-hanging-issue-in-_XReply.patch \ - " - -inherit gettext - -do_configure_append () { - sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb new file mode 100644 index 00000000000..0d27bc2bce9 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb @@ -0,0 +1,7 @@ +require libx11.inc + +SRC_URI += "file://disable_tests.patch" + +inherit gettext + +BBCLASSEXTEND = "native nativesdk"