Drop stale patches.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

3 files changed, 6 insertions, 153 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 358644ee6fd2..99694bd5714a 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.462 2009/11/18 20:28:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.463 2009/11/22 23:49:02 scarabeus Exp $
+
+  22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/1.6.4-re-fix-DGA-removal.patch:
+  Drop stale patches.
 
 *xorg-server-1.6.5-r1 (18 Nov 2009)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 17576f2fc8f6..025058f1da2c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,7 +1,6 @@
 AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
 AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
-AUX 1.6.4-re-fix-DGA-removal.patch 4991 RMD160 568b6250606e4022182aa36e16a4cd4bf15f293b SHA1 53972ea3a706ea0b117f7f170d4874e3df8313f6 SHA256 d254b01d56fd708c6c3ce863902b28113b5de71a18ece365d4ea59c1e1a1d2b8
 DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc728bd0cf965 SHA1 09e3d46178701ce76911553ee53309686822bb31 SHA256 1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
@@ -14,5 +13,5 @@ EBUILD xorg-server-1.6.3.901-r2.ebuild 7085 RMD160 dfbe7f6ae95bf99fc3d610f23d1db
 EBUILD xorg-server-1.6.5-r1.ebuild 6864 RMD160 89ab4e02dfcb4d366cbc273aed15877adf494af8 SHA1 f46a3ca9eb54155bb89d704ac2c108c0b8eabedf SHA256 0bb5fe71b8e9f592556c0cffd987e2dc1c86a1da0ec1455326862c4f55bda34d
 EBUILD xorg-server-1.6.5.ebuild 6870 RMD160 6caca72750504aa7439fdf56f652e13cef55da7f SHA1 be34e22e5ccf628989a66fdcd991a37c5679493c SHA256 a9fc8338a7571fe6043db1fd2f311c5b54abf6816b1a57e9b5c3fafa56f4f514
 EBUILD xorg-server-1.7.1.ebuild 6862 RMD160 7713fdf22c224a75c53c7ceadcd735b56317cb84 SHA1 71df1278e7864d4c07e967d4de96f3b0b7647629 SHA256 ae37fb9bbec38d3a5cad764a5b00aae5a211295d959c84e32dfbdc10d74d690f
-MISC ChangeLog 106507 RMD160 f9216462b29ef721a49143b16a5630f320945840 SHA1 d1d5e50c465081de29790bf7e86d41c23230d73d SHA256 8513285befc4eca752fb9fb5e963252e671a5272a558198015fc8b92e759b55a
+MISC ChangeLog 106631 RMD160 5a05ac825f57123be543a4fb3afc6ffb9c0bcb4d SHA1 3072a745b2c755a3072c91191292de64c86888e4 SHA256 62bb1942e3742cb34700cbf82cb241953cb2302ce0ae5f18f53e84529092e408
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/files/1.6.4-re-fix-DGA-removal.patch b/x11-base/xorg-server/files/1.6.4-re-fix-DGA-removal.patch
deleted file mode 100644
index 877be51f40ee..000000000000
--- a/x11-base/xorg-server/files/1.6.4-re-fix-DGA-removal.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From fc31f76b6ff735e4a4006c5454c4d496ee8b154a Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Wed, 30 Sep 2009 18:40:19 +0000
-Subject: Re-fix DGA removal.
-
-Removing DGA ended up breaking any drivers calling into the old
-xf86DiDGAInit function as it tried to see if DGA was already enabled
-and ended up crashing if the VT wasn't completely initialized. Oops.
-
-Also, if the driver initializes DGA itself, have the DiDGA
-initialization overwrite that information as the DiDGA code will call
-ReInit on mode detect.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc)
----
-diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
-index a06f285..3f7deba 100644
---- a/hw/xfree86/common/xf86DGA.c
-+++ b/hw/xfree86/common/xf86DGA.c
-@@ -120,8 +120,22 @@ DGAInit(
- 
-     DGAScreenKey = &DGAScreenKeyIndex;
- 
--    if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec))))
--	return FALSE;
-+    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
-+
-+    if (!pScreenPriv)
-+    {
-+	if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec))))
-+	    return FALSE;
-+	dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv);
-+	pScreenPriv->CloseScreen = pScreen->CloseScreen;
-+	pScreen->CloseScreen = DGACloseScreen;
-+	pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
-+	pScreen->DestroyColormap = DGADestroyColormap;
-+	pScreenPriv->InstallColormap = pScreen->InstallColormap;
-+	pScreen->InstallColormap = DGAInstallColormap;
-+	pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
-+	pScreen->UninstallColormap = DGAUninstallColormap;
-+    }
- 
-     pScreenPriv->pScrn = pScrn;
-     pScreenPriv->numModes = num;
-@@ -146,17 +160,6 @@ DGAInit(
- 	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
- #endif
- 
--    dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv);
--    pScreenPriv->CloseScreen = pScreen->CloseScreen;
--    pScreen->CloseScreen = DGACloseScreen;
--    pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
--    pScreen->DestroyColormap = DGADestroyColormap;
--    pScreenPriv->InstallColormap = pScreen->InstallColormap;
--    pScreen->InstallColormap = DGAInstallColormap;
--    pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
--    pScreen->UninstallColormap = DGAUninstallColormap;
--
--
-     return TRUE;
- }
- 
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 899cea5..2627029 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -770,7 +770,7 @@ xf86CrtcScreenInit (ScreenPtr screen)
-     screen->CloseScreen = xf86CrtcCloseScreen;
-     
- #ifdef XFreeXDGA
--    xf86DiDGAInit(screen, 0);
-+    _xf86_di_dga_init_internal(screen);
- #endif
- #ifdef RANDR_13_INTERFACE
-     return RANDR_INTERFACE_VERSION;
-@@ -1887,7 +1887,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
-     scrn->currentMode = scrn->modes;
- #ifdef XFreeXDGA
-     if (scrn->pScreen)
--	    xf86DiDGAReInit(scrn->pScreen);
-+	    _xf86_di_dga_reinit_internal(scrn->pScreen);
- #endif
- }
- 
-diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
-index 0a596bc..4fe4150 100644
---- a/hw/xfree86/modes/xf86Crtc.h
-+++ b/hw/xfree86/modes/xf86Crtc.h
-@@ -807,6 +807,10 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
- Bool
- xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
- 
-+/* this is the real function, used only internally */
-+_X_INTERNAL Bool
-+_xf86_di_dga_init_internal (ScreenPtr pScreen);
-+
- /**
-  * Re-initialize dga for this screen (as when the set of modes changes)
-  */
-@@ -814,6 +818,10 @@ xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
- Bool
- xf86DiDGAReInit (ScreenPtr pScreen);
- 
-+/* This is the real function, used only internally */
-+_X_INTERNAL Bool
-+_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
-+
- /*
-  * Set the subpixel order reported for the screen using
-  * the information from the outputs
-diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c
-index 3992c09..bc59535 100644
---- a/hw/xfree86/modes/xf86DiDGA.c
-+++ b/hw/xfree86/modes/xf86DiDGA.c
-@@ -175,6 +175,12 @@ static DGAFunctionRec xf86_dga_funcs = {
- _X_EXPORT Bool
- xf86DiDGAReInit (ScreenPtr pScreen)
- {
-+    return TRUE;
-+}
-+
-+Bool
-+_xf86_di_dga_reinit_internal (ScreenPtr pScreen)
-+{
-     ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];
-     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-     
-@@ -190,12 +196,15 @@ xf86DiDGAReInit (ScreenPtr pScreen)
- _X_EXPORT Bool
- xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address)
- {
-+    return TRUE;
-+}
-+
-+Bool
-+_xf86_di_dga_init_internal (ScreenPtr pScreen)
-+{
-     ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];
-     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- 
--    if (DGAAvailable(pScreen->myNum))
--	return TRUE;
--
-     xf86_config->dga_flags = 0;
-     xf86_config->dga_address = 0;
-     xf86_config->dga_width = 0;
---
-cgit v0.8.2