diff --git a/.cvsignore b/.cvsignore index 0dc4ce5..7107bd7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-1.3.0.0.tar.bz2 +xorg-server-1.4.tar.bz2 diff --git a/exa-firstpixel-tweak.patch b/exa-firstpixel-tweak.patch deleted file mode 100644 index 9507e40..0000000 --- a/exa-firstpixel-tweak.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c -index 708d1ea..9a991e7 100644 ---- a/exa/exa_unaccel.c -+++ b/exa/exa_unaccel.c -@@ -374,26 +374,41 @@ CARD32 - exaGetPixmapFirstPixel (PixmapPtr pPixmap) - { - CARD32 pixel; -+ void *fb; -+ Bool need_finish = FALSE; -+ BoxRec box; - ExaMigrationRec pixmaps[1]; -+ ExaPixmapPriv (pPixmap); -+ -+ /* Try to avoid framebuffer readbacks */ -+ if (exaPixmapIsOffscreen(pPixmap)) { -+ if (!miPointInRegion(DamageRegion(pExaPixmap->pDamage), 0, 0, &box)) { -+ fb = pExaPixmap->sys_ptr; -+ } else { -+ need_finish = TRUE; -+ fb = pPixmap->devPrivate.ptr; -+ pixmaps[0].as_dst = FALSE; -+ pixmaps[0].as_src = TRUE; -+ pixmaps[0].pPix = pPixmap; -+ exaDoMigration (pixmaps, 1, FALSE); -+ exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC); -+ } -+ } - -- pixmaps[0].as_dst = FALSE; -- pixmaps[0].as_src = TRUE; -- pixmaps[0].pPix = pPixmap; -- exaDoMigration (pixmaps, 1, FALSE); -- -- exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC); - switch (pPixmap->drawable.bitsPerPixel) { - case 32: -- pixel = *(CARD32 *)(pPixmap->devPrivate.ptr); -+ pixel = *(CARD32 *)fb; - break; - case 16: -- pixel = *(CARD16 *)(pPixmap->devPrivate.ptr); -+ pixel = *(CARD16 *)fb; - break; - default: -- pixel = *(CARD8 *)(pPixmap->devPrivate.ptr); -+ pixel = *(CARD8 *)fb; - break; - } -- exaFinishAccess(&pPixmap->drawable, EXA_PREPARE_SRC); -+ -+ if (need_finish) -+ exaFinishAccess(&pPixmap->drawable, EXA_PREPARE_SRC); - - return pixel; - } diff --git a/sources b/sources index e861808..625764c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a51a7d482e3c689394755bb17bda8526 xorg-server-1.3.0.0.tar.bz2 +207bb983019a5527182027cd3dc2cd44 xorg-server-1.4.tar.bz2 diff --git a/x11-input.fdi b/x11-input.fdi new file mode 100644 index 0000000..20c73fa --- /dev/null +++ b/x11-input.fdi @@ -0,0 +1,57 @@ + + + + + mouse + + evdev + + + + + mouse + + evdev + + + + + base + + + keyboard + olpc + + evdev + evdev + + + us + + + + + + + base + + + keyboard + pc105 + + evdev + evdev + + + us + + + + + diff --git a/xorg-server.conf b/xorg-server.conf new file mode 100644 index 0000000..47a9a78 --- /dev/null +++ b/xorg-server.conf @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/xorg-x11-server-1.0.1-fpic-libxf86config.patch b/xorg-x11-server-1.0.1-fpic-libxf86config.patch deleted file mode 100644 index a6a35f9..0000000 --- a/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/xorg-x11-server-1.1.0-dont-backfill-bg-none.patch b/xorg-x11-server-1.1.0-dont-backfill-bg-none.patch deleted file mode 100644 index 9a5cacd..0000000 --- a/xorg-x11-server-1.1.0-dont-backfill-bg-none.patch +++ /dev/null @@ -1,21 +0,0 @@ -Disable backfilling of windows created with bg=none, which otherwise -would force a framebuffer readback. - ---- ./composite/compalloc.c.spiffiffity 2006-03-13 16:59:55.000000000 -0500 -+++ ./composite/compalloc.c 2006-04-12 16:37:50.000000000 -0400 -@@ -478,6 +478,7 @@ - * Copy bits from the parent into the new pixmap so that it will - * have "reasonable" contents in case for background None areas. - */ -+#if 0 - if (pGC) - { - XID val = IncludeInferiors; -@@ -492,6 +493,7 @@ - w, h, 0, 0); - FreeScratchGC (pGC); - } -+#endif - return pPixmap; - } - diff --git a/xorg-x11-server-1.1.1-automake-1.10-fixes.patch b/xorg-x11-server-1.1.1-automake-1.10-fixes.patch deleted file mode 100644 index 0d5de03..0000000 --- a/xorg-x11-server-1.1.1-automake-1.10-fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xorg-server-1.1.1/hw/xfree86/os-support/linux/Makefile.am.automake-1.10 2006-11-30 15:35:09.000000000 -0500 -+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/Makefile.am 2006-12-01 11:00:04.000000000 -0500 -@@ -41,7 +41,7 @@ - INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack - - # FIXME: These need to be added to the build --LNX_EXTRA_SOURCES = \ -+LNX_EXTRA_SRCS = \ - lnx_font.c \ - lnx_jstk.c \ - lnxResource.c ---- xorg-server-1.1.1/hw/xfree86/os-support/misc/Makefile.am.automake-1.10 2006-07-05 14:31:41.000000000 -0400 -+++ xorg-server-1.1.1/hw/xfree86/os-support/misc/Makefile.am 2006-12-01 11:00:57.000000000 -0500 -@@ -1,14 +1,14 @@ - # FIXME: Add the *.S files to build when applicable --I386_SOURCES = BUSmemcpy.S IODelay.S SlowBcopy.S -+I386_SRCS = BUSmemcpy.S IODelay.S SlowBcopy.S - OTHER_SOURCES = BUSmemcpy.c IODelay.c SlowBcopy.c - - ARCH_SOURCES = $(OTHER_SOURCES) - - # FIXME: Add to the build (NeedPortIO) --PORTIO_SOURCES = PortIO.S -+PORTIO_SRCS = PortIO.S - - # FIXME: Add to the build (if HasGcc || HasGcc2) --ILHACK_SOURCES = xf86_IlHack.c -+ILHACK_SRCS = xf86_IlHack.c - - noinst_LTLIBRARIES = libmisc.la - diff --git a/xorg-x11-server-1.1.1-builderstring.patch b/xorg-x11-server-1.1.1-builderstring.patch deleted file mode 100644 index 0f1f71b..0000000 --- a/xorg-x11-server-1.1.1-builderstring.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- xorg-server-1.1.1/include/dix-config.h.in.builderstring 2006-07-05 14:38:48.000000000 -0400 -+++ xorg-server-1.1.1/include/dix-config.h.in 2006-08-09 16:59:05.000000000 -0400 -@@ -15,6 +15,9 @@ - /* Operating System Vendor */ - #undef OSVENDOR - -+/* Builder string */ -+#undef BUILDERSTRING -+ - /* Default font path */ - #undef COMPILEDDEFAULTFONTPATH - ---- xorg-server-1.1.1/configure.ac.builderstring 2006-08-09 14:04:19.000000000 -0400 -+++ xorg-server-1.1.1/configure.ac 2006-08-09 16:58:25.000000000 -0400 -@@ -358,6 +358,9 @@ - AC_ARG_WITH(os-vendor, AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]), - [ OSVENDOR="$withval" ], - [ OSVENDOR="" ]) -+AC_ARG_WITH(builderstring, AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]), -+ [ BUILDERSTRING="$withval" ] -+ [ ]) - AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]), - [ MESA_SOURCE="$withval" ], - [ MESA_SOURCE="" ]) -@@ -817,6 +820,8 @@ - AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address]) - AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name]) - AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor]) -+AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string]) -+ - AC_SUBST([VENDOR_STRING]) - AC_SUBST([VENDOR_STRING_SHORT]) - AC_SUBST([VENDOR_RELEASE]) diff --git a/xorg-x11-server-1.1.1-builtin-fonts.patch b/xorg-x11-server-1.1.1-builtin-fonts.patch deleted file mode 100644 index 876b1cf..0000000 --- a/xorg-x11-server-1.1.1-builtin-fonts.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./dix/dixfonts.c.builtin-fonts 2006-09-06 16:45:20.000000000 -0400 -+++ ./dix/dixfonts.c 2006-09-06 16:45:31.000000000 -0400 -@@ -1904,9 +1904,7 @@ - } else - #endif - { --#ifdef KDRIVESERVER - BuiltinRegisterFpeFunctions(); --#endif - FontFileRegisterFpeFunctions(); - #ifndef NOFONTSERVERACCESS - fs_register_fpe_functions(); diff --git a/xorg-x11-server-1.1.1-glcore-visual-matching.patch b/xorg-x11-server-1.1.1-glcore-visual-matching.patch deleted file mode 100644 index a10f869..0000000 --- a/xorg-x11-server-1.1.1-glcore-visual-matching.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- xorg-server-1.1.1/GL/mesa/X/xf86glx.c.glcore-visual 2006-07-05 14:31:36.000000000 -0400 -+++ xorg-server-1.1.1/GL/mesa/X/xf86glx.c 2006-12-11 12:14:30.000000000 -0500 -@@ -311,17 +311,22 @@ - { - __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen; - const __GLcontextModes *modes; -- unsigned i = 0; -+ XMesaVisual *xmv; - - for ( modes = screen->modes ; modes != NULL ; modes = modes->next ) { - if ( modes->visualID == vid ) { - break; - } -- -- i++; - } - -- return (modes != NULL) ? mesaScreen->xm_vis[i] : NULL; -+ if (!modes) -+ return NULL; -+ -+ for (xmv = mesaScreen->xm_vis; xmv; xmv++) -+ if ((*xmv)->mesa_visual.visualID == vid) -+ return *xmv; -+ -+ return NULL; - } - - static void init_screen_visuals(__GLXMESAscreen *screen) diff --git a/xorg-x11-server-1.1.1-graphics-expose.patch b/xorg-x11-server-1.1.1-graphics-expose.patch deleted file mode 100644 index 4cebe16..0000000 --- a/xorg-x11-server-1.1.1-graphics-expose.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- xorg-server-1.1.1/miext/cw/cw_ops.c.graphics-expose 2006-07-05 20:23:57.000000000 -0400 -+++ xorg-server-1.1.1/miext/cw/cw_ops.c 2006-10-04 23:54:03.000000000 -0400 -@@ -30,6 +30,7 @@ - #include "gcstruct.h" - #include "pixmapstr.h" - #include "cw.h" -+#include "mi.h" - - #define SETUP_BACKING_DST(_pDst, _pGC) \ - cwGCPtr pGCPrivate = getCwGC (_pGC); \ -@@ -185,7 +186,7 @@ - int w, int h, int dstx, int dsty) - { - int odstx, odsty; -- RegionPtr exposed = NULL; -+ int osrcx, osrcy; - SETUP_BACKING_DST(pDst, pGC); - SETUP_BACKING_SRC(pSrc, pGC); - -@@ -193,19 +194,20 @@ - - odstx = dstx; - odsty = dsty; -+ osrcx = srcx; -+ osrcy = srcy; - CW_OFFSET_XY_DST(dstx, dsty); - CW_OFFSET_XY_SRC(srcx, srcy); - -- exposed = (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst, -- pBackingGC, srcx, srcy, w, h, -- dstx, dsty); -- -- if (exposed != NULL) -- REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty); -- -+ (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst, -+ pBackingGC, srcx, srcy, w, h, -+ dstx, dsty); -+ - EPILOGUE(pGC); - -- return exposed; -+ return miHandleExposures(pSrc, pDst, pGC, -+ osrcx, osrcy, w, h, -+ odstx, odsty, 0); - } - - static RegionPtr -@@ -213,7 +215,7 @@ - int w, int h, int dstx, int dsty, unsigned long plane) - { - int odstx, odsty; -- RegionPtr exposed = NULL; -+ int osrcx, osrcy; - SETUP_BACKING_DST(pDst, pGC); - SETUP_BACKING_SRC(pSrc, pGC); - -@@ -221,19 +223,20 @@ - - odstx = dstx; - odsty = dsty; -+ osrcx = srcx; -+ osrcy = srcy; - CW_OFFSET_XY_DST(dstx, dsty); - CW_OFFSET_XY_SRC(srcx, srcy); - -- exposed = (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst, -- pBackingGC, srcx, srcy, w, h, -- dstx, dsty, plane); -- -- if (exposed != NULL) -- REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty); -+ (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst, -+ pBackingGC, srcx, srcy, w, h, -+ dstx, dsty, plane); - - EPILOGUE(pGC); - -- return exposed; -+ return miHandleExposures(pSrc, pDst, pGC, -+ osrcx, osrcy, w, h, -+ odstx, odsty, plane); - } - - static void diff --git a/xorg-x11-server-1.1.1-no-composite-in-xnest.patch b/xorg-x11-server-1.1.1-no-composite-in-xnest.patch deleted file mode 100644 index c4e6b0c..0000000 --- a/xorg-x11-server-1.1.1-no-composite-in-xnest.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- xorg-server-1.1.1/hw/xnest/Args.c.no-xnest-composite 2006-07-05 14:31:42.000000000 -0400 -+++ xorg-server-1.1.1/hw/xnest/Args.c 2006-07-25 14:02:33.000000000 -0400 -@@ -51,9 +51,12 @@ - Bool xnestDoDirectColormaps = False; - Window xnestParentWindow = 0; - -+/* XXX terrible hack */ -+extern Bool noCompositeExtension; - /* ddxInitGlobals - called by |InitGlobals| from os/util.c */ - void ddxInitGlobals(void) - { -+ noCompositeExtension = TRUE; - } - - int diff --git a/xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch b/xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch deleted file mode 100644 index 30382b4..0000000 --- a/xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.1.1/hw/xfree86/xf4bpp/Makefile.am.xf1bpp 2006-07-05 14:31:42.000000000 -0400 -+++ xorg-server-1.1.1/hw/xfree86/xf4bpp/Makefile.am 2006-11-10 12:53:25.000000000 -0500 -@@ -46,8 +46,6 @@ - mfbzerarc.c \ - vgamodule.c - --libxf4bpp_la_LIBADD = ../xf1bpp/libxf1bpp.la -- - EXTRA_DIST = OScompiler.h ibmTrace.h ppcGCstr.h ppcSpMcro.h vgaReg.h \ - vgaVideo.h wm3.h NOTES - diff --git a/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch b/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch deleted file mode 100644 index abfa9de..0000000 --- a/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c.vt-activate 2006-07-05 14:31:41.000000000 -0400 -+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c 2006-12-14 22:00:25.000000000 -0500 -@@ -248,14 +248,20 @@ - #endif - /* - * now get the VT -+ * -+ * There's a race here, in that if someone else does a VT_ACTIVATE -+ * between our ACTIVATE/WAITACTIVE, we might never get the VT. -+ * So we have to fail in that case. There's really no fixing this, -+ * it's a racy protocol. - */ - if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0) -- xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed: %s\n", -- strerror(errno)); -+ FatalError("xf86OpenConsole: VT_ACTIVATE failed: %s\n", -+ strerror(errno)); -+ - - if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0) -- xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed: %s\n", -- strerror(errno)); -+ FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n", -+ strerror(errno)); - - if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) - FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", -@@ -352,6 +358,9 @@ - if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0) - xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n", - strerror(errno)); -+ if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, activeVT) < 0) -+ xf86Msg(X_WARNING, "xf86CloseConsole: VT_WAITACTIVE failed: %s\n", -+ strerror(errno)); - activeVT = -1; - } - diff --git a/xorg-x11-server-1.1.1-xkb-in-xnest.patch b/xorg-x11-server-1.1.1-xkb-in-xnest.patch deleted file mode 100644 index 377f43c..0000000 --- a/xorg-x11-server-1.1.1-xkb-in-xnest.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.1.1/mi/miinitext.c.xkb-in-xnest 2006-07-05 14:38:48.000000000 -0400 -+++ xorg-server-1.1.1/mi/miinitext.c 2006-08-17 22:57:27.000000000 -0400 -@@ -595,7 +595,7 @@ - #ifdef XSYNC - if (!noSyncExtension) SyncExtensionInit(); - #endif --#if defined(XKB) && !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS) -+#if defined(XKB) && !defined(PRINT_ONLY_SERVER) - if (!noXkbExtension) XkbExtensionInit(); - #endif - #ifdef XCMISC diff --git a/xorg-x11-server-1.2.0-enable-composite.patch b/xorg-x11-server-1.2.0-enable-composite.patch deleted file mode 100644 index c938657..0000000 --- a/xorg-x11-server-1.2.0-enable-composite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.2.0/os/utils.c.enable-composite 2007-01-22 22:13:16.000000000 -0500 -+++ xorg-server-1.2.0/os/utils.c 2007-01-23 12:26:04.000000000 -0500 -@@ -138,7 +138,7 @@ - #ifdef COMPOSITE - /* COMPOSITE is disabled by default for now until the - * interface is stable */ -- #define COMPOSITE_DEFAULT FALSE -+ #define COMPOSITE_DEFAULT TRUE - _X_EXPORT Bool noCompositeExtension = !COMPOSITE_DEFAULT; - #endif - diff --git a/xorg-x11-server-1.2.0-maxpixclock-option.patch b/xorg-x11-server-1.2.0-maxpixclock-option.patch deleted file mode 100644 index c01137c..0000000 --- a/xorg-x11-server-1.2.0-maxpixclock-option.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c.maxpixclock 2007-01-22 22:13:15.000000000 -0500 -+++ xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c 2007-01-23 12:35:00.000000000 -0500 -@@ -303,7 +303,7 @@ - { - DisplayModePtr Modes = NULL, Mode; - int i, clock; -- Bool have_hsync = FALSE, have_vrefresh = FALSE; -+ Bool have_hsync = FALSE, have_vrefresh = FALSE, have_maxpixclock = FALSE; - int preferred; - - if (!Monitor || !DDC) -@@ -332,6 +332,7 @@ - /* Skip EDID ranges if they were specified in the config file */ - have_hsync = (Monitor->nHsync != 0); - have_vrefresh = (Monitor->nVrefresh != 0); -+ have_maxpixclock = (Monitor->maxPixClock != 0); - - /* Go through the detailed monitor sections */ - for (i = 0; i < DET_TIMINGS; i++) -@@ -366,7 +367,7 @@ - } - - clock = DDC->det_mon[i].section.ranges.max_clock * 1000; -- if (clock > Monitor->maxPixClock) -+ if (!have_maxpixclock && clock > Monitor->maxPixClock) - Monitor->maxPixClock = clock; - - break; ---- xorg-server-1.2.0/hw/xfree86/common/xf86Mode.c.maxpixclock 2007-01-22 22:13:15.000000000 -0500 -+++ xorg-server-1.2.0/hw/xfree86/common/xf86Mode.c 2007-01-23 12:33:41.000000000 -0500 -@@ -1408,6 +1408,12 @@ - scrp->monitor->vrefresh[i].lo, - scrp->monitor->vrefresh[i].hi); - } -+ if (scrp->monitor->maxPixClock) { -+ xf86DrvMsg(scrp->scrnIndex, X_INFO, -+ "%s: Using maximum pixel clock of %.2f MHz\n", -+ scrp->monitor->id, -+ (float)scrp->monitor->maxPixClock / 1000.0); -+ } - } - - /* ---- xorg-server-1.2.0/hw/xfree86/common/xf86Config.c.maxpixclock 2007-01-22 22:13:15.000000000 -0500 -+++ xorg-server-1.2.0/hw/xfree86/common/xf86Config.c 2007-01-23 12:33:41.000000000 -0500 -@@ -2211,12 +2211,15 @@ - } - - typedef enum { -- MON_REDUCEDBLANKING -+ MON_REDUCEDBLANKING, -+ MON_MAX_PIX_CLOCK, - } MonitorValues; - - static OptionInfoRec MonitorOptions[] = { - { MON_REDUCEDBLANKING, "ReducedBlanking", OPTV_BOOLEAN, - {0}, FALSE }, -+ { MON_MAX_PIX_CLOCK, "MaxPixClock", OPTV_FREQ, -+ {0}, FALSE }, - { -1, NULL, OPTV_NONE, - {0}, FALSE }, - }; -@@ -2363,11 +2366,11 @@ - return FALSE; - } - -- /* Check wether this Monitor accepts Reduced Blanking modelines */ - xf86ProcessOptions(-1, monitorp->options, MonitorOptions); -- - xf86GetOptValBool(MonitorOptions, MON_REDUCEDBLANKING, - &monitorp->reducedblanking); -+ xf86GetOptValFreq(MonitorOptions, MON_MAX_PIX_CLOCK, OPTUNITS_KHZ, -+ &monitorp->maxPixClock); - return TRUE; - } - diff --git a/xorg-x11-server-1.2.0-selinux-awareness.patch b/xorg-x11-server-1.2.0-selinux-awareness.patch deleted file mode 100644 index 3c74792..0000000 --- a/xorg-x11-server-1.2.0-selinux-awareness.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xserver-20070223/hw/xfree86/dixmods/Makefile.am.selinux-awareness 2007-02-23 11:20:30.000000000 -0500 -+++ xserver-20070223/hw/xfree86/dixmods/Makefile.am 2007-02-23 11:24:32.000000000 -0500 -@@ -42,7 +42,7 @@ - -I$(top_srcdir)/GL/glx - - libGLcore_la_LDFLAGS = -avoid-version --libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -+libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -lselinux - libGLcore_la_SOURCES = GLcoremodule.c - - libafb_la_LDFLAGS = -avoid-version ---- xserver-20070223/configure.ac.selinux-awareness 2007-02-23 11:24:31.000000000 -0500 -+++ xserver-20070223/configure.ac 2007-02-23 11:25:38.000000000 -0500 -@@ -237,6 +237,8 @@ - ;; - esac - -+SYS_LIBS="${SYS_LIBS} -lselinux" -+ - dnl BSD *_video.c selection - AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) - AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes]) -@@ -1010,7 +1012,7 @@ - AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) - - if test "x$XNEST" = xyes; then -- XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $LIBS" -+ XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $LIBS $XSERVER_LIBS" - AC_SUBST([XNEST_LIBS]) - fi - diff --git a/xorg-x11-server-1.2.0-xephyr-only.patch b/xorg-x11-server-1.2.0-xephyr-only.patch deleted file mode 100644 index 7b86982..0000000 --- a/xorg-x11-server-1.2.0-xephyr-only.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- xorg-server-1.2.0/hw/kdrive/Makefile.am.xephyr 2007-01-22 22:13:14.000000000 -0500 -+++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-01-23 12:28:32.000000000 -0500 -@@ -1,16 +1,3 @@ --if KDRIVEVESA --VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ -- smi via --endif -- --if KDRIVEFBDEV --FBDEV_SUBDIRS = fbdev --endif -- --if XSDLSERVER --XSDL_SUBDIRS = sdl --endif -- - if XEPHYR - XEPHYR_SUBDIRS = ephyr - endif -@@ -22,11 +9,7 @@ - SUBDIRS = \ - src \ - $(LINUX_SUBDIRS) \ -- $(XSDL_SUBDIRS) \ -- $(FBDEV_SUBDIRS) \ -- $(VESA_SUBDIRS) \ -- $(XEPHYR_SUBDIRS) \ -- fake -+ $(XEPHYR_SUBDIRS) - - DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ - smi via fbdev sdl ephyr src linux fake sis300 diff --git a/xorg-x11-server-libxf86config-dont-write-empty-sections.patch b/xorg-x11-server-libxf86config-dont-write-empty-sections.patch deleted file mode 100644 index e47c3f2..0000000 --- a/xorg-x11-server-libxf86config-dont-write-empty-sections.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- hw/xfree86/parser/write.c.orig 2006-07-12 11:15:49.000000000 -0400 -+++ hw/xfree86/parser/write.c 2006-07-12 11:19:59.000000000 -0400 -@@ -108,13 +108,19 @@ - - xf86printLayoutSection (cf, cptr->conf_layout_lst); - -- fprintf (cf, "Section \"Files\"\n"); -- xf86printFileSection (cf, cptr->conf_files); -- fprintf (cf, "EndSection\n\n"); -- -- fprintf (cf, "Section \"Module\"\n"); -- xf86printModuleSection (cf, cptr->conf_modules); -- fprintf (cf, "EndSection\n\n"); -+ if (cptr->conf_files != NULL) -+ { -+ fprintf (cf, "Section \"Files\"\n"); -+ xf86printFileSection (cf, cptr->conf_files); -+ fprintf (cf, "EndSection\n\n"); -+ } -+ -+ if (cptr->conf_modules != NULL) -+ { -+ fprintf (cf, "Section \"Module\"\n"); -+ xf86printModuleSection (cf, cptr->conf_modules); -+ fprintf (cf, "EndSection\n\n"); -+ } - - xf86printVendorSection (cf, cptr->conf_vendor_lst); - diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 3a8b387..ac4d92c 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -8,74 +8,88 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.3.0.0 -Release: 13.1%{?dist} +Version: 1.4 +Release: 7%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 +#Source0: %{pkgname}-%{version}.tar.bz2 Source100: comment-header-modefiles.txt +Source200: xorg.conf +Source201: x11-input.fdi +Source202: xorg-server.conf # general bug fixes Patch0: xorg-x11-server-0.99.3-init-origins-fix.patch -Patch5: xorg-x11-server-libxf86config-dont-write-empty-sections.patch -Patch6: xorg-x11-server-1.1.1-builderstring.patch -Patch7: xorg-x11-server-1.1.1-xkb-in-xnest.patch +#Patch5: xorg-x11-server-libxf86config-dont-write-empty-sections.patch +#Patch6: xorg-x11-server-1.1.1-builderstring.patch +#Patch7: xorg-x11-server-1.1.1-xkb-in-xnest.patch Patch10: xorg-x11-server-1.1.1-vbe-filter-less.patch -Patch11: xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch -Patch12: xorg-x11-server-1.1.1-graphics-expose.patch -Patch15: xorg-x11-server-1.1.1-automake-1.10-fixes.patch -Patch18: xorg-x11-server-1.1.1-glcore-visual-matching.patch +#rejects +#Patch11: xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch +#Patch12: xorg-x11-server-1.1.1-graphics-expose.patch +#Patch15: xorg-x11-server-1.1.1-automake-1.10-fixes.patch +#rejects +#Patch18: xorg-x11-server-1.1.1-glcore-visual-matching.patch Patch19: xserver-1.3.0-xnest-exposures.patch -Patch20: xserver-1.3.0-x86emu-imul-int64.patch +#Patch20: xserver-1.3.0-x86emu-imul-int64.patch Patch21: xserver-1.3.0-xkb-and-loathing.patch Patch22: xserver-1.3.0-fbdevhw-magic-numbers.patch -Patch23: xserver-1.3.0-ramdac-export.patch -Patch24: xserver-1.3.0-reput-video.patch +#Patch23: xserver-1.3.0-ramdac-export.patch +#Patch24: xserver-1.3.0-reput-video.patch # OpenGL compositing manager feature/optimization patches. Patch100: xorg-x11-server-1.1.0-no-move-damage.patch -Patch101: xorg-x11-server-1.1.0-dont-backfill-bg-none.patch -Patch105: xorg-x11-server-1.2.0-enable-composite.patch -Patch106: xorg-x11-server-1.1.1-no-composite-in-xnest.patch +#rejects, no longer needed? +#Patch101: xorg-x11-server-1.1.0-dont-backfill-bg-none.patch +#rejects +#Patch105: xorg-x11-server-1.2.0-enable-composite.patch +#rejects +#Patch106: xorg-x11-server-1.1.1-no-composite-in-xnest.patch Patch107: xorg-x11-server-1.1.1-offscreen-pixmaps.patch Patch108: xserver-1.3.0-no-pseudocolor-composite.patch # Red Hat specific tweaking, not intended for upstream # XXX move these to the end of the list Patch1001: xorg-x11-server-Red-Hat-extramodes.patch -Patch1002: xorg-x11-server-1.2.0-xephyr-only.patch -Patch1003: xorg-x11-server-1.0.1-fpic-libxf86config.patch -Patch1004: xorg-x11-server-1.2.0-selinux-awareness.patch -Patch1005: xorg-x11-server-1.1.1-builtin-fonts.patch +#rejects +#Patch1002: xorg-x11-server-1.2.0-xephyr-only.patch +#rejects +#Patch1003: xorg-x11-server-1.0.1-fpic-libxf86config.patch +#rejects +#Patch1004: xorg-x11-server-1.2.0-selinux-awareness.patch +#rejects +#Patch1005: xorg-x11-server-1.1.1-builtin-fonts.patch Patch1006: xorg-x11-server-1.1.1-no-scanpci.patch -Patch1007: xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch +#Patch1007: xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch Patch1008: xorg-x11-server-1.2.0-xf86config-comment-less.patch -Patch1009: xorg-x11-server-1.2.0-maxpixclock-option.patch Patch1010: xserver-1.3.0-no-prerelease-warning.patch -Patch2001: xserver-1.2.0-geode-mmx.patch -Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch -Patch2003: xserver-1.2.0-vfprintf.patch -Patch2004: xserver-1.2.0-honor-displaysize.patch -Patch2005: xserver-1.2.99.901-xephyr-crash-at-exit.patch -Patch2006: xserver-1.3.0-less-randr-fakerama.patch -Patch2007: xserver-1.3.0-randr12-config-hack.patch -Patch2008: xserver-1.3.0-randrama-no-zero-screens.patch -Patch2009: xserver-1.3.0-arm-iopl.patch -Patch2010: xserver-1.3.0-idletime.patch +#rejects +#Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch +#Patch2003: xserver-1.2.0-vfprintf.patch +#rejects +#Patch2004: xserver-1.2.0-honor-displaysize.patch +#rejects +#Patch2005: xserver-1.2.99.901-xephyr-crash-at-exit.patch +#rejects +#Patch2007: xserver-1.3.0-randr12-config-hack.patch +#Patch2009: xserver-1.3.0-arm-iopl.patch +#rejects +#Patch2010: xserver-1.3.0-idletime.patch # assorted PCI layer shenanigans. oh the pain. Patch2500: xorg-x11-server-1.2.99-unbreak-domain.patch -Patch2501: xserver-1.3.0-pci-bus-count.patch -Patch2502: xserver-1.3.0-mmap-failure-check.patch -Patch2503: xserver-1.3.0-rom-search.patch -Patch2504: xserver-1.3.0-domain-obiwan.patch +#Patch2501: xserver-1.3.0-pci-bus-count.patch +#Patch2502: xserver-1.3.0-mmap-failure-check.patch +#Patch2503: xserver-1.3.0-rom-search.patch +#Patch2504: xserver-1.3.0-domain-obiwan.patch Patch2505: xserver-1.3.0-pci-device-enable.patch -Patch3000: exa-firstpixel-tweak.patch +Patch3001: xserver-1.4-hal-touchpad.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -93,7 +107,21 @@ Patch3000: exa-firstpixel-tweak.patch %define enable_xorg --disable-xorg %endif +%if %{with_hw_servers} +%if 0%{?olpc} +%define with_drm 0 +%else +%define with_drm 1 +%endif +%else +%define with_drm 0 +%endif + +%if 0%{?olpc} +%define xservers --disable-xvfb --disable-xnest --disable-kdrive --disable-xephyr --disable-dmx +%else %define xservers --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr --enable-dmx +%endif # FIXME: Temporary Build deps on autotools, as needed... BuildRequires: automake autoconf libtool @@ -101,12 +129,14 @@ BuildRequires: automake autoconf libtool BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros >= 1.1.5 -BuildRequires: xorg-x11-proto-devel >= 7.1-11 +BuildRequires: xorg-x11-proto-devel >= 7.2-12 BuildRequires: randrproto >= 1.2 BuildRequires: fixesproto >= 4.0 BuildRequires: damageproto >= 1.1 BuildRequires: scrnsaverproto >= 1.1 BuildRequires: kbproto >= 1.0.3 +BuildRequires: inputproto >= 1.4 +BuildRequires: compositeproto >= 0.4 BuildRequires: xorg-x11-xtrans-devel BuildRequires: libXfont-devel @@ -139,11 +169,13 @@ BuildRequires: libXpm-devel BuildRequires: libXaw-devel BuildRequires: libXfixes-devel +%if 0%{!?olpc} BuildRequires: mesa-libGL-devel >= 6.5.2 BuildRequires: mesa-source >= 6.5.2 # XXX silly... BuildRequires: libdrm-devel >= 2.3.0 -%if %{with_hw_servers} +%endif +%if %{with_drm} Requires: libdrm >= 2.3.0 %endif @@ -174,8 +206,10 @@ Group: User Interface/X Provides: Xorg = %{version}-%{release} Provides: Xserver # Requires: xorg-x11-drivers >= 0.99.2-4 +%if 0%{!?olpc} Requires: xorg-x11-drv-mouse xorg-x11-drv-keyboard xorg-x11-drv-vesa Requires: xorg-x11-drv-void xorg-x11-drv-evdev +%endif # virtuals. XXX fix the xkbcomp fork() upstream. Requires: xkbdata xkbcomp Obsoletes: XFree86 xorg-x11 @@ -191,6 +225,7 @@ upon. %endif +%if 0%{!?olpc} %package Xnest Summary: A nested server. Group: User Interface/X @@ -250,6 +285,7 @@ applications without running them on their real X server. Unlike Xnest, Xephyr renders to an X image rather than relaying the X protocol, and therefore supports the newer X extensions like Render and Composite. +%endif # !olpc %if %{with_hw_servers} @@ -280,57 +316,58 @@ Xserver source code needed to build VNC server (Xvnc) %prep %setup -q -n %{pkgname}-%{version} %patch0 -p0 -b .init-origins-fix -%patch5 -p0 -b .libxf86config-dont-write-empty-sections -%patch6 -p1 -b .builderstring -%patch7 -p1 -b .xkb-in-xnest +#%patch5 -p0 -b .libxf86config-dont-write-empty-sections +#%patch6 -p1 -b .builderstring +#%patch7 -p1 -b .xkb-in-xnest %patch10 -p1 -b .vbe-filter -%patch11 -p1 -b .vt-activate -%patch12 -p1 -b .graphics-expose -%patch15 -p1 -b .automake-1.10 -%patch18 -p1 -b .glcore-visual +#%patch11 -p1 -b .vt-activate +#%patch12 -p1 -b .graphics-expose +#%patch15 -p1 -b .automake-1.10 +#%patch18 -p1 -b .glcore-visual %patch19 -p1 -b .xnest-expose -%patch20 -p1 -b .x86emu-imul +#%patch20 -p1 -b .x86emu-imul %patch21 -p1 -b .xkb-signal-loathing %patch22 -p1 -b .magic-numbers -%patch23 -p1 -b .ramdac -%patch24 -p1 -b .reput +#%patch23 -p1 -b .ramdac +#%patch24 -p1 -b .reput %patch100 -p0 -b .no-move-damage -%patch101 -p0 -b .dont-backfill-bg-none -%patch105 -p1 -b .enable-composite -%patch106 -p1 -b .no-xnest-composite +#%patch101 -p0 -b .dont-backfill-bg-none +#%patch105 -p1 -b .enable-composite +#%patch106 -p1 -b .no-xnest-composite %patch107 -p1 -b .offscreen-pixmaps %patch108 -p1 -b .composite-paranoia %patch1001 -p1 -b .Red-Hat-extramodes -%patch1002 -p1 -b .xephyr -%patch1003 -p1 -b .fpic -%patch1004 -p1 -b .selinux-awareness -%patch1005 -p0 -b .builtin-fonts +#%patch1002 -p1 -b .xephyr +#%patch1003 -p1 -b .fpic +#%patch1004 -p1 -b .selinux-awareness +#%patch1005 -p0 -b .builtin-fonts %patch1006 -p1 -b .no-scanpci -%patch1007 -p1 -b .xf1bpp +#%patch1007 -p1 -b .xf1bpp %patch1008 -p1 -b .comment-less -%patch1009 -p1 -b .maxpixclock %patch1010 -p1 -b .prerelease-warning -%patch2001 -p1 -b .geode-mmx -%patch2002 -p1 -b .xephyr-keysym -%patch2003 -p1 -b .vfprintf -%patch2004 -p1 -b .displaysize -%patch2005 -p1 -b .xephyr-crash -%patch2006 -p1 -b .fakerama -%patch2007 -p1 -b .randrconfig -%patch2008 -p1 -b .randrama-zero-screens -%patch2009 -p1 -b .arm -%patch2010 -p1 -b .idletime +#%patch2001 -p1 -b .geode-mmx +#%patch2002 -p1 -b .xephyr-keysym +#%patch2003 -p1 -b .vfprintf +#%patch2004 -p1 -b .displaysize +#%patch2005 -p1 -b .xephyr-crash +#%patch2007 -p1 -b .randrconfig +#%patch2008 -p1 -b .randrama-zero-screens +#%patch2009 -p1 -b .arm +#%patch2010 -p1 -b .idletime %patch2500 -p1 -b .unbreak-domains -%patch2501 -p1 -b .pci-bus-count -%patch2502 -p1 -b .mmap-check -%patch2503 -p1 -b .rom-search -%patch2504 -p1 -b .domain-obiwan +#%patch2501 -p1 -b .pci-bus-count +#%patch2502 -p1 -b .mmap-check +#%patch2503 -p1 -b .rom-search +#%patch2504 -p1 -b .domain-obiwan %patch2505 -p1 -b .device-enable +#bernie +%patch3001 -p1 -b .touchpad + %build %if 0%{?fedora} == 7 @@ -344,8 +381,8 @@ Xserver source code needed to build VNC server (Xvnc) aclocal ; automake -a ; autoconf %configure \ %{enable_xorg} \ - --disable-xprint --enable-xvfb --enable-xnest --enable-dmx \ - --enable-kdrive --enable-xephyr \ + --disable-xprint \ + %{xservers} \ --disable-static \ --with-pic \ --enable-composite \ @@ -362,10 +399,39 @@ aclocal ; automake -a ; autoconf --with-rgb-path=%{_datadir}/X11/rgb \ --disable-xorgcfg \ --enable-install-libxf86config \ - --with-mesa-source=%{_datadir}/mesa/source \ -%if %{with_hw_servers} +%if 0%{?olpc} + --disable-xtrap \ + --disable-record \ + --disable-xvmc \ + --disable-dga \ + --disable-xdmcp \ + --disable-xinerama \ + --disable-xf86vidmode \ + --disable-xf86misc \ + --disable-xace \ + --disable-xcsecurity \ + --disable-appgroup \ + --disable-cup \ + --disable-evi \ + --disable-dbe \ + --disable-xevie \ + --disable-glx \ + --disable-aiglx \ + --disable-afb \ + --disable-mfb \ + --disable-cfb \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + --enable-builtin-fonts \ + --enable-null-root-cursor \ + --enable-config-dbus \ + --enable-config-hal \ +%endif +%if %{with_drm} --enable-dri \ --with-dri-driver-path=%{drimoduledir} \ +%else + --disable-dri \ %endif ${CONFIGURE} @@ -389,12 +455,20 @@ for each in vesamodes extramodes ; do done %endif +%if 0%{?olpc} +install -D -m 0644 %{SOURCE200} $RPM_BUILD_ROOT/etc/X11/xorg.conf +install -D -m 0644 %{SOURCE201} $RPM_BUILD_ROOT/etc/hal/fdi/policy/x11-input.fdi +install -D -m 0644 %{SOURCE202} $RPM_BUILD_ROOT/etc/dbus-1/system.d/xorg-server.conf +%endif + # Make the source package %define xserver_source_dir %{_datadir}/xorg-x11-server-source %define inst_srcdir %{buildroot}/%{xserver_source_dir} mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}} cp cpprules.in %{inst_srcdir} +%if 0%{!?olpc} cp Xext/SecurityPolicy %{inst_srcdir}/Xext +%endif cp xkb/README.compiled %{inst_srcdir}/xkb cp GL/symlink-mesa.sh %{inst_srcdir}/GL cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86 @@ -439,6 +513,7 @@ xargs tar cf - | (cd %{inst_srcdir} && tar xf -) rm -rf $RPM_BUILD_ROOT %if %{with_hw_servers} +%if 0%{!?olpc} %pre Xorg { pushd /etc/X11 @@ -467,6 +542,7 @@ rm -rf $RPM_BUILD_ROOT popd } &> /dev/null || : %endif +%endif # The Xserver.1 manpage is intentionally present in multiple subpackages. # It could reasonably form part of a -common subpackage though. @@ -485,13 +561,15 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/xorg/modules %dir %{_libdir}/xorg/modules/drivers %dir %{_libdir}/xorg/modules/extensions +%if 0%{!?olpc} %{_libdir}/xorg/modules/extensions/libGLcore.so %{_libdir}/xorg/modules/extensions/libglx.so %{_libdir}/xorg/modules/extensions/libdri.so %{_libdir}/xorg/modules/extensions/libdbe.so +%{_libdir}/xorg/modules/extensions/libxtrap.so +%endif %{_libdir}/xorg/modules/extensions/libextmod.so %{_libdir}/xorg/modules/extensions/librecord.so -%{_libdir}/xorg/modules/extensions/libxtrap.so %dir %{_libdir}/xorg/modules/input %dir %{_libdir}/xorg/modules/fonts %{_libdir}/xorg/modules/fonts/libfreetype.so @@ -506,37 +584,49 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xorg/modules/multimedia/tda9850_drv.so %{_libdir}/xorg/modules/multimedia/tda9885_drv.so %{_libdir}/xorg/modules/multimedia/uda1380_drv.so -%{_libdir}/xorg/modules/libafb.so -%{_libdir}/xorg/modules/libcfb.so -%{_libdir}/xorg/modules/libcfb32.so %{_libdir}/xorg/modules/libexa.so %{_libdir}/xorg/modules/libfb.so %{_libdir}/xorg/modules/libint10.so -%{_libdir}/xorg/modules/libmfb.so %{_libdir}/xorg/modules/libpcidata.so %{_libdir}/xorg/modules/libshadow.so %{_libdir}/xorg/modules/libshadowfb.so %{_libdir}/xorg/modules/libvbe.so %{_libdir}/xorg/modules/libvgahw.so +%{_libdir}/xorg/modules/libwfb.so %{_libdir}/xorg/modules/libxaa.so +%if 0%{!?olpc} %{_libdir}/xorg/modules/libxf1bpp.so %{_libdir}/xorg/modules/libxf4bpp.so %{_libdir}/xorg/modules/libxf8_16bpp.so %{_libdir}/xorg/modules/libxf8_32bpp.so +%{_libdir}/xorg/modules/libafb.so +%{_libdir}/xorg/modules/libcfb.so +%{_libdir}/xorg/modules/libcfb32.so +%{_libdir}/xorg/modules/libmfb.so +%endif %dir %{_libdir}/xserver +%if 0%{!?olpc} %{_libdir}/xserver/SecurityPolicy +%endif %{_mandir}/man1/gtf.1* %{_mandir}/man1/Xorg.1* %{_mandir}/man1/Xserver.1* %{_mandir}/man1/cvt.1* %{_mandir}/man4/fbdevhw.4* %{_mandir}/man4/exa.4* +%{_mandir}/man5/SecurityPolicy.5.* %{_mandir}/man5/xorg.conf.5* %dir %{_localstatedir}/lib/xkb %{_localstatedir}/lib/xkb/README.compiled %endif +%if 0%{?olpc} +%verify(not md5 size mtime) %config /etc/X11/xorg.conf +%verify(not md5 size mtime) %config(noreplace) /etc/hal/fdi/policy/x11-input.fdi +%verify(not md5 size mtime) %config(noreplace) /etc/dbus-1/system.d/xorg-server.conf +%endif +%if 0%{!?olpc} %files Xnest %defattr(-,root,root,-) %{_bindir}/Xnest @@ -580,6 +670,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_bindir}/Xephyr %{_mandir}/man1/Xserver.1* +%endif %if %{with_hw_servers} @@ -598,8 +689,28 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 09 2007 Bernardo Innocenti 1.4-5 +- Add dbus configuration file. +- Add xserver-1.4-hal-touchpad.patch. + +* Tue Oct 09 2007 Bernardo Innocenti 1.4-2 +- Mark xorg.conf and x11-input.fdi as config files. + +* Tue Oct 09 2007 Bernardo Innocenti 1.4-1 +- Add OLPC specific xorg.conf and x11-input.fdi. + +* Sun Sep 23 2007 Bernardo Innocenti 1.4-0 +- Update to 1.4 release. + +* Mon Sep 05 2007 Bernardo Innocenti 1.3.99.1-0.git20070814 +- Remove spurious dependencies. + +* Mon Aug 13 2007 Bernardo Innocenti 1.3.99.1-0.git20070814 +- xserver 1.3.99.1 (git20070814) +- Drop patches already present in upstream. + * Wed Jul 11 2007 Adam Jackson 1.3.0.0-13.1 -- Test of exa-firstpixel-tweak.patch +- Test of exa-firstpixel-tweak.patch. * Mon Jul 02 2007 Adam Jackson 1.3.0.0-13 - Add IDLETIME sync counter for great powersaving justice. diff --git a/xorg.conf b/xorg.conf new file mode 100644 index 0000000..bfb6cbb --- /dev/null +++ b/xorg.conf @@ -0,0 +1,79 @@ +# Xorg configuration file for OLPC + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "fake" "CorePointer" "CoreKeyboard" +EndSection + +# Fool 1.4 autoconf into seeing a mouse and keyboard so it won't +# try to synthetize them +Section "InputDevice" + Identifier "fake" + Driver "void" +EndSection + +Section "Module" + SubSection "extmod" + Option "omit XFree86-DGA" + Option "omit XFree86-Misc" + Option "omit MIT-SUNDRY-NONSTANDARD" + Option "omit TOG-CUP" + Option "omit Extended-Visual-Information" + EndSubSection + Load "freetype" + Load "evdev" + # Load "record" # Mostly a debugging tool +EndSection + +Section "Extensions" + Option "XTEST" "Disable" # Mostly a debugging tool + #Option "SECURITY" "Disable" # CRASH! + Option "XC-APPGROUP" "Disable" + Option "XINERAMA" "Disable" +EndSection + +Section "ServerFlags" + Option "AllowMouseOpenFail" "yes" +EndSection + +Section "Monitor" + Identifier "DCON" + HorizSync 30-67 + VertRefresh 48-52 + DisplaySize 152 114 + Mode "1200x900" + DotClock 57.275 + HTimings 1200 1208 1216 1240 + VTimings 900 905 908 912 + Flags "-HSync" "-VSync" + EndMode +EndSection + +Section "Device" + Identifier "Geode" + Driver "amd" + VendorName "Advanced Micro Devices, Inc." + BoardName "AMD Geode GX/LX" + + # Disable VGA for the OLPC board + Option "NoVGA" "true" + + Option "AccelMethod" "EXA" + Option "NoCompression" "true" + Option "CustomMode" "true" + Option "DconPanel" "true" + Option "PanelGeometry" "1200x900" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Geode" + Monitor "DCON" + DefaultDepth 16 + + SubSection "Display" + Depth 16 + Modes "1200x900" + EndSubSection +EndSection diff --git a/xserver-1.2.0-geode-mmx.patch b/xserver-1.2.0-geode-mmx.patch deleted file mode 100644 index defdc2e..0000000 --- a/xserver-1.2.0-geode-mmx.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/fb/fbpict.c -+++ a/fb/fbpict.c -@@ -1516,7 +1516,9 @@ static unsigned int detectCPUFeatures(void) { - 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; diff --git a/xserver-1.2.0-honor-displaysize.patch b/xserver-1.2.0-honor-displaysize.patch deleted file mode 100644 index b81b9d7..0000000 --- a/xserver-1.2.0-honor-displaysize.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c.jx 2007-02-26 13:39:00.000000000 -0500 -+++ xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c 2007-02-26 14:37:33.000000000 -0500 -@@ -313,8 +313,10 @@ - - preferred = PREFERRED_TIMING_MODE(DDC->features.msc); - -- Monitor->widthmm = 10 * DDC->features.hsize; -- Monitor->heightmm = 10 * DDC->features.vsize; -+ if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) { -+ Monitor->widthmm = 10 * DDC->features.hsize; -+ Monitor->heightmm = 10 * DDC->features.vsize; -+ } - - /* If this is a digital display, then we can use reduced blanking */ - if (DDC->features.input_type) diff --git a/xserver-1.2.0-vfprintf.patch b/xserver-1.2.0-vfprintf.patch deleted file mode 100644 index 1aeda9b..0000000 --- a/xserver-1.2.0-vfprintf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h.jx 2007-01-22 22:13:15.000000000 -0500 -+++ xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h 2007-01-29 18:13:11.000000000 -0500 -@@ -428,7 +428,7 @@ - #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) diff --git a/xserver-1.2.0-xephyr-keysym-madness.patch b/xserver-1.2.0-xephyr-keysym-madness.patch deleted file mode 100644 index becc829..0000000 --- a/xserver-1.2.0-xephyr-keysym-madness.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c.xephyr-keysym 2007-01-22 22:13:14.000000000 -0500 -+++ xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c 2007-01-29 17:58:00.000000000 -0500 -@@ -77,9 +77,10 @@ - - static int HostXWantDamageDebug = 0; - --extern KeySym EphyrKeymap[]; -+/* these two need to be 32-bits. do not say KeySym, that way lies madness */ -+extern unsigned int EphyrKeymap[]; -+extern unsigned int kdKeymap[]; - --extern KeySym kdKeymap[]; - extern int kdMinScanCode; - extern int kdMaxScanCode; - extern int kdMinKeyCode; -@@ -662,7 +663,7 @@ - void - hostx_load_keymap(void) - { -- KeySym *keymap; -+ unsigned int *keymap; - int host_width, min_keycode, max_keycode, width; - int i,j; - diff --git a/xserver-1.2.99.901-xephyr-crash-at-exit.patch b/xserver-1.2.99.901-xephyr-crash-at-exit.patch deleted file mode 100644 index 5186099..0000000 --- a/xserver-1.2.99.901-xephyr-crash-at-exit.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/xserver-1.3.0-arm-iopl.patch b/xserver-1.3.0-arm-iopl.patch deleted file mode 100644 index fa00d66..0000000 --- a/xserver-1.3.0-arm-iopl.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- xorg-server-1.3.0.0/hw/xfree86/common/xf86Bus.c.arm 2007-02-17 20:37:56.000000000 -0500 -+++ xorg-server-1.3.0.0/hw/xfree86/common/xf86Bus.c 2007-06-04 11:33:14.000000000 -0400 -@@ -3006,7 +3006,7 @@ - - } - --#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) -+#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__arm__) - #include "vgaHW.h" - #include "compiler.h" - #endif -@@ -3018,7 +3018,7 @@ - CheckGenericGA() - { - /* This needs to be changed for multiple domains */ --#if !defined(__sparc__) && !defined(__sparc) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__) && !defined(__s390__) -+#if !defined(__sparc__) && !defined(__sparc) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__arm__) && !defined(__s390__) && !defined(__arm__) - IOADDRESS GenericIOBase = VGAHW_GET_IOBASE(); - CARD8 CurrentValue, TestValue; - ---- xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_video.c.arm 2006-09-18 02:04:18.000000000 -0400 -+++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_video.c 2007-06-04 11:35:21.000000000 -0400 -@@ -62,7 +62,8 @@ - #elif !defined(__powerpc__) && \ - !defined(__mc68000__) && \ - !defined(__sparc__) && \ -- !defined(__mips__) -+ !defined(__mips__) && \ -+ !defined(__arm__) - - /* - * Due to conflicts with "compiler.h", don't rely on to declare -@@ -567,7 +568,7 @@ - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); ---- xorg-server-1.3.0.0/hw/xfree86/os-support/misc/SlowBcopy.c.arm 2006-09-18 02:04:18.000000000 -0400 -+++ xorg-server-1.3.0.0/hw/xfree86/os-support/misc/SlowBcopy.c 2007-06-04 11:31:28.000000000 -0400 -@@ -35,7 +35,8 @@ - #if !defined(__sparc__) && \ - !defined(__powerpc__) && \ - !defined(__mips__) && \ -- !defined(__ia64__) -+ !defined(__ia64__) && \ -+ !defined(__arm__) - outb(0x80, 0x00); - #endif - } diff --git a/xserver-1.3.0-domain-obiwan.patch b/xserver-1.3.0-domain-obiwan.patch deleted file mode 100644 index f74c226..0000000 --- a/xserver-1.3.0-domain-obiwan.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 1b94c117e0f294ef2f89bf24d45ba7a8e45efe35 -Author: Matthias Hopf -Date: Tue Oct 10 19:37:22 2006 +0200 - - Fixing probably long-standing bug in domain support. - -diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c -index c6dad1f..7d220d0 100644 ---- a/hw/xfree86/os-support/bus/linuxPci.c -+++ b/hw/xfree86/os-support/bus/linuxPci.c -@@ -498,7 +498,7 @@ xf86GetPciDomain(PCITAG Tag) - pPCI = xf86GetPciHostConfigFromTag(Tag); - - if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum))) -- return result; -+ return result + 1; - - if (!pPCI || pPCI->fakeDevice) - return 1; /* Domain 0 is reserved */ diff --git a/xserver-1.3.0-idletime.patch b/xserver-1.3.0-idletime.patch deleted file mode 100644 index ca32b67..0000000 --- a/xserver-1.3.0-idletime.patch +++ /dev/null @@ -1,152 +0,0 @@ -commit 7e2c935920cafadbd87c351f1a3239932864fb90 -Author: Fredrik Höglund -Date: Fri May 18 20:06:14 2007 +0200 - - Add a new IDLETIME system sync counter. - - This counter exposes the time in milliseconds since the last - input event. Clients such as screen savers and power managers - can set an alarm on this counter to find out when the idle time - reaches a certain value, without having to poll the server. - -diff --git a/Xext/sync.c b/Xext/sync.c -index c5441a1..6fc2dcc 100644 ---- a/Xext/sync.c -+++ b/Xext/sync.c -@@ -243,6 +243,11 @@ SyncInitServerTime( - void - ); - -+static void -+SyncInitIdleTime( -+ void -+); -+ - static void - SyncResetProc( - ExtensionEntry * /* extEntry */ -@@ -2400,6 +2405,7 @@ SyncExtensionInit(INITARGS) - * because there is always a servertime counter. - */ - SyncInitServerTime(); -+ SyncInitIdleTime(); - - #ifdef DEBUG - fprintf(stderr, "Sync Extension %d.%d\n", -@@ -2520,3 +2526,116 @@ SyncInitServerTime(void) - ServertimeQueryValue, ServertimeBracketValues); - pnext_time = NULL; - } -+ -+ -+ -+/* -+ * IDLETIME implementation -+ */ -+ -+static pointer IdleTimeCounter; -+static XSyncValue *pIdleTimeValueLess; -+static XSyncValue *pIdleTimeValueGreater; -+ -+static void -+IdleTimeQueryValue (pointer pCounter, CARD64 *pValue_return) -+{ -+ CARD32 idle = GetTimeInMillis() - lastDeviceEventTime.milliseconds; -+ XSyncIntsToValue (pValue_return, idle, 0); -+} -+ -+static void -+IdleTimeBlockHandler (pointer env, -+ struct timeval **wt, -+ pointer LastSelectMask) -+{ -+ XSyncValue idle; -+ -+ if (!pIdleTimeValueLess && !pIdleTimeValueGreater) -+ return; -+ -+ IdleTimeQueryValue (NULL, &idle); -+ -+ if (pIdleTimeValueLess && -+ XSyncValueLessOrEqual (idle, *pIdleTimeValueLess)) -+ { -+ AdjustWaitForDelay (wt, 0); -+ } -+ else if (pIdleTimeValueGreater) -+ { -+ unsigned long timeout = 0; -+ -+ if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) -+ { -+ XSyncValue value; -+ Bool overflow; -+ -+ XSyncValueSubtract (&value, *pIdleTimeValueGreater, -+ idle, &overflow); -+ timeout = XSyncValueLow32 (value); -+ } -+ -+ AdjustWaitForDelay (wt, timeout); -+ } -+} -+ -+static void -+IdleTimeWakeupHandler (pointer env, -+ int rc, -+ pointer LastSelectMask) -+{ -+ XSyncValue idle; -+ -+ if (!pIdleTimeValueLess && !pIdleTimeValueGreater) -+ return; -+ -+ IdleTimeQueryValue (NULL, &idle); -+ -+ if ((pIdleTimeValueGreater && -+ XSyncValueGreaterThan (idle, *pIdleTimeValueGreater)) || -+ (pIdleTimeValueLess && XSyncValueLessThan (idle, *pIdleTimeValueLess))) -+ { -+ SyncChangeCounter (IdleTimeCounter, idle); -+ } -+} -+ -+static void -+IdleTimeBracketValues (pointer pCounter, -+ CARD64 *pbracket_less, -+ CARD64 *pbracket_greater) -+{ -+ Bool registered = (pIdleTimeValueLess || pIdleTimeValueGreater); -+ -+ if (registered && !pbracket_less && !pbracket_greater) -+ { -+ RemoveBlockAndWakeupHandlers(IdleTimeBlockHandler, -+ IdleTimeWakeupHandler, -+ NULL); -+ } -+ else if (!registered && (pbracket_less || pbracket_greater)) -+ { -+ RegisterBlockAndWakeupHandlers(IdleTimeBlockHandler, -+ IdleTimeWakeupHandler, -+ NULL); -+ } -+ -+ pIdleTimeValueGreater = pbracket_greater; -+ pIdleTimeValueLess = pbracket_less; -+} -+ -+static void -+SyncInitIdleTime (void) -+{ -+ CARD64 resolution; -+ XSyncValue idle; -+ -+ IdleTimeQueryValue (NULL, &idle); -+ XSyncIntToValue (&resolution, 4); -+ -+ IdleTimeCounter = SyncCreateSystemCounter ("IDLETIME", idle, resolution, -+ XSyncCounterUnrestricted, -+ IdleTimeQueryValue, -+ IdleTimeBracketValues); -+ -+ pIdleTimeValueLess = pIdleTimeValueGreater = NULL; -+} diff --git a/xserver-1.3.0-less-randr-fakerama.patch b/xserver-1.3.0-less-randr-fakerama.patch deleted file mode 100644 index f8c1dee..0000000 --- a/xserver-1.3.0-less-randr-fakerama.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- xorg-server-1.3.0.0/randr/rrxinerama.c.jx 2007-01-30 02:01:52.000000000 -0500 -+++ xorg-server-1.3.0.0/randr/rrxinerama.c 2007-04-25 13:26:23.000000000 -0400 -@@ -425,6 +425,14 @@ - 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/xserver-1.3.0-mmap-failure-check.patch b/xserver-1.3.0-mmap-failure-check.patch deleted file mode 100644 index e926ba3..0000000 --- a/xserver-1.3.0-mmap-failure-check.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./hw/xfree86/os-support/bus/linuxPci.c.orig 2007-03-14 09:37:44.000000000 -0600 -+++ ./hw/xfree86/os-support/bus/linuxPci.c 2007-03-14 09:41:01.000000000 -0600 -@@ -634,28 +634,28 @@ - ADDRESS Base, unsigned long Size) - { - int domain = xf86GetPciDomain(Tag); -- int fd; -+ int fd = -1; - pointer addr; - - /* - * We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs - * legacy_mem interface is unavailable. - */ -- if (Base > 1024*1024) -- return linuxMapPci(ScreenNum, Flags, Tag, Base, Size, -+ if (Base >= 1024*1024) -+ addr = linuxMapPci(ScreenNum, Flags, Tag, Base, Size, - PCIIOC_MMAP_IS_MEM); -- -- if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0) -- return linuxMapPci(ScreenNum, Flags, Tag, Base, Size, -+ else if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0) -+ addr = linuxMapPci(ScreenNum, Flags, Tag, Base, Size, - PCIIOC_MMAP_IS_MEM); -+ else -+ addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base); - -- addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base); -- if (addr == MAP_FAILED) { -- close (fd); -+ if (fd >= 0) -+ close(fd); -+ if (addr == NULL || addr == MAP_FAILED) { - perror("mmap failure"); - FatalError("xf86MapDomainMem(): mmap() failure\n"); - } -- close(fd); - return addr; - } - diff --git a/xserver-1.3.0-pci-bus-count.patch b/xserver-1.3.0-pci-bus-count.patch deleted file mode 100644 index 13b5808..0000000 --- a/xserver-1.3.0-pci-bus-count.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- xorg-server-1.1.1/hw/xfree86/os-support/bus/Pci.c.jx 2007-02-12 11:08:52.000000000 -0500 -+++ xorg-server-1.1.1/hw/xfree86/os-support/bus/Pci.c 2007-03-30 12:20:08.000000000 -0400 -@@ -231,14 +231,14 @@ - int pciMaxBusNum = MAX_PCI_BUSES; - static Bool inProbe = FALSE; - --static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, }; -+static pciConfigPtr *pci_devp = NULL; - - static int readPciBios( PCITAG Tag, CARD8* tmp, ADDRESS hostbase, - unsigned char * buf, int len, PciBiosType BiosType ); - - static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len); - --int xf86MaxPciDevs = MAX_PCI_DEVICES; -+int xf86MaxPciDevs = 0; - - /* - * Platform specific PCI function pointers. -@@ -271,6 +271,11 @@ - if (pciNumBuses <= 0) - ARCH_PCI_OS_INIT(); - #endif -+ if (xf86MaxPciDevs == 0) -+ xf86MaxPciDevs = MAX_PCI_DEVICES; /* XXX bogus */ -+ if (pci_devp) -+ xfree(pci_devp); -+ pci_devp = xnfcalloc(xf86MaxPciDevs + 1, sizeof(pciConfigPtr)); - } - - void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len)) -@@ -913,7 +918,7 @@ - * result in an endless recursion if platform/OS specific PCI - * bus probing code calls this function from with in it. - */ -- if (done || pci_devp[0]) -+ if (done || pci_devp) - return pci_devp; - - done = TRUE; diff --git a/xserver-1.3.0-ramdac-export.patch b/xserver-1.3.0-ramdac-export.patch deleted file mode 100644 index 486312d..0000000 --- a/xserver-1.3.0-ramdac-export.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Julien Cristau -Date: Wed, 30 May 2007 02:01:30 +0000 (-0400) -Subject: Make sure that the ramdac symbols are present in the server -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=3c6f1428489c1f71acd41066ea73ef4ae7c60f17 - -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). ---- - ---- 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/xserver-1.3.0-randr12-config-hack.patch b/xserver-1.3.0-randr12-config-hack.patch deleted file mode 100644 index c0c8028..0000000 --- a/xserver-1.3.0-randr12-config-hack.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.jx 2007-04-16 12:53:50.000000000 -0400 -+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c 2007-05-02 14:03:28.000000000 -0400 -@@ -1202,6 +1202,23 @@ - return output; - } - -+static char * -+preferredMode(ScrnInfoPtr pScrn, xf86OutputPtr output) -+{ -+ char *preferred_mode = NULL; -+ -+ /* Check for a configured preference for a particular mode */ -+ preferred_mode = xf86GetOptValString (output->options, -+ OPTION_PREFERRED_MODE); -+ if (preferred_mode) -+ return preferred_mode; -+ -+ if (pScrn->display->modes && *pScrn->display->modes) -+ preferred_mode = *pScrn->display->modes; -+ -+ return preferred_mode; -+} -+ - #define DEBUG_REPROBE 1 - - void -@@ -1377,8 +1394,7 @@ - output->probed_modes = xf86SortModes (output->probed_modes); - - /* Check for a configured preference for a particular mode */ -- preferred_mode = xf86GetOptValString (output->options, -- OPTION_PREFERRED_MODE); -+ preferred_mode = preferredMode(scrn, output); - - if (preferred_mode) - { diff --git a/xserver-1.3.0-randrama-no-zero-screens.patch b/xserver-1.3.0-randrama-no-zero-screens.patch deleted file mode 100644 index 4862198..0000000 --- a/xserver-1.3.0-randrama-no-zero-screens.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- xorg-server-1.3.0.0/randr/rrxinerama.c.jx 2007-05-17 17:07:31.000000000 -0400 -+++ xorg-server-1.3.0.0/randr/rrxinerama.c 2007-05-31 21:41:13.000000000 -0400 -@@ -147,12 +147,6 @@ - } - - static Bool --RRXineramaScreenActive (ScreenPtr pScreen) --{ -- return rrGetScrPriv(pScreen) != NULL; --} -- --static Bool - RRXineramaCrtcActive (RRCrtcPtr crtc) - { - return crtc->mode != NULL && crtc->numOutputs > 0; -@@ -164,7 +158,7 @@ - int i, n; - - n = 0; -- if (RRXineramaScreenActive (pScreen)) -+ if (rrGetScrPriv (pScreen)) - { - rrScrPriv(pScreen); - for (i = 0; i < pScrPriv->numCrtcs; i++) -@@ -174,6 +168,12 @@ - return n; - } - -+static Bool -+RRXineramaScreenActive (ScreenPtr pScreen) -+{ -+ return RRXineramaScreenCount (pScreen) > 0; -+} -+ - int - ProcRRXineramaGetScreenCount(ClientPtr client) - { diff --git a/xserver-1.3.0-reput-video.patch b/xserver-1.3.0-reput-video.patch deleted file mode 100644 index 9f921e6..0000000 --- a/xserver-1.3.0-reput-video.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Michel Dänzer -Date: Thu, 24 May 2007 10:10:05 +0000 (+0200) -Subject: Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow. -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/xserver-1.3.0-rom-search.patch b/xserver-1.3.0-rom-search.patch deleted file mode 100644 index c18188e..0000000 --- a/xserver-1.3.0-rom-search.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xorg-server-1.2.99.905/hw/xfree86/os-support/bus/linuxPci.c.jx 2007-04-09 16:15:43.000000000 -0400 -+++ xorg-server-1.2.99.905/hw/xfree86/os-support/bus/linuxPci.c 2007-04-09 17:37:28.000000000 -0400 -@@ -778,8 +778,8 @@ - bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag)); - dev = PCI_DEV_FROM_TAG(Tag); - func = PCI_FUNC_FROM_TAG(Tag); -- sprintf(file, "/sys/devices/pci%04x:%02x/%04x:%02x:%02x.%1x/rom", -- dom, bus, dom, bus, dev, func); -+ sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom", -+ dom, bus, dev, func); - - /* - * If the caller wants the ROM and the sysfs rom interface exists, diff --git a/xserver-1.3.0-x86emu-imul-int64.patch b/xserver-1.3.0-x86emu-imul-int64.patch deleted file mode 100644 index 7cdb3c4..0000000 --- a/xserver-1.3.0-x86emu-imul-int64.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 2fe74ef339c3a4902ae8214f5a0454662895422c -Author: Matthias Hopf -Date: Thu Mar 15 16:56:01 2007 +0100 - - Fix calculations in x86 emulator for the long long case (Andreas Schwab). - -diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c -index 461e09e..b9e7257 100644 ---- a/hw/xfree86/x86emu/prim_ops.c -+++ b/hw/xfree86/x86emu/prim_ops.c -@@ -2082,7 +2082,7 @@ Implements the IMUL instruction and side effects. - void imul_long_direct(u32 *res_lo, u32* res_hi,u32 d, u32 s) - { - #ifdef __HAS_LONG_LONG__ -- s64 res = (s32)d * (s32)s; -+ s64 res = (s64)(s32)d * (s32)s; - - *res_lo = (u32)res; - *res_hi = (u32)(res >> 32); -@@ -2174,7 +2174,7 @@ Implements the MUL instruction and side effects. - void mul_long(u32 s) - { - #ifdef __HAS_LONG_LONG__ -- u64 res = (u32)M.x86.R_EAX * (u32)s; -+ u64 res = (u64)M.x86.R_EAX * s; - - M.x86.R_EAX = (u32)res; - M.x86.R_EDX = (u32)(res >> 32); diff --git a/xserver-1.4-hal-touchpad.patch b/xserver-1.4-hal-touchpad.patch new file mode 100644 index 0000000..a2d3cc3 --- /dev/null +++ b/xserver-1.4-hal-touchpad.patch @@ -0,0 +1,60 @@ +diff --git a/config/hal.c b/config/hal.c +index 3479be9..a235876 100644 +--- a/config/hal.c ++++ b/config/hal.c +@@ -177,7 +177,8 @@ device_added(LibHalContext *hal_ctx, const char *udi) + if (strcmp(props[i], "input.keys") == 0 || + strcmp(props[i], "input.keyboard") == 0) + type |= TYPE_KEYS; +- if (strcmp(props[i], "input.mouse") == 0) ++ if (strcmp(props[i], "input.mouse") == 0 || ++ strcmp(props[i], "input.touchpad") == 0) + type |= TYPE_POINTER; + } + libhal_free_string_array(props); +diff --git a/config/x11-input.fdi b/config/x11-input.fdi +index c390706..20c73fa 100644 +--- a/config/x11-input.fdi ++++ b/config/x11-input.fdi +@@ -1,7 +1,14 @@ + + + +- ++ ++ mouse ++ ++ evdev ++ ++ ++ + + mouse + + keyboard ++ olpc ++ ++ evdev ++ evdev ++ ++ ++ us ++ ++ ++ ++ ++ ++ ++ base ++ ++ ++ keyboard + pc105 +