From patchwork Sun Jan 7 19:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 856590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zF75Q4tkqz9s7M for ; Mon, 8 Jan 2018 06:00:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9EF548862E; Sun, 7 Jan 2018 19:00:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZLHmJ-AXD4mr; Sun, 7 Jan 2018 19:00:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A2579885E0; Sun, 7 Jan 2018 19:00:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B0B2A1C143E for ; Sun, 7 Jan 2018 19:00:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AAC9B2EC4A for ; Sun, 7 Jan 2018 19:00:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pNJqCfOSsKg4 for ; Sun, 7 Jan 2018 19:00:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by silver.osuosl.org (Postfix) with ESMTPS id 418212DA1A for ; Sun, 7 Jan 2018 19:00:15 +0000 (UTC) Received: from fwd29.aul.t-online.de (fwd29.aul.t-online.de [172.20.26.134]) by mailout06.t-online.de (Postfix) with SMTP id D9C9941C4818 for ; Sun, 7 Jan 2018 20:00:12 +0100 (CET) Received: from fli4l.lan.fli4l (VTwOHyZX8hoa27+oEyDwaPjWwOL+HvmOVyLKbYdsHEUWcHvbnhHGGKuIRwcq1QDQkG@[79.228.30.86]) by fwd29.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1eYGB0-1CDpSq0; Sun, 7 Jan 2018 20:00:10 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:43380 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89_1) (envelope-from ) id 1eYGAz-0003hl-Cl for buildroot@buildroot.org; Sun, 07 Jan 2018 20:00:09 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 7 Jan 2018 20:00:09 +0100 Message-Id: <20180107190009.22933-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 X-ID: VTwOHyZX8hoa27+oEyDwaPjWwOL+HvmOVyLKbYdsHEUWcHvbnhHGGKuIRwcq1QDQkG X-TOI-MSGID: 87f6dd49-ed34-45fb-908c-745299965693 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: fix build with composite support disabled X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Added upstream to fix http://autobuild.buildroot.net/results/44e/44e29c2fb5d236a66e0466698fbc9201a37dbc63/ Signed-off-by: Bernd Kuhls --- ...clude-compositeext.h-if-COMPOSITE-is-supp.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch b/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch new file mode 100644 index 0000000000..93be91ae7f --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch @@ -0,0 +1,31 @@ +From d16133e3e293fe16b291114d344fbd5a61d5ed65 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia +Date: Thu, 20 Jul 2017 19:48:26 -0700 +Subject: [PATCH] glx: Only include compositeext.h if COMPOSITE is + supported + +Regressed-in: ea483af99a6351323afe00a0b630cd63310efdb1 +Signed-off-by: Jeremy Huddleston Sequoia +Signed-off-by: Bernd Kuhls +--- + glx/glxscreens.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/glx/glxscreens.c b/glx/glxscreens.c +index 78e0aaff9..609661274 100644 +--- a/glx/glxscreens.c ++++ b/glx/glxscreens.c +@@ -43,7 +43,10 @@ + #include "glxutil.h" + #include "glxext.h" + #include "protocol-versions.h" ++ ++#ifdef COMPOSITE + #include "compositeext.h" ++#endif + + static DevPrivateKeyRec glxScreenPrivateKeyRec; + +-- +2.11.0 +