From 3ac2e61705432951f9e1b96b42b4214e7f748f94 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat, 9 Mar 2013 17:12:53 +1000
Subject: [PATCH 1/3] xfixes: ifdef PanoramiXFixes* (#62015)

Fixes build failure with --disable-xinerama introduced by
482e0cb cursor: Move pointer barrier code over to XI

Reason is new include order: sdksyms.sh includes xfixes.h, which previously
did not include xfixesint.h.

As of 482e0cb xfixes.h includes xibarriers.h which includes xfixesint.h

X.Org Bug 62015 <http://bugs.freedesktop.org/show_bug.cgi?id=62015>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Daniel Martin <consume.noise@gmail.com>
---
 xfixes/xfixesint.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 334c71fbf..44e889040 100644
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -291,8 +291,10 @@ int
  SProcXFixesDestroyPointerBarrier(ClientPtr client);
 
 /* Xinerama */
+#ifdef PANORAMIX
 extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
 void PanoramiXFixesInit(void);
 void PanoramiXFixesReset(void);
+#endif
 
 #endif                          /* _XFIXESINT_H_ */

From 31595b528645a7e4903eb81da0fc332d78407f25 Mon Sep 17 00:00:00 2001
From: Robert Morell <rmorell@nvidia.com>
Date: Tue, 12 Mar 2013 09:37:43 -0700
Subject: [PATCH 2/3] configure.ac: Require inputproto 2.3

This picks up support for Xi pointer barriers in the protocol.

Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6e1ff65c4..44982b3e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -788,7 +788,7 @@ XPROTO="xproto >= 7.0.22"
 RANDRPROTO="randrproto >= 1.4.0"
 RENDERPROTO="renderproto >= 0.11"
 XEXTPROTO="xextproto >= 7.1.99"
-INPUTPROTO="inputproto >= 2.2.99.1"
+INPUTPROTO="inputproto >= 2.3"
 KBPROTO="kbproto >= 1.0.3"
 FONTSPROTO="fontsproto"
 FIXESPROTO="fixesproto >= 5.0"

From 7050aae69c2a55dfdbb5c6af7882307e90ba4275 Mon Sep 17 00:00:00 2001
From: Robert Morell <rmorell@nvidia.com>
Date: Tue, 12 Mar 2013 09:40:16 -0700
Subject: [PATCH 3/3] list.h: Make xorg_list_init inline

Otherwise this file is emitted in every unit that includes it.

Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 include/list.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/list.h b/include/list.h
index 067c6794f..11de7c561 100644
--- a/include/list.h
+++ b/include/list.h
@@ -119,7 +119,7 @@ struct xorg_list {
  *
  * @param The list to initialized.
  */
-static void
+static inline void
 xorg_list_init(struct xorg_list *list)
 {
     list->next = list->prev = list;