rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

1.15RC1

Browse Source
This commit is contained in:
Adam Jackson 2013-11-06 15:45:57 -05:00
parent d4760aa7f8
commit 488b3f2f01
52 changed files with 582 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ xorg-server-1.9.1.tar.bz2
/xorg-server-1.14.2.tar.bz2
/xorg-server-1.14.3.tar.bz2
/xorg-server-1.14.99.3.tar.bz2
/xorg-server-1.14.99.901.tar.bz2

186
0001-Disable-DRI3-and-sync-fence-FD-functions-if-xshmfenc.patch Normal file
View File

@ -0,0 +1,186 @@
From aaf0e29619196a283fee7ead2020a91032d84f48 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 3 Nov 2013 09:56:02 -0800
Subject: [PATCH 1/5] Disable DRI3 and sync fence FD functions if xshmfence
isn't available
Make sure the server can build when the xshmfence library isn't present
Signed-off-by: Keith Packard <keithp@keithp.com>
---
Xext/sync.c | 8 ++++++++
configure.ac | 46 ++++++++++++++++++++++++++++++++++++++++++++--
dri3/dri3.h | 6 ++++++
include/xorg-server.h.in | 3 +++
miext/sync/Makefile.am | 7 ++++++-
5 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/Xext/sync.c b/Xext/sync.c
index a04c383..dd18cde 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -919,6 +919,7 @@ SyncCreate(ClientPtr client, XID id, unsigned char type)
int
SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL initially_triggered)
{
+#if HAVE_XSHMFENCE
SyncFence *pFence;
int status;
@@ -936,12 +937,19 @@ SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL
return BadAlloc;
return Success;
+#else
+ return BadImplementation;
+#endif
}
int
SyncFDFromFence(ClientPtr client, DrawablePtr pDraw, SyncFence *pFence)
{
+#if HAVE_XSHMFENCE
return miSyncFDFromFence(pDraw, pFence);
+#else
+ return BadImplementation;
+#endif
}
static SyncCounter *
diff --git a/configure.ac b/configure.ac
index 0d855f2..a7515a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -792,6 +792,7 @@ DMXPROTO="dmxproto >= 2.2.99.1"
VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
WINDOWSWMPROTO="windowswmproto"
APPLEWMPROTO="applewmproto >= 1.4"
+XSHMFENCE="xshmfence"
dnl Required modules
XPROTO="xproto >= 7.0.22"
@@ -1119,17 +1120,59 @@ AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO,
[HAVE_DRI3PROTO=yes], [HAVE_DRI3PROTO=no])
+
case "$DRI3,$HAVE_DRI3PROTO" in
+ yes,yes | auto,yes)
+ ;;
yes,no)
AC_MSG_ERROR([DRI3 requested, but dri3proto not found.])
+ DRI3=no
+ ;;
+ no,*)
+ ;;
+ *)
+ AC_MSG_NOTICE([DRI3 disabled because dri3proto not found.])
+ DRI3=no
;;
+esac
+
+PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE,
+ [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no])
+
+AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes)
+
+case x"$HAVE_XSHMFENCE" in
+ xyes)
+ AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library])
+ ;;
+esac
+
+
+case "$DRI3,$HAVE_XSHMFENCE" in
yes,yes | auto,yes)
- AC_DEFINE(DRI3, 1, [Build DRI3 extension])
+ ;;
+ yes,no)
+ AC_MSG_ERROR("DRI3 requested, but xshmfence not found.])
+ DRI3=no
+ ;;
+ no,*)
+ ;;
+ *)
+ AC_MSG_NOTICE([DRI3 disabled because xshmfence not found.])
+ DRI3=no
+ ;;
+esac
+
+case x"$DRI3" in
+ xyes|xauto)
DRI3=yes
+ AC_DEFINE(DRI3, 1, [Build DRI3 extension])
DRI3_LIB='$(top_builddir)/dri3/libdri3.la'
SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI3PROTO"
+ AC_MSG_NOTICE([DRI3 enabled]);
;;
esac
+
AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes)
if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
@@ -1333,7 +1376,6 @@ if test "x$XDMAUTH" = xyes; then
XDMCP_MODULES="xdmcp"
fi
fi
-REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])
diff --git a/dri3/dri3.h b/dri3/dri3.h
index 7774c87..7c0c330 100644
--- a/dri3/dri3.h
+++ b/dri3/dri3.h
@@ -23,6 +23,10 @@
#ifndef _DRI3_H_
#define _DRI3_H_
+#include <xorg-server.h>
+
+#ifdef DRI3
+
#include <X11/extensions/dri3proto.h>
#include <randrstr.h>
@@ -56,4 +60,6 @@ typedef struct dri3_screen_info {
extern _X_EXPORT Bool
dri3_screen_init(ScreenPtr screen, dri3_screen_info_ptr info);
+#endif
+
#endif /* _DRI3_H_ */
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 1281b3e..960817e 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -218,4 +218,7 @@
#define _XSERVER64 1
#endif
+/* Have support for X shared memory fence library (xshmfence) */
+#undef HAVE_XSHMFENCE
+
#endif /* _XORG_SERVER_H_ */
diff --git a/miext/sync/Makefile.am b/miext/sync/Makefile.am
index e25ceac..ac13c52 100644
--- a/miext/sync/Makefile.am
+++ b/miext/sync/Makefile.am
@@ -8,8 +8,13 @@ if XORG
sdk_HEADERS = misync.h misyncstr.h misyncshm.h
endif
+XSHMFENCE_SRCS = misyncshm.c
+
libsync_la_SOURCES = \
misync.c \
misync.h \
- misyncshm.c \
misyncstr.h
+
+if XSHMFENCE
+libsync_la_SOURCES += $(XSHMFENCE_SRCS)
+endif
--
1.8.3.1

2
0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch
View File

@ -1,4 +1,4 @@
From 7bd95101b4a0f39f10d3ed455749a268bf37f967 Mon Sep 17 00:00:00 2001
From cace30177d37bf70dafcc297c38af4ecd7f74dba Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Thu, 12 Jan 2012 18:16:08 +0000
Subject: [PATCH 01/39] dbe: Cleanup in CloseScreen hook not ext CloseDown

32
0001-dmx-queue-button-events-with-valid-valuators.patch
View File

@ -1,32 +0,0 @@
From c6c228e06f215091f13b74dd99e0ae9c99049771 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 23 Oct 2013 15:16:25 +1000
Subject: [PATCH] dmx: queue button events with valid valuators
Setting POINTER_SCREEN with a unset valuator mask causes a jump to 0/0.
Alternative implementation here would be to remove the POINTER_SCREEN flag,
but that's likely more confusing to the casual reader.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
hw/dmx/input/dmxevents.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index 2875620..3fd6348 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -725,7 +725,9 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
case ButtonPress:
case ButtonRelease:
detail = dmxGetButtonMapping(dmxLocal, detail);
- valuator_mask_zero(&mask);
+ valuators[0] = e->xbutton.x;
+ valuators[1] = e->xbutton.y;
+ valuator_mask_set_range(&mask, 0, 2, valuators);
QueuePointerEvents(p, type, detail,
POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
return;
--
1.8.3.1

25
0001-xwayland-Port-to-new-damage-API.patch
View File

@ -1,25 +0,0 @@
From 99bc1cf93e274c3f7620d757c5d4fbe40229e810 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 25 Oct 2013 14:35:36 -0400
Subject: [PATCH] xwayland: Port to new damage API
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
hw/xfree86/xwayland/xwayland-window.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index c03855c..0cb4f28 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -190,7 +190,6 @@ xwl_unrealize_window(WindowPtr window)
xorg_list_del(&xwl_window->link);
if (RegionNotEmpty(DamageRegion(xwl_window->damage)))
xorg_list_del(&xwl_window->link_damage);
- DamageUnregister(&window->drawable, xwl_window->damage);
DamageDestroy(xwl_window->damage);
free(xwl_window);
dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
--
1.8.3.1

40
0002-hw-xfree86-Link-libdri3-only-when-DRI3-is-defined.patch Normal file
View File

@ -0,0 +1,40 @@
From 903a058370645ea075ea98d380fd565efb6160c9 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 4 Nov 2013 19:01:26 -0800
Subject: [PATCH 2/5] hw/xfree86: Link libdri3 only when DRI3 is defined
Don't attempt to link non-existant libraries...
Signed-off-by: Keith Packard <keithp@keithp.com>
---
hw/xfree86/Makefile.am | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index eea16a8..485386f 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -9,6 +9,11 @@ DRI2_SUBDIR = dri2
DRI2_LIB = dri2/libdri2.la
endif
+if DRI3
+DRI3_BUILDDIR = $(top_builddir)/dri3
+DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la
+endif
+
if XF86UTILS
XF86UTILS_SUBDIR = utils
endif
@@ -59,7 +64,7 @@ LOCAL_LIBS = \
dixmods/libxorgxkb.la \
$(DRI_LIB) \
$(DRI2_LIB) \
- $(top_builddir)/dri3/libdri3.la \
+ $(DRI3_LIB) \
$(top_builddir)/miext/sync/libsync.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/os/libos.la
--
1.8.3.1

2
0002-xkb-Add-struct-XkbCompContext.patch
View File

@ -1,4 +1,4 @@
From e262b6e2a6664298e68ca01154c1a16115f24ee2 Mon Sep 17 00:00:00 2001
From b126aca8d6b8b81527a7dcab0d9659a9b5d63d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Tue, 9 Apr 2013 16:54:55 -0400
Subject: [PATCH 02/39] xkb: Add struct XkbCompContext

30
0003-os-Actually-use-the-computed-clockid-in-GetTimeInMic.patch Normal file
View File

@ -0,0 +1,30 @@
From 5f1e832694e57986c0185048a941b3af51b2f85f Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Tue, 5 Nov 2013 07:08:21 -0800
Subject: [PATCH 3/5] os: Actually use the computed clockid in GetTimeInMicros
The selection of which clock to use for this function was not actually
getting used when fetching the final clock value.
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
os/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/os/utils.c b/os/utils.c
index 995f62a..fb20da7 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -480,7 +480,7 @@ GetTimeInMicros(void)
else
clockid = ~0L;
}
- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+ if (clockid != ~0L && clock_gettime(clockid, &tp) == 0)
return (CARD64) tp.tv_sec * (CARD64)1000000 + tp.tv_nsec / 1000;
#endif
--
1.8.3.1

2
0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch
View File

@ -1,4 +1,4 @@
From c2e072d4eeeaa15bfe4b963617688a1f25230ab7 Mon Sep 17 00:00:00 2001
From 04122fce2aac2185efc9a0e6d6e4363e73990658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Tue, 9 Apr 2013 17:11:03 -0400
Subject: [PATCH 03/39] xkb: Split out code to start and finish xkbcomp

71
0004-Link-with-xshmfence-reference-miSyncShmScreenInit-in.patch Normal file
View File

@ -0,0 +1,71 @@
From f348935e7d2c84a438aba08eee2f2c4e0dc77d20 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 5 Nov 2013 18:37:12 -0800
Subject: [PATCH 4/5] Link with xshmfence, reference miSyncShmScreenInit in
sdksyms
This gets the server to link with xshmfence again, and also ensures
that the miSyncShm code is linked into the server with the reference
from sdksyms.
Signed-off-by: Keith Packard <keithp@keithp.com>
---
configure.ac | 1 +
hw/xfree86/sdksyms.sh | 3 +++
include/dix-config.h.in | 3 +++
include/xorg-config.h.in | 3 +++
4 files changed, 10 insertions(+)
diff --git a/configure.ac b/configure.ac
index a7515a3..feeae04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1144,6 +1144,7 @@ AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes)
case x"$HAVE_XSHMFENCE" in
xyes)
AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library])
+ REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
;;
esac
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 7c9734c..d7f259d 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -44,6 +44,9 @@ cat > sdksyms.c << EOF
/* miext/sync/Makefile.am */
#include "misync.h"
#include "misyncstr.h"
+#if HAVE_XSHMFENCE
+#include "misyncshm.h"
+#endif
/* Xext/Makefile.am -- half is module, half is builtin */
#ifdef XV
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 397ee96..156383b 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -449,4 +449,7 @@
#include "dix-config-apple-verbatim.h"
#endif
+/* Have support for X shared memory fence library (xshmfence) */
+#undef HAVE_XSHMFENCE
+
#endif /* _DIX_CONFIG_H_ */
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index 487d7ad..e3444da 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -145,4 +145,7 @@
/* Support APM/ACPI power management in the server */
#undef XF86PM
+/* Have support for X shared memory fence library (xshmfence) */
+#undef HAVE_XSHMFENCE
+
#endif /* _XORG_CONFIG_H_ */
--
1.8.3.1

2
0004-xkb-Add-XkbCompileKeymapFromString.patch
View File

@ -1,4 +1,4 @@
From a8d1deb17d69dd8a5aa923edf6640173a5a2191b Mon Sep 17 00:00:00 2001
From ae806ffa6b94bf75b9cb1b2db3e717fcaf13c8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Tue, 9 Apr 2013 17:45:08 -0400
Subject: [PATCH 04/39] xkb: Add XkbCompileKeymapFromString()

29
0005-Use-GL_LIBS-instead-of-lGL-for-linking.patch Normal file
View File

@ -0,0 +1,29 @@
From 8fcf82cbf015609e00b3feb9bc567133c7aee5cf Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 5 Nov 2013 18:39:11 -0800
Subject: [PATCH 5/5] Use $GL_LIBS instead of -lGL for linking
-lGL presumes that the GL library is in the system path, while
$GL_LIBS is auto-detected.
Signed-off-by: Keith Packard <keithp@keithp.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index feeae04..6925df8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1075,7 +1075,7 @@ if test "x$GLX" = xyes; then
AC_SUBST(XLIB_CFLAGS)
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
GLX_LIBS='$(top_builddir)/glx/libglx.la'
- GLX_SYS_LIBS="$GLX_SYS_LIBS -lGL"
+ GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS"
else
GLX=no
fi
--
1.8.3.1

8
0005-configure-Track-updated-version-of-libxtrans.patch
View File

@ -1,4 +1,4 @@
From 513821c7014ad999033b273f76a521710f8f6116 Mon Sep 17 00:00:00 2001
From 4346239a5d9d34761885009ba65a4e3231a45182 Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Thu, 22 Nov 2012 20:22:56 -0200
Subject: [PATCH 05/39] configure: Track updated version of libxtrans
@ -18,18 +18,18 @@ Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 7b4e70f..7f99d2f 100644
index 6925df8..9fb014f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -802,7 +802,7 @@ FIXESPROTO="fixesproto >= 5.0"
@@ -806,7 +806,7 @@ FIXESPROTO="fixesproto >= 5.0"
DAMAGEPROTO="damageproto >= 1.1"
XCMISCPROTO="xcmiscproto >= 1.2.0"
BIGREQSPROTO="bigreqsproto >= 1.1.0"
-XTRANS="xtrans >= 1.2.2"
+XTRANS="xtrans >= 1.2.7"
PRESENTPROTO="presentproto >= 1.0"
dnl List of libraries that require a specific version
LIBAPPLEWM="applewm >= 1.4"
--
1.8.3.1

12
0006-os-Add-a-function-to-create-a-client-for-an-fd.patch
View File

@ -1,4 +1,4 @@
From 701261b0407926a34b6d23151f414d95b159c494 Mon Sep 17 00:00:00 2001
From 82eb27b4322bf392542381adf4aef1aae9fc7c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Tue, 21 Jun 2011 21:28:31 -0400
Subject: [PATCH 06/39] os: Add a function to create a client for an fd
@ -22,10 +22,10 @@ index b76ab6e..8ad9af0 100644
#endif /* OPAQUE_H */
diff --git a/include/os.h b/include/os.h
index c7108a5..32e5b96 100644
index 11b2198..4d4a0d6 100644
--- a/include/os.h
+++ b/include/os.h
@@ -160,8 +160,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
@@ -164,8 +164,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ );
@ -38,7 +38,7 @@ index c7108a5..32e5b96 100644
extern _X_EXPORT CARD32 GetTimeInMillis(void);
diff --git a/os/connection.c b/os/connection.c
index 6cd8bcf..499a4dd 100644
index 162e1d9..a95e7da 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -64,6 +64,7 @@ SOFTWARE.
@ -116,10 +116,10 @@ index 6cd8bcf..499a4dd 100644
+
#endif
diff --git a/os/utils.c b/os/utils.c
index 97c3125..3e9f525 100644
index fb20da7..42aa13b 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -778,7 +778,11 @@ ProcessCommandLine(int argc, char *argv[])
@@ -805,7 +805,11 @@ ProcessCommandLine(int argc, char *argv[])
#endif
else if (strcmp(argv[i], "-nolisten") == 0) {
if (++i < argc) {

2
0007-Export-xf86NewInputDevice-and-xf86AllocateInput.patch
View File

@ -1,4 +1,4 @@
From be359481c9c0947451d119efb643dcaef0529a42 Mon Sep 17 00:00:00 2001
From c676298e955548887ce98024c0a28456a8b21cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Thu, 21 Jul 2011 09:55:46 -0700
Subject: [PATCH 07/39] Export xf86NewInputDevice and xf86AllocateInput

2
0008-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch
View File

@ -1,4 +1,4 @@
From 2493a32018a467ff7a6b8420f1110eb5687a0526 Mon Sep 17 00:00:00 2001
From b91512c03726e442854813af60b1e399492f346c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Fri, 18 Sep 2009 22:02:43 -0400
Subject: [PATCH 08/39] Export CompositeRedirectSubwindows and

4
0009-Add-redirect-window-for-input-device-feature.patch
View File

@ -1,4 +1,4 @@
From be8fccebacac8c209bbc6e42e5aba49bc8102491 Mon Sep 17 00:00:00 2001
From 9702f1ac244758172c3f8edbfc26e99fe1d52fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Fri, 18 Sep 2009 22:09:03 -0400
Subject: [PATCH 09/39] Add redirect window for input device feature
@ -11,7 +11,7 @@ Subject: [PATCH 09/39] Add redirect window for input device feature
4 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/Xi/exevents.c b/Xi/exevents.c
index fd4b80c..f510a9e 100644
index 5dc9020..69b4038 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -2025,6 +2025,19 @@ DeliverTouchEvents(DeviceIntPtr dev, TouchPointInfoPtr ti,

2
0010-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
View File

@ -1,4 +1,4 @@
From 53821bf2c6e95332e3141cafe2fe26527f5dd543 Mon Sep 17 00:00:00 2001
From 995cadad451bce76a211b1b2f366c41efa1a8c65 Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Wed, 21 Aug 2013 21:23:09 -0700
Subject: [PATCH 10/39] dri2: Introduce a third version of the AuthMagic

58
0011-Add-xwayland-module.patch
View File

@ -1,4 +1,4 @@
From b1dc31ffa9508e38164432e9431e4b9c5ce80c34 Mon Sep 17 00:00:00 2001
From 0831ea9c83af12f497093e2566d94f75c3ba202f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Fri, 18 Sep 2009 22:08:16 -0400
Subject: [PATCH 11/39] Add xwayland module
@ -16,7 +16,7 @@ Squashed and rebased from the xwayland-1.12 branch. Contributions from
Scott Moreau <oreaus@gmail.com>
Tiago Vignatti <tiago.vignatti@intel.com>
---
configure.ac | 13 +-
configure.ac | 15 +
hw/xfree86/Makefile.am | 8 +-
hw/xfree86/common/xf86Config.c | 28 +-
hw/xfree86/common/xf86Globals.c | 2 +
@ -32,11 +32,11 @@ Squashed and rebased from the xwayland-1.12 branch. Contributions from
hw/xfree86/xwayland/xwayland-input.c | 610 +++++++++++++++++++++++++++++++++
hw/xfree86/xwayland/xwayland-output.c | 309 +++++++++++++++++
hw/xfree86/xwayland/xwayland-private.h | 132 +++++++
hw/xfree86/xwayland/xwayland-window.c | 317 +++++++++++++++++
hw/xfree86/xwayland/xwayland-window.c | 316 +++++++++++++++++
hw/xfree86/xwayland/xwayland.c | 392 +++++++++++++++++++++
hw/xfree86/xwayland/xwayland.h | 83 +++++
include/xorg-server.h.in | 3 +
20 files changed, 2595 insertions(+), 10 deletions(-)
20 files changed, 2597 insertions(+), 9 deletions(-)
create mode 100644 hw/xfree86/xwayland/Makefile.am
create mode 100644 hw/xfree86/xwayland/drm.xml
create mode 100644 hw/xfree86/xwayland/xserver.xml
@ -50,18 +50,18 @@ Squashed and rebased from the xwayland-1.12 branch. Contributions from
create mode 100644 hw/xfree86/xwayland/xwayland.h
diff --git a/configure.ac b/configure.ac
index 7f99d2f..da10573 100644
index 9fb014f..c146b7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,6 +635,7 @@ AC_ARG_ENABLE(windowswm, AS_HELP_STRING([--enable-windowswm], [Build XWin w
AC_ARG_ENABLE(libdrm, AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes])
@@ -635,6 +635,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg
AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes])
AC_ARG_ENABLE(linux_acpi, AC_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes])
AC_ARG_ENABLE(linux_apm, AC_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes])
+AC_ARG_ENABLE(wayland, AS_HELP_STRING([--disable-wayland], [Build Wayland extension (default: enabled)]), [WAYLAND=$enableval], [WAYLAND=yes])
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1018,6 +1019,14 @@ fi
@@ -1023,6 +1024,14 @@ fi
if test "x$MITSHM" = xauto; then
MITSHM="$ac_cv_sysv_ipc"
fi
@ -76,12 +76,21 @@ index 7f99d2f..da10573 100644
AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])
if test "x$MITSHM" = xyes; then
AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension])
@@ -1113,12 +1122,13 @@ case "$DRI2,$HAVE_DRI2PROTO" in
@@ -1118,6 +1127,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
esac
AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
-if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
+<<<<<<< HEAD
PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO,
[HAVE_DRI3PROTO=yes], [HAVE_DRI3PROTO=no])
@@ -1177,11 +1187,15 @@ esac
AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes)
if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
+=======
+if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$WAYLAND" = xyes ; then
+>>>>>>> Add xwayland module
if test "x$DRM" = xyes; then
AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])
PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
@ -91,7 +100,7 @@ index 7f99d2f..da10573 100644
if test "x$DRI2" = xyes; then
save_CFLAGS=$CFLAGS
@@ -2276,6 +2286,7 @@ hw/xfree86/dixmods/Makefile
@@ -2352,6 +2366,7 @@ hw/xfree86/dixmods/Makefile
hw/xfree86/doc/Makefile
hw/xfree86/dri/Makefile
hw/xfree86/dri2/Makefile
@ -100,11 +109,11 @@ index 7f99d2f..da10573 100644
hw/xfree86/exa/man/Makefile
hw/xfree86/fbdevhw/Makefile
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 59cfb5f..38fb0c1 100644
index 485386f..ff04b25 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -9,6 +9,10 @@ DRI2_SUBDIR = dri2
DRI2_LIB = dri2/libdri2.la
@@ -14,6 +14,10 @@ DRI3_BUILDDIR = $(top_builddir)/dri3
DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la
endif
+if WAYLAND
@ -114,7 +123,7 @@ index 59cfb5f..38fb0c1 100644
if XF86UTILS
XF86UTILS_SUBDIR = utils
endif
@@ -27,12 +31,12 @@ endif
@@ -32,12 +36,12 @@ endif
SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \
ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \
@ -141,12 +150,12 @@ index 74d5ed3..39cd58c 100644
+ {.name = "xwayland",.toLoad = FALSE,.load_opt=NULL},
+ {.name = NULL,.toLoad = FALSE,.load_opt=NULL}
};
/* Forward declarations */
@@ -260,6 +261,17 @@ xf86ModulelistFromConfig(pointer **optlist)
return NULL;
}
+ /*
+ * Set the xwayland module to autoload if requested.
+ */
@ -2071,10 +2080,10 @@ index 0000000..e427316
+#endif /* _XWAYLAND_PRIVATE_H_ */
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
new file mode 100644
index 0000000..d56e0d0
index 0000000..925d63c
--- /dev/null
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -0,0 +1,317 @@
@@ -0,0 +1,316 @@
+/*
+ * Copyright © 2011 Intel Corporation
+ *
@ -2317,7 +2326,6 @@ index 0000000..d56e0d0
+ xorg_list_del(&xwl_window->link);
+ if (RegionNotEmpty(DamageRegion(xwl_window->damage)))
+ xorg_list_del(&xwl_window->link_damage);
+ DamageUnregister(&window->drawable, xwl_window->damage);
+ DamageDestroy(xwl_window->damage);
+ free(xwl_window);
+ dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
@ -2880,12 +2888,12 @@ index 0000000..f268366
+
+#endif /* _XWAYLAND_H_ */
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 81935be..2f9d27b 100644
index 960817e..ec43ff7 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -212,4 +212,7 @@
#define _XSERVER64 1
#endif
@@ -221,4 +221,7 @@
/* Have support for X shared memory fence library (xshmfence) */
#undef HAVE_XSHMFENCE
+/* Building Xorg server. */
+#undef XORG_WAYLAND

2
0012-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
View File

@ -1,4 +1,4 @@
From b1439c7708dae1b0f68f6e53264d5be1f636bd82 Mon Sep 17 00:00:00 2001
From 201d8504ebaa1de7be149089281a7f40cd57bb38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Wed, 21 Aug 2013 23:02:58 -0700
Subject: [PATCH 12/39] xwayland: Add a HW_WAYLAND flag to let drivers

2
0013-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
View File

@ -1,4 +1,4 @@
From 2d673d0606ca79ede96c019670286338949e59ec Mon Sep 17 00:00:00 2001
From a8f7359014b9e604998a2da53764fe99e5c7b784 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@redhat.com>
Date: Wed, 21 Aug 2013 09:53:25 +0200
Subject: [PATCH 13/39] xwayland-shm: don't create alpha buffers if the window

2
0014-xwayland-handle-global-object-destruction.patch
View File

@ -1,4 +1,4 @@
From 8608443b26b21991e27bc26fa83cd14b30ee9a01 Mon Sep 17 00:00:00 2001
From a7da07002daaa1e1397a3fe32ea3c77df4f15071 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@redhat.com>
Date: Wed, 21 Aug 2013 09:53:26 +0200
Subject: [PATCH 14/39] xwayland: handle global object destruction

2
0015-xwayland-add-support-for-multiple-outputs.patch
View File

@ -1,4 +1,4 @@
From 99b250c3246d6547cbc6bc84f7f42b9aec5b3a4f Mon Sep 17 00:00:00 2001
From b4354c5a6d8587c079f52e3363b339558f5832a7 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@redhat.com>
Date: Thu, 22 Aug 2013 16:23:48 +0200
Subject: [PATCH 15/39] xwayland: add support for multiple outputs

2
0016-xwayland-Probe-outputs-on-preinit.patch
View File

@ -1,4 +1,4 @@
From 796e417ebb9c2f796ce9588a6a8d7b2cd29c7af3 Mon Sep 17 00:00:00 2001
From 6c0e4bfda0aca061d51b8f29ad01cadc963c42f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Sun, 1 Sep 2013 23:14:43 +0200
Subject: [PATCH 16/39] xwayland: Probe outputs on preinit

2
0017-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
View File

@ -1,4 +1,4 @@
From 400d9b22c0927a20b7255100a4ba8d3d11bef262 Mon Sep 17 00:00:00 2001
From 11a0bb26adf1a5daf6805c0973bc3bef009c53b1 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 16 Aug 2013 13:21:21 +0100
Subject: [PATCH 17/39] XFree86: Load wlshm driver as fallback for Wayland

2
0018-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
View File

@ -1,4 +1,4 @@
From 55f33977d3753f357c407def598647698d5b05a4 Mon Sep 17 00:00:00 2001
From c8cd8d2f034af7d390f721484e340e66cdcf0ec0 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 7 Nov 2012 17:22:42 +1100
Subject: [PATCH 18/39] XWayland: Don't send out-of-bounds damage co-ordinates

36
0019-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
View File

@ -1,27 +1,27 @@
From cf0846ea962e60ae1229dba6ee25b067ebafe906 Mon Sep 17 00:00:00 2001
From 4950f4b3973a9391a674fedd02dc364abe0f121e Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Tue, 16 Oct 2012 17:14:01 +1100
Subject: [PATCH 19/39] xwayland: Introduce an auto mode for --enable-wayland
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
---
configure.ac | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
configure.ac | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index da10573..a74d607 100644
index c146b7b..5cb4f5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,7 +635,7 @@ AC_ARG_ENABLE(windowswm, AS_HELP_STRING([--enable-windowswm], [Build XWin w
AC_ARG_ENABLE(libdrm, AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes])
@@ -635,7 +635,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg
AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes])
AC_ARG_ENABLE(linux_acpi, AC_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes])
AC_ARG_ENABLE(linux_apm, AC_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes])
-AC_ARG_ENABLE(wayland, AS_HELP_STRING([--disable-wayland], [Build Wayland extension (default: enabled)]), [WAYLAND=$enableval], [WAYLAND=yes])
+AC_ARG_ENABLE(wayland, AS_HELP_STRING([--disable-wayland], [Build Wayland extension (default: auto)]), [WAYLAND=$enableval], [WAYLAND=auto])
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1020,12 +1020,16 @@ if test "x$MITSHM" = xauto; then
@@ -1025,12 +1025,16 @@ if test "x$MITSHM" = xauto; then
MITSHM="$ac_cv_sysv_ipc"
fi
@ -40,6 +40,26 @@ index da10573..a74d607 100644
AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])
if test "x$MITSHM" = xyes; then
@@ -1127,7 +1131,6 @@ case "$DRI2,$HAVE_DRI2PROTO" in
esac
AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
-<<<<<<< HEAD
PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO,
[HAVE_DRI3PROTO=yes], [HAVE_DRI3PROTO=no])
@@ -1186,10 +1189,7 @@ esac
AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes)
-if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
-=======
-if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$WAYLAND" = xyes ; then
->>>>>>> Add xwayland module
+if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$WAYLAND" = xyes ; then
if test "x$DRM" = xyes; then
AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])
PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
--
1.8.3.1

2
0020-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
View File

@ -1,4 +1,4 @@
From b207060d767d908eb4b70607f280d67854a4f161 Mon Sep 17 00:00:00 2001
From 7e4dd0de5b558a4a93ca9572c74af10117a9f50e Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 7 Nov 2012 17:15:13 +1100
Subject: [PATCH 20/39] XWayland: Don't hardcode DRM libs and -lwayland-client

2
0021-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
View File

@ -1,4 +1,4 @@
From 7d66d6b1bceebea3bdb49886e1f6980d480713df Mon Sep 17 00:00:00 2001
From d99536639333fb9d90a296196395ba96ffe22d96 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 16 Aug 2013 13:51:08 +0100
Subject: [PATCH 21/39] XWayland: Support 16bpp X surfaces in DRM/SHM

2
0022-xwayland-Remove-Xdnd-selection-watching-code.patch
View File

@ -1,4 +1,4 @@
From 048c854b7332d19b0654e856c414115acfd456b1 Mon Sep 17 00:00:00 2001
From 8157fe1fecd6696a534fef89bc4a1c12ff8f2818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Wed, 11 Sep 2013 11:15:18 -0700
Subject: [PATCH 22/39] xwayland: Remove Xdnd selection watching code

2
0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
View File

@ -1,4 +1,4 @@
From 7865d8abc9fe47ccde165f37c4a887fb398f7216 Mon Sep 17 00:00:00 2001
From 0d8af023c8037f9d6a219ec38da11e5e473a9610 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Fri, 13 Sep 2013 17:17:16 -0400
Subject: [PATCH 23/39] xf86Init: trim out non-wayland capable servers from

10
0024-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
View File

@ -1,4 +1,4 @@
From 58a429b667443eb2c38bad82358edc1d3df045c5 Mon Sep 17 00:00:00 2001
From ef4f0c33441998d31776b4e05ac637c8e2571219 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@redhat.com>
Date: Fri, 13 Sep 2013 15:52:29 +0200
Subject: [PATCH 24/39] Add XORG_WAYLAND symbol to xorg-config.h.in
@ -11,12 +11,12 @@ xorg-config.h.in.
1 file changed, 3 insertions(+)
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index 0df31ae..8aec1d8 100644
index e3444da..a35a9b0 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -142,4 +142,7 @@
/* Define to 1 if you have the `seteuid' function. */
#undef HAVE_SETEUID
@@ -148,4 +148,7 @@
/* Have support for X shared memory fence library (xshmfence) */
#undef HAVE_XSHMFENCE
+/* Building Xorg server. */
+#undef XORG_WAYLAND

2
0025-Fix-fallback-loading-of-the-wayland-driver.patch
View File

@ -1,4 +1,4 @@
From b04cf1f3df9627b804de1c0c2a2436a608992333 Mon Sep 17 00:00:00 2001
From 3b4990d5042c9e6520fa1bd6ff2be696243b3792 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@redhat.com>
Date: Fri, 13 Sep 2013 15:52:30 +0200
Subject: [PATCH 25/39] Fix fallback loading of the wayland driver

4
0026-xwayland-Don-t-include-xorg-server.h.patch
View File

@ -1,4 +1,4 @@
From 043aa3410eaebb0bf97b6efd2e1897f53d69e76d Mon Sep 17 00:00:00 2001
From 2ee348cc8b94f823f84eea4024b26beb16d49f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Fri, 13 Sep 2013 14:52:13 -0700
Subject: [PATCH 26/39] xwayland: Don't include xorg-server.h
@ -36,7 +36,7 @@ index 691b5f0..7004b9b 100644
#include <xf86Crtc.h>
#include <mipointrst.h>
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index d56e0d0..88f57ce 100644
index 925d63c..b7677ed 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -33,7 +33,6 @@

4
0027-os-Don-t-include-xorg-server.h.patch
View File

@ -1,4 +1,4 @@
From 77e8c128a8f939895907060126539b2913326e75 Mon Sep 17 00:00:00 2001
From 064a8d7f03e8576be8d581a197efe12d319304e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Fri, 13 Sep 2013 14:53:16 -0700
Subject: [PATCH 27/39] os: Don't include xorg-server.h
@ -10,7 +10,7 @@ don't depend on anything from Quartz or Wayland.
1 file changed, 4 deletions(-)
diff --git a/os/connection.c b/os/connection.c
index 499a4dd..65ca01b 100644
index a95e7da..0a858b7 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -64,7 +64,6 @@ SOFTWARE.

8
0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
View File

@ -1,4 +1,4 @@
From 31d81fa77db3989a987b12a822130f8f12cc2276 Mon Sep 17 00:00:00 2001
From cc29e0dc978c1aea7b989c69a6512a80e2acf071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Fri, 13 Sep 2013 15:16:31 -0700
Subject: [PATCH 28/39] os: Also define ListenOnOpenFD and AddClientOnOpenFD
@ -10,10 +10,10 @@ Remove the #ifdef from the header file as well.
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/os.h b/include/os.h
index 32e5b96..5d845b0 100644
index 4d4a0d6..4752d15 100644
--- a/include/os.h
+++ b/include/os.h
@@ -160,10 +160,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
@@ -164,10 +164,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ );
@ -24,7 +24,7 @@ index 32e5b96..5d845b0 100644
-#endif
extern _X_EXPORT CARD32 GetTimeInMillis(void);
extern _X_EXPORT CARD64 GetTimeInMicros(void);
--
1.8.3.1

4
0029-xwayland-Remove-unused-variables.patch
View File

@ -1,4 +1,4 @@
From 6e37c4facede1739b5e4e84d775f480d5ebd67ef Mon Sep 17 00:00:00 2001
From 74f9b7e691aef5e3f340cddd8acb2a5e20be7f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 16 Sep 2013 11:51:57 -0700
Subject: [PATCH 29/39] xwayland: Remove unused variables
@ -8,7 +8,7 @@ Subject: [PATCH 29/39] xwayland: Remove unused variables
1 file changed, 3 deletions(-)
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index 88f57ce..20db80c 100644
index b7677ed..3c85630 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -92,9 +92,6 @@ xwl_create_window(WindowPtr window)

2
0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
View File

@ -1,4 +1,4 @@
From ce5be44c0556b9b097b4800aee75025feef9e2ff Mon Sep 17 00:00:00 2001
From 4587f79c2b5b191d450a97c8951771e98f237316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 16 Sep 2013 12:05:19 -0700
Subject: [PATCH 30/39] xwayland: Use a per-screen private key for cursor

4
0031-XWayland-Don-t-commit-empty-surfaces.patch
View File

@ -1,4 +1,4 @@
From fc45cb4efcb5dd4de3e90911b44c6d66ef6e6618 Mon Sep 17 00:00:00 2001
From 274388f6055f0fe33654113b6c2eb09551f20c2b Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Thu, 12 Sep 2013 16:58:00 -0400
Subject: [PATCH 31/39] XWayland: Don't commit empty surfaces
@ -16,7 +16,7 @@ Signed-off-by: Daniel Stone <daniels@collabora.com>
1 file changed, 1 deletion(-)
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index 20db80c..5045e65 100644
index 3c85630..fb9c64a 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -80,7 +80,6 @@ xwl_window_attach(struct xwl_window *xwl_window, PixmapPtr pixmap)

5
0032-xwayland-Also-look-for-wlglamor.patch
View File

@ -1,4 +1,4 @@
From f6f1c358958303aaa0cb2ae40044dd8cdc756618 Mon Sep 17 00:00:00 2001
From 8742e0ca22257c2c028fbe434ba81a3859a9bf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Fri, 11 Oct 2013 16:14:54 -0700
Subject: [PATCH 32/39] xwayland: Also look for wlglamor
@ -19,5 +19,6 @@ index b35cb96..9576b86 100644
matches[i++] = xnfstrdup("wayland");
else
#endif
--
--
1.8.3.1

7
0033-xwayland-Add-wlglamor-the-right-way.patch
View File

@ -1,4 +1,4 @@
From 6ed319fdf521f3a36eb9635297beec3d3d23be8d Mon Sep 17 00:00:00 2001
From 4a8be9e6f0b389d6e2c883dbf9bceb1f8403ac75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Fri, 11 Oct 2013 16:29:02 -0700
Subject: [PATCH 33/39] xwayland: Add wlglamor the right way
@ -13,7 +13,7 @@ index 9576b86..cc6dcce 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -282,12 +282,12 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
#if !defined(sun)
/* Fallback to platform default frame buffer driver */
- if (i < (nmatches - 1)) {
@ -28,5 +28,6 @@ index 9576b86..cc6dcce 100644
#endif
#if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb");
--
--
1.8.3.1

6
0034-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
View File

@ -1,4 +1,4 @@
From 0f0a11b4d5d573080e9db39d150eb66d78a9aab2 Mon Sep 17 00:00:00 2001
From 52668595cb7e52612944a77276eb71f29d037738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Fri, 11 Oct 2013 15:41:59 -0700
Subject: [PATCH 34/39] xwayland: Don't redirect windows, leave it to the wm
@ -8,7 +8,7 @@ Subject: [PATCH 34/39] xwayland: Don't redirect windows, leave it to the wm
1 file changed, 51 deletions(-)
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index 5045e65..c03855c 100644
index fb9c64a..0cb4f28 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -31,11 +31,9 @@
@ -73,7 +73,7 @@ index 5045e65..c03855c 100644
static void
damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data)
{
@@ -290,12 +245,6 @@ xwl_screen_init_window(struct xwl_screen *xwl_screen, ScreenPtr screen)
@@ -289,12 +244,6 @@ xwl_screen_init_window(struct xwl_screen *xwl_screen, ScreenPtr screen)
if (!dixRegisterPrivateKey(&xwl_window_private_key, PRIVATE_WINDOW, 0))
return BadAlloc;

17
0035-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch
View File

@ -1,4 +1,4 @@
From 15a94f4f263cfe848382e0587a68d48da31a24b3 Mon Sep 17 00:00:00 2001
From f7a01c6db6f3aaf161b1c057633a4e53adf8b62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Fri, 11 Oct 2013 16:40:39 -0700
Subject: [PATCH 35/39] Revert "Export CompositeRedirectSubwindows and
@ -18,16 +18,16 @@ index 98b27b1..b7d731e 100644
+++ b/composite/compalloc.c
@@ -46,7 +46,6 @@
#endif
#include "compint.h"
-#include "compositeext.h"
static void
compScreenUpdate(ScreenPtr pScreen)
@@ -412,11 +411,6 @@ compRedirectSubwindows(ClientPtr pClient, WindowPtr pWin, int update)
return Success;
}
-int CompositeRedirectSubwindows (WindowPtr pWin, int update)
-{
- return compRedirectSubwindows (serverClient, pWin, update);
@ -39,7 +39,7 @@ index 98b27b1..b7d731e 100644
@@ -488,11 +482,6 @@ compUnredirectSubwindows(ClientPtr pClient, WindowPtr pWin, int update)
return BadValue;
}
-int CompositeUnRedirectSubwindows (WindowPtr pWin, int update)
-{
- return compUnredirectSubwindows (serverClient, pWin, update);
@ -60,8 +60,9 @@ index a072966..0b148f0 100644
- int update);
-extern _X_EXPORT int CompositeUnRedirectSubwindows (WindowPtr pWin,
- int update);
extern _X_EXPORT RESTYPE CompositeClientWindowType;
--
--
1.8.3.1

11
0036-xwayland-Fix-hidden-cursor.patch
View File

@ -1,4 +1,4 @@
From 00e15ddb814dd39bbe7915fff7920aa90ca52cea Mon Sep 17 00:00:00 2001
From 48552ee6143a7fd576b746cce1ed2580d25a5bce Mon Sep 17 00:00:00 2001
From: Trevor McCort <tjmccort@gmail.com>
Date: Tue, 15 Oct 2013 19:41:12 -0500
Subject: [PATCH 36/39] xwayland: Fix hidden cursor
@ -18,11 +18,11 @@ index 2cdd248..2b3cb5e 100644
@@ -153,9 +153,16 @@ xwl_seat_set_cursor(struct xwl_seat *xwl_seat)
{
struct wl_buffer *buffer;
- if (!xwl_seat->x_cursor || !xwl_seat->wl_pointer)
+ if (!xwl_seat->wl_pointer)
return;
+ if (!xwl_seat->x_cursor) {
+ wl_pointer_set_cursor(xwl_seat->wl_pointer,
+ xwl_seat->pointer_enter_serial,
@ -32,6 +32,7 @@ index 2cdd248..2b3cb5e 100644
+
buffer = dixGetPrivate(&xwl_seat->x_cursor->devPrivates,
&xwl_seat->xwl_screen->cursor_private_key);
--
--
1.8.3.1

31
0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
View File

@ -1,4 +1,4 @@
From 1af712071d2cf7aac5232da166276d38cded68e7 Mon Sep 17 00:00:00 2001
From 2a58c1c5cc8db21252838b6aacb14986850f1ddd Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 22 Oct 2013 16:50:29 +0200
Subject: [PATCH 37/39] xkb: Repurpose XkbCopyDeviceKeymap to apply a given
@ -14,18 +14,18 @@ apply to a device but don't have a source device.
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Xi/exevents.c b/Xi/exevents.c
index f510a9e..5b6d370 100644
index 69b4038..028bdb4 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -230,7 +230,7 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
mk->sourceid = device->id;
- if (!XkbCopyDeviceKeymap(master, device))
+ if (!XkbDeviceApplyKeymap(master, device->key->xkbInfo->desc))
FatalError("Couldn't pivot keymap from device to core!\n");
}
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index bef98ef..83ee1d0 100644
--- a/include/xkbsrv.h
@ -33,12 +33,12 @@ index bef98ef..83ee1d0 100644
@@ -812,8 +812,8 @@ extern _X_EXPORT void XkbSendNewKeyboardNotify(DeviceIntPtr /* kbd */ ,
extern Bool XkbCopyKeymap(XkbDescPtr /* dst */ ,
XkbDescPtr /* src */ );
-extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */ ,
- DeviceIntPtr /* src */ );
+extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ ,
+ XkbDescPtr /* src */ );
extern void XkbFilterEvents(ClientPtr /* pClient */ ,
int /* nEvents */ ,
diff --git a/xkb/xkb.c b/xkb/xkb.c
@ -47,11 +47,11 @@ index c78aceb..7a631b8 100644
+++ b/xkb/xkb.c
@@ -5991,7 +5991,7 @@ ProcXkbGetKbdByName(ClientPtr client)
continue;
if (tmpd != dev)
- XkbCopyDeviceKeymap(tmpd, dev);
+ XkbDeviceApplyKeymap(tmpd, xkb);
if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) {
old_sli = tmpd->kbdfeed->xkb_sli;
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
@ -60,18 +60,18 @@ index 6c6af60..1f8a839 100644
+++ b/xkb/xkbUtils.c
@@ -1999,28 +1999,28 @@ XkbCopyKeymap(XkbDescPtr dst, XkbDescPtr src)
}
Bool
-XkbCopyDeviceKeymap(DeviceIntPtr dst, DeviceIntPtr src)
+XkbDeviceApplyKeymap(DeviceIntPtr dst, XkbDescPtr desc)
{
xkbNewKeyboardNotify nkn;
Bool ret;
- if (!dst->key || !src->key)
+ if (!dst->key || !desc)
return FALSE;
memset(&nkn, 0, sizeof(xkbNewKeyboardNotify));
nkn.oldMinKeyCode = dst->key->xkbInfo->desc->min_key_code;
nkn.oldMaxKeyCode = dst->key->xkbInfo->desc->max_key_code;
@ -88,11 +88,12 @@ index 6c6af60..1f8a839 100644
- if (src->key->xkbInfo->desc->geom)
+ if (desc->geom)
nkn.changed |= XkbNKN_GeometryMask;
- ret = XkbCopyKeymap(dst->key->xkbInfo->desc, src->key->xkbInfo->desc);
+ ret = XkbCopyKeymap(dst->key->xkbInfo->desc, desc);
if (ret)
XkbSendNewKeyboardNotify(dst, &nkn);
--
--
1.8.3.1

15
0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
View File

@ -1,4 +1,4 @@
From 50904d21bffcd88bede056d10e7826d5f6c83278 Mon Sep 17 00:00:00 2001
From bcbc8bf3a7ed433cb6424deca845f49d3b744339 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 21 Oct 2013 14:41:53 +0200
Subject: [PATCH 38/39] xkb: Factor out a function to copy a keymap's controls
@ -17,13 +17,13 @@ index 83ee1d0..6a2e96e 100644
@@ -829,6 +829,9 @@ extern void XkbFakeDeviceButton(DeviceIntPtr /* dev */ ,
int /* press */ ,
int /* button */ );
+extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
+ XkbDescPtr /* src */ );
+
#include "xkbfile.h"
#include "xkbrules.h"
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 7a631b8..6a68e81 100644
--- a/xkb/xkb.c
@ -33,12 +33,12 @@ index 7a631b8..6a68e81 100644
XkbDescPtr old_xkb;
xkbNewKeyboardNotify nkn;
- int i, nG, nTG;
old_xkb = xkb;
xkb = new;
dev->key->xkbInfo->desc = xkb;
new = old_xkb; /* so it'll get freed automatically */
- *xkb->ctrls = *old_xkb->ctrls;
- for (nG = nTG = 0, i = xkb->min_key_code; i <= xkb->max_key_code; i++) {
- nG = XkbKeyNumGroups(xkb, i);
@ -52,7 +52,7 @@ index 7a631b8..6a68e81 100644
- }
- xkb->ctrls->num_groups = nTG;
+ XkbCopyControls(xkb, old_xkb);
nkn.deviceID = nkn.oldDeviceID = dev->id;
nkn.minKeyCode = new->min_key_code;
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
@ -86,5 +86,6 @@ index 1f8a839..6cf6e79 100644
+ }
+ dst->ctrls->num_groups = nTG;
+}
--
--
1.8.3.1

2
0039-xwayland-Handle-keymap-changes.patch
View File

@ -1,4 +1,4 @@
From f56320a89c3da88bc844069e33edf34cca09e39a Mon Sep 17 00:00:00 2001
From d43a01c9cb622ea7300614dce3d0752e21ca180a Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 21 Oct 2013 14:41:54 +0200
Subject: [PATCH 39/39] xwayland: Handle keymap changes

2
sources
View File

@ -1 +1 @@
08cf32dbeeeed5102272a45323809073 xorg-server-1.14.99.3.tar.bz2
69ace33c5403088f356c7ffd7c223839 xorg-server-1.14.99.901.tar.bz2

104
xorg-x11-server.spec
View File

@ -8,7 +8,7 @@
# format, and add a PatchN: line. If you want to push something upstream,
# check out the master branch, pull, cherry-pick, and push.
%global gitdate 20131021
%global gitdate 20131101
%global stable_abi 0
%if !0%{?gitdate} || %{stable_abi}
@ -41,8 +41,8 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.14.99.3
Release: 2%{?gitdate:.%{gitdate}}%{dist}
Version: 1.14.99.901
Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -74,55 +74,59 @@ Source31: xserver-sdk-abi-requires.git
# maintainer convenience script
Source40: driver-abi-rebuild.sh
# sync with tip
Patch0001: 0001-Disable-DRI3-and-sync-fence-FD-functions-if-xshmfenc.patch
Patch0002: 0002-hw-xfree86-Link-libdri3-only-when-DRI3-is-defined.patch
Patch0003: 0003-os-Actually-use-the-computed-clockid-in-GetTimeInMic.patch
Patch0004: 0004-Link-with-xshmfence-reference-miSyncShmScreenInit-in.patch
Patch0005: 0005-Use-GL_LIBS-instead-of-lGL-for-linking.patch
# xwayland. trivial rebase onto master:
# http://cgit.freedesktop.org/~ajax/xserver/log/?h=wl-rebase-for-f20
Patch0000: 0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch
Patch0001: 0002-xkb-Add-struct-XkbCompContext.patch
Patch0002: 0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch
Patch0003: 0004-xkb-Add-XkbCompileKeymapFromString.patch
Patch0004: 0005-configure-Track-updated-version-of-libxtrans.patch
Patch0005: 0006-os-Add-a-function-to-create-a-client-for-an-fd.patch
Patch0006: 0007-Export-xf86NewInputDevice-and-xf86AllocateInput.patch
Patch0007: 0008-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch
Patch0008: 0009-Add-redirect-window-for-input-device-feature.patch
Patch0009: 0010-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
Patch0010: 0011-Add-xwayland-module.patch
Patch0011: 0012-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
Patch0012: 0013-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
Patch0013: 0014-xwayland-handle-global-object-destruction.patch
Patch0014: 0015-xwayland-add-support-for-multiple-outputs.patch
Patch0015: 0016-xwayland-Probe-outputs-on-preinit.patch
Patch0016: 0017-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
Patch0017: 0018-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
Patch0018: 0019-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
Patch0019: 0020-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
Patch0020: 0021-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
Patch0021: 0022-xwayland-Remove-Xdnd-selection-watching-code.patch
Patch0022: 0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
Patch0023: 0024-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
Patch0024: 0025-Fix-fallback-loading-of-the-wayland-driver.patch
Patch0025: 0026-xwayland-Don-t-include-xorg-server.h.patch
Patch0026: 0027-os-Don-t-include-xorg-server.h.patch
Patch0027: 0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
Patch0028: 0029-xwayland-Remove-unused-variables.patch
Patch0029: 0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
Patch0030: 0031-XWayland-Don-t-commit-empty-surfaces.patch
Patch0031: 0032-xwayland-Also-look-for-wlglamor.patch
Patch0032: 0033-xwayland-Add-wlglamor-the-right-way.patch
Patch0033: 0034-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
Patch0034: 0035-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch
Patch0035: 0036-xwayland-Fix-hidden-cursor.patch
Patch0036: 0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
Patch0037: 0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
Patch0038: 0039-xwayland-Handle-keymap-changes.patch
Patch0101: 0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch
Patch0102: 0002-xkb-Add-struct-XkbCompContext.patch
Patch0103: 0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch
Patch0104: 0004-xkb-Add-XkbCompileKeymapFromString.patch
Patch0105: 0005-configure-Track-updated-version-of-libxtrans.patch
Patch0106: 0006-os-Add-a-function-to-create-a-client-for-an-fd.patch
Patch0107: 0007-Export-xf86NewInputDevice-and-xf86AllocateInput.patch
Patch0108: 0008-Export-CompositeRedirectSubwindows-and-CompositeUnRe.patch
Patch0109: 0009-Add-redirect-window-for-input-device-feature.patch
Patch0110: 0010-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
Patch0111: 0011-Add-xwayland-module.patch
Patch0112: 0012-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
Patch0113: 0013-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
Patch0114: 0014-xwayland-handle-global-object-destruction.patch
Patch0115: 0015-xwayland-add-support-for-multiple-outputs.patch
Patch0116: 0016-xwayland-Probe-outputs-on-preinit.patch
Patch0117: 0017-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
Patch0118: 0018-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
Patch0119: 0019-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
Patch0120: 0020-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
Patch0121: 0021-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
Patch0122: 0022-xwayland-Remove-Xdnd-selection-watching-code.patch
Patch0123: 0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
Patch0124: 0024-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
Patch0125: 0025-Fix-fallback-loading-of-the-wayland-driver.patch
Patch0126: 0026-xwayland-Don-t-include-xorg-server.h.patch
Patch0127: 0027-os-Don-t-include-xorg-server.h.patch
Patch0128: 0028-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
Patch0129: 0029-xwayland-Remove-unused-variables.patch
Patch0130: 0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
Patch0131: 0031-XWayland-Don-t-commit-empty-surfaces.patch
Patch0132: 0032-xwayland-Also-look-for-wlglamor.patch
Patch0133: 0033-xwayland-Add-wlglamor-the-right-way.patch
Patch0134: 0034-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
Patch0135: 0035-Revert-Export-CompositeRedirectSubwindows-and-Compos.patch
Patch0136: 0036-xwayland-Fix-hidden-cursor.patch
Patch0137: 0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
Patch0138: 0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
Patch0139: 0039-xwayland-Handle-keymap-changes.patch
# Trivial things to never merge upstream ever:
# This really could be done prettier.
Patch5002: xserver-1.4.99-ssh-isnt-local.patch
# don't build the (broken) acpi code
Patch6011: xserver-1.6.0-less-acpi-brokenness.patch
# ajax needs to upstream this
Patch6030: xserver-1.6.99-right-of.patch
#Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
@ -151,10 +155,6 @@ Patch8041: 0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch
# extra magic to be upstreamed
Patch9001: 0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch
Patch9002: 0001-xwayland-Just-send-the-bounding-box-of-the-damage.patch
Patch9003: 0001-xwayland-Port-to-new-damage-API.patch
# Bug 1019821: Xdmx mouse after button-click goes to upper-left position
Patch9040: 0001-dmx-queue-button-events-with-valid-valuators.patch
%global moduledir %{_libdir}/xorg/modules
%global drimoduledir %{_libdir}/dri
@ -218,6 +218,8 @@ BuildRequires: libunwind-devel
BuildRequires: pkgconfig(xcb-aux) pkgconfig(xcb-image) pkgconfig(xcb-icccm)
BuildRequires: pkgconfig(xcb-keysyms)
# blocking on https://bugzilla.redhat.com/show_bug.cgi?id=1027380
#BuildRequires: pkgconfig(xshmfence)
# All server subpackages have a virtual provide for the name of the server
# they deliver. The Xorg one is versioned, the others are intentionally
@ -453,6 +455,7 @@ autoreconf -f -v --install || exit 1
--with-os-name="$(hostname -s) $(uname -r)" \
--with-xkb-output=%{_localstatedir}/lib/xkb \
--with-dtrace \
--disable-linux-acpi --disable-linux-apm \
--enable-xselinux --enable-record \
--enable-config-udev \
%{?wayland} \
@ -643,6 +646,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Wed Nov 06 2013 Adam Jackson <ajax@redhat.com> 1.14.99.901-1
- 1.15RC1
* Mon Oct 28 2013 Adam Jackson <ajax@redhat.com> 1.14.99.3-2
- Don't build xwayland in RHEL

25
xserver-1.6.0-less-acpi-brokenness.patch
View File

@ -1,25 +0,0 @@
From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 9 Nov 2011 11:52:06 +1000
Subject: [PATCH 2/7] Don't build the ACPI code.
No good can come of this.
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a12783c..54f4464 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
linux_alpha=yes
;;
i*86|amd64*|x86_64*|ia64*)
- linux_acpi="yes"
;;
*)
;;
--
1.7.10.1

25
xserver-1.6.99-hush-prerelease-warning.patch
View File

@ -1,25 +0,0 @@
From e9a81cb99315cf4c5325b276b802c659b9f04045 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 15 Sep 2009 10:33:40 -0400
Subject: [PATCH] Hush prerelease warning.
---
hw/xfree86/common/xf86Init.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 056e46d..3cdbdf4 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -132,7 +132,7 @@ static Bool formatsDone = FALSE;
static void
xf86PrintBanner(void)
{
-#if PRE_RELEASE
+#if 0
ErrorF("\n"
"This is a pre-release version of the X server from " XVENDORNAME ".\n"
"It is not supported in any way.\n"
--
1.6.4.2

18
xserver-autobind-hotplug.patch
View File

@ -1,4 +1,4 @@
From 05a3edae62a02bbbc3102beb5edd73d78c266ef7 Mon Sep 17 00:00:00 2001
From cd6f931fb06f825f246222a4362fbf728f8dce73 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 17 Aug 2012 09:49:24 +1000
Subject: [PATCH] autobind GPUs to the screen, (v3)
@ -18,7 +18,7 @@ Signed-off-by: Dave Airlie <airlied@gmail.com>
3 files changed, 47 insertions(+)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 91ec4c8..142ce95 100644
index 6282252..dc33ad1 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -361,6 +361,16 @@ xf86CreateRootWindow(WindowPtr pWin)
@ -38,7 +38,7 @@ index 91ec4c8..142ce95 100644
static void
InstallSignalHandlers(void)
{
@@ -930,6 +940,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
@@ -949,6 +959,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
for (i = 0; i < xf86NumGPUScreens; i++)
AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
@ -48,7 +48,7 @@ index 91ec4c8..142ce95 100644
if (sigio_blocked)
OsReleaseSIGIO();
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index e368dee..1581413 100644
index 33b2b7d..be3bdd9 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -393,6 +393,8 @@ xf86platformProbeDev(DriverPtr drvp)
@ -66,13 +66,13 @@ index e368dee..1581413 100644
AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
+ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
return 0;
}
RRResourcesChanged(xf86Screens[0]->pScreen);
RRTellChanged(xf86Screens[0]->pScreen);
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 4a490c6..5453f3a 100644
index 4726f2a..e83ea13 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -3358,3 +3358,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn)
@@ -3440,3 +3440,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn)
crtc->x = crtc->y = 0;
}
}
@ -109,5 +109,5 @@ index 4a490c6..5453f3a 100644
+ }
+}
--
1.8.2
1.8.3.1