From c8690bb1702742fb6b49c92d16054810f386bf3aa16e61da4a2971ed098a9010 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 22 Aug 2012 08:30:45 +0000 Subject: [PATCH 1/2] Accepting request 131324 from home:klausi123:X11 This submit is just for preparing the final 13.0 release, please have a look at it and comment so i can fix things up until the final 13.0 release for 12.3! #3 OBS-URL: https://build.opensuse.org/request/show/131324 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=408 --- ...-Check-harder-for-primary-PCI-device.patch | 0 ...en-killing-X-with-ctrl-alt-backspace.patch | 0 ...arms-from-senslessly-calling-CheckTr.patch | 0 ...ssing-configlayout-when-deleting-dev.patch | 0 ...l-for-creating-backtraces-on-crashes.patch | 0 ... => N_autoconfig_fallback_fbdev_first.diff | 0 ...197858_dpms.diff => N_bug-197858_dpms.diff | 0 ... => N_bug534768-prefer_local_symbols.patch | 0 ...che-xkbcomp-output-for-fast-start-up.patch | 0 ...e_to_shape.diff => N_confine_to_shape.diff | 0 ...creensaver.diff => N_dpms_screensaver.diff | 0 ...utoconfig.diff => N_driver-autoconfig.diff | 0 ...heck.diff => N_edid_data_sanity_check.diff | 0 fbdevhw.diff => N_fbdevhw.diff | 0 fix-dpi-values.diff => N_fix-dpi-values.diff | 0 ...tch => N_fix_fglrx_screendepth_issue.patch | 0 ...-path.diff => N_p_default-module-path.diff | 0 ...f => N_p_xnest-ignore-getimage-errors.diff | 0 randr1_1-sig11.diff => N_randr1_1-sig11.diff | 0 sync-fix.patch => N_sync-fix.patch | 0 vidmode-sig11.diff => N_vidmode-sig11.diff | 0 ...r-xdmcp.patch => N_xorg-server-xdmcp.patch | 0 ...xserver.diff => N_zap_warning_xserver.diff | 0 U_dri2_add_DRI2CreateDrawable2.patch | 66 ----- ..._reference_to_destroyed_GLX_drawable.patch | 47 ---- bug474071-fix1.diff | 35 --- N-VNC-Add-proto.diff => n_VNC-Add-proto.diff | 0 ...C.patch => n_VNC-Add-support-for-VNC.patch | 63 ++--- ...C-access-the-framebuffer-directly-an.patch | 0 ...f-all-keyboard-layouts-independent-o.patch | 0 ...rash-due-to-unset-input-device-names.patch | 0 ...hen-no-depth-translation-is-required.patch | 0 ...ut-when-vnc-viewer-connection-breaks.patch | 0 Xvnc-pthread.diff => n_Xvnc-pthread.diff | 0 ...patch => n_xorg-x11-server-rpmmacros.patch | 0 pci-legacy-mem-fallback.diff | 21 -- pio_ia64.diff | 87 ------- pu_fixes.diff | 22 -- ...x-Fix-mishandling-of-shared-contexts.patch | 51 ---- ...GLClientmajorVersion-or-GLClientmino.patch | 58 ----- ...screen-createContext-to-take-attribu.patch | 141 ---------- ...-for-GLX_ARB_create_context-and-GLX_.patch | 84 ------ ...all-DRI2-createContextAttribs-from-_.patch | 210 --------------- ...lement-GLX-SetClientInfoARB-protocol.patch | 102 -------- ...itialize-all-context-fields-together.patch | 64 ----- ...-Initialize-remaining-context-fields.patch | 37 --- ...tion-to-add-a-context-to-all-global-.patch | 81 ------ ...-functions-available-outside-the-glx.patch | 81 ------ ...otocol-for-glXCreateContextAttribsAR.patch | 245 ------------------ xorg-server-1.12.3.tar.bz2 | 3 - xorg-server-1.12.99.905.tar.bz2 | 3 + xorg-server-provides | 6 +- xorg-x11-server.changes | 15 ++ xorg-x11-server.spec | 145 ++++------- xserver-bg-none-root.patch | 155 ----------- 55 files changed, 104 insertions(+), 1718 deletions(-) rename 0001-Check-harder-for-primary-PCI-device.patch => N_0001-Check-harder-for-primary-PCI-device.patch (100%) rename 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch => N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch (100%) rename 0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch => N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch (100%) rename 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch => N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch (100%) rename Use-external-tool-for-creating-backtraces-on-crashes.patch => N_Use-external-tool-for-creating-backtraces-on-crashes.patch (100%) rename autoconfig_fallback_fbdev_first.diff => N_autoconfig_fallback_fbdev_first.diff (100%) rename bug-197858_dpms.diff => N_bug-197858_dpms.diff (100%) rename bug534768-prefer_local_symbols.patch => N_bug534768-prefer_local_symbols.patch (100%) rename cache-xkbcomp-output-for-fast-start-up.patch => N_cache-xkbcomp-output-for-fast-start-up.patch (100%) rename confine_to_shape.diff => N_confine_to_shape.diff (100%) rename dpms_screensaver.diff => N_dpms_screensaver.diff (100%) rename driver-autoconfig.diff => N_driver-autoconfig.diff (100%) rename edid_data_sanity_check.diff => N_edid_data_sanity_check.diff (100%) rename fbdevhw.diff => N_fbdevhw.diff (100%) rename fix-dpi-values.diff => N_fix-dpi-values.diff (100%) rename fix_fglrx_screendepth_issue.patch => N_fix_fglrx_screendepth_issue.patch (100%) rename p_default-module-path.diff => N_p_default-module-path.diff (100%) rename p_xnest-ignore-getimage-errors.diff => N_p_xnest-ignore-getimage-errors.diff (100%) rename randr1_1-sig11.diff => N_randr1_1-sig11.diff (100%) rename sync-fix.patch => N_sync-fix.patch (100%) rename vidmode-sig11.diff => N_vidmode-sig11.diff (100%) rename xorg-server-xdmcp.patch => N_xorg-server-xdmcp.patch (100%) rename zap_warning_xserver.diff => N_zap_warning_xserver.diff (100%) delete mode 100644 U_dri2_add_DRI2CreateDrawable2.patch delete mode 100644 U_glx_Free_reference_to_destroyed_GLX_drawable.patch delete mode 100644 bug474071-fix1.diff rename N-VNC-Add-proto.diff => n_VNC-Add-proto.diff (100%) rename N-VNC-Add-support-for-VNC.patch => n_VNC-Add-support-for-VNC.patch (99%) rename N-VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch => n_VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch (100%) rename N-VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch => n_VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch (100%) rename N-VNC-Fix-crash-due-to-unset-input-device-names.patch => n_VNC-Fix-crash-due-to-unset-input-device-names.patch (100%) rename N-VNC-Fix-crash-when-no-depth-translation-is-required.patch => n_VNC-Fix-crash-when-no-depth-translation-is-required.patch (100%) rename N-VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch => n_VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch (100%) rename Xvnc-pthread.diff => n_Xvnc-pthread.diff (100%) rename xorg-x11-server-rpmmacros.patch => n_xorg-x11-server-rpmmacros.patch (100%) delete mode 100644 pci-legacy-mem-fallback.diff delete mode 100644 pio_ia64.diff delete mode 100644 pu_fixes.diff delete mode 100644 u_0001-glx-Fix-mishandling-of-shared-contexts.patch delete mode 100644 u_0002-glx-Don-t-track-GLClientmajorVersion-or-GLClientmino.patch delete mode 100644 u_0003-glx-Extend-__GLXscreen-createContext-to-take-attribu.patch delete mode 100644 u_0004-glx-Add-tracking-for-GLX_ARB_create_context-and-GLX_.patch delete mode 100644 u_0005-glx-Optionally-call-DRI2-createContextAttribs-from-_.patch delete mode 100644 u_0006-glx-Implement-GLX-SetClientInfoARB-protocol.patch delete mode 100644 u_0007-glx-Initialize-all-context-fields-together.patch delete mode 100644 u_0008-glx-Initialize-remaining-context-fields.patch delete mode 100644 u_0009-glx-Use-one-function-to-add-a-context-to-all-global-.patch delete mode 100644 u_0010-glx-Make-several-functions-available-outside-the-glx.patch delete mode 100644 u_0011-glx-Implement-protocol-for-glXCreateContextAttribsAR.patch delete mode 100644 xorg-server-1.12.3.tar.bz2 create mode 100644 xorg-server-1.12.99.905.tar.bz2 delete mode 100644 xserver-bg-none-root.patch diff --git a/0001-Check-harder-for-primary-PCI-device.patch b/N_0001-Check-harder-for-primary-PCI-device.patch similarity index 100% rename from 0001-Check-harder-for-primary-PCI-device.patch rename to N_0001-Check-harder-for-primary-PCI-device.patch diff --git a/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch b/N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch similarity index 100% rename from 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch rename to N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch diff --git a/0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch b/N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch similarity index 100% rename from 0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch rename to N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch diff --git a/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch b/N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch similarity index 100% rename from 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch rename to N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch diff --git a/Use-external-tool-for-creating-backtraces-on-crashes.patch b/N_Use-external-tool-for-creating-backtraces-on-crashes.patch similarity index 100% rename from Use-external-tool-for-creating-backtraces-on-crashes.patch rename to N_Use-external-tool-for-creating-backtraces-on-crashes.patch diff --git a/autoconfig_fallback_fbdev_first.diff b/N_autoconfig_fallback_fbdev_first.diff similarity index 100% rename from autoconfig_fallback_fbdev_first.diff rename to N_autoconfig_fallback_fbdev_first.diff diff --git a/bug-197858_dpms.diff b/N_bug-197858_dpms.diff similarity index 100% rename from bug-197858_dpms.diff rename to N_bug-197858_dpms.diff diff --git a/bug534768-prefer_local_symbols.patch b/N_bug534768-prefer_local_symbols.patch similarity index 100% rename from bug534768-prefer_local_symbols.patch rename to N_bug534768-prefer_local_symbols.patch diff --git a/cache-xkbcomp-output-for-fast-start-up.patch b/N_cache-xkbcomp-output-for-fast-start-up.patch similarity index 100% rename from cache-xkbcomp-output-for-fast-start-up.patch rename to N_cache-xkbcomp-output-for-fast-start-up.patch diff --git a/confine_to_shape.diff b/N_confine_to_shape.diff similarity index 100% rename from confine_to_shape.diff rename to N_confine_to_shape.diff diff --git a/dpms_screensaver.diff b/N_dpms_screensaver.diff similarity index 100% rename from dpms_screensaver.diff rename to N_dpms_screensaver.diff diff --git a/driver-autoconfig.diff b/N_driver-autoconfig.diff similarity index 100% rename from driver-autoconfig.diff rename to N_driver-autoconfig.diff diff --git a/edid_data_sanity_check.diff b/N_edid_data_sanity_check.diff similarity index 100% rename from edid_data_sanity_check.diff rename to N_edid_data_sanity_check.diff diff --git a/fbdevhw.diff b/N_fbdevhw.diff similarity index 100% rename from fbdevhw.diff rename to N_fbdevhw.diff diff --git a/fix-dpi-values.diff b/N_fix-dpi-values.diff similarity index 100% rename from fix-dpi-values.diff rename to N_fix-dpi-values.diff diff --git a/fix_fglrx_screendepth_issue.patch b/N_fix_fglrx_screendepth_issue.patch similarity index 100% rename from fix_fglrx_screendepth_issue.patch rename to N_fix_fglrx_screendepth_issue.patch diff --git a/p_default-module-path.diff b/N_p_default-module-path.diff similarity index 100% rename from p_default-module-path.diff rename to N_p_default-module-path.diff diff --git a/p_xnest-ignore-getimage-errors.diff b/N_p_xnest-ignore-getimage-errors.diff similarity index 100% rename from p_xnest-ignore-getimage-errors.diff rename to N_p_xnest-ignore-getimage-errors.diff diff --git a/randr1_1-sig11.diff b/N_randr1_1-sig11.diff similarity index 100% rename from randr1_1-sig11.diff rename to N_randr1_1-sig11.diff diff --git a/sync-fix.patch b/N_sync-fix.patch similarity index 100% rename from sync-fix.patch rename to N_sync-fix.patch diff --git a/vidmode-sig11.diff b/N_vidmode-sig11.diff similarity index 100% rename from vidmode-sig11.diff rename to N_vidmode-sig11.diff diff --git a/xorg-server-xdmcp.patch b/N_xorg-server-xdmcp.patch similarity index 100% rename from xorg-server-xdmcp.patch rename to N_xorg-server-xdmcp.patch diff --git a/zap_warning_xserver.diff b/N_zap_warning_xserver.diff similarity index 100% rename from zap_warning_xserver.diff rename to N_zap_warning_xserver.diff diff --git a/U_dri2_add_DRI2CreateDrawable2.patch b/U_dri2_add_DRI2CreateDrawable2.patch deleted file mode 100644 index 429f2c1..0000000 --- a/U_dri2_add_DRI2CreateDrawable2.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 8a87acc9e57be740e3bd252567622246051a0723 Mon Sep 17 00:00:00 2001 -From: Michel Dänzer -Date: Thu, 12 Jul 2012 11:16:36 +0000 -Subject: dri2: Add DRI2CreateDrawable2. - -Same as DRI2CreateDrawable, except it can return the DRI2 specific XID of the -DRI2 drawable reference to the base drawable. - -Signed-off-by: Michel Dänzer -Reviewed-by: Kristian Høgsberg -Signed-off-by: Keith Packard ---- -Index: xorg-server-1.12.3/hw/xfree86/dri2/dri2.c -=================================================================== ---- xorg-server-1.12.3.orig/hw/xfree86/dri2/dri2.c -+++ xorg-server-1.12.3/hw/xfree86/dri2/dri2.c -@@ -280,8 +280,9 @@ DRI2AddDrawableRef(DRI2DrawablePtr pPriv - } - - int --DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id, -- DRI2InvalidateProcPtr invalidate, void *priv) -+DRI2CreateDrawable2(ClientPtr client, DrawablePtr pDraw, XID id, -+ DRI2InvalidateProcPtr invalidate, void *priv, -+ XID *dri2_id_out) - { - DRI2DrawablePtr pPriv; - XID dri2_id; -@@ -298,9 +299,19 @@ DRI2CreateDrawable(ClientPtr client, Dra - if (rc != Success) - return rc; - -+ if (dri2_id_out) -+ *dri2_id_out = dri2_id; -+ - return Success; - } - -+int -+DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id, -+ DRI2InvalidateProcPtr invalidate, void *priv) -+{ -+ return DRI2CreateDrawable2(client, pDraw, id, invalidate, priv, NULL); -+} -+ - static int - DRI2DrawableGone(pointer p, XID id) - { -Index: xorg-server-1.12.3/hw/xfree86/dri2/dri2.h -=================================================================== ---- xorg-server-1.12.3.orig/hw/xfree86/dri2/dri2.h -+++ xorg-server-1.12.3/hw/xfree86/dri2/dri2.h -@@ -237,6 +237,13 @@ extern _X_EXPORT int DRI2CreateDrawable( - - extern _X_EXPORT void DRI2DestroyDrawable(DrawablePtr pDraw); - -+extern _X_EXPORT int DRI2CreateDrawable2(ClientPtr client, -+ DrawablePtr pDraw, -+ XID id, -+ DRI2InvalidateProcPtr invalidate, -+ void *priv, -+ XID *dri2_id_out); -+ - extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffers(DrawablePtr pDraw, - int *width, - int *height, diff --git a/U_glx_Free_reference_to_destroyed_GLX_drawable.patch b/U_glx_Free_reference_to_destroyed_GLX_drawable.patch deleted file mode 100644 index 3ffe8db..0000000 --- a/U_glx_Free_reference_to_destroyed_GLX_drawable.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a2d0829531249e24dbca25fc20ed30a2bb2d8ed8 Mon Sep 17 00:00:00 2001 -From: Michel Dänzer -Date: Thu, 12 Jul 2012 11:16:37 +0000 -Subject: glx: Free DRI2 drawable reference to destroyed GLX drawable. - -Otherwise the reference can lead to use after free in -__glXDRIinvalidateBuffers(). - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50019 - -Signed-off-by: Michel Dänzer -Reviewed-by: Kristian Høgsberg -Signed-off-by: Keith Packard ---- -Index: xorg-server-1.12.3/glx/glxdri2.c -=================================================================== ---- xorg-server-1.12.3.orig/glx/glxdri2.c -+++ xorg-server-1.12.3/glx/glxdri2.c -@@ -96,6 +96,7 @@ struct __GLXDRIdrawable { - int height; - __DRIbuffer buffers[MAX_DRAWABLE_BUFFERS]; - int count; -+ XID dri2_id; - }; - - static void -@@ -104,6 +105,8 @@ __glXDRIdrawableDestroy(__GLXdrawable * - __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable; - const __DRIcoreExtension *core = private->screen->core; - -+ FreeResource(private->dri2_id, FALSE); -+ - (*core->destroyDrawable) (private->driDrawable); - - __glXDrawableRelease(drawable); -@@ -597,8 +600,9 @@ __glXDRIscreenCreateDrawable(ClientPtr c - private->base.waitGL = __glXDRIdrawableWaitGL; - private->base.waitX = __glXDRIdrawableWaitX; - -- if (DRI2CreateDrawable(client, pDraw, drawId, -- __glXDRIinvalidateBuffers, private)) { -+ if (DRI2CreateDrawable2(client, pDraw, drawId, -+ __glXDRIinvalidateBuffers, private, -+ &private->dri2_id)) { - free(private); - return NULL; - } diff --git a/bug474071-fix1.diff b/bug474071-fix1.diff deleted file mode 100644 index 828f200..0000000 --- a/bug474071-fix1.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: linuxPci.c -================================================================================ ---- linuxPci.c -+++ linuxPci.c -@@ -195,7 +195,7 @@ - struct pci_id_match bridge_match = { - PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, - (PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8), -- 0 -+ (PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8) - }; - struct pci_device *bridge; - struct pci_device_iterator *iter; -@@ -433,7 +433,6 @@ - xf86MapLegacyIO(struct pci_device *dev) - { - const int domain = dev->domain; -- struct pci_device *bridge = get_parent_bridge(dev); - int fd; - - if (domain >= MAX_DOMAINS) -@@ -441,9 +440,11 @@ - - if (DomainMmappedIO[domain] == NULL) { - /* Permanently map all of I/O space */ -- fd = linuxOpenLegacy(bridge, "legacy_io"); -+ fd = linuxOpenLegacy(dev, "legacy_io"); - if (fd < 0) { -- DomainMmappedIO[domain] = linuxMapPci(-1, VIDMEM_MMIO, bridge, -+ struct pci_device *bridge = get_parent_bridge(dev); -+ if (bridge != NULL) -+ DomainMmappedIO[domain] = linuxMapPci(-1, VIDMEM_MMIO, bridge, - 0, linuxGetIOSize(bridge), - PCIIOC_MMAP_IS_IO); - } diff --git a/N-VNC-Add-proto.diff b/n_VNC-Add-proto.diff similarity index 100% rename from N-VNC-Add-proto.diff rename to n_VNC-Add-proto.diff diff --git a/N-VNC-Add-support-for-VNC.patch b/n_VNC-Add-support-for-VNC.patch similarity index 99% rename from N-VNC-Add-support-for-VNC.patch rename to n_VNC-Add-support-for-VNC.patch index 731b7f2..6799b66 100644 --- a/N-VNC-Add-support-for-VNC.patch +++ b/n_VNC-Add-support-for-VNC.patch @@ -11,6 +11,7 @@ but has been modified heavily to apply and compile with 10.3. Signed-off-by: Egbert Eich Adapted for 1.12.1 by Mike Gorse +Adapted for 1.13.0 by Tobias Klausmann --- diff -pruN xorg-server-1.12.1.orig/configure.ac xorg-server-1.12.1/configure.ac --- xorg-server-1.12.1.orig/configure.ac 2012-04-13 17:44:02.000000000 -0500 @@ -94,14 +95,14 @@ diff -pruN xorg-server-1.12.1.orig/configure.ac xorg-server-1.12.1/configure.ac hw/Makefile hw/xfree86/Makefile hw/xfree86/common/Makefile -@@ -2191,6 +2242,7 @@ hw/xfree86/ramdac/Makefile +@@ -2262,6 +2280,7 @@ hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile +hw/xfree86/vnc/Makefile hw/xfree86/x86emu/Makefile - hw/xfree86/xaa/Makefile hw/xfree86/utils/Makefile + hw/xfree86/utils/man/Makefile @@ -2207,6 +2259,8 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile @@ -3221,7 +3222,7 @@ diff -pruN xorg-server-1.12.1.orig/hw/vnc/dispcur.c xorg-server-1.12.1/hw/vnc/di + tossPict (pScreenPriv->pTempPicture); +#endif + free ((pointer) pScreenPriv); -+ return (*pScreen->CloseScreen) (index, pScreen); ++ return (*pScreen->CloseScreen) (pScreen); +} + +static Bool @@ -4098,7 +4099,7 @@ diff -pruN xorg-server-1.12.1.orig/hw/vnc/draw.c xorg-server-1.12.1/hw/vnc/draw. + + TRC((stderr,"Unwrapped screen functions\n")); + -+ return (*pScreen->CloseScreen) (i, pScreen); ++ return (*pScreen->CloseScreen) (pScreen); +} + +#if XFREE86VNC @@ -15652,7 +15653,7 @@ diff -pruN xorg-server-1.12.1.orig/hw/vnc/sprite.c xorg-server-1.12.1/hw/vnc/spr + + free ((pointer) pScreenPriv); + -+ return (*pScreen->CloseScreen) (i, pScreen); ++ return (*pScreen->CloseScreen) (pScreen); +} + +static void @@ -22307,45 +22308,42 @@ diff -pruN xorg-server-1.12.1.orig/hw/vnc/zlib.c xorg-server-1.12.1/hw/vnc/zlib. +} + + -diff -pruN xorg-server-1.12.1.orig/hw/xfree86/dixmods/Makefile.am xorg-server-1.12.1/hw/xfree86/dixmods/Makefile.am ---- xorg-server-1.12.1.orig/hw/xfree86/dixmods/Makefile.am 2012-01-18 13:52:23.000000000 -0600 -+++ xorg-server-1.12.1/hw/xfree86/dixmods/Makefile.am 2012-04-18 14:45:21.587820816 -0500 -@@ -10,6 +10,10 @@ if DBE - DBEMOD = libdbe.la +diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am +index f161db6..1e075f8 100644 +--- a/hw/xfree86/dixmods/Makefile.am ++++ b/hw/xfree86/dixmods/Makefile.am +@@ -4,19 +4,29 @@ if GLX + GLXMODS = libglx.la endif +if XCLIPLIST +XCLIPLISTMOD = libxcliplist.la +endif + - if RECORD - RECORDMOD = librecord.la - endif -@@ -21,11 +25,13 @@ module_LTLIBRARIES = libfb.la \ + module_LTLIBRARIES = libfb.la \ + libwfb.la \ + libshadow.la + extsmoduledir = $(moduledir)/extensions - extsmodule_LTLIBRARIES = $(RECORDMOD) \ - $(DBEMOD) \ -+ $(XCLIPLISTMOD) \ - $(GLXMODS) +-extsmodule_LTLIBRARIES = $(GLXMODS) ++extsmodule_LTLIBRARIES = $(GLXMODS) \ ++ $(XCLIPLISTMOD) AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ INCLUDES = @XORG_INCS@ \ - -I$(top_srcdir)/dbe \ + -I$(top_srcdir)/xcliplist \ -I$(top_srcdir)/hw/xfree86/loader \ -I$(top_srcdir)/miext/shadow \ -I$(top_srcdir)/glx -@@ -34,6 +40,10 @@ libdbe_la_LDFLAGS = -module -avoid-versi - libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la - libdbe_la_SOURCES = dbemodule.c +libxcliplist_la_LDFLAGS = -avoid-version +libxcliplist_la_LIBADD = $(top_builddir)/xcliplist/libxcliplist.la +libxcliplist_la_SOURCES = $(top_srcdir)/xcliplist/cliplistmod.c + - libfb_la_LDFLAGS = -module -avoid-version + libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c +-- diff -pruN xorg-server-1.12.1.orig/hw/xfree86/Makefile.am xorg-server-1.12.1/hw/xfree86/Makefile.am --- xorg-server-1.12.1.orig/hw/xfree86/Makefile.am 2012-03-30 22:04:18.000000000 -0500 +++ xorg-server-1.12.1/hw/xfree86/Makefile.am 2012-04-18 14:45:21.587820816 -0500 @@ -22524,8 +22522,8 @@ diff -pruN xorg-server-1.12.1.orig/hw/xfree86/vnc/vncInit.c xorg-server-1.12.1/h +#if 0 +static const OptionInfoRec *VNCAvailableOptions(void *unused); +#endif -+static void rfbWakeupHandler (int i, pointer blockData, unsigned long err, pointer pReadmask); + ++static void rfbWakeupHandler (pointer pScreen,unsigned long err,pointer pReadmask); +static Bool vncCursorRealizeCursor(DeviceIntPtr, ScreenPtr, CursorPtr); +static Bool vncCursorUnrealizeCursor(DeviceIntPtr, ScreenPtr, CursorPtr); +static void vncCursorSetCursor(DeviceIntPtr, ScreenPtr, CursorPtr, int, int); @@ -23012,12 +23010,13 @@ diff -pruN xorg-server-1.12.1.orig/hw/xfree86/vnc/vncInit.c xorg-server-1.12.1/h + +static void +rfbWakeupHandler ( -+ int i, -+ pointer blockData, ++ /*int i,*/ ++ pointer pScreen, ++ /*pointer blockData,*/ + unsigned long err, + pointer pReadmask +){ -+ ScreenPtr pScreen = screenInfo.screens[i]; ++ /*ScreenPtr pScreen = screenInfo.screens[i];*/ + vncScreenPtr pScreenPriv = VNCPTR(pScreen); + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + int sigstate = xf86BlockSIGIO(); @@ -23037,7 +23036,8 @@ diff -pruN xorg-server-1.12.1.orig/hw/xfree86/vnc/vncInit.c xorg-server-1.12.1/h + xf86UnblockSIGIO(sigstate); + + pScreen->WakeupHandler = pScreenPriv->WakeupHandler; -+ (*pScreen->WakeupHandler) (i, blockData, err, pReadmask); ++ /*(*pScreen->WakeupHandler) (i, blockData, err, pReadmask);*/ ++ (*pScreen->WakeupHandler) (pScreen, err, pReadmask); + pScreen->WakeupHandler = rfbWakeupHandler; +} + @@ -23091,6 +23091,7 @@ diff -pruN xorg-server-1.12.1.orig/hw/xfree86/vnc/vncInit.c xorg-server-1.12.1/h + return (pointer)TRUE; +} +#endif ++ diff -pruN xorg-server-1.12.1.orig/hw/xfree86/vnc/vncint.h xorg-server-1.12.1/hw/xfree86/vnc/vncint.h --- xorg-server-1.12.1.orig/hw/xfree86/vnc/vncint.h 1969-12-31 18:00:00.000000000 -0600 +++ xorg-server-1.12.1/hw/xfree86/vnc/vncint.h 2012-04-18 14:45:21.588820803 -0500 @@ -23268,8 +23269,8 @@ diff -pruN xorg-server-1.12.1.orig/Makefile.am xorg-server-1.12.1/Makefile.am diff -pruN xorg-server-1.12.1.orig/mi/miinitext.c xorg-server-1.12.1/mi/miinitext.c --- xorg-server-1.12.1.orig/mi/miinitext.c 2012-03-29 21:57:27.000000000 -0500 +++ xorg-server-1.12.1/mi/miinitext.c 2012-04-18 14:45:21.589820790 -0500 -@@ -88,6 +88,18 @@ SOFTWARE. - #undef XF86VIDMODE +@@ -105,6 +105,18 @@ #ifdef HAVE_XGL_CONFIG_H + #include #endif +#ifdef VNCSERVER @@ -23286,7 +23287,7 @@ diff -pruN xorg-server-1.12.1.orig/mi/miinitext.c xorg-server-1.12.1/mi/miinitex + #include "misc.h" #include "extension.h" - #include "micmap.h" + #include "extinit.h" diff -pruN xorg-server-1.12.1.orig/xcliplist/cliplist.c xorg-server-1.12.1/xcliplist/cliplist.c --- xorg-server-1.12.1.orig/xcliplist/cliplist.c 1969-12-31 18:00:00.000000000 -0600 +++ xorg-server-1.12.1/xcliplist/cliplist.c 2012-04-18 14:45:21.589820790 -0500 diff --git a/N-VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch b/n_VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch similarity index 100% rename from N-VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch rename to n_VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch diff --git a/N-VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch b/n_VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch similarity index 100% rename from N-VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch rename to n_VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch diff --git a/N-VNC-Fix-crash-due-to-unset-input-device-names.patch b/n_VNC-Fix-crash-due-to-unset-input-device-names.patch similarity index 100% rename from N-VNC-Fix-crash-due-to-unset-input-device-names.patch rename to n_VNC-Fix-crash-due-to-unset-input-device-names.patch diff --git a/N-VNC-Fix-crash-when-no-depth-translation-is-required.patch b/n_VNC-Fix-crash-when-no-depth-translation-is-required.patch similarity index 100% rename from N-VNC-Fix-crash-when-no-depth-translation-is-required.patch rename to n_VNC-Fix-crash-when-no-depth-translation-is-required.patch diff --git a/N-VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch b/n_VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch similarity index 100% rename from N-VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch rename to n_VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch diff --git a/Xvnc-pthread.diff b/n_Xvnc-pthread.diff similarity index 100% rename from Xvnc-pthread.diff rename to n_Xvnc-pthread.diff diff --git a/xorg-x11-server-rpmmacros.patch b/n_xorg-x11-server-rpmmacros.patch similarity index 100% rename from xorg-x11-server-rpmmacros.patch rename to n_xorg-x11-server-rpmmacros.patch diff --git a/pci-legacy-mem-fallback.diff b/pci-legacy-mem-fallback.diff deleted file mode 100644 index a40a813..0000000 --- a/pci-legacy-mem-fallback.diff +++ /dev/null @@ -1,21 +0,0 @@ -Index: hw/xfree86/os-support/bus/linuxPci.c -================================================================================ ---- hw/xfree86/os-support/bus/linuxPci.c -+++ hw/xfree86/os-support/bus/linuxPci.c -@@ -397,6 +397,7 @@ - * legacy_mem interface is unavailable. - */ - if ((Base > 1024*1024) || ((fd = linuxOpenLegacy(dev, "legacy_mem")) < 0)) -+ fallback: - return linuxMapPci(ScreenNum, Flags, dev, Base, Size, - PCIIOC_MMAP_IS_MEM); - else -@@ -405,6 +406,8 @@ - if (fd >= 0) - close(fd); - if (addr == NULL || addr == MAP_FAILED) { -+ if (errno == ENXIO) -+ goto fallback; - perror("mmap failure"); - FatalError("xf86MapDomainMem(): mmap() failure\n"); - } diff --git a/pio_ia64.diff b/pio_ia64.diff deleted file mode 100644 index 8601143..0000000 --- a/pio_ia64.diff +++ /dev/null @@ -1,87 +0,0 @@ -Index: xorg-server-1.8.0/hw/xfree86/common/compiler.h -=================================================================== ---- xorg-server-1.8.0.orig/hw/xfree86/common/compiler.h -+++ xorg-server-1.8.0/hw/xfree86/common/compiler.h -@@ -409,12 +409,18 @@ extern _X_EXPORT unsigned int inl(unsign - # undef inb - # undef inw - # undef inl --extern _X_EXPORT void outb(unsigned long port, unsigned char val); --extern _X_EXPORT void outw(unsigned long port, unsigned short val); --extern _X_EXPORT void outl(unsigned long port, unsigned int val); --extern _X_EXPORT unsigned int inb(unsigned long port); --extern _X_EXPORT unsigned int inw(unsigned long port); --extern _X_EXPORT unsigned int inl(unsigned long port); -+#define outb(p,v) outb_ia64(p,v) -+#define outw(p,v) outw_ia64(p,v) -+#define outl(p,v) outl_ia64(p,v) -+#define inb(p) inb_ia64(p) -+#define inw(p) inw_ia64(p) -+#define inl(p) inl_ia64(p) -+extern _X_EXPORT void outb_ia64(unsigned long port, unsigned char val); -+extern _X_EXPORT void outw_ia64(unsigned long port, unsigned short val); -+extern _X_EXPORT void outl_ia64(unsigned long port, unsigned int val); -+extern _X_EXPORT unsigned int inb_ia64(unsigned long port); -+extern _X_EXPORT unsigned int inw_ia64(unsigned long port); -+extern _X_EXPORT unsigned int inl_ia64(unsigned long port); - - # elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__) - -Index: xorg-server-1.8.0/hw/xfree86/os-support/shared/ia64Pci.c -=================================================================== ---- xorg-server-1.8.0.orig/hw/xfree86/os-support/shared/ia64Pci.c -+++ xorg-server-1.8.0/hw/xfree86/os-support/shared/ia64Pci.c -@@ -60,7 +60,7 @@ static int ia64_port_to_fd(unsigned long - return (port >> 24) & 0xffffffff; - } - --void outb(unsigned long port, unsigned char val) -+void outb_ia64(unsigned long port, unsigned char val) - { - int fd = ia64_port_to_fd(port); - -@@ -80,7 +80,7 @@ void outb(unsigned long port, unsigned c - return; - } - --void outw(unsigned long port, unsigned short val) -+void outw_ia64(unsigned long port, unsigned short val) - { - int fd = ia64_port_to_fd(port); - -@@ -100,7 +100,7 @@ void outw(unsigned long port, unsigned s - return; - } - --void outl(unsigned long port, unsigned int val) -+void outl_ia64(unsigned long port, unsigned int val) - { - int fd = ia64_port_to_fd(port); - -@@ -120,7 +120,7 @@ void outl(unsigned long port, unsigned i - return; - } - --unsigned int inb(unsigned long port) -+unsigned int inb_ia64(unsigned long port) - { - int fd = ia64_port_to_fd(port); - unsigned char val; -@@ -142,7 +142,7 @@ unsigned int inb(unsigned long port) - return val; - } - --unsigned int inw(unsigned long port) -+unsigned int inw_ia64(unsigned long port) - { - int fd = ia64_port_to_fd(port); - unsigned short val; -@@ -164,7 +164,7 @@ unsigned int inw(unsigned long port) - return val; - } - --unsigned int inl(unsigned long port) -+unsigned int inl_ia64(unsigned long port) - { - int fd = ia64_port_to_fd(port); - unsigned int val; diff --git a/pu_fixes.diff b/pu_fixes.diff deleted file mode 100644 index 624b94a..0000000 --- a/pu_fixes.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: hw/xfree86/xaa/xaaImage.c -=================================================================== ---- hw/xfree86/xaa/xaaImage.c.orig -+++ hw/xfree86/xaa/xaaImage.c -@@ -240,6 +240,7 @@ XAAWritePixmap(ScrnInfoPtr pScrn, int x, - (*infoRec->SetupForImageWrite) (pScrn, rop, planemask, trans, bpp, depth); - (*infoRec->SubsequentImageWriteRect) (pScrn, x, y, w, h, skipleft); - -+#if 0 - if (beCareful) { - /* in cases with bad alignment we have to be careful not - to read beyond the end of the source */ -@@ -248,6 +249,9 @@ XAAWritePixmap(ScrnInfoPtr pScrn, int x, - else - beCareful = FALSE; - } -+#endif -+ if (beCareful) -+ h--; - - if (dwords > infoRec->ImageWriteRange) { - while (h--) { diff --git a/u_0001-glx-Fix-mishandling-of-shared-contexts.patch b/u_0001-glx-Fix-mishandling-of-shared-contexts.patch deleted file mode 100644 index 88b6ca2..0000000 --- a/u_0001-glx-Fix-mishandling-of-shared-contexts.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 277985e545626c9a9bd82aafddac4f935d95a4e2 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Mon, 5 Dec 2011 10:55:20 -0800 -Subject: [PATCH 01/11] glx: Fix mishandling of shared contexts - -Signed-off-by: Ian Romanick -Reviewed-by: Eric Anholt -Reviewed-by: Christopher James Halse Rogers ---- - glx/glxcmds.c | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 24fed8f..6fa10fe 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -251,20 +251,20 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, - &shareglxc, &err)) - return err; - -- if (shareglxc->isDirect) { -- /* -- ** NOTE: no support for sharing display lists between direct -- ** contexts, even if they are in the same address space. -- */ --#if 0 -- /* Disabling this code seems to allow shared display lists -- * and texture objects to work. We'll leave it disabled for now. -- */ -+ /* Page 26 (page 32 of the PDF) of the GLX 1.4 spec says: -+ * -+ * "The server context state for all sharing contexts must exist -+ * in a single address space or a BadMatch error is generated." -+ * -+ * If the share context is indirect, force the new context to also be -+ * indirect. If the shard context is direct but the new context -+ * cannot be direct, generate BadMatch. -+ */ -+ if (shareglxc->isDirect && !isDirect) { - client->errorValue = shareList; - return BadMatch; --#endif - } -- else { -+ else if (!shareglxc->isDirect) { - /* - ** Create an indirect context regardless of what the client asked - ** for; this way we can share display list space with shareList. --- -1.7.3.4 - diff --git a/u_0002-glx-Don-t-track-GLClientmajorVersion-or-GLClientmino.patch b/u_0002-glx-Don-t-track-GLClientmajorVersion-or-GLClientmino.patch deleted file mode 100644 index f5f8193..0000000 --- a/u_0002-glx-Don-t-track-GLClientmajorVersion-or-GLClientmino.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2bbacf1fb21b98e8b9481931f131c176a0f78dc5 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Fri, 2 Dec 2011 21:14:46 -0800 -Subject: [PATCH 02/11] glx: Don't track GLClientmajorVersion or GLClientminorVersion - -Nothing uses these fields anywhere in the server. - -Signed-off-by: Ian Romanick -Reviewed-by: Jesse Barnes -Reviewed-by: Christopher James Halse Rogers ---- - glx/glxcmds.c | 2 -- - glx/glxext.c | 2 -- - glx/glxserver.h | 2 -- - 3 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 6fa10fe..5c70afa 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -2396,8 +2396,6 @@ __glXDisp_ClientInfo(__GLXclientState * cl, GLbyte * pc) - if (!memchr(buf, 0, (client->req_len << 2) - sizeof(xGLXClientInfoReq))) - return BadLength; - -- cl->GLClientmajorVersion = req->major; -- cl->GLClientminorVersion = req->minor; - free(cl->GLClientextensions); - cl->GLClientextensions = strdup(buf); - -diff --git a/glx/glxext.c b/glx/glxext.c -index acd696e..599f029 100644 ---- a/glx/glxext.c -+++ b/glx/glxext.c -@@ -281,8 +281,6 @@ glxClientCallback(CallbackListPtr *list, pointer closure, pointer data) - ** By default, assume that the client supports - ** GLX major version 1 minor version 0 protocol. - */ -- cl->GLClientmajorVersion = 1; -- cl->GLClientminorVersion = 0; - cl->client = pClient; - break; - -diff --git a/glx/glxserver.h b/glx/glxserver.h -index 7076848..87c94d9 100644 ---- a/glx/glxserver.h -+++ b/glx/glxserver.h -@@ -145,8 +145,6 @@ struct __GLXclientStateRec { - /* Back pointer to X client record */ - ClientPtr client; - -- int GLClientmajorVersion; -- int GLClientminorVersion; - char *GLClientextensions; - }; - --- -1.7.3.4 - diff --git a/u_0003-glx-Extend-__GLXscreen-createContext-to-take-attribu.patch b/u_0003-glx-Extend-__GLXscreen-createContext-to-take-attribu.patch deleted file mode 100644 index c6bb5d5..0000000 --- a/u_0003-glx-Extend-__GLXscreen-createContext-to-take-attribu.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 71a819742edf386ace3cfaacc7dfe24b00f5ff7e Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Mon, 5 Dec 2011 10:56:07 -0800 -Subject: [PATCH 03/11] glx: Extend __GLXscreen::createContext to take attributes - -The attributes will be used for glXCreateContextAttribsARB additions -in follow-on patches. - -v2: Add missing 'int *error' parameters noticed by Christopher James -Halse Rogers. - -v3: Remove redundant 'int err;' declaration noticed by Christopher -James Halse Rogers. This was supposed to be in v2, but I missed it. - -Signed-off-by: Ian Romanick -Reviewed-by: Jesse Barnes -Reviewed-by: Christopher James Halse Rogers ---- - glx/glxcmds.c | 10 ++++++++-- - glx/glxdri.c | 12 +++++++++++- - glx/glxdri2.c | 5 ++++- - glx/glxdriswrast.c | 12 +++++++++++- - glx/glxscreens.h | 5 ++++- - 5 files changed, 38 insertions(+), 6 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 5c70afa..308c14a 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -276,8 +276,14 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, - /* - ** Allocate memory for the new context - */ -- if (!isDirect) -- glxc = pGlxScreen->createContext(pGlxScreen, config, shareglxc); -+ if (!isDirect) { -+ /* Without any attributes, the only error that the driver should be -+ * able to generate is BadAlloc. As result, just drop the error -+ * returned from the driver on the floor. -+ */ -+ glxc = pGlxScreen->createContext(pGlxScreen, config, shareglxc, -+ 0, NULL, &err); -+ } - else - glxc = __glXdirectContextCreate(pGlxScreen, config, shareglxc); - if (!glxc) { -diff --git a/glx/glxdri.c b/glx/glxdri.c -index 9b8b66f..bc49f29 100644 ---- a/glx/glxdri.c -+++ b/glx/glxdri.c -@@ -599,7 +599,10 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen) - static __GLXcontext * - __glXDRIscreenCreateContext(__GLXscreen * baseScreen, - __GLXconfig * glxConfig, -- __GLXcontext * baseShareContext) -+ __GLXcontext * baseShareContext, -+ unsigned num_attribs, -+ const uint32_t *attribs, -+ int *error) - { - __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen; - __GLXDRIcontext *context, *shareContext; -@@ -611,6 +614,13 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen, - drm_context_t hwContext; - ScreenPtr pScreen = baseScreen->pScreen; - -+ /* DRI1 cannot support createContextAttribs, so these parameters will -+ * never be used. -+ */ -+ (void) num_attribs; -+ (void) attribs; -+ (void) error; -+ - shareContext = (__GLXDRIcontext *) baseShareContext; - if (shareContext) - driShare = shareContext->driContext; -diff --git a/glx/glxdri2.c b/glx/glxdri2.c -index aa38295..656b577 100644 ---- a/glx/glxdri2.c -+++ b/glx/glxdri2.c -@@ -380,7 +380,10 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen) - static __GLXcontext * - __glXDRIscreenCreateContext(__GLXscreen * baseScreen, - __GLXconfig * glxConfig, -- __GLXcontext * baseShareContext) -+ __GLXcontext * baseShareContext, -+ unsigned num_attribs, -+ const uint32_t *attribs, -+ int *error) - { - __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen; - __GLXDRIcontext *context, *shareContext; -diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c -index c69b4d2..b478398 100644 ---- a/glx/glxdriswrast.c -+++ b/glx/glxdriswrast.c -@@ -257,7 +257,10 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen) - static __GLXcontext * - __glXDRIscreenCreateContext(__GLXscreen * baseScreen, - __GLXconfig * glxConfig, -- __GLXcontext * baseShareContext) -+ __GLXcontext * baseShareContext, -+ unsigned num_attribs, -+ const uint32_t *attribs, -+ int *error) - { - __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen; - __GLXDRIcontext *context, *shareContext; -@@ -265,6 +268,13 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen, - const __DRIcoreExtension *core = screen->core; - __DRIcontext *driShare; - -+ /* DRISWRAST won't support createContextAttribs, so these parameters will -+ * never be used. -+ */ -+ (void) num_attribs; -+ (void) attribs; -+ (void) error; -+ - shareContext = (__GLXDRIcontext *) baseShareContext; - if (shareContext) - driShare = shareContext->driContext; -diff --git a/glx/glxscreens.h b/glx/glxscreens.h -index d5420ee..7ef4657 100644 ---- a/glx/glxscreens.h -+++ b/glx/glxscreens.h -@@ -117,7 +117,10 @@ struct __GLXscreen { - - __GLXcontext *(*createContext) (__GLXscreen * screen, - __GLXconfig * modes, -- __GLXcontext * shareContext); -+ __GLXcontext * shareContext, -+ unsigned num_attribs, -+ const uint32_t *attribs, -+ int *error); - - __GLXdrawable *(*createDrawable) (ClientPtr client, - __GLXscreen * context, --- -1.7.3.4 - diff --git a/u_0004-glx-Add-tracking-for-GLX_ARB_create_context-and-GLX_.patch b/u_0004-glx-Add-tracking-for-GLX_ARB_create_context-and-GLX_.patch deleted file mode 100644 index 0ab1072..0000000 --- a/u_0004-glx-Add-tracking-for-GLX_ARB_create_context-and-GLX_.patch +++ /dev/null @@ -1,84 +0,0 @@ -From e453ac810a2020d0b8a21f67bd0e4712558fd57b Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Mon, 5 Dec 2011 13:48:19 -0800 -Subject: [PATCH 04/11] glx: Add tracking for GLX_ARB_create_context and GLX_ARB_create_context_profile - -The formatting of the extension data table was mangled by indent. -This patch also undoes that and adds approripate control comments so -that indent won't do it again. - -Signed-off-by: Ian Romanick -Reviewed-by: Dave Airlie -Reviewed-by: Christopher James Halse Rogers ---- - glx/extension_string.c | 34 +++++++++++++++++++--------------- - glx/extension_string.h | 4 +++- - 2 files changed, 22 insertions(+), 16 deletions(-) - -diff --git a/glx/extension_string.c b/glx/extension_string.c -index 866f8bf..6a1a6c6 100644 ---- a/glx/extension_string.c -+++ b/glx/extension_string.c -@@ -67,23 +67,27 @@ struct extension_info { - - static const struct extension_info known_glx_extensions[] = { - /* GLX_ARB_get_proc_address is implemented on the client. */ -- {GLX(ARB_multisample), VER(1, 4), Y,}, -- -- {GLX(EXT_import_context), VER(0, 0), Y,}, -- {GLX(EXT_texture_from_pixmap), VER(0, 0), Y,}, -- {GLX(EXT_visual_info), VER(0, 0), Y,}, -- {GLX(EXT_visual_rating), VER(0, 0), Y,}, -- -- {GLX(MESA_copy_sub_buffer), VER(0, 0), N,}, -- {GLX(OML_swap_method), VER(0, 0), Y,}, -- {GLX(SGI_make_current_read), VER(1, 3), N,}, -- {GLX(SGI_swap_control), VER(0, 0), N,}, -- {GLX(SGIS_multisample), VER(0, 0), Y,}, -- {GLX(SGIX_fbconfig), VER(1, 3), Y,}, -- {GLX(SGIX_pbuffer), VER(1, 3), Y,}, -- {GLX(SGIX_visual_select_group), VER(0, 0), Y,}, -- {GLX(INTEL_swap_event), VER(1, 4), N,}, -- {NULL} -+ /* *INDENT-OFF* */ -+ { GLX(ARB_create_context), VER(0,0), N, }, -+ { GLX(ARB_create_context_profile), VER(0,0), N, }, -+ { GLX(ARB_multisample), VER(1,4), Y, }, -+ -+ { GLX(EXT_import_context), VER(0,0), Y, }, -+ { GLX(EXT_texture_from_pixmap), VER(0,0), Y, }, -+ { GLX(EXT_visual_info), VER(0,0), Y, }, -+ { GLX(EXT_visual_rating), VER(0,0), Y, }, -+ -+ { GLX(MESA_copy_sub_buffer), VER(0,0), N, }, -+ { GLX(OML_swap_method), VER(0,0), Y, }, -+ { GLX(SGI_make_current_read), VER(1,3), N, }, -+ { GLX(SGI_swap_control), VER(0,0), N, }, -+ { GLX(SGIS_multisample), VER(0,0), Y, }, -+ { GLX(SGIX_fbconfig), VER(1,3), Y, }, -+ { GLX(SGIX_pbuffer), VER(1,3), Y, }, -+ { GLX(SGIX_visual_select_group), VER(0,0), Y, }, -+ { GLX(INTEL_swap_event), VER(1,4), N, }, -+ { NULL } -+ /* *INDENT-ON* */ - }; - - /** -diff --git a/glx/extension_string.h b/glx/extension_string.h -index e02213f..947bf89 100644 ---- a/glx/extension_string.h -+++ b/glx/extension_string.h -@@ -36,7 +36,9 @@ - - enum { - /* GLX_ARB_get_proc_address is implemented on the client. */ -- ARB_multisample_bit = 0, -+ ARB_create_context_bit = 0, -+ ARB_create_context_profile_bit, -+ ARB_multisample_bit, - EXT_import_context_bit, - EXT_texture_from_pixmap_bit, - EXT_visual_info_bit, --- -1.7.3.4 - diff --git a/u_0005-glx-Optionally-call-DRI2-createContextAttribs-from-_.patch b/u_0005-glx-Optionally-call-DRI2-createContextAttribs-from-_.patch deleted file mode 100644 index 92dcd31..0000000 --- a/u_0005-glx-Optionally-call-DRI2-createContextAttribs-from-_.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 228d954789f97baf230c97c29a515abb8fd4b6d1 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Mon, 5 Dec 2011 13:52:01 -0800 -Subject: [PATCH 05/11] glx: Optionally call DRI2 createContextAttribs from __glXDRIscreenCreateContext - -Signed-off-by: Ian Romanick -Reviewed-by: Christopher James Halse Rogers ---- - glx/glxdri2.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 151 insertions(+), 5 deletions(-) - -diff --git a/glx/glxdri2.c b/glx/glxdri2.c -index 656b577..ba09cbd 100644 ---- a/glx/glxdri2.c -+++ b/glx/glxdri2.c -@@ -47,6 +47,7 @@ - #include "glxserver.h" - #include "glxutil.h" - #include "glxdricommon.h" -+#include - - #include "glapitable.h" - #include "glapi.h" -@@ -377,6 +378,143 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen) - free(screen); - } - -+static Bool -+dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, -+ unsigned *major_ver, unsigned *minor_ver, -+ uint32_t *flags, unsigned *error) -+{ -+ unsigned i; -+ -+ if (num_attribs == 0) -+ return True; -+ -+ if (attribs == NULL) { -+ *error = BadImplementation; -+ return False; -+ } -+ -+ *major_ver = 1; -+ *minor_ver = 0; -+ -+ for (i = 0; i < num_attribs; i++) { -+ switch (attribs[i * 2]) { -+ case GLX_CONTEXT_MAJOR_VERSION_ARB: -+ *major_ver = attribs[i * 2 + 1]; -+ break; -+ case GLX_CONTEXT_MINOR_VERSION_ARB: -+ *minor_ver = attribs[i * 2 + 1]; -+ break; -+ case GLX_CONTEXT_FLAGS_ARB: -+ *flags = attribs[i * 2 + 1]; -+ break; -+ case GLX_RENDER_TYPE: -+ break; -+ default: -+ /* If an unknown attribute is received, fail. -+ */ -+ *error = BadValue; -+ return False; -+ } -+ } -+ -+ /* Unknown flag value. -+ */ -+ if (*flags & ~(__DRI_CTX_FLAG_DEBUG | __DRI_CTX_FLAG_FORWARD_COMPATIBLE)) { -+ *error = BadValue; -+ return False; -+ } -+ -+ *error = Success; -+ return True; -+} -+ -+static void -+create_driver_context(__GLXDRIcontext * context, -+ __GLXDRIscreen * screen, -+ __GLXDRIconfig * config, -+ __DRIcontext * driShare, -+ unsigned num_attribs, -+ const uint32_t *attribs, -+ int *error) -+{ -+ context->driContext = NULL; -+ -+#if __DRI_DRI2_VERSION >= 3 -+ if (screen->dri2->base.version >= 3) { -+ uint32_t ctx_attribs[3 * 2]; -+ unsigned num_ctx_attribs = 0; -+ unsigned dri_err = 0; -+ unsigned major_ver; -+ unsigned minor_ver; -+ uint32_t flags; -+ -+ if (num_attribs != 0) { -+ if (!dri2_convert_glx_attribs(num_attribs, attribs, -+ &major_ver, &minor_ver, -+ &flags, (unsigned *) error)) -+ return NULL; -+ -+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MAJOR_VERSION; -+ ctx_attribs[num_ctx_attribs++] = major_ver; -+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MINOR_VERSION; -+ ctx_attribs[num_ctx_attribs++] = minor_ver; -+ -+ if (flags != 0) { -+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_FLAGS; -+ -+ /* The current __DRI_CTX_FLAG_* values are identical to the -+ * GLX_CONTEXT_*_BIT values. -+ */ -+ ctx_attribs[num_ctx_attribs++] = flags; -+ } -+ } -+ -+ context->driContext = -+ (*screen->dri2->createContextAttribs)(screen->driScreen, -+ __DRI_API_OPENGL, -+ config->driConfig, -+ driShare, -+ num_ctx_attribs / 2, -+ ctx_attribs, -+ &dri_err, -+ context); -+ -+ switch (dri_err) { -+ case __DRI_CTX_ERROR_SUCCESS: -+ *error = Success; -+ break; -+ case __DRI_CTX_ERROR_NO_MEMORY: -+ *error = BadAlloc; -+ break; -+ case __DRI_CTX_ERROR_BAD_API: -+ *error = __glXError(GLXBadProfileARB); -+ break; -+ case __DRI_CTX_ERROR_BAD_VERSION: -+ case __DRI_CTX_ERROR_BAD_FLAG: -+ *error = __glXError(GLXBadFBConfig); -+ break; -+ case __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE: -+ case __DRI_CTX_ERROR_UNKNOWN_FLAG: -+ default: -+ *error = BadValue; -+ break; -+ } -+ -+ return; -+ } -+#endif -+ -+ if (num_attribs != 0) { -+ *error = BadValue; -+ return; -+ } -+ -+ context->driContext = -+ (*screen->dri2->createNewContext) (screen->driScreen, -+ config->driConfig, -+ driShare, context); -+} -+ - static __GLXcontext * - __glXDRIscreenCreateContext(__GLXscreen * baseScreen, - __GLXconfig * glxConfig, -@@ -397,8 +535,10 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen, - driShare = NULL; - - context = calloc(1, sizeof *context); -- if (context == NULL) -+ if (context == NULL) { -+ *error = BadAlloc; - return NULL; -+ } - - context->base.destroy = __glXDRIcontextDestroy; - context->base.makeCurrent = __glXDRIcontextMakeCurrent; -@@ -407,10 +547,8 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen, - context->base.textureFromPixmap = &__glXDRItextureFromPixmap; - context->base.wait = __glXDRIcontextWait; - -- context->driContext = -- (*screen->dri2->createNewContext) (screen->driScreen, -- config->driConfig, -- driShare, context); -+ create_driver_context(context, screen, config, driShare, num_attribs, -+ attribs, error); - if (context->driContext == NULL) { - free(context); - return NULL; -@@ -646,6 +784,14 @@ initializeExtensions(__GLXDRIscreen * screen) - __glXEnableExtension(screen->glx_enable_bits, "GLX_INTEL_swap_event"); - LogMessage(X_INFO, "AIGLX: enabled GLX_INTEL_swap_event\n"); - -+#if __DRI_DRI2_VERSION >= 3 -+ if (screen->dri2->base.version >= 3) { -+ __glXEnableExtension(screen->glx_enable_bits, -+ "GLX_ARB_create_context"); -+ LogMessage(X_INFO, "AIGLX: enabled GLX_ARB_create_context\n"); -+ } -+#endif -+ - if (DRI2HasSwapControl(pScreen)) { - __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_swap_control"); - __glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_swap_control"); --- -1.7.3.4 - diff --git a/u_0006-glx-Implement-GLX-SetClientInfoARB-protocol.patch b/u_0006-glx-Implement-GLX-SetClientInfoARB-protocol.patch deleted file mode 100644 index d22d1bb..0000000 --- a/u_0006-glx-Implement-GLX-SetClientInfoARB-protocol.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 975f069a92f8bd85f9d0ce4916f2c1c4a3cea339 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Fri, 9 Dec 2011 17:28:21 -0800 -Subject: [PATCH 06/11] glx: Implement GLX SetClientInfoARB protocol - -v2: Bump glproto version to 1.4.15. This patch uses structure names -that only exist in that glproto version and later. Noticed by -Christopher James Halse Rogers. - -Signed-off-by: Ian Romanick -Reviewed-by: Dave Airlie -Reviewed-by: Christopher James Halse Rogers ---- - configure.ac | 2 +- - glx/clientinfo.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 48 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6a41ea8..de7526f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -777,7 +777,7 @@ DRI2PROTO="dri2proto >= 2.6" - XINERAMAPROTO="xineramaproto" - BIGFONTPROTO="xf86bigfontproto >= 1.2.0" - DGAPROTO="xf86dgaproto >= 2.0.99.1" --GLPROTO="glproto >= 1.4.14" -+GLPROTO="glproto >= 1.4.15" - DMXPROTO="dmxproto >= 2.2.99.1" - VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" - WINDOWSWMPROTO="windowswmproto" -diff --git a/glx/clientinfo.c b/glx/clientinfo.c -index 15bbf15..b26ac1a 100644 ---- a/glx/clientinfo.c -+++ b/glx/clientinfo.c -@@ -26,17 +26,62 @@ - - #include "glxserver.h" - #include "indirect_dispatch.h" -+#include "glxbyteorder.h" -+#include "unpack.h" - - int - __glXDisp_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc) - { -- return BadRequest; -+ xGLXSetClientInfoARBReq *req = (xGLXSetClientInfoARBReq *) pc; -+ char *gl_extensions; -+ char *glx_extensions; -+ -+ /* Verify that the size of the packet matches the size inferred from the -+ * sizes specified for the various fields. -+ */ -+ const unsigned expected_size = sz_xGLXSetClientInfoARBReq -+ + (req->numVersions * 8) -+ + __GLX_PAD(req->numGLExtensionBytes) -+ + __GLX_PAD(req->numGLXExtensionBytes); -+ -+ if (req->length != (expected_size / 4)) -+ return BadLength; -+ -+ /* Verify that the actual length of the GL extension string matches what's -+ * encoded in protocol packet. -+ */ -+ gl_extensions = (char *) (req + 1) + (req->numVersions * 8); -+ if (req->numGLExtensionBytes != 0 -+ && memchr(gl_extensions, 0, -+ __GLX_PAD(req->numGLExtensionBytes)) == NULL) -+ return BadLength; -+ -+ /* Verify that the actual length of the GLX extension string matches -+ * what's encoded in protocol packet. -+ */ -+ glx_extensions = gl_extensions + __GLX_PAD(req->numGLExtensionBytes); -+ if (req->numGLXExtensionBytes != 0 -+ && memchr(glx_extensions, 0, -+ __GLX_PAD(req->numGLXExtensionBytes)) == NULL) -+ return BadLength; -+ -+ free(cl->GLClientextensions); -+ cl->GLClientextensions = strdup(gl_extensions); -+ -+ return 0; - } - - int - __glXDispSwap_SetClientInfoARB(__GLXclientState * cl, GLbyte * pc) - { -- return BadRequest; -+ xGLXSetClientInfoARBReq *req = (xGLXSetClientInfoARBReq *) pc; -+ -+ req->length = bswap_16(req->length); -+ req->numVersions = bswap_32(req->numVersions); -+ req->numGLExtensionBytes = bswap_32(req->numGLExtensionBytes); -+ req->numGLXExtensionBytes = bswap_32(req->numGLXExtensionBytes); -+ -+ return __glXDisp_SetClientInfoARB(cl, pc); - } - - int --- -1.7.3.4 - diff --git a/u_0007-glx-Initialize-all-context-fields-together.patch b/u_0007-glx-Initialize-all-context-fields-together.patch deleted file mode 100644 index 7e203d3..0000000 --- a/u_0007-glx-Initialize-all-context-fields-together.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 232ab8f5869905e7a8eb736b4625366c9f316e9c Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Sat, 10 Dec 2011 15:09:57 -0800 -Subject: [PATCH 07/11] glx: Initialize all context fields together - -v2: Fix whitespace error noticed by Christopher James Halse Rogers. - -Signed-off-by: Ian Romanick -Reviewed-by: Jesse Barnes -Reviewed-by: Christopher James Halse Rogers ---- - glx/glxcmds.c | 26 +++++++++----------------- - 1 files changed, 9 insertions(+), 17 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 308c14a..571ae50 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -290,26 +290,10 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, - return BadAlloc; - } - -- /* -- ** Initially, setup the part of the context that could be used by -- ** a GL core that needs windowing information (e.g., Mesa). -+ /* Initialize the GLXcontext structure. - */ - glxc->pGlxScreen = pGlxScreen; - glxc->config = config; -- -- /* -- ** Register this context as a resource. -- */ -- if (!AddResource(gcId, __glXContextRes, (pointer) glxc)) { -- (*glxc->destroy) (glxc); -- client->errorValue = gcId; -- return BadAlloc; -- } -- -- /* -- ** Finally, now that everything is working, setup the rest of the -- ** context. -- */ - glxc->id = gcId; - glxc->share_id = shareList; - glxc->idExists = GL_TRUE; -@@ -317,6 +301,14 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, - glxc->isDirect = isDirect; - glxc->renderMode = GL_RENDER; - -+ /* Register this context as a resource. -+ */ -+ if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) { -+ (*glxc->destroy) (glxc); -+ client->errorValue = gcId; -+ return BadAlloc; -+ } -+ - __glXAddToContextList(glxc); - - return Success; --- -1.7.3.4 - diff --git a/u_0008-glx-Initialize-remaining-context-fields.patch b/u_0008-glx-Initialize-remaining-context-fields.patch deleted file mode 100644 index 68d9b2b..0000000 --- a/u_0008-glx-Initialize-remaining-context-fields.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e18884c868215b5dabc1f2fac73dd9c763074394 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Sat, 10 Dec 2011 15:11:57 -0800 -Subject: [PATCH 08/11] glx: Initialize remaining context fields - -There is no reason to assume the screen's context allocated -initialized these fields, so don't. - -Signed-off-by: Ian Romanick -Reviewed-by: Jesse Barnes -Reviewed-by: Christopher James Halse Rogers ---- - glx/glxcmds.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 571ae50..8a9a1d3 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -299,7 +299,14 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, - glxc->idExists = GL_TRUE; - glxc->isCurrent = GL_FALSE; - glxc->isDirect = isDirect; -+ glxc->hasUnflushedCommands = GL_FALSE; - glxc->renderMode = GL_RENDER; -+ glxc->feedbackBuf = NULL; -+ glxc->feedbackBufSize = 0; -+ glxc->selectBuf = NULL; -+ glxc->selectBufSize = 0; -+ glxc->drawPriv = NULL; -+ glxc->readPriv = NULL; - - /* Register this context as a resource. - */ --- -1.7.3.4 - diff --git a/u_0009-glx-Use-one-function-to-add-a-context-to-all-global-.patch b/u_0009-glx-Use-one-function-to-add-a-context-to-all-global-.patch deleted file mode 100644 index 315e7e2..0000000 --- a/u_0009-glx-Use-one-function-to-add-a-context-to-all-global-.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 660e48e6c6a9df08655c286ac3a9ffa45eb44c26 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Sat, 10 Dec 2011 15:15:18 -0800 -Subject: [PATCH 09/11] glx: Use one function to add a context to all global tables - -Instead of having separate __glXAddContextToList and AddResource -functions, just have one function that does both steps. - -Signed-off-by: Ian Romanick -Reviewed-by: Jesse Barnes -Reviewed-by: Christopher James Halse Rogers ---- - glx/glxcmds.c | 6 ++---- - glx/glxext.c | 11 +++++++++-- - glx/glxext.h | 2 +- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 8a9a1d3..d9d2201 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -308,16 +308,14 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, - glxc->drawPriv = NULL; - glxc->readPriv = NULL; - -- /* Register this context as a resource. -+ /* Add the new context to the various global tables of GLX contexts. - */ -- if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) { -+ if (!__glXAddContext(glxc)) { - (*glxc->destroy) (glxc); - client->errorValue = gcId; - return BadAlloc; - } - -- __glXAddToContextList(glxc); -- - return Success; - } - -diff --git a/glx/glxext.c b/glx/glxext.c -index 599f029..8d168d8 100644 ---- a/glx/glxext.c -+++ b/glx/glxext.c -@@ -157,11 +157,18 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid) - return True; - } - --void --__glXAddToContextList(__GLXcontext * cx) -+Bool -+__glXAddContext(__GLXcontext * cx) - { -+ /* Register this context as a resource. -+ */ -+ if (!AddResource(cx->id, __glXContextRes, (pointer)cx)) { -+ return False; -+ } -+ - cx->next = glxAllContexts; - glxAllContexts = cx; -+ return True; - } - - static void -diff --git a/glx/glxext.h b/glx/glxext.h -index 7cd5cb4..9b0978b 100644 ---- a/glx/glxext.h -+++ b/glx/glxext.h -@@ -38,7 +38,7 @@ - extern GLboolean __glXFreeContext(__GLXcontext * glxc); - extern void __glXFlushContextCache(void); - --extern void __glXAddToContextList(__GLXcontext * cx); -+extern Bool __glXAddContext(__GLXcontext * cx); - extern void __glXErrorCallBack(GLenum code); - extern void __glXClearErrorOccured(void); - extern GLboolean __glXErrorOccured(void); --- -1.7.3.4 - diff --git a/u_0010-glx-Make-several-functions-available-outside-the-glx.patch b/u_0010-glx-Make-several-functions-available-outside-the-glx.patch deleted file mode 100644 index 7a278d2..0000000 --- a/u_0010-glx-Make-several-functions-available-outside-the-glx.patch +++ /dev/null @@ -1,81 +0,0 @@ -From ce0cf92a76cb220a89b10b8f6b0a57c5cf69a97f Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Fri, 16 Dec 2011 14:42:51 -0800 -Subject: [PATCH 10/11] glx: Make several functions available outside the glxcmds.c compilation unit - -validGlxScreen, validGlxFBConfig, validGlxContext, and -__glXdirectContextCreate will soon be used by createcontext.c. - -Signed-off-by: Ian Romanick -Reviewed-by: Dave Airlie -Reviewed-by: Christopher James Halse Rogers ---- - glx/glxcmds.c | 8 ++++---- - glx/glxcontext.h | 13 +++++++++++++ - 2 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index d9d2201..d483bbf 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -50,7 +50,7 @@ - #include "indirect_table.h" - #include "indirect_util.h" - --static int -+_X_HIDDEN int - validGlxScreen(ClientPtr client, int screen, __GLXscreen ** pGlxScreen, - int *err) - { -@@ -67,7 +67,7 @@ validGlxScreen(ClientPtr client, int screen, __GLXscreen ** pGlxScreen, - return TRUE; - } - --static int -+_X_HIDDEN int - validGlxFBConfig(ClientPtr client, __GLXscreen * pGlxScreen, XID id, - __GLXconfig ** config, int *err) - { -@@ -131,7 +131,7 @@ validGlxFBConfigForWindow(ClientPtr client, __GLXconfig * config, - return TRUE; - } - --static int -+_X_HIDDEN int - validGlxContext(ClientPtr client, XID id, int access_mode, - __GLXcontext ** context, int *err) - { -@@ -200,7 +200,7 @@ __glXdirectContextDestroy(__GLXcontext * context) - free(context); - } - --static __GLXcontext * -+_X_HIDDEN __GLXcontext * - __glXdirectContextCreate(__GLXscreen * screen, - __GLXconfig * modes, __GLXcontext * shareContext) - { -diff --git a/glx/glxcontext.h b/glx/glxcontext.h -index ef2c4db..b803a7f 100644 ---- a/glx/glxcontext.h -+++ b/glx/glxcontext.h -@@ -121,4 +121,17 @@ struct __GLXcontext { - - void __glXContextDestroy(__GLXcontext * context); - -+extern int validGlxScreen(ClientPtr client, int screen, -+ __GLXscreen ** pGlxScreen, int *err); -+ -+extern int validGlxFBConfig(ClientPtr client, __GLXscreen * pGlxScreen, -+ XID id, __GLXconfig ** config, int *err); -+ -+extern int validGlxContext(ClientPtr client, XID id, int access_mode, -+ __GLXcontext ** context, int *err); -+ -+extern __GLXcontext *__glXdirectContextCreate(__GLXscreen * screen, -+ __GLXconfig * modes, -+ __GLXcontext * shareContext); -+ - #endif /* !__GLX_context_h__ */ --- -1.7.3.4 - diff --git a/u_0011-glx-Implement-protocol-for-glXCreateContextAttribsAR.patch b/u_0011-glx-Implement-protocol-for-glXCreateContextAttribsAR.patch deleted file mode 100644 index cbefe86..0000000 --- a/u_0011-glx-Implement-protocol-for-glXCreateContextAttribsAR.patch +++ /dev/null @@ -1,245 +0,0 @@ -From feae6434d2653bcfcaf617932c1b4893d51a1ef4 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Fri, 16 Dec 2011 14:44:55 -0800 -Subject: [PATCH 11/11] glx: Implement protocol for glXCreateContextAttribsARB - -Signed-off-by: Ian Romanick -Reviewed-by: Dave Airlie -Reviewed-by: Christopher James Halse Rogers ---- - glx/createcontext.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 212 insertions(+), 1 deletions(-) - -diff --git a/glx/createcontext.c b/glx/createcontext.c -index 9c1eab3..025c423 100644 ---- a/glx/createcontext.c -+++ b/glx/createcontext.c -@@ -24,13 +24,224 @@ - #include - #endif - -+#include - #include "glxserver.h" -+#include "glxext.h" - #include "indirect_dispatch.h" - -+#define ALL_VALID_FLAGS \ -+ (GLX_CONTEXT_DEBUG_BIT_ARB | GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB) -+ -+static Bool -+validate_GL_version(int major_version, int minor_version) -+{ -+ if (major_version <= 0 || minor_version < 0) -+ return False; -+ -+ switch (major_version) { -+ case 1: -+ if (minor_version > 5) -+ return False; -+ break; -+ -+ case 2: -+ if (minor_version > 1) -+ return False; -+ break; -+ -+ case 3: -+ if (minor_version > 3) -+ return False; -+ break; -+ -+ default: -+ break; -+ } -+ -+ return True; -+} -+ -+static Bool -+validate_render_type(uint32_t render_type) -+{ -+ switch (render_type) { -+ case GLX_RGBA_TYPE: -+ case GLX_COLOR_INDEX_TYPE: -+ return True; -+ default: -+ return False; -+ } -+} -+ - int - __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, GLbyte * pc) - { -- return BadRequest; -+ ClientPtr client = cl->client; -+ xGLXCreateContextAttribsARBReq *req = (xGLXCreateContextAttribsARBReq *) pc; -+ int32_t *attribs = (req->numAttribs != 0) ? (int32_t *) (req + 1) : NULL; -+ unsigned i; -+ int major_version = 1; -+ int minor_version = 0; -+ uint32_t flags = 0; -+ uint32_t render_type = GLX_RGBA_TYPE; -+ __GLXcontext *ctx = NULL; -+ __GLXcontext *shareCtx = NULL; -+ __GLXscreen *glxScreen; -+ __GLXconfig *config; -+ int err; -+ -+ /* Verify that the size of the packet matches the size inferred from the -+ * sizes specified for the various fields. -+ */ -+ const unsigned expected_size = (sz_xGLXCreateContextAttribsARBReq -+ + (req->numAttribs * 8)) / 4; -+ -+ if (req->length != expected_size) -+ return BadLength; -+ -+ LEGAL_NEW_RESOURCE(req->context, client); -+ -+ /* The GLX_ARB_create_context spec says: -+ * -+ * "* If is not a valid GLXFBConfig, GLXBadFBConfig is -+ * generated." -+ * -+ * On the client, the screen comes from the FBConfig, so GLXBadFBConfig -+ * should be issued if the screen is nonsense. -+ */ -+ if (!validGlxScreen(client, req->screen, &glxScreen, &err)) -+ return __glXError(GLXBadFBConfig); -+ -+ if (!validGlxFBConfig(client, glxScreen, req->fbconfig, &config, &err)) -+ return __glXError(GLXBadFBConfig); -+ -+ /* Validate the context with which the new context should share resources. -+ */ -+ if (req->shareList != None) { -+ if (!validGlxContext(client, req->shareList, DixReadAccess, -+ &shareCtx, &err)) -+ return err; -+ -+ /* The crazy condition is because C doesn't have a logical XOR -+ * operator. Comparing directly for equality may fail if one is 1 and -+ * the other is 2 even though both are logically true. -+ */ -+ if (!!req->isDirect != !!shareCtx->isDirect) { -+ client->errorValue = req->shareList; -+ return BadMatch; -+ } -+ -+ /* The GLX_ARB_create_context spec says: -+ * -+ * "* If the server context state for ...was -+ * created on a different screen than the one referenced by -+ * ...BadMatch is generated." -+ */ -+ if (glxScreen != shareCtx->pGlxScreen) { -+ client->errorValue = shareCtx->pGlxScreen->pScreen->myNum; -+ return BadMatch; -+ } -+ } -+ -+ for (i = 0; i < req->numAttribs; i++) { -+ switch (attribs[i * 2]) { -+ case GLX_CONTEXT_MAJOR_VERSION_ARB: -+ major_version = attribs[2 * i + 1]; -+ break; -+ -+ case GLX_CONTEXT_MINOR_VERSION_ARB: -+ minor_version = attribs[2 * i + 1]; -+ break; -+ -+ case GLX_CONTEXT_FLAGS_ARB: -+ flags = attribs[2 * i + 1]; -+ break; -+ -+ case GLX_RENDER_TYPE: -+ render_type = attribs[2 * i + 1]; -+ break; -+ -+ default: -+ return BadValue; -+ } -+ } -+ -+ /* The GLX_ARB_create_context spec says: -+ * -+ * "If attributes GLX_CONTEXT_MAJOR_VERSION_ARB and -+ * GLX_CONTEXT_MINOR_VERSION_ARB, when considered together -+ * with attributes GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB and -+ * GLX_RENDER_TYPE, specify an OpenGL version and feature set -+ * that are not defined, BadMatch is generated. -+ * -+ * ...Feature deprecation was introduced with OpenGL 3.0, so -+ * forward-compatible contexts may only be requested for -+ * OpenGL 3.0 and above. Thus, examples of invalid -+ * combinations of attributes include: -+ * -+ * - Major version < 1 or > 3 -+ * - Major version == 1 and minor version < 0 or > 5 -+ * - Major version == 2 and minor version < 0 or > 1 -+ * - Major version == 3 and minor version > 2 -+ * - Forward-compatible flag set and major version < 3 -+ * - Color index rendering and major version >= 3" -+ */ -+ if (!validate_GL_version(major_version, minor_version)) -+ return BadMatch; -+ -+ if (major_version < 3 -+ && ((flags & GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB) != 0)) -+ return BadMatch; -+ -+ if (major_version >= 3 && render_type == GLX_COLOR_INDEX_TYPE) -+ return BadMatch; -+ -+ if (!validate_render_type(render_type)) -+ return BadValue; -+ -+ if ((flags & ~ALL_VALID_FLAGS) != 0) -+ return BadValue; -+ -+ /* Allocate memory for the new context -+ */ -+ if (req->isDirect) { -+ ctx = __glXdirectContextCreate(glxScreen, config, shareCtx); -+ err = BadAlloc; -+ } -+ else { -+ ctx = glxScreen->createContext(glxScreen, config, shareCtx, -+ req->numAttribs, (uint32_t *) attribs, -+ &err); -+ } -+ -+ if (ctx == NULL) -+ return err; -+ -+ ctx->pGlxScreen = glxScreen; -+ ctx->config = config; -+ ctx->id = req->context; -+ ctx->share_id = req->shareList; -+ ctx->idExists = True; -+ ctx->isCurrent = False; -+ ctx->isDirect = req->isDirect; -+ ctx->hasUnflushedCommands = False; -+ ctx->renderMode = GL_RENDER; -+ ctx->feedbackBuf = NULL; -+ ctx->feedbackBufSize = 0; -+ ctx->selectBuf = NULL; -+ ctx->selectBufSize = 0; -+ ctx->drawPriv = NULL; -+ ctx->readPriv = NULL; -+ -+ /* Add the new context to the various global tables of GLX contexts. -+ */ -+ if (!__glXAddContext(ctx)) { -+ (*ctx->destroy) (ctx); -+ client->errorValue = req->context; -+ return BadAlloc; -+ } -+ -+ return Success; - } - - int --- -1.7.3.4 - diff --git a/xorg-server-1.12.3.tar.bz2 b/xorg-server-1.12.3.tar.bz2 deleted file mode 100644 index 7cd0393..0000000 --- a/xorg-server-1.12.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d2b96ae1db56e14a70949b2149f4aeb37d86bc657e846300af46016533d9956 -size 3767822 diff --git a/xorg-server-1.12.99.905.tar.bz2 b/xorg-server-1.12.99.905.tar.bz2 new file mode 100644 index 0000000..3cd7cee --- /dev/null +++ b/xorg-server-1.12.99.905.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27ebad6cafee89995811125c20632a133ab3e7c6d9a27b717f5df3e9fa2f119d +size 3711047 diff --git a/xorg-server-provides b/xorg-server-provides index 0b1a143..058c777 100644 --- a/xorg-server-provides +++ b/xorg-server-provides @@ -1,4 +1,4 @@ -Provides: X11_ABI_XINPUT = 16.0 -Provides: X11_ABI_VIDEODRV = 12.0 +Provides: X11_ABI_XINPUT = 18.0 +Provides: X11_ABI_VIDEODRV = 13.0 Provides: X11_ABI_ANSIC = 0.4 -Provides: X11_ABI_EXTENSION = 6.0 +Provides: X11_ABI_EXTENSION = 7.0 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index b6a3ffa..369685a 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Aug 8 20:15:33 UTC 2012 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 1.13.0 prerelease: + + Packaging changes: + - Unify naming of patches + - Drop upstreamed patches: 223,224, 300 - 310 (double checked) + - Remove patch pio_ia64.diff - not applicable anymore + - Remove patch xserver-bg-none-root.patch - not applicable anymore + - Remove patch bug474071-fix1.diff - not appliable anymore + - Remove patch pci-legacy-mem-fallback.diff - not applicable anymore + - Remove patch pu_fixes.diff - not applicable anymore (xaa is gone) + - Adapt the n_VNC-Add-support-for-VNC.patch to successfully apply + Not ready to comile... + ------------------------------------------------------------------- Sun Jul 22 10:35:59 UTC 2012 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 696db60..c2932b2 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -17,7 +17,7 @@ Name: xorg-x11-server -%define dirsuffix 1.12.3 +%define dirsuffix 1.12.99.905 %define vnc 1 Summary: X License: GPL-2.0+ ; MIT @@ -33,14 +33,12 @@ Source96: xorg-x11-server.macros.in # Source98 and Source99 are used to ensure proper ABI provides. Source98: xorg-server-provides Source99: pre_checkin.sh -# PATCH-FEATURE-OPENSUSE xorg-x11-server-rpmmacros.patch dimstar@opensuse.org -- Provide RPM macros to require correct ABI Versions. -Patch0: xorg-x11-server-rpmmacros.patch +# PATCH-FEATURE-OPENSUSE n_xorg-x11-server-rpmmacros.patch dimstar@opensuse.org -- Provide RPM macros to require correct ABI Versions. +Patch0: n_xorg-x11-server-rpmmacros.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch2: p_default-module-path.diff +Patch2: N_p_default-module-path.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch6: pu_fixes.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch16: p_xnest-ignore-getimage-errors.diff +Patch16: N_p_xnest-ignore-getimage-errors.diff BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: flex @@ -117,89 +115,66 @@ Obsoletes: xorg-x11-Xvfb Obsoletes: xorg-x11-server-glx %if %vnc # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch17: N-VNC-Add-support-for-VNC.patch +Patch17: n_VNC-Add-support-for-VNC.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch18: N-VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch +Patch18: n_VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch19: N-VNC-Fix-crash-when-no-depth-translation-is-required.patch +Patch19: n_VNC-Fix-crash-when-no-depth-translation-is-required.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch20: N-VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch +Patch20: n_VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch21: N-VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch +Patch21: n_VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch22: N-VNC-Fix-crash-due-to-unset-input-device-names.patch +Patch22: n_VNC-Fix-crash-due-to-unset-input-device-names.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch23: Xvnc-pthread.diff -Patch24: N-VNC-Add-proto.diff +Patch23: n_Xvnc-pthread.diff +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch24: n_VNC-Add-proto.diff %endif # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch45: bug-197858_dpms.diff +Patch45: N_bug-197858_dpms.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch77: fbdevhw.diff +Patch77: N_fbdevhw.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch79: edid_data_sanity_check.diff +Patch79: N_edid_data_sanity_check.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch101: zap_warning_xserver.diff -# PATCH-NEEDS-REBASE -Patch103: confine_to_shape.diff +Patch101: N_zap_warning_xserver.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch106: randr1_1-sig11.diff +Patch103: N_confine_to_shape.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch112: fix-dpi-values.diff +Patch106: N_randr1_1-sig11.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch123: vidmode-sig11.diff +Patch112: N_fix-dpi-values.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch +Patch123: N_vidmode-sig11.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch127: dpms_screensaver.diff -# PATCH-NEEDS-REBASE (might not be applicable at all anymore) -Patch128: pci-legacy-mem-fallback.diff -# PATCH-NEEDS-REBASE (might not be applicable at all anymore) -Patch129: bug474071-fix1.diff +Patch125: N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch143: autoconfig_fallback_fbdev_first.diff +Patch127: N_dpms_screensaver.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch145: driver-autoconfig.diff +Patch143: N_autoconfig_fallback_fbdev_first.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch162: cache-xkbcomp-output-for-fast-start-up.patch +Patch145: N_driver-autoconfig.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch163: xserver-bg-none-root.patch +Patch162: N_cache-xkbcomp-output-for-fast-start-up.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch200: N_bug534768-prefer_local_symbols.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch200: bug534768-prefer_local_symbols.patch +Patch202: N_0001-Check-harder-for-primary-PCI-device.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch202: 0001-Check-harder-for-primary-PCI-device.patch +Patch203: N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch +Patch206: N_fix_fglrx_screendepth_issue.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch206: fix_fglrx_screendepth_issue.patch -# PATCH-NEEDS-REBASE (might not be applicable at all anymore) -Patch210: pio_ia64.diff +Patch211: N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch211: 0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch +Patch213: N_xorg-server-xdmcp.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch213: xorg-server-xdmcp.patch +Patch220: N_Use-external-tool-for-creating-backtraces-on-crashes.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch220: Use-external-tool-for-creating-backtraces-on-crashes.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch222: sync-fix.patch -Patch223: U_glx_Free_reference_to_destroyed_GLX_drawable.patch -Patch224: U_dri2_add_DRI2CreateDrawable2.patch +Patch222: N_sync-fix.patch + Patch225: u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch -# Patches to implement GLX_ARB_create_context extensions required for OpenGL 3.0 support -# http://lists.x.org/archives/xorg-devel/2012-April/030452.html -# git://people.freedesktop.org/~idr/xserver.git -Patch300: u_0001-glx-Fix-mishandling-of-shared-contexts.patch -Patch301: u_0002-glx-Don-t-track-GLClientmajorVersion-or-GLClientmino.patch -Patch302: u_0003-glx-Extend-__GLXscreen-createContext-to-take-attribu.patch -Patch303: u_0004-glx-Add-tracking-for-GLX_ARB_create_context-and-GLX_.patch -Patch304: u_0005-glx-Optionally-call-DRI2-createContextAttribs-from-_.patch -Patch305: u_0006-glx-Implement-GLX-SetClientInfoARB-protocol.patch -Patch306: u_0007-glx-Initialize-all-context-fields-together.patch -Patch307: u_0008-glx-Initialize-remaining-context-fields.patch -Patch308: u_0009-glx-Use-one-function-to-add-a-context-to-all-global-.patch -Patch309: u_0010-glx-Make-several-functions-available-outside-the-glx.patch -Patch310: u_0011-glx-Implement-protocol-for-glXCreateContextAttribsAR.patch %description This package contains the X.Org Server. @@ -276,19 +251,21 @@ sh %{SOURCE99} --verify . %{SOURCE98} cp %{SOURCE96} . %patch0 -p1 %patch2 -%patch6 %patch16 -p1 %if %vnc -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 +### Needs to be rebased +#%patch17 -p1 + +#%patch18 -p1 +#%patch19 -p1 +#%patch20 -p1 +#%patch21 -p1 +#%patch22 -p1 +#%patch23 -p1 +#%patch24 -p1 %endif -%patch45 -p0 +### Needs to be rebased +#%patch45 -p0 %patch77 %patch79 -p1 %patch101 -p1 @@ -299,42 +276,22 @@ cp %{SOURCE96} . ### disabled for now #%patch125 -p1 %patch127 -p1 -# NEeds rebase -#%patch128 -# Needs rebase -#%patch129 -p0 %patch143 -p0 %patch145 -p0 ### disabled for now #%patch162 -p1 -### disabled for now -#%patch163 -p1 %patch200 -p1 %patch202 -p1 %patch203 -p1 %patch206 -p0 -# Needs Rebase -#%patch210 -p1 ### disabled for now #%patch211 -p1 %patch213 -p1 ### Disable backtrace generation patch for now #%patch220 -p1 -%patch222 -p1 -%patch223 -p1 -%patch224 -p1 +### patch222 might not be applicable anymore +#%patch222 -p1 %patch225 -p1 -%patch300 -p1 -%patch301 -p1 -%patch302 -p1 -%patch303 -p1 -%patch304 -p1 -%patch305 -p1 -%patch306 -p1 -%patch307 -p1 -%patch308 -p1 -%patch309 -p1 -%patch310 -p1 %build autoreconf -fi @@ -544,7 +501,7 @@ exit 0 %files -n xorg-x11-Xvnc %defattr(-, root, root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} -%{_bindir}/Xvnc +#%{_bindir}/Xvnc %endif %changelog diff --git a/xserver-bg-none-root.patch b/xserver-bg-none-root.patch deleted file mode 100644 index 9447cd5..0000000 --- a/xserver-bg-none-root.patch +++ /dev/null @@ -1,155 +0,0 @@ -From a3e15680da24cb8259f6a83dee0c930dab024290 Mon Sep 17 00:00:00 2001 -From: Kristian -Date: Fri, 15 Aug 2008 15:15:14 +1000 -Subject: [PATCH] Add nr for background=none root - ---- - dix/globals.c | 1 + - dix/window.c | 22 ++++++++++++---------- - hw/xfree86/common/xf86Init.c | 11 +++++++++++ - hw/xfree86/common/xf86str.h | 5 ++++- - include/opaque.h | 1 + - os/utils.c | 3 +++ - 6 files changed, 32 insertions(+), 11 deletions(-) - -Index: xorg-server-1.8.0/dix/globals.c -=================================================================== -Index: xorg-server-1.8.0/dix/window.c -=================================================================== ---- xorg-server-1.8.0.orig/dix/window.c -+++ xorg-server-1.8.0/dix/window.c -@@ -465,23 +465,24 @@ InitRootWindow(WindowPtr pWin) - pWin->cursorIsNone = FALSE; - pWin->optional->cursor = rootCursor; - rootCursor->refcnt++; -- -+ pWin->backingStore = defaultBackingStore; -+ pWin->forcedBS = (defaultBackingStore != NotUseful); - - if (party_like_its_1989) { - MakeRootTile(pWin); - backFlag |= CWBackPixmap; -+ pScreen->ChangeWindowAttributes(pWin, backFlag); -+ } else if (bgNoneRoot) { -+ /* nothing, handled in xf86CreateRootWindow */ - } else { - if (whiteRoot) - pWin->background.pixel = pScreen->whitePixel; - else - pWin->background.pixel = pScreen->blackPixel; - backFlag |= CWBackPixel; -- } - -- pWin->backingStore = defaultBackingStore; -- pWin->forcedBS = (defaultBackingStore != NotUseful); -- /* We SHOULD check for an error value here XXX */ -- (*pScreen->ChangeWindowAttributes)(pWin, backFlag); -+ pScreen->ChangeWindowAttributes(pWin, backFlag); -+ } - - MapWindow(pWin, serverClient); - } -Index: xorg-server-1.8.0/hw/xfree86/common/xf86Init.c -=================================================================== -Index: xorg-server-1.8.0/hw/xfree86/common/xf86str.h -=================================================================== ---- xorg-server-1.8.0.orig/hw/xfree86/common/xf86str.h -+++ xorg-server-1.8.0/hw/xfree86/common/xf86str.h -@@ -503,7 +503,7 @@ typedef struct _confdrirec { - } confDRIRec, *confDRIPtr; - - /* These values should be adjusted when new fields are added to ScrnInfoRec */ --#define NUM_RESERVED_INTS 16 -+#define NUM_RESERVED_INTS 15 - #define NUM_RESERVED_POINTERS 14 - #define NUM_RESERVED_FUNCS 11 - -@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec { - ClockRangePtr clockRanges; - int adjustFlags; - -+ /* -nr support */ -+ int canDoBGNoneRoot; -+ - /* - * These can be used when the minor ABI version is incremented. - * The NUM_* parameters must be reduced appropriately to keep the -Index: xorg-server-1.8.0/include/opaque.h -=================================================================== ---- xorg-server-1.8.0.orig/include/opaque.h -+++ xorg-server-1.8.0/include/opaque.h -@@ -71,6 +71,7 @@ extern _X_EXPORT Bool defeatAccessContro - extern _X_EXPORT long maxBigRequestSize; - extern _X_EXPORT Bool party_like_its_1989; - extern _X_EXPORT Bool whiteRoot; -+extern _X_EXPORT Bool bgNoneRoot; - - extern _X_EXPORT Bool CoreDump; - -Index: xorg-server-1.8.0/os/utils.c -=================================================================== ---- xorg-server-1.8.0.orig/os/utils.c -+++ xorg-server-1.8.0/os/utils.c -@@ -511,6 +511,7 @@ void UseMsg(void) - #endif - ErrorF("-nolisten string don't listen on protocol\n"); - ErrorF("-noreset don't reset after last client exists\n"); -+ ErrorF("-nr create root window with no background\n"); - ErrorF("-reset reset after last client exists\n"); - ErrorF("-p # screen-saver pattern duration (minutes)\n"); - ErrorF("-pn accept failure to listen on all ports\n"); -@@ -852,6 +853,8 @@ ProcessCommandLine(int argc, char *argv[ - defaultBackingStore = WhenMapped; - else if ( strcmp( argv[i], "-wr") == 0) - whiteRoot = TRUE; -+ else if ( strcmp( argv[i], "-nr") == 0) -+ bgNoneRoot = TRUE; - else if ( strcmp( argv[i], "-maxbigreqsize") == 0) { - if(++i < argc) { - long reqSizeArg = atol(argv[i]); ---- xorg-server-1.9.0/dix/globals.c.orig 2010-06-06 19:53:51.000000000 +0200 -+++ xorg-server-1.9.0/dix/globals.c 2010-08-23 15:27:52.000000000 +0200 -@@ -122,6 +122,7 @@ FontPtr defaultFont; /* not declared i - CursorPtr rootCursor; - Bool party_like_its_1989 = FALSE; - Bool whiteRoot = FALSE; -+Bool bgNoneRoot = FALSE; - - TimeStamp currentTime; - TimeStamp lastDeviceEventTime; ---- xorg-server-1.9.0/hw/xfree86/common/xf86Init.c.orig 2010-06-10 16:07:55.000000000 +0200 -+++ xorg-server-1.9.0/hw/xfree86/common/xf86Init.c 2010-08-23 15:32:56.000000000 +0200 -@@ -76,6 +76,7 @@ - #include "xf86Xinput.h" - #include "xf86InPriv.h" - #include "picturestr.h" -+#include "xace.h" - - #include "xf86Bus.h" - #include "xf86VGAarbiter.h" -@@ -242,6 +243,7 @@ xf86CreateRootWindow(WindowPtr pWin) - int ret = TRUE; - int err = Success; - ScreenPtr pScreen = pWin->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RootWinPropPtr pProp; - CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) - dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); -@@ -293,6 +295,17 @@ xf86CreateRootWindow(WindowPtr pWin) - } - } - -+ if (bgNoneRoot) { -+ if (pScrn->canDoBGNoneRoot) { -+ pWin->backgroundState = XaceBackgroundNoneState(pWin); -+ pWin->background.pixel = pScreen->whitePixel; -+ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore); -+ } else { -+ pWin->background.pixel = pScreen->blackPixel; -+ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore); -+ } -+ } -+ - DebugF("xf86CreateRootWindow() returns %d\n", ret); - return ret; - } From eaf2f174ff61060552f03de763fa45ff47de1472b67d595aa31679d88cf190cc Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 6 Sep 2012 15:09:42 +0000 Subject: [PATCH 2/2] Accepting request 132986 from home:klausi123:X11 Update to 1.13.0 Is it possible to add 12.2 to the repos for X11:XOrg? OBS-URL: https://build.opensuse.org/request/show/132986 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=409 --- xorg-server-1.12.99.905.tar.bz2 | 3 --- xorg-server-1.13.0.tar.bz2 | 3 +++ xorg-x11-server.changes | 6 ++---- xorg-x11-server.spec | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 xorg-server-1.12.99.905.tar.bz2 create mode 100644 xorg-server-1.13.0.tar.bz2 diff --git a/xorg-server-1.12.99.905.tar.bz2 b/xorg-server-1.12.99.905.tar.bz2 deleted file mode 100644 index 3cd7cee..0000000 --- a/xorg-server-1.12.99.905.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27ebad6cafee89995811125c20632a133ab3e7c6d9a27b717f5df3e9fa2f119d -size 3711047 diff --git a/xorg-server-1.13.0.tar.bz2 b/xorg-server-1.13.0.tar.bz2 new file mode 100644 index 0000000..1a9fc49 --- /dev/null +++ b/xorg-server-1.13.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a751cae62dad1f8032613bef96a758c2eceacc0425533e8ee446fc53207174c4 +size 3713571 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 369685a..8d0d46e 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,17 +1,15 @@ ------------------------------------------------------------------- Wed Aug 8 20:15:33 UTC 2012 - tobias.johannes.klausmann@mni.thm.de -- Update to version 1.13.0 prerelease: +- Update to version 1.13.0: + Packaging changes: - Unify naming of patches - - Drop upstreamed patches: 223,224, 300 - 310 (double checked) + - Drop upstreamed patches: 223, 224, 300 - 310 (double checked) - Remove patch pio_ia64.diff - not applicable anymore - Remove patch xserver-bg-none-root.patch - not applicable anymore - Remove patch bug474071-fix1.diff - not appliable anymore - Remove patch pci-legacy-mem-fallback.diff - not applicable anymore - Remove patch pu_fixes.diff - not applicable anymore (xaa is gone) - - Adapt the n_VNC-Add-support-for-VNC.patch to successfully apply - Not ready to comile... ------------------------------------------------------------------- Sun Jul 22 10:35:59 UTC 2012 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index c2932b2..3564f2f 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -17,7 +17,7 @@ Name: xorg-x11-server -%define dirsuffix 1.12.99.905 +%define dirsuffix 1.13.0 %define vnc 1 Summary: X License: GPL-2.0+ ; MIT