Skip to contentSkip to conversation

package/x11r7/xserver_xorg-server: fix build with composite support disabled

PATCH New Bernd Kuhls 2 participants 2 messages Jan 7, 2018

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix build with composite support disabled

Added upstream to fix
http://autobuild.buildroot.net/results/44e/44e29c2fb5d236a66e0466698fbc9201a37dbc63/

Signed-off-by Bernd Kuhls <[email protected]>
---
 ...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
package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch new file +31 -0
new file mode 100644
index 0000000000..93be91ae7f
@@ -0,0 +1,31 @@
+From d16133e3e293fe16b291114d344fbd5a61d5ed65 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <[email protected]>
+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 <[email protected]>
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ 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
+
Signature · 1 line
2.11.0
Applied
#1 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix build with composite support disabled

Hello,

Quoted 8 lines · Bernd Kuhls

Added upstream to fix
http://autobuild.buildroot.net/results/44e/44e29c2fb5d236a66e0466698fbc9201a37dbc63/

Signed-off-by Bernd Kuhls <[email protected]>
---
 ...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

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com