diff options
Diffstat (limited to 'x11-base/xorg-server/files')
25 files changed, 0 insertions, 1381 deletions
diff --git a/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch b/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch deleted file mode 100644 index 48775d3..0000000 --- a/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch +++ /dev/null @@ -1,38 +0,0 @@ -http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=876b806ec09d5ff0c6cd19df91006c4eefedfaa6 -Reapply patch to fix AMD CPU detection - author Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com> - Tue, 6 Feb 2007 22:16:23 +0000 (17:16 -0500) - committer Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com> - Tue, 6 Feb 2007 22:16:23 +0000 (17:16 -0500) - commit 876b806ec09d5ff0c6cd19df91006c4eefedfaa6 - tree 0c30b71f2adbbea5641bc4611c6360e23a2e172d tree - parent 13568d2aa43da4216bbcb46e1125ff28c323ac54 commit | commitdiff -Reapply patch to fix AMD CPU detection - ---- xorg-server-1.2.0.orig/fb/fbpict.c 2007-03-18 21:43:21.000000000 +0100 -+++ xorg-server-1.2.0/fb/fbpict.c 2007-03-19 00:30:44.000000000 +0100 -@@ -1470,21 +1470,23 @@ - if (result) { - /* result now contains the standard feature bits */ - if (result & (1 << 15)) - features |= CMOV; - if (result & (1 << 23)) - features |= MMX; - if (result & (1 << 25)) - features |= SSE; - if (result & (1 << 26)) - features |= SSE2; -- if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) { -+ if ((features & MMX) && !(features & SSE) && -+ (strcmp(vendor, "AuthenticAMD") == 0 || -+ strcmp(vendor, "Geode by NSC") == 0)) { - /* check for AMD MMX extensions */ - - unsigned int result; - __asm__("push %%ebx\n" - "mov $0x80000000, %%eax\n" - "cpuid\n" - "xor %%edx, %%edx\n" - "cmp $0x1, %%eax\n" - "jge 2\n" - "mov $0x80000001, %%eax\n" diff --git a/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch b/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch deleted file mode 100644 index b4747c4..0000000 --- a/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=b5fde366e2e21234ac0b81222fd5c42ca3e49cba -Properly free device devPrivates - memory leak fix. - author Eamon Walsh <ewalsh@tycho.nsa.gov> - Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500) - committer Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> - Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500) - commit b5fde366e2e21234ac0b81222fd5c42ca3e49cba - tree 21c4d64fc97f8a7b0ec39f7e7a408540dd78691e tree - parent a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac commit | commitdiff -Properly free device devPrivates - memory leak fix. - ---- xorg-server-1.2.0.orig/dix/devices.c 2007-03-18 21:43:21.000000000 +0100 -+++ xorg-server-1.2.0/dix/devices.c 2007-03-18 21:47:58.000000000 +0100 -@@ -268,20 +268,24 @@ - if (l->xkb_sli) - XkbFreeSrvLedInfo(l->xkb_sli); - #endif - xfree(l); - } - #ifdef XKB - while (dev->xkb_interest) { - XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource); - } - #endif -+ -+ if (dev->devPrivates) -+ xfree(dev->devPrivates); -+ - xfree(dev->sync.event); - xfree(dev); - } - - void - CloseDownDevices() - { - register DeviceIntPtr dev, next; - - for (dev = inputInfo.devices; dev; dev = next) diff --git a/x11-base/xorg-server/files/1.2.0-typo-fix.patch b/x11-base/xorg-server/files/1.2.0-typo-fix.patch deleted file mode 100644 index 0a15217..0000000 --- a/x11-base/xorg-server/files/1.2.0-typo-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=a23b0b069cac8a48e2b306b2095515d75f647705 -Typo fix. - author Adam Jackson <ajax@benzedrine.nwnk.net> - Mon, 12 Feb 2007 22:50:00 +0000 (17:50 -0500) - committer Adam Jackson <ajax@benzedrine.nwnk.net> - Mon, 12 Feb 2007 22:50:00 +0000 (17:50 -0500) - commit a23b0b069cac8a48e2b306b2095515d75f647705 - tree 44d98fa9da8b879e4d610a9fc484804a418d217c tree - parent d21c95f80bdba2f29eedd57fb0b00e580391c08e commit | commitdiff -Typo fix. - ---- xorg-server-1.2.0.orig/hw/xfree86/os-support/xf86_libc.h 2007-03-18 21:43:21.000000000 +0100 -+++ xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h 2007-03-19 00:31:52.000000000 +0100 -@@ -421,21 +421,21 @@ - #undef tan - #define tan(d) xf86tan(d) - #undef tmpfile - #define tmpfile() xf86tmpfile() - #undef tolower - #define tolower(i) xf86tolower(i) - #undef toupper - #define toupper(i) xf86toupper(i) - #undef ungetc - #define ungetc(i,FP) xf86ungetc(i,FP) --#undef vfprinf -+#undef vfprintf - #define vfprintf(p,f,a) xf86vfprintf(p,f,a) - #undef vsnprintf - #define vsnprintf(s,n,f,a) xf86vsnprintf(s,n,f,a) - #undef vsprintf - #define vsprintf(s,f,a) xf86vsprintf(s,f,a) - /* XXX Disable assert as if NDEBUG was defined */ - /* Some X headers defined this away too */ - #undef assert - #define assert(a) ((void)0) - #undef HUGE_VAL
\ No newline at end of file diff --git a/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch b/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch deleted file mode 100644 index 7c6144b..0000000 --- a/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch +++ /dev/null @@ -1,36 +0,0 @@ -http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=d9e079d2a385203fdd18d958cfc19d759cab4ba8 -Zero out client devPrivates on allocation. - author Eamon Walsh <ewalsh@tycho.nsa.gov> - Fri, 22 Dec 2006 18:07:09 +0000 (13:07 -0500) - committer Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> - Fri, 22 Dec 2006 18:07:09 +0000 (13:07 -0500) - commit d9e079d2a385203fdd18d958cfc19d759cab4ba8 - tree 20548a2b4ab268c5a32c5883f3d06816c9f5d43e tree - parent e437f357b6850a6c87ca6696870b3abd40e5b8ed commit | commitdiff -Zero out client devPrivates on allocation. - ---- xorg-server-1.2.0.orig/dix/dispatch.c 2007-03-18 21:43:21.000000000 +0100 -+++ xorg-server-1.2.0/dix/dispatch.c 2007-03-18 22:00:24.000000000 +0100 -@@ -3683,20 +3683,22 @@ - ppriv = (DevUnion *)(client + 1); - else - { - ppriv = (DevUnion *)xalloc(totalClientSize - sizeof(ClientRec)); - if (!ppriv) - return 0; - } - client->devPrivates = ppriv; - sizes = clientPrivateSizes; - ptr = (char *)(ppriv + clientPrivateLen); -+ if (ppriv) -+ bzero(ppriv, totalClientSize - sizeof(ClientRec)); - for (i = clientPrivateLen; --i >= 0; ppriv++, sizes++) - { - if ( (size = *sizes) ) - { - ppriv->ptr = (pointer)ptr; - ptr += size; - } - else - ppriv->ptr = (pointer)NULL; - } diff --git a/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch b/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch deleted file mode 100644 index 18075a6..0000000 --- a/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch +++ /dev/null @@ -1,244 +0,0 @@ -Index: xorg-server-1.3.0.0/Xi/chgfctl.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xi/chgfctl.c -+++ xorg-server-1.3.0.0/Xi/chgfctl.c -@@ -451,18 +451,13 @@ ChangeStringFeedback(ClientPtr client, D - xStringFeedbackCtl * f) - { - register char n; -- register long *p; - int i, j; - KeySym *syms, *sup_syms; - - syms = (KeySym *) (f + 1); - if (client->swapped) { - swaps(&f->length, n); /* swapped num_keysyms in calling proc */ -- p = (long *)(syms); -- for (i = 0; i < f->num_keysyms; i++) { -- swapl(p, n); -- p++; -- } -+ SwapLongs((CARD32 *) syms, f->num_keysyms); - } - - if (f->num_keysyms > s->ctrl.max_symbols) { -Index: xorg-server-1.3.0.0/Xi/chgkmap.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xi/chgkmap.c -+++ xorg-server-1.3.0.0/Xi/chgkmap.c -@@ -79,18 +79,14 @@ int - SProcXChangeDeviceKeyMapping(register ClientPtr client) - { - register char n; -- register long *p; -- register int i, count; -+ register unsigned int count; - - REQUEST(xChangeDeviceKeyMappingReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq); -- p = (long *)&stuff[1]; - count = stuff->keyCodes * stuff->keySymsPerKeyCode; -- for (i = 0; i < count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), count); - return (ProcXChangeDeviceKeyMapping(client)); - } - -@@ -106,10 +102,14 @@ ProcXChangeDeviceKeyMapping(register Cli - int ret; - unsigned len; - DeviceIntPtr dev; -+ unsigned int count; - - REQUEST(xChangeDeviceKeyMappingReq); - REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq); - -+ count = stuff->keyCodes * stuff->keySymsPerKeyCode; -+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32)); -+ - dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) { - SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0, -Index: xorg-server-1.3.0.0/Xi/chgprop.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xi/chgprop.c -+++ xorg-server-1.3.0.0/Xi/chgprop.c -@@ -81,19 +81,15 @@ int - SProcXChangeDeviceDontPropagateList(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xChangeDeviceDontPropagateListReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq); - swapl(&stuff->window, n); - swaps(&stuff->count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq, -+ stuff->count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count); - return (ProcXChangeDeviceDontPropagateList(client)); - } - -Index: xorg-server-1.3.0.0/Xi/grabdev.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xi/grabdev.c -+++ xorg-server-1.3.0.0/Xi/grabdev.c -@@ -82,8 +82,6 @@ int - SProcXGrabDevice(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xGrabDeviceReq); - swaps(&stuff->length, n); -@@ -91,11 +89,11 @@ SProcXGrabDevice(register ClientPtr clie - swapl(&stuff->grabWindow, n); - swapl(&stuff->time, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ -+ if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count) -+ return BadLength; -+ -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - - return (ProcXGrabDevice(client)); - } -Index: xorg-server-1.3.0.0/Xi/grabdevb.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xi/grabdevb.c -+++ xorg-server-1.3.0.0/Xi/grabdevb.c -@@ -80,8 +80,6 @@ int - SProcXGrabDeviceButton(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xGrabDeviceButtonReq); - swaps(&stuff->length, n); -@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(register ClientPt - swapl(&stuff->grabWindow, n); - swaps(&stuff->modifiers, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xGrabDeviceButtonReq, -+ stuff->event_count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - - return (ProcXGrabDeviceButton(client)); - } -Index: xorg-server-1.3.0.0/Xi/grabdevk.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xi/grabdevk.c -+++ xorg-server-1.3.0.0/Xi/grabdevk.c -@@ -80,8 +80,6 @@ int - SProcXGrabDeviceKey(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xGrabDeviceKeyReq); - swaps(&stuff->length, n); -@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(register ClientPtr c - swapl(&stuff->grabWindow, n); - swaps(&stuff->modifiers, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - return (ProcXGrabDeviceKey(client)); - } - -Index: xorg-server-1.3.0.0/Xi/selectev.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xi/selectev.c -+++ xorg-server-1.3.0.0/Xi/selectev.c -@@ -84,19 +84,16 @@ int - SProcXSelectExtensionEvent(register ClientPtr client) - { - register char n; -- register long *p; -- register int i; - - REQUEST(xSelectExtensionEventReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq); - swapl(&stuff->window, n); - swaps(&stuff->count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xSelectExtensionEventReq, -+ stuff->count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count); -+ - return (ProcXSelectExtensionEvent(client)); - } - -Index: xorg-server-1.3.0.0/Xi/sendexev.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xi/sendexev.c -+++ xorg-server-1.3.0.0/Xi/sendexev.c -@@ -83,7 +83,7 @@ int - SProcXSendExtensionEvent(register ClientPtr client) - { - register char n; -- register long *p; -+ register CARD32 *p; - register int i; - xEvent eventT; - xEvent *eventP; -@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(register Client - REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq); - swapl(&stuff->destination, n); - swaps(&stuff->count, n); -+ -+ if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count + -+ (stuff->num_events * (sizeof(xEvent) >> 2))) -+ return BadLength; -+ - eventP = (xEvent *) & stuff[1]; - for (i = 0; i < stuff->num_events; i++, eventP++) { - proc = EventSwapVector[eventP->u.u.type & 0177]; -@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(register Client - *eventP = eventT; - } - -- p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events); -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events); -+ SwapLongs(p, stuff->count); - return (ProcXSendExtensionEvent(client)); - } - diff --git a/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch b/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch deleted file mode 100644 index b8e5178..0000000 --- a/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: xorg-server-1.3.0.0/Xext/security.c -=================================================================== ---- xorg-server-1.3.0.0.orig/Xext/security.c -+++ xorg-server-1.3.0.0/Xext/security.c -@@ -1567,7 +1567,7 @@ SecurityLoadPropertyAccessList(void) - return; - - #ifndef __UNIXOS2__ -- f = fopen(SecurityPolicyFile, "r"); -+ f = Fopen(SecurityPolicyFile, "r"); - #else - f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r"); - #endif -@@ -1653,7 +1653,7 @@ SecurityLoadPropertyAccessList(void) - } - #endif /* PROPDEBUG */ - -- fclose(f); -+ Fclose(f); - } /* SecurityLoadPropertyAccessList */ - - diff --git a/x11-base/xorg-server/files/1.3-alpha-build-fix.patch b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch deleted file mode 100644 index 481e4ad..0000000 --- a/x11-base/xorg-server/files/1.3-alpha-build-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 0f91abd5c68eb044d09733d18ef0f6b8ed128200 -Author: Julien Cristau <jcristau@debian.org> -Date: Thu Jul 19 20:37:26 2007 -0400 - - Fix alpha build failures - - Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and - <unistd.h> instead - -diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h -index 5aca9e9..085c942 100644 ---- a/hw/xfree86/os-support/linux/lnx.h -+++ b/hw/xfree86/os-support/linux/lnx.h -@@ -11,7 +11,6 @@ extern int iopl __P ((int __level)); - - /* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */ - # include <linux/unistd.h> --# include <asm/pci.h> - extern long (*_iobase)(unsigned, int, int, int); - - /* -diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c -index 0a76129..e255118 100644 ---- a/hw/xfree86/os-support/linux/lnx_axp.c -+++ b/hw/xfree86/os-support/linux/lnx_axp.c -@@ -112,8 +112,8 @@ lnxGetAXP(void) - /* - * pciconfig_iobase wrappers and dynamic i/o selection - */ --#include <linux/unistd.h> --#include <asm/pci.h> -+#include "lnx.h" -+#include <unistd.h> - #include <errno.h> - - /* glibc versions (single hose only) */ diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch b/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch deleted file mode 100644 index c5b9571..0000000 --- a/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch +++ /dev/null @@ -1,49 +0,0 @@ -Title : x11-base/xorg-server-1.3.0.0 uses wrong screen resolutions on a dual-head systems -Assignee : x11@gentoo.org -Reported : 2007-05-23 16:53 0000 -Updated : 2007-10-02 19:39:28 0000 -Status : NEW -Severity : normal -Priority : P2 -Reporter : jouni.rinne@pp1.inet.fi -Product : Gentoo Linux -Component : Server -Keywords : Inclusion -CC : bas@lijer.nl -CC : daniel.pielmeier@googlemail.com -CC : frlinux@frlinux.net -CC : ml81@gmx.de -Comments : 14 -Attachments : 1 -URL : http://bugs.gentoo.org/show_bug.cgi?id=179545 - -commit 9c80eda826448822328bb678a7d284cc43fffb17 -Author: Adam Jackson <ajax@benzedrine.nwnk.net> -Date: Wed Apr 25 16:35:04 2007 -0400 - - Disable RANDR's fake Xinerama protocol when there's more than one screen. - - ... in the protocol sense. Xinerama doesn't have any provision for more - than one protocol screen each with its own geometry. - - Red Hat bug #231257. - -diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c -index 1db27f1..2a57e4e 100644 ---- a/randr/rrxinerama.c -+++ b/randr/rrxinerama.c -@@ -428,6 +428,14 @@ RRXineramaExtensionInit(void) - return; - #endif - -+ /* -+ * Xinerama isn't capable enough to have multiple protocol screens each -+ * with their own output geometry. So if there's more than one protocol -+ * screen, just don't even try. -+ */ -+ if (screenInfo.numScreens > 1) -+ return; -+ - (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0, - ProcRRXineramaDispatch, - SProcRRXineramaDispatch, diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch b/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch deleted file mode 100644 index 4828699..0000000 --- a/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch +++ /dev/null @@ -1,58 +0,0 @@ -Title : xorg-server-1.3: desktop does not resize with RandR -Assignee : x11@gentoo.org -Reported : 2007-06-30 11:37 0000 -Updated : 2007-10-06 08:32:58 0000 -Status : ASSIGNED -Severity : normal -Priority : P2 -Reporter : sascha.lucas@rus.uni-stuttgart.de -Product : Gentoo Linux -Component : KDE -Keywords : Inclusion -CC : caster@gentoo.org -CC : chrschmitt@gmail.com -CC : gentoo@chlhp.de -CC : kde@gentoo.org -Comments : 14 -Attachments : 0 -URL : http://bugs.gentoo.org/show_bug.cgi?id=183721 - -commit c10df5b967d4da4e11786520317e2917de5541fa -Author: Aaron Plattner <aplattner@nvidia.com> -Date: Tue Apr 3 15:47:01 2007 -0700 - - Swap RRScreenChangeNotifyEvent dimensions when the screen has one crtc and it's rotated. - - RandR 1.1 clients expect the size fields in this event to be the unrotated - dimensions of the screen. This behavior is "weird", but that's the way the old - code worked so we need to be bug-compatible with it. - -diff --git a/randr/rrscreen.c b/randr/rrscreen.c -index ad74ac3..f83fce3 100644 ---- a/randr/rrscreen.c -+++ b/randr/rrscreen.c -@@ -116,11 +116,19 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen) - - se.sequenceNumber = client->sequence; - se.sizeID = RR10CurrentSizeID (pScreen); -- -- se.widthInPixels = pScreen->width; -- se.heightInPixels = pScreen->height; -- se.widthInMillimeters = pScreen->mmWidth; -- se.heightInMillimeters = pScreen->mmHeight; -+ -+ if (se.rotation & (RR_Rotate_90 | RR_Rotate_270)) { -+ se.widthInPixels = pScreen->height; -+ se.heightInPixels = pScreen->width; -+ se.widthInMillimeters = pScreen->mmHeight; -+ se.heightInMillimeters = pScreen->mmWidth; -+ } else { -+ se.widthInPixels = pScreen->width; -+ se.heightInPixels = pScreen->height; -+ se.widthInMillimeters = pScreen->mmWidth; -+ se.heightInMillimeters = pScreen->mmHeight; -+ } -+ - WriteEventsToClient (client, 1, (xEvent *) &se); - } - diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch deleted file mode 100644 index c8fdfed..0000000 --- a/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch +++ /dev/null @@ -1,45 +0,0 @@ -Title : x11-base/xorg-server-1.3.0.0 Xephyr segfaults on startup on amd64 -Assignee : x11@gentoo.org -Reported : 2007-09-20 17:22 0000 -Updated : 2007-09-20 17:52:21 0000 -Status : NEW -URL : https://bugs.freedesktop.org/show_bug.cgi?id=11582 -Severity : normal -Priority : P2 -Reporter : chithanh@cs.tu-berlin.de -Product : Gentoo Linux -Component : Server -Keywords : Inclusion -Comments : 2 -Attachments : 1 -URL : http://bugs.gentoo.org/show_bug.cgi?id=193207 - -commit dcc3de91d2b80be98e4488df29ec6b551c7ff6d1 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Aug 18 11:50:33 2007 +0200 - - Xephyr: fix immediat segfault on amd64 - - This closes bug https://bugs.freedesktop.org/show_bug.cgi?id=11582 - -diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c -index d0a2f2f..12118da 100644 ---- a/hw/kdrive/ephyr/hostx.c -+++ b/hw/kdrive/ephyr/hostx.c -@@ -40,6 +40,7 @@ - #include <X11/Xatom.h> - #include <X11/keysym.h> - #include <X11/extensions/XShm.h> -+#include <X11/Xmd.h> - - /* - * All xlib calls go here, which gets built as its own .a . -@@ -79,7 +80,7 @@ static int HostXWantDamageDebug = 0; - - extern KeySym EphyrKeymap[]; - --extern KeySym kdKeymap[]; -+extern CARD32 kdKeymap[]; - extern int kdMinScanCode; - extern int kdMaxScanCode; - extern int kdMinKeyCode; diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch deleted file mode 100644 index 88df93b..0000000 --- a/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=197104 - -commit a5b8053606d6e786cdcf6734f271acc05f9cc588 -Author: Adam Jackson <ajax@benzedrine.nwnk.net> -Date: Tue Sep 11 11:37:06 2007 -0400 - - Ignore - not just block - SIGALRM around Popen()/Pclose(). - - Because our "popen" implementation uses stdio, and because nobody's stdio - library is capable of surviving signals, we need to make absolutely sure - that we hide the SIGALRM from the smart scheduler. Otherwise, when you - open a menu in openoffice, and it recompiles XKB to deal with the - accelerators, and you popen xkbcomp because we suck, then the scheduler - will tell you you're taking forever doing something stupid, and the - wait() code will get confused, and input will hang and your CPU usage - slams to 100%. Down, not across. - -diff --git a/os/utils.c b/os/utils.c -index 3bb7dbe..afcaae4 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -1720,6 +1720,8 @@ static struct pid { - int pid; - } *pidlist; - -+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */ -+ - pointer - Popen(char *command, char *type) - { -@@ -1741,11 +1743,15 @@ Popen(char *command, char *type) - return NULL; - } - -+ /* Ignore the smart scheduler while this is going on */ -+ old_alarm = signal(SIGALRM, SIG_IGN); -+ - switch (pid = fork()) { - case -1: /* error */ - close(pdes[0]); - close(pdes[1]); - xfree(cur); -+ signal(SIGALRM, old_alarm); - return NULL; - case 0: /* child */ - if (setgid(getgid()) == -1) -@@ -1921,6 +1927,8 @@ Pclose(pointer iop) - /* allow EINTR again */ - OsReleaseSignals (); - -+ signal(SIGALRM, old_alarm); -+ - return pid == -1 ? -1 : pstat; - } - diff --git a/x11-base/xorg-server/files/1.3.0.0-ramdac.patch b/x11-base/xorg-server/files/1.3.0.0-ramdac.patch deleted file mode 100644 index 37ab1b7..0000000 --- a/x11-base/xorg-server/files/1.3.0.0-ramdac.patch +++ /dev/null @@ -1,91 +0,0 @@ -Title : xorg-server-1.3: xf86-video-s3 - s3_drv.so: undefined symbol: RamDacInit -Assignee : x11@gentoo.org -Reported : 2007-09-12 15:53 0000 -Updated : 2007-10-06 08:34:19 0000 -Status : NEW -Severity : normal -Priority : P2 -Reporter : dpblnt@gmail.com -Product : Gentoo Linux -Component : Applications -Keywords : Inclusion -Comments : 3 -Attachments : 1 -URL : http://bugs.gentoo.org/show_bug.cgi?id=192312 - -commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17 -Author: Julien Cristau <jcristau@debian.org> -Date: Tue May 29 22:01:30 2007 -0400 - - Make sure that the ramdac symbols are present in the server - - The former ramdac module is now built into the server, so its symbols need to - be explicitly exported to drivers (Debian #423129). - -diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c -index 5175f01..6535e4c 100644 ---- a/hw/xfree86/loader/xf86sym.c -+++ b/hw/xfree86/loader/xf86sym.c -@@ -96,6 +96,11 @@ - #endif - #include "xf86DDC.h" - #include "edid.h" -+#include "xf86Cursor.h" -+#include "xf86RamDac.h" -+#include "BT.h" -+#include "IBM.h" -+#include "TI.h" - - #ifndef HAS_GLIBC_SIGSETJMP - #if defined(setjmp) && defined(__GNU_LIBRARY__) && \ -@@ -1255,4 +1260,50 @@ _X_HIDDEN void *xfree86LookupTab[] = { - SYMFUNC(xf86I2CWriteRead) - SYMFUNC(xf86I2CWriteVec) - SYMFUNC(xf86I2CWriteWord) -+ -+ /* ramdac/xf86RamDac.c */ -+ SYMFUNC(RamDacCreateInfoRec) -+ SYMFUNC(RamDacHelperCreateInfoRec) -+ SYMFUNC(RamDacDestroyInfoRec) -+ SYMFUNC(RamDacHelperDestroyInfoRec) -+ SYMFUNC(RamDacInit) -+ SYMFUNC(RamDacHandleColormaps) -+ SYMFUNC(RamDacFreeRec) -+ SYMFUNC(RamDacGetHWIndex) -+ SYMVAR(RamDacHWPrivateIndex) -+ SYMVAR(RamDacScreenPrivateIndex) -+ -+ /* ramdac/xf86Cursor.c */ -+ SYMFUNC(xf86InitCursor) -+ SYMFUNC(xf86CreateCursorInfoRec) -+ SYMFUNC(xf86DestroyCursorInfoRec) -+ SYMFUNC(xf86ForceHWCursor) -+ -+ /* ramdac/BT.c */ -+ SYMFUNC(BTramdacProbe) -+ SYMFUNC(BTramdacSave) -+ SYMFUNC(BTramdacRestore) -+ SYMFUNC(BTramdacSetBpp) -+ -+ /* ramdac/IBM.c */ -+ SYMFUNC(IBMramdacProbe) -+ SYMFUNC(IBMramdacSave) -+ SYMFUNC(IBMramdacRestore) -+ SYMFUNC(IBMramdac526SetBpp) -+ SYMFUNC(IBMramdac640SetBpp) -+ SYMFUNC(IBMramdac526CalculateMNPCForClock) -+ SYMFUNC(IBMramdac640CalculateMNPCForClock) -+ SYMFUNC(IBMramdac526HWCursorInit) -+ SYMFUNC(IBMramdac640HWCursorInit) -+ SYMFUNC(IBMramdac526SetBppWeak) -+ -+ /* ramdac/TI.c */ -+ SYMFUNC(TIramdacCalculateMNPForClock) -+ SYMFUNC(TIramdacProbe) -+ SYMFUNC(TIramdacSave) -+ SYMFUNC(TIramdacRestore) -+ SYMFUNC(TIramdac3026SetBpp) -+ SYMFUNC(TIramdac3030SetBpp) -+ SYMFUNC(TIramdacHWCursorInit) -+ SYMFUNC(TIramdacLoadPalette) - }; diff --git a/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch b/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch deleted file mode 100644 index 4e5b130..0000000 --- a/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch +++ /dev/null @@ -1,30 +0,0 @@ -* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2 -- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual - mess. (#231425) - -https://bugs.freedesktop.org/show_bug.cgi?id=10713 -http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xserver-1.2.99.901-xephyr-crash-at-exit.patch?rev=1.1&view=log -Debian bug #420421 (and maybe #424517) - ---- xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c.jx 2007-03-07 14:15:25.000000000 -0500 -+++ xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c 2007-03-13 14:27:38.000000000 -0400 -@@ -281,12 +281,14 @@ - __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen; - int i; - -- for (i = 0; i < mesaScreen->num_vis; i++) { -- if (mesaScreen->xm_vis[i]) -- XMesaDestroyVisual(mesaScreen->xm_vis[i]); -- } -+ if (mesaScreen->xm_vis) { -+ for (i = 0; i < mesaScreen->num_vis; i++) { -+ if (mesaScreen->xm_vis[i]) -+ XMesaDestroyVisual(mesaScreen->xm_vis[i]); -+ } - -- xfree(mesaScreen->xm_vis); -+ xfree(mesaScreen->xm_vis); -+ } - - __glXScreenDestroy(screen); - diff --git a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch deleted file mode 100644 index 23eeca1..0000000 --- a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Michel Dänzer <michel@tungstengraphics.com> -Date: Thu, 24 May 2007 10:10:05 +0000 (+0200) -Subject: Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow. -X-Git-Tag: xorg-server-1.3.99.0 -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=649e7f82d8d4333443493056b81eb20d6cf022bc - -Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow. - -This avoids a crash in xf86XVReputVideo and also cleans up the code slightly. ---- - ---- a/hw/xfree86/common/xf86xv.c -+++ b/hw/xfree86/common/xf86xv.c -@@ -979,6 +979,9 @@ xf86XVEnlistPortInWindow(WindowPtr pWin, - winPriv->next = PrivRoot; - pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv; - } -+ -+ portPriv->pDraw = (DrawablePtr)pWin; -+ - return Success; - } - -@@ -1375,7 +1378,6 @@ xf86XVPutVideo( - result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv); - if(result != Success) return result; - -- portPriv->pDraw = pDraw; - portPriv->type = XvInputMask; - - /* save a copy of these parameters */ -@@ -1479,7 +1481,6 @@ xf86XVPutStill( - - xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv); - portPriv->isOn = XV_ON; -- portPriv->pDraw = pDraw; - portPriv->drw_x = drw_x; portPriv->drw_y = drw_y; - portPriv->drw_w = drw_w; portPriv->drw_h = drw_h; - portPriv->type = 0; /* no mask means it's transient and should -@@ -1529,7 +1530,6 @@ xf86XVGetVideo( - result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv); - if(result != Success) return result; - -- portPriv->pDraw = pDraw; - portPriv->type = XvOutputMask; - - /* save a copy of these parameters */ -@@ -1784,7 +1784,6 @@ xf86XVPutImage( - (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) { - - portPriv->isOn = XV_ON; -- portPriv->pDraw = pDraw; - portPriv->drw_x = drw_x; portPriv->drw_y = drw_y; - portPriv->drw_w = drw_w; portPriv->drw_h = drw_h; - portPriv->type = 0; /* no mask means it's transient and should diff --git a/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch b/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch deleted file mode 100644 index fd2c5ad..0000000 --- a/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch +++ /dev/null @@ -1,124 +0,0 @@ -Gentoo bug #191964 -freedesktop.org bug #7447 attachment #11368 -Fixed in 1.4 and newer - -diff --git a/composite/compalloc.c b/composite/compalloc.c -index f555411..006e808 100644 ---- a/composite/compalloc.c -+++ b/composite/compalloc.c -@@ -461,7 +461,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h) - ScreenPtr pScreen = pWin->drawable.pScreen; - WindowPtr pParent = pWin->parent; - PixmapPtr pPixmap; -- GCPtr pGC; - - pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth); - -@@ -471,25 +470,63 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h) - pPixmap->screen_x = x; - pPixmap->screen_y = y; - -- pGC = GetScratchGC (pWin->drawable.depth, pScreen); -- -- /* -- * Copy bits from the parent into the new pixmap so that it will -- * have "reasonable" contents in case for background None areas. -- */ -- if (pGC) -+ if (pParent->drawable.depth == pWin->drawable.depth) - { -- XID val = IncludeInferiors; -+ GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen); - -- ValidateGC(&pPixmap->drawable, pGC); -- dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL); -- (*pGC->ops->CopyArea) (&pParent->drawable, -- &pPixmap->drawable, -- pGC, -- x - pParent->drawable.x, -- y - pParent->drawable.y, -- w, h, 0, 0); -- FreeScratchGC (pGC); -+ /* -+ * Copy bits from the parent into the new pixmap so that it will -+ * have "reasonable" contents in case for background None areas. -+ */ -+ if (pGC) -+ { -+ XID val = IncludeInferiors; -+ -+ ValidateGC(&pPixmap->drawable, pGC); -+ dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL); -+ (*pGC->ops->CopyArea) (&pParent->drawable, -+ &pPixmap->drawable, -+ pGC, -+ x - pParent->drawable.x, -+ y - pParent->drawable.y, -+ w, h, 0, 0); -+ FreeScratchGC (pGC); -+ } -+ } -+ else -+ { -+ PictFormatPtr pSrcFormat = compWindowFormat (pParent); -+ PictFormatPtr pDstFormat = compWindowFormat (pWin); -+ XID inferiors = IncludeInferiors; -+ int error; -+ -+ PicturePtr pSrcPicture = CreatePicture (None, -+ &pParent->drawable, -+ pSrcFormat, -+ CPSubwindowMode, -+ &inferiors, -+ serverClient, &error); -+ -+ PicturePtr pDstPicture = CreatePicture (None, -+ &pPixmap->drawable, -+ pDstFormat, -+ 0, 0, -+ serverClient, &error); -+ -+ if (pSrcPicture && pDstPicture) -+ { -+ CompositePicture (PictOpSrc, -+ pSrcPicture, -+ NULL, -+ pDstPicture, -+ x - pParent->drawable.x, -+ y - pParent->drawable.y, -+ 0, 0, 0, 0, w, h); -+ } -+ if (pSrcPicture) -+ FreePicture (pSrcPicture, 0); -+ if (pDstPicture) -+ FreePicture (pDstPicture, 0); - } - return pPixmap; - } -diff --git a/composite/compint.h b/composite/compint.h -index 38b1777..f69595c 100644 ---- a/composite/compint.h -+++ b/composite/compint.h -@@ -237,6 +237,9 @@ compCheckTree (ScreenPtr pScreen); - #define compCheckTree(s) - #endif - -+PictFormatPtr -+compWindowFormat (WindowPtr pWin); -+ - void - compSetPixmap (WindowPtr pWin, PixmapPtr pPixmap); - -diff --git a/composite/compwindow.c b/composite/compwindow.c -index a4c4e6f..bfd2946 100644 ---- a/composite/compwindow.c -+++ b/composite/compwindow.c -@@ -685,7 +685,7 @@ compGetWindowVisual (WindowPtr pWin) - return 0; - } - --static PictFormatPtr -+PictFormatPtr - compWindowFormat (WindowPtr pWin) - { - ScreenPtr pScreen = pWin->drawable.pScreen; diff --git a/x11-base/xorg-server/files/xorg-server-1.3.0.0-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.3.0.0-loongson.patch deleted file mode 100644 index 04ee66e..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.3.0.0-loongson.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h ---- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h 2006-07-06 02:31:40.000000000 +0800 -+++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h 2007-02-01 14:23:47.000000000 +0800 -@@ -44,6 +44,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c ---- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2007-02-28 21:14:05.000000000 +0800 -+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c 2007-02-01 12:29:26.000000000 +0800 -@@ -540,9 +540,10 @@ - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif - - if (ExtendedEnabled) -@@ -569,7 +570,22 @@ - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) -+#elif defined(__mips__) -+ fd = open("/dev/mem", O_RDWR); -+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase == MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); diff --git a/x11-base/xorg-server/files/xorg-server-1.6.0-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.0-loongson.patch deleted file mode 100644 index 4351f28..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.6.0-loongson.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h -index 1528cc1..6be12b9 100644 ---- a/hw/xfree86/dri/sarea.h -+++ b/hw/xfree86/dri/sarea.h -@@ -42,6 +42,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 688106a..1552860 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif - - if (ExtendedEnabled) -@@ -532,7 +533,22 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -+#elif defined(__mips__) -+ fd = open("/dev/mem", O_RDWR); -+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase == MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); diff --git a/x11-base/xorg-server/files/xorg-server-1.6.2-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.2-loongson.patch deleted file mode 100644 index 4351f28..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.6.2-loongson.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h -index 1528cc1..6be12b9 100644 ---- a/hw/xfree86/dri/sarea.h -+++ b/hw/xfree86/dri/sarea.h -@@ -42,6 +42,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 688106a..1552860 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif - - if (ExtendedEnabled) -@@ -532,7 +533,22 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -+#elif defined(__mips__) -+ fd = open("/dev/mem", O_RDWR); -+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase == MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); diff --git a/x11-base/xorg-server/files/xorg-server-1.6.3-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.3-loongson.patch deleted file mode 100644 index 4351f28..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.6.3-loongson.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h -index 1528cc1..6be12b9 100644 ---- a/hw/xfree86/dri/sarea.h -+++ b/hw/xfree86/dri/sarea.h -@@ -42,6 +42,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 688106a..1552860 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif - - if (ExtendedEnabled) -@@ -532,7 +533,22 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -+#elif defined(__mips__) -+ fd = open("/dev/mem", O_RDWR); -+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase == MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); diff --git a/x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch deleted file mode 100644 index 4351f28..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h -index 1528cc1..6be12b9 100644 ---- a/hw/xfree86/dri/sarea.h -+++ b/hw/xfree86/dri/sarea.h -@@ -42,6 +42,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 688106a..1552860 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif - - if (ExtendedEnabled) -@@ -532,7 +533,22 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -+#elif defined(__mips__) -+ fd = open("/dev/mem", O_RDWR); -+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase == MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); diff --git a/x11-base/xorg-server/files/xorg-server-1.6.5-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.5-loongson.patch deleted file mode 100644 index 4351f28..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.6.5-loongson.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h -index 1528cc1..6be12b9 100644 ---- a/hw/xfree86/dri/sarea.h -+++ b/hw/xfree86/dri/sarea.h -@@ -42,6 +42,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 688106a..1552860 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif - - if (ExtendedEnabled) -@@ -532,7 +533,22 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -+#elif defined(__mips__) -+ fd = open("/dev/mem", O_RDWR); -+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase == MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); diff --git a/x11-base/xorg-server/files/xorg-server-1.7.1-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.7.1-loongson.patch deleted file mode 100644 index 4351f28..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.7.1-loongson.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h -index 1528cc1..6be12b9 100644 ---- a/hw/xfree86/dri/sarea.h -+++ b/hw/xfree86/dri/sarea.h -@@ -42,6 +42,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 688106a..1552860 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif - - if (ExtendedEnabled) -@@ -532,7 +533,22 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -+#elif defined(__mips__) -+ fd = open("/dev/mem", O_RDWR); -+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase == MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); diff --git a/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch deleted file mode 100644 index ca5bbb4..0000000 --- a/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- hw/xfree86/modes/xf86EdidModes.c 2007-05-02 01:23:52.000000000 +0200 -+++ hw/xfree86/modes/xf86EdidModes.c.new 2007-05-02 01:24:09.000000000 +0200 -@@ -92,6 +92,11 @@ - DDC->vendor.prod_id == 638) - return TRUE; - -+ /* Samsung SyncMaster 225BW */ -+ if (memcmp (DDC->vendor.name, "SAM", 4) == 0 && -+ DDC->vendor.prod_id == 596) -+ return TRUE; -+ - return FALSE; - } - diff --git a/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch b/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch deleted file mode 100644 index a6a35f9..0000000 --- a/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.0.1/hw/xfree86/parser/Makefile.am.xf86configfpic 2006-03-06 13:57:45.000000000 -0500 -+++ xorg-server-1.0.1/hw/xfree86/parser/Makefile.am 2006-03-06 13:59:11.000000000 -0500 -@@ -23,7 +23,7 @@ - DRI.c \ - Extensions.c - --AM_CFLAGS = $(XORG_CFLAGS) -+AM_CFLAGS = $(XORG_CFLAGS) -fPIC - - EXTRA_DIST = \ - Configint.h \ diff --git a/x11-base/xorg-server/files/xprint.init b/x11-base/xorg-server/files/xprint.init deleted file mode 100644 index e5fed1b..0000000 --- a/x11-base/xorg-server/files/xprint.init +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xprint.init,v 1.1 2006/03/24 18:45:00 spyderous Exp $ - -opts="${opts} get_xpserverlist lsprinters" - -depend() { - use cupsd -} - -start() { - ebegin "Starting xprint" - /usr/lib/misc/xprint start > /dev/null - eend $? -} - -get_xpserverlist() { - /usr/lib/misc/xprint get_xpserverlist -} - -lsprinters() { - /usr/lib/misc/xprint lsprinters -} - -stop() { - ebegin "Stopping xprint" - /usr/lib/misc/xprint stop > /dev/null - eend $? -} |