[x11-base/xorg-server] version bump to 1.13.1

13 files changed, 2 insertions, 912 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 259d16c..9eab820 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,19 +5,8 @@ AUX xdm.initd-3 5662 SHA256 36a4b4e5fcb4f7ae303e1dfc20b1ec005a7ada9448ebb96e518d
 AUX xdm.initd-5 5721 SHA256 de1a07296c7248a90fc39212f9b586816fd2f911af71624ad13ef55bf8a0fefa SHA512 014d4dbd7beb236f6c6260953c0c07744211fabd667426b76f5b87030bff5e8b1d1b98c938f1987ba436b5313888134cff18186afdf02627eacdd95b4a3660e8 WHIRLPOOL 921133ec9640aa4b71b91fd5694d3712ef07dda8a26c0a6e33f33cfb9facfefbc5b048f4472e19e19946b47a9a812459ce268952a09a1a64715f0f93d9259c48
 AUX xdm.initd-8 5702 SHA256 f5f97f5ac47738f352d172185b9256c78562a91510fd3d69dbc87bb3a5d0814f SHA512 daa949c3804d8480a0d6568c02ce2b9f2c3a51f4b630762e119e3faa9d03a4632c76589cb4e6eaca26dce73fe2cbfab9a7bf81726f9c4a65c65895f224b7a12c WHIRLPOOL d292e260d1fa1b85da01a44b009b7aa3d7ff534eabd5dd691a59f2548bcdb6d86218446fa99eca3810648abaa6f033b0299fdda364b232600d1cf4087ac2d4ea
 AUX xdm.initd-9 5700 SHA256 96b1fe826db2b46b08e055d57bffd9405616b7980d9e40e95f19e52bc49eef3f SHA512 a4f652aff6a03d902da7ce1c706396911e853e78031d3246b764cb67930f20935d5aa912834add9f839742e824c380d2793b6b62592a10ad1bde646623b419d3 WHIRLPOOL ebddb96a2552a76f1d2f13b25dd773c822e8a0a5135f950163426477c689d0c35a74946a3323103d604783244e3a2f0bee5f5009b50828c90227370b13c433a9
-AUX xorg-cve-2011-4028+4029.patch 671 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c SHA512 1474c1045de134ec3224bd77d71ab00b57fcd0983eb2f45719ba3916f93020526ae0b4b62578ac8803556ad129d086f814acc957910df4d343d935c7556702ef WHIRLPOOL 183b05d47989b4c4991b37c9007d5b376ff44b627652c92da52eb93c61e452a7214467ad0366fcb2aebed8b65e4a473faa6cc52eb57d54c22a89c5616a602748
-AUX xorg-server-1.11-disable-tests-without-ddx.patch 2184 SHA256 e3b92e31843ff5046a96d3c4eb6ce67ab00e6422ffe92e7e7d13424b67dc844e SHA512 d6abd8d50f341ff1d7971c45ab44b50b7ca27cfe84418047f2d0ca722d22f0c5da54753bd80d7e172b3fc54b7aee79b526af5c9444f3c711e3dc6d596cbfcbbf WHIRLPOOL ba2239350399bfddf70968e8126f773fe3b64943f7b87691587a48fb0aa7553338315825c1d619dbebbee04b9fd1ed8326bd432969148ed012abd2e790c7d795
-AUX xorg-server-1.11-dix-pointerrootwin-send-focusin.patch 970 SHA256 c65e3499f6f2974d00bfcec6f6c6826982e87327b61d9621dce6c2bf26949a7d SHA512 6bae6d30aed0389f0f858b3d3cddd03bad15ec8c21bbf741c30b6163b69066a8dec311a48b82fe44aeab13d4258eac82e9ebb53c84150f60846e3a7f7c266163 WHIRLPOOL 1e3bdd0c95b136410c63dfa380c1b696bec6570aef110c4e526503e54c081e86ddb3e02a49c76ecf52433efa58a1a74bbd00255ac24d5f6db6980f4a674ee839
-AUX xorg-server-1.11-dix-send-focus-events.patch 2345 SHA256 77e1ce80ebf57718b5aa7cfdb1add109c62c8b8728899405c212239b2576d110 SHA512 382d64834fa4e10756efc731954a5e3dc1c00148cecf7ff8506995e5b2258cb8344c679435049ffaa89d847c98a9fa7855849c23de40dc168b806bf1c01eaec9 WHIRLPOOL 0be9ae4e435e2f0dbb794ef2fb30aff6538c3e484267ed0ecc05515b2ee63613be26beed2c4d6c036e2cde3629d7159e96a6e75bbc9cbea059e63a33af6e777f
-AUX xorg-server-1.11-log-format-fix.patch 13585 SHA256 2a70be6fa9d77c5dbc831cc1891eb7426005a22fc3e03707810a2e07eebd58c0 SHA512 d6c560aa7c7ae0aa0e893e81feaf45850c7b43764b725258db8fb71e3cb85b0ec5bfedb05385582adb2456a7a2cd745f14ef0476fb7139527c6b9c8890e9ab14 WHIRLPOOL 1bc8f276072e613d9c1788bb2df5d5a8e5e1374c71e134854ec8b2154e85321d89dbd5c7b7fe1a533658bc5f020ac3ccc07ccdc78b56029c5d8f0777e1096304
 AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 SHA512 ca52ce0931819acf46a066116b8485c3a398a56d79826a5cdb2b3b8c7809e5163e17a5954de370805dc51a3be3c75a0333d5c17c30bf99139105d705de2fff95 WHIRLPOOL 048be09bad947a5ef02d5935534c47d08439f0ceccddcdb017908bf73aa0484a69b0e42e8e6630393323305b31a8008ef8a0f4655556082245bc5fcde254aa5b
-AUX xorg-server-1.12-xf86edidmodes-array-bounds.patch 1219 SHA256 d781acc0ab5c34ab52d87135346a1346b529dce663779d1e8641252e260d4de2 SHA512 dcf1040e1055fe6910ea48c0e559a44c4416f41f4c706fc72698cae5816e3d435857f652f46e5e03abf585ed8bc96abc56e08a1db033fd1d6081da0c275da935 WHIRLPOOL acb6b53c0768408be0802c6194e694c075ebac41ba2c6f1cf79a44fddb874ddf973bc16e1442abb5b84bfb70d3d149ed8dac0b254483de6cd6aec8224af6a7b0
-AUX xorg-server-1.13.0-exa-track-source-pixmaps.patch 2803 SHA256 a9cdbe03cad8ffe355de8ae1bd05a2b3b900da409f8f4702c9a28f4c522d2888 SHA512 2d9634f60d22a0b4ea94d2122fdc0b565bc4e16cedad15ffb3459fa8a08b00bb990f996078f95d40c4b1fc84b8c9848e1b2784ecd48b6e51641e0f2982ef0262 WHIRLPOOL 7641904488db86144f8b96e20f262ab69a88b4b88781a006fc18f0a748e35d7c3b666b47e39f15f60b6a5a3c07c76e430cd116cc21ebcf4c7278146a0ac9d870
-AUX xorg-server-1.13.0-zaphod-screen-crossing.patch 1446 SHA256 5e7aff773e4a86613c500d317021e10ee3a535b2354e87322aded37d0b8ce51b SHA512 8e9adf98ddbf0a364cce1f6e0a74bad127339c783bb61dde7b412c92de997cc38bf241637c140f61c9ca104c6d012e03789d7b59dac1751140ab100ce84448b9 WHIRLPOOL 08279fdfaf04b775b872af2f0d04fc07f51a785000636b38b179b2b3d73c110eedd2b39276817136e7d480f33e9f057f4b99372ff4215bc484e4b7f5084a8567
-AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52
-AUX xorg-server-disable-acpi.patch 663 SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 SHA512 0f741e3dac610ba75c3f22cb9412d93e6d8422216100bce886be5f8d6dc49a94e0dab525039247d7af668f162b02fdab302aeb55b02a949ebf56c1f455fa68cf WHIRLPOOL 69e7425e3fbb1154b64568261ab17dc513d561a0d92558fad4e1281869b43132892f14eb89443dc11003cc62bacb4a80f86f592d9dc4bdd873f29fd970c25558
-AUX xorg-server-glapi_c.patch 2215 SHA256 5f59b883d49f53d2f6f71cbbf5e4ef74bdf545238afd61fa3011e0eb311cfb3b SHA512 77ccf8cf5732930affd41c3631a945e768becf504e507c1140d2d4d55f0fb49fb787fd9ace14463c22173c95c3187c985712cba79b53c3f1472be08ea46401d4 WHIRLPOOL f284f2fb5b04d6ae3a0cb781a7e78ba8763d3fe75efb738a0643783d77685bc1606b8fc940e66c89c1ee41a5f2ffdba1698b8d11b0c59550f4f40dab4716a219
 AUX xorg-server-non-root.patch 745 SHA256 80625533d841d021b79e4b4dfcb0555f9e1caeaffa0056193195c7717c835504 SHA512 e53f4ae7d343c9b4bd7fe820a9a256b3df3539d4f312be7a9c047b631f15c56ec1c99d6ef472239826329bb99e4845b51f535f9eca910e9fb372a3c23d32ffb9 WHIRLPOOL b90b5b239917fa01458eef90fd62ec159d3e6ae199fc42c39a705f97d9a2c5f950435f5e28f5a370431b60d5d6765704e115e418368ce7e3eff1403bc7044024
 AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
-DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30
-EBUILD xorg-server-1.13.0-r121.ebuild 7188 SHA256 9940e17d15c044c3bacc3f6935d98b69ea7e0a414c2bd7179919fafa53a96c8b SHA512 8cc990daffd3ccd76f5f570d25932be448d28a21e5a379db3ec334f582a7f68ed52f94c13b4629c58a7a390f114e7ecb86514fafdd9b44db7201d67045ab3ccc WHIRLPOOL 377406b633454880a8c48591b732d6ba99239938b505539fd9a04211ab8146028e06e83997a365065e481eb76d27b757d508f8e0318e633eb69ffa4399f69d9d
+DIST xorg-server-1.13.1.tar.bz2 5480147 SHA256 b6c91f5156a5463443f0ca95e53eba145eeb431f09908253359934960b303a3f SHA512 a04131d3b504e240917929e9859ac12bce6a3df9879bf127d3e45436647f323c014fdc30a3af00f2922fc49095bb7ab76e6c6b830430fcb326006d1c510e6191 WHIRLPOOL 14311b9dd949a49a07f5909a0530673d65e9ae5aa00f18ac6a6e90d319cb2766fb874e1f6c24d07e6e14b0ba0f7609f15fe8fac1c33d8bf5dad312bae564babc
+EBUILD xorg-server-1.13.1-r121.ebuild 7072 SHA256 c77e8e828410d643a9c5770772983c664bd3648496fda966fb6ac838cdeaf181 SHA512 e33c5164ccf1c040e3c3b0703bc8c048ae6c0bcd6b22998d7dd71a118df426555738bef6f88f5519e977a8e0240c3ada235437d06259eb27794f47ca2d95e924 WHIRLPOOL d9bad91e974844dc93ecd4213061d7c95f01230496bdf88b35ea142a7a3e28805003f9659827e2b649a237b1b46a305f31614fc1d587729bc32129ad55801d62
diff --git a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
deleted file mode 100644
index 66e77f6..0000000
--- a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/os/utils.c b/os/utils.c
-index e8ecb71..18ff1ca 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -297,7 +297,7 @@ LockServer(void)
-     FatalError("Could not create lock file in %s\n", tmp);
-   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
-   (void) write(lfd, pid_str, 11);
--  (void) chmod(tmp, 0444);
-+  (void) fchmod(lfd, 0444);
-   (void) close(lfd);
-
-   /*
-@@ -318,7 +318,7 @@ LockServer(void)
-       /*
-        * Read the pid from the existing file
-        */
--      lfd = open(LockFile, O_RDONLY);
-+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
-       if (lfd < 0) {
-         unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile);
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch b/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch
deleted file mode 100644
index facb972..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur a/test/Makefile.am b/test/Makefile.am
---- a/test/Makefile.am	2011-07-15 15:26:40.000000000 +0200
-+++ b/test/Makefile.am	2012-01-02 01:03:15.232740535 +0100
-@@ -1,21 +1,32 @@
- if ENABLE_UNIT_TESTS
- if HAVE_LD_WRAP
--SUBDIRS= . xi2
--noinst_PROGRAMS = xkb input xtest list misc fixes
-+SUBDIRS= .
-+noinst_PROGRAMS = list
-+if XORG
-+# Tests that require at least some DDX functions in order to fully link
-+# For now, requires xf86 ddx, could be adjusted to use another
-+SUBDIRS += xi2
-+noinst_PROGRAMS += xkb input xtest misc fixes
-+endif
- check_LTLIBRARIES = libxservertest.la
- 
- TESTS=$(noinst_PROGRAMS)
- 
- AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
--INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \
--	-I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \
-+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw
-+if XORG
-+INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
-+	-I$(top_srcdir)/hw/xfree86/ddc \
- 	-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
- 	-I$(top_srcdir)/hw/xfree86/ramdac
-+endif
- TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
- 
-+if XORG
- if SPECIAL_DTRACE_OBJECTS
- TEST_LDADD += $(OS_LIB) $(DIX_LIB)
- endif
-+endif
- 
- xkb_LDADD=$(TEST_LDADD)
- input_LDADD=$(TEST_LDADD)
-@@ -24,9 +35,10 @@
- misc_LDADD=$(TEST_LDADD)
- fixes_LDADD=$(TEST_LDADD)
- 
-+libxservertest_la_LIBADD = $(XSERVER_LIBS)
-+if XORG
- nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
--libxservertest_la_LIBADD = \
--            $(XSERVER_LIBS) \
-+libxservertest_la_LIBADD += \
-             $(top_builddir)/hw/xfree86/loader/libloader.la \
-             $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
-             $(top_builddir)/hw/xfree86/common/libcommon.la \
-@@ -36,7 +48,9 @@
-             $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
-             $(top_builddir)/hw/xfree86/ddc/libddc.la \
-             $(top_builddir)/hw/xfree86/i2c/libi2c.la \
--            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
-+            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la
-+endif
-+libxservertest_la_LIBADD += \
-             $(top_builddir)/mi/libmi.la \
-             $(top_builddir)/os/libos.la \
-             @XORG_LIBS@
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch b/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
deleted file mode 100644
index d548c89..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3ce102c362cadcd7087bdcf48440d9498eaf77d0 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 05 Jan 2012 12:08:01 +0000
-Subject: dix: on PointerRootWin send a FocusIn to the sprite window too
-
-XTS XSetDeviceFocus-7
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/dix/enterleave.c b/dix/enterleave.c
-index 2b8c7c5..89a82ab 100644
---- a/dix/enterleave.c
-+++ b/dix/enterleave.c
-@@ -1299,7 +1299,10 @@ DeviceFocusEvents(DeviceIntPtr dev,
-         for (i = 0; i < nscreens; i++)
-             DeviceFocusEvent(dev, XI_FocusIn, mode, in, screenInfo.screens[i]->root);
-         if (to == PointerRootWin)
-+        {
-             DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), sprite->win, mode, NotifyPointer);
-+            DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyPointer, sprite->win);
-+        }
-     }
-     else
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch b/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch
deleted file mode 100644
index e9ba0a7..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a125aabda3a5cf27aa98cb61f16e49280b66f451 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 05 Jan 2012 12:02:51 +0000
-Subject: dix: send focus events to the immediate parent (#44079)
-
-For a transition from windows A to B, A->parent did not receive an event.
-DeviceFocusOutEvents sends to windows ]from, to[, so start with the actual
-window, not it's parent.
-
-X.Org Bug 44079 <http://bugs.freedesktop.org/show_bug.cgi?id=44079>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
----
-diff --git a/dix/enterleave.c b/dix/enterleave.c
-index a39e640..2b8c7c5 100644
---- a/dix/enterleave.c
-+++ b/dix/enterleave.c
-@@ -1292,7 +1292,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
-                         NotifyPointer);
-             DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
-             /* next call catches the root too, if the screen changed */
--            DeviceFocusOutEvents(dev, from->parent, NullWindow, mode,
-+            DeviceFocusOutEvents(dev, from, NullWindow, mode,
-                     NotifyNonlinearVirtual);
-         }
-         /* Notify all the roots */
-@@ -1321,7 +1321,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
-             if (IsParent(to, from))
-             {
-                 DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyAncestor, from);
--                DeviceFocusOutEvents(dev, from->parent, to, mode,
-+                DeviceFocusOutEvents(dev, from, to, mode,
-                         NotifyVirtual);
-                 DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyInferior, to);
-                 if ((IsParent(to, sprite->win)) &&
-@@ -1353,7 +1353,7 @@ DeviceFocusEvents(DeviceIntPtr dev,
-                                 NotifyPointer);
-                     DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from);
-                     if (from->parent != NullWindow)
--                        DeviceFocusOutEvents(dev, from->parent, common, mode,
-+                        DeviceFocusOutEvents(dev, from, common, mode,
-                                 NotifyNonlinearVirtual);
-                     if (to->parent != NullWindow)
-                         DeviceFocusInEvents(dev, common, to, mode, NotifyNonlinearVirtual);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch b/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch
deleted file mode 100644
index 61e7eae..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch
+++ /dev/null
@@ -1,441 +0,0 @@
-Description: extreme backport of upstream log format fixes (CVE-2012-2118).
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/996250
-Origin: http://patchwork.freedesktop.org/patch/10001/
-
-Index: xorg-server-1.11.4/os/log.c
-===================================================================
---- xorg-server-1.11.4.orig/os/log.c	2012-05-06 11:03:17.621808123 -0700
-+++ xorg-server-1.11.4/os/log.c	2012-05-06 11:03:18.057814189 -0700
-@@ -167,6 +167,12 @@
- #ifndef X_NOT_IMPLEMENTED_STRING
- #define X_NOT_IMPLEMENTED_STRING	"(NI)"
- #endif
-+#ifndef X_DEBUG_STRING
-+#define X_DEBUG_STRING          "(DB)"
-+#endif
-+#ifndef X_NONE_STRING
-+#define X_NONE_STRING           ""
-+#endif
- 
- /*
-  * LogInit is called to start logging to a file.  It is also called (with
-@@ -223,7 +229,7 @@
-      * needed.
-      */
-     if (saveBuffer && bufferSize > 0) {
--	free(saveBuffer);	/* Must be free(), not free() */
-+	free(saveBuffer);
- 	saveBuffer = NULL;
- 	bufferSize = 0;
-     }
-@@ -265,36 +271,19 @@
- }
- 
- /* This function does the actual log message writes. */
--
--void
--LogVWrite(int verb, const char *f, va_list args)
-+static void
-+LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
- {
--    static char tmpBuffer[1024];
--    int len = 0;
-     static Bool newline = TRUE;
- 
--    if (newline) {
--	sprintf(tmpBuffer, "[%10.3f] ", GetTimeInMillis() / 1000.0);
--	len = strlen(tmpBuffer);
--	if (logFile)
--	    fwrite(tmpBuffer, len, 1, logFile);
--    }
--
--    /*
--     * Since a va_list can only be processed once, write the string to a
--     * buffer, and then write the buffer out to the appropriate output
--     * stream(s).
--     */
--    if (verb < 0 || logFileVerbosity >= verb || logVerbosity >= verb) {
--	vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args);
--	len = strlen(tmpBuffer);
--    }
--    newline = (tmpBuffer[len-1] == '\n');
--    if ((verb < 0 || logVerbosity >= verb) && len > 0)
--	fwrite(tmpBuffer, len, 1, stderr);
--    if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
-+    if (verb < 0 || logVerbosity >= verb)
-+        fwrite(buf, len, 1, stderr);
-+    if (verb < 0 || logFileVerbosity >= verb) {
- 	if (logFile) {
--	    fwrite(tmpBuffer, len, 1, logFile);
-+            if (newline)
-+                fprintf(logFile, "[%10.3f] ", GetTimeInMillis() / 1000.0);
-+            newline = end_line;
-+            fwrite(buf, len, 1, logFile);
- 	    if (logFlush) {
- 		fflush(logFile);
- #ifndef WIN32
-@@ -311,13 +300,19 @@
- 		    FatalError("realloc() failed while saving log messages\n");
- 	    }
- 	    bufferUnused -= len;
--	    memcpy(saveBuffer + bufferPos, tmpBuffer, len);
-+            memcpy(saveBuffer + bufferPos, buf, len);
- 	    bufferPos += len;
- 	}
-     }
- }
- 
- void
-+LogVWrite(int verb, const char *f, va_list args)
-+{
-+    return LogVMessageVerb(X_NONE, verb, f, args);
-+}
-+
-+void
- LogWrite(int verb, const char *f, ...)
- {
-     va_list args;
-@@ -327,60 +322,75 @@
-     va_end(args);
- }
- 
--void
--LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
-+/* Returns the Message Type string to prepend to a logging message, or NULL
-+ * if the message will be dropped due to insufficient verbosity. */
-+static const char *
-+LogMessageTypeVerbString(MessageType type, int verb)
- {
--    const char *s  = X_UNKNOWN_STRING;
--    char tmpBuf[1024];
-+    if (type == X_ERROR)
-+        verb = 0;
- 
--    /* Ignore verbosity for X_ERROR */
--    if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
--	switch (type) {
--	case X_PROBED:
--	    s = X_PROBE_STRING;
--	    break;
--	case X_CONFIG:
--	    s = X_CONFIG_STRING;
--	    break;
--	case X_DEFAULT:
--	    s = X_DEFAULT_STRING;
--	    break;
--	case X_CMDLINE:
--	    s = X_CMDLINE_STRING;
--	    break;
--	case X_NOTICE:
--	    s = X_NOTICE_STRING;
--	    break;
--	case X_ERROR:
--	    s = X_ERROR_STRING;
--	    if (verb > 0)
--		verb = 0;
--	    break;
--	case X_WARNING:
--	    s = X_WARNING_STRING;
--	    break;
--	case X_INFO:
--	    s = X_INFO_STRING;
--	    break;
--	case X_NOT_IMPLEMENTED:
--	    s = X_NOT_IMPLEMENTED_STRING;
--	    break;
--	case X_UNKNOWN:
--	    s = X_UNKNOWN_STRING;
--	    break;
--	case X_NONE:
--	    s = NULL;
--	    break;
--	}
-+    if (logVerbosity < verb && logFileVerbosity < verb)
-+        return NULL;
- 
--        /* if s is not NULL we need a space before format */
--        snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
--                                                   s ? " " : "",
--                                                   format);
--        LogVWrite(verb, tmpBuf, args);
-+    switch (type) {
-+    case X_PROBED:
-+        return X_PROBE_STRING;
-+    case X_CONFIG:
-+        return X_CONFIG_STRING;
-+    case X_DEFAULT:
-+        return X_DEFAULT_STRING;
-+    case X_CMDLINE:
-+        return X_CMDLINE_STRING;
-+    case X_NOTICE:
-+        return X_NOTICE_STRING;
-+    case X_ERROR:
-+        return X_ERROR_STRING;
-+    case X_WARNING:
-+        return X_WARNING_STRING;
-+    case X_INFO:
-+        return X_INFO_STRING;
-+    case X_NOT_IMPLEMENTED:
-+        return X_NOT_IMPLEMENTED_STRING;
-+    case X_UNKNOWN:
-+        return X_UNKNOWN_STRING;
-+    case X_NONE:
-+        return X_NONE_STRING;
-+    case X_DEBUG:
-+        return X_DEBUG_STRING;
-+    default:
-+        return X_UNKNOWN_STRING;
-     }
- }
- 
-+void
-+LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
-+{
-+    const char *type_str;
-+    char buf[1024];
-+    const size_t size = sizeof(buf);
-+    Bool newline;
-+    size_t len = 0;
-+
-+    type_str = LogMessageTypeVerbString(type, verb);
-+    if (!type_str)
-+        return;
-+
-+    /* if type_str is not "", prepend it and ' ', to message */
-+    if (type_str[0] != '\0')
-+        len += Xscnprintf(&buf[len], size - len, "%s ", type_str);
-+
-+    if (size - len > 1)
-+        len += Xvscnprintf(&buf[len], size - len, format, args);
-+
-+    /* Force '\n' at end of truncated line */
-+    if (size - len == 1)
-+        buf[len - 1] = '\n';
-+
-+    newline = (buf[len - 1] == '\n');
-+    LogSWrite(verb, buf, len, newline);
-+}
-+
- /* Log message with verbosity level specified. */
- void
- LogMessageVerb(MessageType type, int verb, const char *format, ...)
-@@ -404,6 +414,49 @@
- }
- 
- void
-+LogVHdrMessageVerb(MessageType type, int verb, const char *msg_format,
-+                   va_list msg_args, const char *hdr_format, va_list hdr_args)
-+{
-+    const char *type_str;
-+    char buf[1024];
-+    const size_t size = sizeof(buf);
-+    Bool newline;
-+    size_t len = 0;
-+
-+    type_str = LogMessageTypeVerbString(type, verb);
-+    if (!type_str)
-+        return;
-+
-+    /* if type_str is not "", prepend it and ' ', to message */
-+    if (type_str[0] != '\0')
-+        len += Xscnprintf(&buf[len], size - len, "%s ", type_str);
-+
-+    if (hdr_format && size - len > 1)
-+        len += Xvscnprintf(&buf[len], size - len, hdr_format, hdr_args);
-+
-+    if (msg_format && size - len > 1)
-+        len += Xvscnprintf(&buf[len], size - len, msg_format, msg_args);
-+
-+    /* Force '\n' at end of truncated line */
-+    if (size - len == 1)
-+        buf[len - 1] = '\n';
-+
-+    newline = (buf[len - 1] == '\n');
-+    LogSWrite(verb, buf, len, newline);
-+}
-+
-+void
-+LogHdrMessageVerb(MessageType type, int verb, const char *msg_format,
-+                  va_list msg_args, const char *hdr_format, ...)
-+{
-+    va_list hdr_args;
-+
-+    va_start(hdr_args, hdr_format);
-+    LogVHdrMessageVerb(type, verb, msg_format, msg_args, hdr_format, hdr_args);
-+    va_end(hdr_args);
-+}
-+
-+void
- AbortServer(void) _X_NORETURN;
- void
- SigAbortServer(int signo) _X_NORETURN;
-Index: xorg-server-1.11.4/include/Xprintf.h
-===================================================================
---- xorg-server-1.11.4.orig/include/Xprintf.h	2012-05-06 10:32:42.436348011 -0700
-+++ xorg-server-1.11.4/include/Xprintf.h	2012-05-06 11:03:18.057814189 -0700
-@@ -66,4 +66,16 @@
- # define vasprintf Xvasprintf
- #endif
- 
-+/*
-+ * These functions provide a portable implementation of the linux kernel
-+ * scnprintf & vscnprintf routines that return the number of bytes actually
-+ * copied during a snprintf, (excluding the final '\0').
-+ */
-+extern _X_EXPORT int
-+Xscnprintf(char *s, int n, const char * _X_RESTRICT_KYWD fmt, ...)
-+_X_ATTRIBUTE_PRINTF(3,4);
-+extern _X_EXPORT int
-+Xvscnprintf(char *s, int n, const char * _X_RESTRICT_KYWD fmt, va_list va)
-+_X_ATTRIBUTE_PRINTF(3,0);
-+
- #endif /* XPRINTF_H */
-Index: xorg-server-1.11.4/os/xprintf.c
-===================================================================
---- xorg-server-1.11.4.orig/os/xprintf.c	2012-05-06 10:32:42.472348510 -0700
-+++ xorg-server-1.11.4/os/xprintf.c	2012-05-06 11:03:18.057814189 -0700
-@@ -182,6 +182,50 @@
-     return size;
- }
- 
-+/**
-+ * Varargs snprintf that returns the actual number of bytes (excluding final
-+ * '\0') that were copied into the buffer.
-+ * This is opposed to the normal sprintf() usually returns the number of bytes
-+ * that would have been written.
-+ *
-+ * @param s       buffer to copy into
-+ * @param n       size of buffer s
-+ * @param format  printf style format string
-+ * @param va      variable argument list
-+ * @return        number of bytes actually copied, excluding final '\0'
-+ */
-+int
-+Xvscnprintf(char *s, int n, const char *format, va_list args)
-+{
-+    int x;
-+    if (n == 0)
-+        return 0;
-+    x = vsnprintf(s, n , format, args);
-+    return (x >= n) ? (n - 1) : x;
-+}
-+
-+/**
-+ * snprintf that returns the actual number of bytes (excluding final '\0') that
-+ * were copied into the buffer.
-+ * This is opposed to the normal sprintf() usually returns the number of bytes
-+ * that would have been written.
-+ *
-+ * @param s       buffer to copy into
-+ * @param n       size of buffer s
-+ * @param format  printf style format string
-+ * @param ...     arguments for specified format
-+ * @return        number of bytes actually copied, excluding final '\0'
-+ */
-+int Xscnprintf(char *s, int n, const char *format, ...)
-+{
-+    int x;
-+    va_list ap;
-+    va_start(ap, format);
-+    x = Xvscnprintf(s, n, format, ap);
-+    va_end(ap);
-+    return x;
-+}
-+
- /* Old api, now deprecated, may be removed in the future */
- char *
- Xvprintf(const char *format, va_list va)
-Index: xorg-server-1.11.4/hw/xfree86/common/xf86Helper.c
-===================================================================
---- xorg-server-1.11.4.orig/hw/xfree86/common/xf86Helper.c	2012-05-06 10:32:42.488348731 -0700
-+++ xorg-server-1.11.4/hw/xfree86/common/xf86Helper.c	2012-05-06 11:03:18.057814189 -0700
-@@ -1036,25 +1036,13 @@
- xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
- 		va_list args)
- {
--    char *tmpFormat;
--
-     /* Prefix the scrnIndex name to the format string. */
-     if (scrnIndex >= 0 && scrnIndex < xf86NumScreens &&
--	xf86Screens[scrnIndex]->name) {
--	tmpFormat = malloc(strlen(format) +
--			   strlen(xf86Screens[scrnIndex]->name) +
--			   PREFIX_SIZE + 1);
--	if (!tmpFormat)
--	    return;
--
--	snprintf(tmpFormat, PREFIX_SIZE + 1, "%s(%d): ",
--		 xf86Screens[scrnIndex]->name, scrnIndex);
--
--	strcat(tmpFormat, format);
--	LogVMessageVerb(type, verb, tmpFormat, args);
--	free(tmpFormat);
--    } else
--	LogVMessageVerb(type, verb, format, args);
-+        xf86Screens[scrnIndex]->name)
-+        LogHdrMessageVerb(type, verb, format, args, "%s(%d): ",
-+                          xf86Screens[scrnIndex]->name, scrnIndex);
-+    else
-+        LogVMessageVerb(type, verb, format, args);
- }
- #undef PREFIX_SIZE
- 
-@@ -1087,15 +1075,18 @@
- xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format,
- 		 va_list args)
- {
--    char *msg;
-+    const char *driverName = NULL;
-+    const char *deviceName = NULL;
- 
--    if (asprintf(&msg, "%s: %s: %s", dev->drv->driverName, dev->name, format)
--	== -1) {
--	LogVMessageVerb(type, verb, "%s", args);
--    } else {
--	LogVMessageVerb(type, verb, msg, args);
--	free(msg);
-+    /* Prefix driver and device names to formatted message. */
-+    if (dev) {
-+        deviceName = dev->name;
-+        if (dev->drv)
-+            driverName = dev->drv->driverName;
-     }
-+
-+    LogHdrMessageVerb(type, verb, format, args, "%s: %s: ", driverName,
-+                      deviceName);
- }
- 
- /* Print input driver message, with verbose level specified directly */
-Index: xorg-server-1.11.4/include/os.h
-===================================================================
---- xorg-server-1.11.4.orig/include/os.h	2012-05-06 11:03:17.621808123 -0700
-+++ xorg-server-1.11.4/include/os.h	2012-05-06 11:03:29.353971366 -0700
-@@ -514,6 +514,7 @@
-     X_INFO,			/* Informational message */
-     X_NONE,			/* No prefix */
-     X_NOT_IMPLEMENTED,		/* Not implemented */
-+    X_DEBUG,            /* Debug message */
-     X_UNKNOWN = -1		/* unknown -- this must always be last */
- } MessageType;
- 
-@@ -528,6 +529,20 @@
- 			   ...) _X_ATTRIBUTE_PRINTF(3,4);
- extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...)
- 			_X_ATTRIBUTE_PRINTF(2,3);
-+
-+extern _X_EXPORT void
-+LogVHdrMessageVerb(MessageType type, int verb,
-+                   const char *msg_format, va_list msg_args,
-+                   const char *hdr_format, va_list hdr_args)
-+_X_ATTRIBUTE_PRINTF(3, 0)
-+_X_ATTRIBUTE_PRINTF(5, 0);
-+extern _X_EXPORT void
-+LogHdrMessageVerb(MessageType type, int verb,
-+                  const char *msg_format, va_list msg_args,
-+                  const char *hdr_format, ...)
-+_X_ATTRIBUTE_PRINTF(3, 0)
-+_X_ATTRIBUTE_PRINTF(5, 6);
-+
- extern _X_EXPORT void FreeAuditTimer(void);
- extern _X_EXPORT void AuditF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
- extern _X_EXPORT void VAuditF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0);
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch b/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch
deleted file mode 100644
index 8fedc32..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Patch by Torsten Kaiser <x11@ariolc.dyndns.org>
-taken from https://bugs.freedesktop.org/show_bug.cgi?id=45623
-
-diff -ur a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
---- a/hw/xfree86/modes/xf86EdidModes.c	2012-05-17 19:09:03.000000000 +0200
-+++ b/hw/xfree86/modes/xf86EdidModes.c	2012-05-30 01:27:06.000000000 +0200
-@@ -723,7 +723,13 @@
-     1920, 1200, 75, 0}, {
-     1920, 1200, 85, 0}, {
-     1920, 1440, 60, 0}, {
--1920, 1440, 75, 0},};
-+1920, 1440, 75, 0},
-+    /* fill up last byte */
-+    { 0,0,0,0 },
-+    { 0,0,0,0 },
-+    { 0,0,0,0 },
-+    { 0,0,0,0 },
-+};
- 
- static DisplayModePtr
- DDCModesFromEstIII(unsigned char *est)
-@@ -732,10 +738,11 @@
-     int i, j, m;
- 
-     for (i = 0; i < 6; i++) {
--        for (j = 7; j > 0; j--) {
-+        for (j = 7; j >= 0; j--) {
-             if (est[i] & (1 << j)) {
-                 m = (i * 8) + (7 - j);
--                modes = xf86ModesAdd(modes,
-+                if (EstIIIModes[m].w)
-+                        modes = xf86ModesAdd(modes,
-                                      FindDMTMode(EstIIIModes[m].w,
-                                                  EstIIIModes[m].h,
-                                                  EstIIIModes[m].r,
diff --git a/x11-base/xorg-server/files/xorg-server-1.13.0-exa-track-source-pixmaps.patch b/x11-base/xorg-server/files/xorg-server-1.13.0-exa-track-source-pixmaps.patch
deleted file mode 100644
index e31d41c..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.13.0-exa-track-source-pixmaps.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 395c9e17089a7e4ed46a747904b36b1fec94fab3 Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <michel.daenzer@amd.com>
-Date: Mon, 29 Oct 2012 11:57:54 +0000
-Subject: EXA: Track source/mask pixmaps more explicitly for Composite fallback regions.
-
-In particular, make sure pExaScr->src/maskPix are cleared when the
-corresponding pictures aren't associated with drawables, i.e. solid or gradient
-pictures. Without this, we would in some cases associate the source/mask region
-with unrelated pixmaps from previous Composite fallbacks, resulting in random
-corruption.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47266
-
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 1ca096d5e07221025c4c4110528772b7d94f15ee)
----
-diff --git a/exa/exa_priv.h b/exa/exa_priv.h
-index ea7e7fa..2e4759d 100644
---- a/exa/exa_priv.h
-+++ b/exa/exa_priv.h
-@@ -209,6 +209,7 @@ typedef struct {
-     RegionRec srcReg;
-     RegionRec maskReg;
-     PixmapPtr srcPix;
-+    PixmapPtr maskPix;
- 
-     DevPrivateKeyRec pixmapPrivateKeyRec;
-     DevPrivateKeyRec gcPrivateKeyRec;
-diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
-index 5716138..b0a0011 100644
---- a/exa/exa_unaccel.c
-+++ b/exa/exa_unaccel.c
-@@ -442,6 +442,13 @@ ExaSrcValidate(DrawablePtr pDrawable,
-     RegionPtr dst;
-     int xoff, yoff;
- 
-+    if (pExaScr->srcPix == pPix)
-+        dst = &pExaScr->srcReg;
-+    else if (pExaScr->maskPix == pPix)
-+        dst = &pExaScr->maskReg;
-+    else
-+        return;
-+
-     exaGetDrawableDeltas(pDrawable, pPix, &xoff, &yoff);
- 
-     box.x1 = x + xoff;
-@@ -449,8 +456,6 @@ ExaSrcValidate(DrawablePtr pDrawable,
-     box.x2 = box.x1 + width;
-     box.y2 = box.y1 + height;
- 
--    dst = (pExaScr->srcPix == pPix) ? &pExaScr->srcReg : &pExaScr->maskReg;
--
-     RegionInit(&reg, &box, 1);
-     RegionUnion(dst, dst, &reg);
-     RegionUninit(&reg);
-@@ -495,16 +500,19 @@ ExaPrepareCompositeReg(ScreenPtr pScreen,
-         if (pSrc != pDst)
-             RegionTranslate(pSrc->pCompositeClip,
-                             -pSrc->pDrawable->x, -pSrc->pDrawable->y);
--    }
-+    } else
-+        pExaScr->srcPix = NULL;
- 
-     if (pMask && pMask->pDrawable) {
-         pMaskPix = exaGetDrawablePixmap(pMask->pDrawable);
-         RegionNull(&pExaScr->maskReg);
-         maskReg = &pExaScr->maskReg;
-+        pExaScr->maskPix = pMaskPix;
-         if (pMask != pDst && pMask != pSrc)
-             RegionTranslate(pMask->pCompositeClip,
-                             -pMask->pDrawable->x, -pMask->pDrawable->y);
--    }
-+    } else
-+        pExaScr->maskPix = NULL;
- 
-     RegionTranslate(pDst->pCompositeClip,
-                     -pDst->pDrawable->x, -pDst->pDrawable->y);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/files/xorg-server-1.13.0-zaphod-screen-crossing.patch b/x11-base/xorg-server/files/xorg-server-1.13.0-zaphod-screen-crossing.patch
deleted file mode 100644
index 1577a2e..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.13.0-zaphod-screen-crossing.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 835737244f84d34b0b9c5a93560710a2275dcc63 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 18 Oct 2012 05:11:31 +0000
-Subject: dix: fix zaphod screen scrossing (#54654)
-
-POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the
-coordinates after a screen crossing are already relative to the new screen's
-origin. Add that offset to the coordinates before re-setting.
-
-regression introduced by
-commit bafbd99080be49a17be97d2cc758fbe623369945
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Aug 8 11:34:32 2012 +1000
-
-    dix: work around scaling issues during WarpPointer (#53037)
-
-X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit e7cd5cce740e653000fb1192b600268dcf77dde2)
----
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 71d83c4..8b4379d 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-        coordinates were.
-      */
-     if (flags & POINTER_SCREEN) {
--        screenx = sx;
--        screeny = sy;
-+        scr = miPointerGetScreen(pDev);
-+        screenx = sx + scr->x;
-+        screeny = sy + scr->y;
-     }
- 
-     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
deleted file mode 100644
index 2b05967..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 74016af..9c296f5 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev,
- 	    break;
- 	case 0x102b:		    driverList[0] = "mga";	break;
- 	case 0x10c8:		    driverList[0] = "neomagic"; break;
--	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
-+	case 0x10de: case 0x12d2:
-+	    switch (dev->device_id) {
-+	    /* NV1 */
-+	    case 0x0008:
-+	    case 0x0009:
-+		driverList[0] = "vesa";
-+		break;
-+	    /* NV3 */
-+	    case 0x0018:
-+	    case 0x0019:
-+		driverList[0] = "nv";
-+		break;
-+	    default:
-+		driverList[0] = "nouveau";
-+		break;
-+	    }
-+	    break;
- 	case 0x1106:		    driverList[0] = "openchrome"; break;
-         case 0x1b36:		    driverList[0] = "qxl"; break;
- 	case 0x1163:		    driverList[0] = "rendition"; break;
--- 
diff --git a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
deleted file mode 100644
index cc80e6c..0000000
--- a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 11 Mar 2009 14:02:11 -0400
-Subject: [PATCH] Don't build the ACPI code.
-
-No good can come of this.
----
- configure.ac |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 72ae67e..04716f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
- 		case $host_cpu in
- 		  ia64*)
- 			linux_ia64=yes
--			linux_acpi="yes"
- 			;;
- 		  alpha*)
- 		  	linux_alpha=yes
- 			;;
- 		  i*86|amd64*|x86_64*)
--			linux_acpi="yes"
- 			;;
- 		  *)
- 			;;
--- 
-1.6.1.3
-
diff --git a/x11-base/xorg-server/files/xorg-server-glapi_c.patch b/x11-base/xorg-server/files/xorg-server-glapi_c.patch
deleted file mode 100644
index e65a969..0000000
--- a/x11-base/xorg-server/files/xorg-server-glapi_c.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 17d9e374721d6c8ee3f7f9cdc882f80127bdb57f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 02 Mar 2011 18:21:39 +0000
-Subject: glx: Lobotomize _glapi_get_proc_address
-
-This isn't a meaningful thing in the indirect glx loader, so just warn
-if it ever happens and move on.
-
-But also, mark it PUBLIC, so if the driver does ever call it we merely
-warn instead of aborting because ld.so can't find the symbol.
-
-Reviewed-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/glx/glapi.c b/glx/glapi.c
-index 1814493..79ff6b1 100644
---- a/glx/glapi.c
-+++ b/glx/glapi.c
-@@ -54,6 +54,7 @@
- 
- #include <dix-config.h>
- #include <X11/Xfuncproto.h>
-+#include <os.h>
- #define PUBLIC _X_EXPORT
- 
- #else
-@@ -713,43 +714,15 @@ _glapi_add_dispatch( const char * const * function_names,
-    return offset;
- }
- 
--/**
-- * Return pointer to the named function.  If the function name isn't found
-- * in the name of static functions, try generating a new API entrypoint on
-- * the fly with assembly language.
-+/*
-+ * glXGetProcAddress doesn't exist in the protocol, the drivers never call
-+ * this themselves, and neither does the server.  warn if it happens though.
-  */
--_glapi_proc
-+PUBLIC _glapi_proc
- _glapi_get_proc_address(const char *funcName)
- {
--   struct _glapi_function * entry;
--   GLuint i;
--
--#ifdef MANGLE
--   if (funcName[0] != 'm' || funcName[1] != 'g' || funcName[2] != 'l')
--      return NULL;
--#else
--   if (funcName[0] != 'g' || funcName[1] != 'l')
--      return NULL;
--#endif
--
--   /* search extension functions first */
--   for (i = 0; i < NumExtEntryPoints; i++) {
--      if (strcmp(ExtEntryTable[i].name, funcName) == 0) {
--         return ExtEntryTable[i].dispatch_stub;
--      }
--   }
--
--#if !defined( XFree86Server ) && !defined( XGLServer )
--   /* search static functions */
--   {
--      const _glapi_proc func = get_static_proc_address(funcName);
--      if (func)
--         return func;
--   }
--#endif /* !defined( XFree86Server ) */
--
--   entry = add_function_name(funcName);
--   return (entry == NULL) ? NULL : entry->dispatch_stub;
-+    ErrorF("_glapi_get_proc_address called!\n");
-+    return NULL;
- }
- 
- /**
---
-cgit v0.8.3-6-g21f6
diff --git a/x11-base/xorg-server/xorg-server-1.13.0-r121.ebuild b/x11-base/xorg-server/xorg-server-1.13.1-r121.ebuild
index 23906cd..4aed366 100644
--- a/x11-base/xorg-server/xorg-server-1.13.0-r121.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.13.1-r121.ebuild
@@ -111,8 +111,6 @@ REQUIRED_USE="!minimal? (
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
-	"${FILESDIR}"/${PN}-1.13.0-exa-track-source-pixmaps.patch
-	"${FILESDIR}"/${PN}-1.13.0-zaphod-screen-crossing.patch
 	"${FILESDIR}"/xorg-server-non-root.patch
 )