Hello community, here is the log from the commit of package xorg-x11-server checked in at Wed Oct 3 01:21:17 CEST 2007. -------- --- xorg-x11-server/xorg-x11-server.changes 2007-09-21 16:43:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2007-09-29 18:37:20.015156000 +0200 @@ -1,0 +2,59 @@ +Sat Sep 29 00:51:38 CEST 2007 - sndirsch@suse.de + +- xorg-server 1.4 + * Welcome to X.Org X Server 1.4, now with hotplugging input to go + with the hotplugging output. Also included in this release are + many performance and correctness fixes to the EXA acceleration + architecture, support for DTrace profiling of the X Server, + accelerated GLX_EXT_texture_from_pixmap with supporting DRI + drivers, and many improvements to the RandR 1.2 support that + was added in xorg-server-1.3. The X Server now relies on the + pixman library, which replaces the fb/fbcompose.c and + accelerated implementations that were previously shared through + code-duplication with the cairo project. + * obsolete patches: + - bug-259290_trapfault.diff + - cfb8-undefined.diff + - commit-c09e68c + - i810_dri_fix_freeze.diff + - p_bug159532.diff + - p_enable-altrix.diff + - p_pci-ce-x.diff + - p_pci-off-by-one.diff + - p_xorg_rom_read.diff + - randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff + - randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff + - randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff + - randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff + - randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff + - remove__GLinterface.patch + - support_mesa6.5.3.patch + - use-composite-for-unequal-depths.patch + - x86emu.diff + - xephyr-sig11-fix.diff + * adjusted patches: + - 64bit.diff + - bug-197858_dpms.diff + - bug227111-ddc_screensize.diff + - disable-root-xorg_conf.diff + - fpic.diff + - glx-align.patch + - libdrm.diff + - p_bug96328.diff + - p_ia64-console.diff + - p_vga-crashfix.diff + - xephyr.diff +- pixman.diff: + * search for pixman instead of pixman-1 +- bumped version to 7.3 + +------------------------------------------------------------------- +Tue Sep 25 19:11:13 CEST 2007 - sndirsch@suse.de + +- remove wrongly prebuilt xf1bpp files after extracting tarball; + fixes vga module loading (Bug #328201) +- do not use "make -j" to (quick)fix xf1bpp build +- do not apply p_pci-domain.diff on IA64 +- use updated off-by-one patch by schwab for IA64 + +------------------------------------------------------------------- Old: ---- bug-259290_trapfault.diff cfb8-undefined.diff commit-c09e68c i810_dri_fix_freeze.diff p_bug159532.diff p_enable-altrix.diff p_pci-ce-x.diff p_pci-off-by-one.diff p_xorg_rom_read.diff randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff remove__GLinterface.patch support_mesa6.5.3.patch use-composite-for-unequal-depths.patch x86emu.diff xephyr-sig11-fix.diff xorg-server-1.3.0.0.tar.bz2 New: ---- pixman.diff p_pci-off-by-one.diff.ia64 xorg-server-1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-server (Version 7.2) +# spec file for package xorg-x11-server (Version 7.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ # norootforbuild Name: xorg-x11-server -%define dirsuffix 1.3.0.0 -%define fglrx_driver_hack 1 +%define dirsuffix 1.4 +%define fglrx_driver_hack 0 %define vnc 0 BuildRequires: Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel %if %vnc @@ -20,8 +20,8 @@ %endif Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 -Version: 7.2 -Release: 142 +Version: 7.3 +Release: 1 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -56,25 +56,21 @@ Patch7: p_mouse_misc.diff Patch8: p_bug96328.diff Patch9: p_vga-crashfix.diff -Patch10: p_xorg_rom_read.diff Patch11: ps_showopts.diff Patch12: p_xf86Mode.diff Patch13: p_xorg_acpi.diff Patch14: p_xkills_wrong_client.diff -Patch15: p_bug159532.diff Patch16: p_xnest-ignore-getimage-errors.diff Patch18: p_ia64-console.diff Patch19: disable-aiglx.diff Patch22: disable-root-xorg_conf.diff Patch23: disable-fbblt-opt.diff Patch25: glx-align.patch -Patch26: p_enable-altrix.diff Patch27: mouse.diff -Patch28: cfb8-undefined.diff Patch29: xephyr.diff Patch30: p_ppc_domain_workaround.diff Patch32: acpi_events.diff -Patch33: p_pci-off-by-one.diff +Patch34: p_pci-off-by-one.diff.ia64 Patch36: libdrm.diff %if %vnc Patch39: 0018-vnc-support.txt @@ -83,27 +79,14 @@ Patch41: loadmod-bug197195.diff Patch42: bug227111-ddc_screensize.diff Patch45: bug-197858_dpms.diff -Patch46: x86emu.diff -Patch61: bug-259290_trapfault.diff Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch -Patch64: support_mesa6.5.3.patch -Patch65: remove__GLinterface.patch -Patch66: commit-c09e68c Patch67: xorg-docs.diff -Patch68: xephyr-sig11-fix.diff Patch69: xserver-mode-fuzzy-check.diff -Patch70: i810_dri_fix_freeze.diff -Patch71: randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff Patch72: randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff -Patch73: randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff -Patch74: randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff -Patch75: randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff -Patch76: randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff Patch77: fbdevhw.diff -Patch78: use-composite-for-unequal-depths.patch Patch79: edit_data_sanity_check.diff +Patch80: pixman.diff Patch334: p_pci-domain.diff -Patch357: p_pci-ce-x.diff %description This package contains the X.Org Server. @@ -161,6 +144,10 @@ # make legal department happy (Bug #204110) test -f ../Mesa-7.0.1/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 test -f ../Mesa-7.0.1/progs/ggi/asc-view.c && exit 1 +# remove wrongly prebuilt files (Bug #328201) +mv hw/xfree86/xf1bpp/mfbmodule.c . +rm hw/xfree86/xf1bpp/*.c +mv mfbmodule.c hw/xfree86/xf1bpp %patch %patch1 %patch2 @@ -169,14 +156,12 @@ %patch5 %patch6 %patch7 -p2 -%patch8 -p2 +%patch8 -p0 %patch9 -p2 -%patch10 -p3 %patch11 #%patch12 -p2 %patch13 %patch14 -p2 -%patch15 -p2 %patch16 -p2 pushd hw/xfree86/os-support %patch18 @@ -185,45 +170,35 @@ %patch22 %patch23 %patch25 -p1 -%patch26 %patch27 -%patch28 %patch29 ### Bug 197572: X.Org PCI/IA64 patches +%ifnarch ia64 %patch334 -p0 -b .p_pci-domain.diff -%patch357 -p0 -b .p_pci-ce-x.diff +%endif %patch30 %patch32 -p1 -%patch33 -p0 +%ifarch ia64 +%patch34 -p0 +%else +%endif %patch36 -p0 %if %vnc %patch39 -p1 %patch40 -p0 %endif %patch41 -p1 -%patch42 -p1 +%patch42 -p0 %patch45 -p0 -%patch46 -p0 -%patch61 -p1 %patch63 -p1 -%patch64 -p2 -%patch65 -p2 -%patch66 -p1 pushd xorg-docs-* %patch67 popd -%patch68 %patch69 -p1 -%patch70 -p1 -%patch71 -p1 %patch72 -p1 -%patch73 -p1 -%patch74 -p1 -%patch75 -p1 -%patch76 -p1 %patch77 -%patch78 -p1 %patch79 -p1 +%patch80 %build pushd xorg-docs-* @@ -294,7 +269,8 @@ --with-fontdir="/usr/share/fonts" \ --with-xkb-path="/usr/share/X11/xkb" \ --with-xkb-output="/var/lib/xkb/compiled" -make %{?jobs:-j %jobs} +#make %{?jobs:-j %jobs} +make make -C hw/kdrive %{?jobs:-j %jobs} %install @@ -517,12 +493,8 @@ /usr/bin/xdmx /usr/bin/xdmxconfig %ifnarch s390 s390x -/usr/bin/xorgcfg /usr/bin/xorgconfig -/usr/include/X11/bitmaps/ -/usr/include/X11/pixmaps/ /usr/%{_lib}/X11/* -/usr/share/X11/ /usr/%{_lib}/xorg/modules/ %{_mandir}/man4/* %{_mandir}/man5/* @@ -557,6 +529,59 @@ /usr/bin/Xvnc %endif %changelog +* Sat Sep 29 2007 - sndirsch@suse.de +- xorg-server 1.4 + * Welcome to X.Org X Server 1.4, now with hotplugging input to go + with the hotplugging output. Also included in this release are + many performance and correctness fixes to the EXA acceleration + architecture, support for DTrace profiling of the X Server, + accelerated GLX_EXT_texture_from_pixmap with supporting DRI + drivers, and many improvements to the RandR 1.2 support that + was added in xorg-server-1.3. The X Server now relies on the + pixman library, which replaces the fb/fbcompose.c and + accelerated implementations that were previously shared through + code-duplication with the cairo project. + * obsolete patches: + - bug-259290_trapfault.diff + - cfb8-undefined.diff + - commit-c09e68c + - i810_dri_fix_freeze.diff + - p_bug159532.diff + - p_enable-altrix.diff + - p_pci-ce-x.diff + - p_pci-off-by-one.diff + - p_xorg_rom_read.diff + - randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff + - randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff + - randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff + - randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff + - randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff + - remove__GLinterface.patch + - support_mesa6.5.3.patch + - use-composite-for-unequal-depths.patch + - x86emu.diff + - xephyr-sig11-fix.diff + * adjusted patches: + - 64bit.diff + - bug-197858_dpms.diff + - bug227111-ddc_screensize.diff + - disable-root-xorg_conf.diff + - fpic.diff + - glx-align.patch + - libdrm.diff + - p_bug96328.diff + - p_ia64-console.diff + - p_vga-crashfix.diff + - xephyr.diff +- pixman.diff: + * search for pixman instead of pixman-1 +- bumped version to 7.3 +* Tue Sep 25 2007 - sndirsch@suse.de +- remove wrongly prebuilt xf1bpp files after extracting tarball; + fixes vga module loading (Bug #328201) +- do not use "make -j" to (quick)fix xf1bpp build +- do not apply p_pci-domain.diff on IA64 +- use updated off-by-one patch by schwab for IA64 * Fri Sep 21 2007 - sndirsch@suse.de - edit_data_sanity_check.diff: * added sanity check for monitor EDID data (Bug #326454) ++++++ 64bit.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:36.000000000 +0200 @@ -11,13 +11,3 @@ for (i = 0; i < size; i++) ErrorF("%d: %s\n", i, strings[i]); free(strings); ---- hw/xfree86/dri/drimodule.c.orig 2006-12-08 20:54:05.218730315 +0100 -+++ hw/xfree86/dri/drimodule.c 2006-12-08 20:54:46.246132159 +0100 -@@ -88,6 +88,6 @@ - drmSetServerInfo(&DRIDRMServerInfo); - - /* Need a non-NULL return value to indicate success */ -- return 1; -+ return (pointer) 1; - } - ++++++ bug-197858_dpms.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:36.000000000 +0200 @@ -1,6 +1,6 @@ ---- os/WaitFor.c.orig 2007-01-26 15:53:27.000000000 +0100 -+++ os/WaitFor.c 2007-01-29 11:24:14.000000000 +0100 -@@ -144,6 +144,7 @@ static OsTimerPtr timers = NULL; +--- os/WaitFor.c.orig 2007-08-23 21:04:55.000000000 +0200 ++++ os/WaitFor.c 2007-09-29 17:25:11.868664250 +0200 +@@ -141,6 +141,7 @@ static OsTimerPtr timers = NULL; * For more info on ClientsWithInput, see ReadRequestFromClient(). * pClientsReady is an array to store ready client->index values into. *****************/ @@ -8,7 +8,7 @@ int WaitForSomething(int *pClientsReady) -@@ -298,10 +299,9 @@ WaitForSomething(int *pClientsReady) +@@ -295,10 +296,9 @@ WaitForSomething(int *pClientsReady) if (expired) return 0; } @@ -21,19 +21,22 @@ if (*checkForInput[0] == *checkForInput[1]) { if (timers) -@@ -338,7 +338,8 @@ WaitForSomething(int *pClientsReady) +@@ -335,6 +335,12 @@ WaitForSomething(int *pClientsReady) QueueWorkProc(EstablishNewConnections, NULL, (pointer)&LastSelectMask); - #ifdef DPMSExtension -- if (XFD_ANYSET (&devicesReadable) && (DPMSPowerLevel != DPMSModeOn)) + ++#ifdef DPMSExtension + XFD_ANDSET(&tmp_set, &devicesReadable, &EnabledDevices); + if (XFD_ANYSET (&tmp_set) && (DPMSPowerLevel != DPMSModeOn)) - DPMSSet(DPMSModeOn); - #endif ++ DPMSSet(DPMSModeOn); ++#endif ++ if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable)) ---- hw/xfree86/common/xf86Events.c.orig_1 2007-02-01 10:18:02.000000000 +0100 -+++ hw/xfree86/common/xf86Events.c 2007-02-01 10:43:54.000000000 +0100 -@@ -164,6 +164,7 @@ typedef struct x_IHRec { + break; + #ifdef WIN32 +--- hw/xfree86/common/xf86Events.c.orig 2007-09-05 23:59:13.000000000 +0200 ++++ hw/xfree86/common/xf86Events.c 2007-09-29 17:29:22.620335250 +0200 +@@ -143,6 +143,7 @@ typedef struct x_IHRec { InputHandlerProc ihproc; pointer data; Bool enabled; @@ -41,7 +44,7 @@ struct x_IHRec * next; } IHRec, *IHPtr; -@@ -1526,8 +1527,12 @@ xf86VTSwitch() +@@ -877,8 +878,12 @@ xf86VTSwitch() for (i = 0; i < xf86NumScreens; i++) xf86Screens[i]->LeaveVT(i, 0); @@ -56,39 +59,39 @@ xf86AccessLeave(); /* We need this here, otherwise */ xf86AccessLeaveState(); /* console won't be restored */ -@@ -1563,9 +1568,12 @@ xf86VTSwitch() - pInfo = pInfo->next; +@@ -916,9 +921,12 @@ xf86VTSwitch() } - #endif /* !__UNIXOS2__ */ + /* XXX HACK */ + xf86ReleaseKeys(inputInfo.keyboard); - for (ih = InputHandlers; ih; ih = ih->next) - xf86EnableInputHandler(ih); - + for (ih = InputHandlers; ih; ih = ih->next) { -+ if (ih->is_input) -+ xf86EnableInputHandler(ih); -+ else -+ xf86EnableGeneralHandler(ih); ++ if (ih->is_input) ++ xf86EnableInputHandler(ih); ++ else ++ xf86EnableGeneralHandler(ih); + } xf86UnblockSIGIO(prevSIGIO); } else { -@@ -1626,8 +1634,12 @@ xf86VTSwitch() - } - #endif /* !__UNIXOS2__ */ - +@@ -981,8 +989,12 @@ xf86VTSwitch() + /* XXX HACK */ + xf86ReleaseKeys(inputInfo.keyboard); + - for (ih = InputHandlers; ih; ih = ih->next) - xf86EnableInputHandler(ih); + for (ih = InputHandlers; ih; ih = ih->next) { -+ if (ih->is_input) -+ xf86EnableInputHandler(ih); -+ else -+ xf86EnableGeneralHandler(ih); -+ } ++ if (ih->is_input) ++ xf86EnableInputHandler(ih); ++ else ++ xf86EnableGeneralHandler(ih); ++ } xf86UnblockSIGIO(prevSIGIO); } -@@ -1664,8 +1676,10 @@ xf86AddInputHandler(int fd, InputHandler - { +@@ -1019,8 +1031,10 @@ xf86AddInputHandler(int fd, InputHandler + { IHPtr ih = addInputHandler(fd, proc, data); - if (ih) ++++++ bug227111-ddc_screensize.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:36.000000000 +0200 @@ -1,19 +1,15 @@ -diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c -index a1650bc..9e36388 100644 ---- a/hw/xfree86/ddc/ddcProperty.c -+++ b/hw/xfree86/ddc/ddcProperty.c -@@ -313,9 +313,11 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr +--- hw/xfree86/modes/xf86EdidModes.c.orig 2007-09-29 17:01:58.097559000 +0200 ++++ hw/xfree86/modes/xf86EdidModes.c 2007-09-29 17:03:07.269882000 +0200 +@@ -401,8 +401,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr - preferred = PREFERRED_TIMING_MODE(DDC->features.msc); + Monitor->DDC = DDC; - Monitor->widthmm = 10 * DDC->features.hsize; - Monitor->heightmm = 10 * DDC->features.vsize; -- -+ if (!Monitor->widthmm) ++ if (!Monitor->widthmm) + Monitor->widthmm = 10 * DDC->features.hsize; + if (!Monitor->heightmm) + Monitor->heightmm = 10 * DDC->features.vsize; -+ + /* If this is a digital display, then we can use reduced blanking */ - if (DDC->features.input_type) - Monitor->reducedblanking = TRUE; + if (DDC->features.input_type) ++++++ disable-root-xorg_conf.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:36.000000000 +0200 @@ -81,14 +81,6 @@ "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ "%P/etc/X11/%X," \ -@@ -126,7 +125,6 @@ extern int config_mode; - "/etc/X11/%R," "%P/etc/X11/%R," \ - "%E," "%F," \ - "/etc/X11/%F," "%P/etc/X11/%F," \ -- "%D/%X," \ - "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ - "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ - "%P/etc/X11/%X," \ diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xwin/winconfig.c ./hw/xwin/winconfig.c --- ../xorg-server-1.1.99.3.orig/hw/xwin/winconfig.c 2006-07-22 01:12:41.000000000 +0200 +++ ./hw/xwin/winconfig.c 2006-08-31 10:22:29.000000000 +0200 ++++++ fpic.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:36.000000000 +0200 @@ -4,8 +4,8 @@ DRI.c \ Extensions.c --AM_CFLAGS = $(XORG_CFLAGS) -+AM_CFLAGS = $(XORG_CFLAGS) -fPIC +-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) ++AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC EXTRA_DIST = \ Configint.h \ ++++++ glx-align.patch ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:36.000000000 +0200 @@ -38,9 +38,9 @@ --- a/GL/glx/Makefile.am 2006-07-05 11:31:36.000000000 -0700 +++ b/GL/glx/Makefile.am 2006-09-21 21:37:03.000000000 -0700 @@ -17,7 +17,8 @@ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ - -DNO_LIBCWRAPPER \ + -I@MESA_SOURCE@/src/mesa/glapi \ + -I@MESA_SOURCE@/src/mesa/main \ + -DXFree86Server \ - @GLX_DEFINES@ + @GLX_DEFINES@ \ + @GLX_ARCH_DEFINES@ ++++++ libdrm.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:36.000000000 +0200 @@ -1,14 +1,6 @@ --- hw/xfree86/common/xf86Helper.c.orig 2006-12-13 16:21:35.000000000 +0100 +++ hw/xfree86/common/xf86Helper.c 2006-12-13 18:23:53.000000000 +0100 -@@ -2386,22 +2386,29 @@ - - _X_EXPORT pointer - xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) - { - pointer ret; - int errmaj = 0, errmin = 0; - - ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL, +@@ -2394,6 +2394,13 @@ &errmaj, &errmin); if (!ret) LoaderErrorMsg(pScrn->name, name, errmaj, errmin); @@ -22,11 +14,3 @@ return ret; } - /* - * xf86LoadOneModule loads a single module. - */ - _X_EXPORT pointer - xf86LoadOneModule(char *name, pointer opt) - { - int errmaj, errmin; - char *Name; ++++++ p_bug96328.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:37.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:37.000000000 +0200 @@ -1,26 +1,10 @@ -Index: xf86Configure.c -=================================================================== -RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v -retrieving revision 1.1.1.43.10.1 -diff -u -r1.1.1.43.10.1 xf86Configure.c ---- programs/Xserver/hw/xfree86/common/xf86Configure.c 28 Jan 2005 16:21:08 -0000 1.1.1.43.10.1 -+++ programs/Xserver/hw/xfree86/common/xf86Configure.c 3 Aug 2005 14:54:46 -0000 -@@ -267,34 +267,36 @@ +--- hw/xfree86/common/xf86Configure.c.orig 2007-09-29 15:44:40.095702000 +0200 ++++ hw/xfree86/common/xf86Configure.c 2007-09-29 15:50:35.625921250 +0200 +@@ -267,23 +267,36 @@ /* Crude mechanism to auto-detect mouse (os dependent) */ { - int fd; --#if 0 && defined linux -- /* Our autodetection code can do a better job */ -- int len; -- char path[32]; -- -- if ((len = readlink(DFLT_MOUSE_DEV, path, sizeof(path) - 1)) > 0) { -- path[len] = '\0'; -- if (strstr(path, "psaux") != NULL) -- DFLT_MOUSE_PROTO = "PS/2"; -- } --#endif + int fd = -1; + #ifdef WSCONS_SUPPORT @@ -31,15 +15,15 @@ - close(fd); - } else { - ErrorF("cannot open /dev/wsmouse\n"); -+ if (fd == -1) { -+ fd = open("/dev/wsmouse", 0); -+ if (fd != -1) { -+ DFLT_MOUSE_DEV = "/dev/wsmouse"; -+ DFLT_MOUSE_PROTO = "wsmouse"; -+ close(fd); -+ } else { -+ ErrorF("cannot open /dev/wsmouse\n"); -+ } ++ if (fd == -1) { ++ fd = open("/dev/wsmouse", 0); ++ if (fd != -1) { ++ DFLT_MOUSE_DEV = "/dev/wsmouse"; ++ DFLT_MOUSE_PROTO = "wsmouse"; ++ close(fd); ++ } else { ++ ErrorF("cannot open /dev/wsmouse\n"); ++ } } #endif @@ -48,20 +32,20 @@ - if (fd != -1) { - foundMouse = TRUE; - close(fd); -+ if (fd == -1) { -+ fd = open(DFLT_MOUSE_DEV, 0); ++ if (fd == -1) { ++ fd = open(DFLT_MOUSE_DEV, 0); +# ifdef linux -+ if (fd == -1) { -+ char *name = "/dev/input/mice"; -+ fd = open(name, 0); -+ if (fd != -1) -+ DFLT_MOUSE_DEV = name; -+ } ++ if (fd == -1) { ++ char *name = "/dev/input/mice"; ++ fd = open(name, 0); ++ if (fd != -1) ++ DFLT_MOUSE_DEV = name; ++ } +# endif -+ if (fd != -1) { -+ foundMouse = TRUE; -+ close(fd); -+ } ++ if (fd != -1) { ++ foundMouse = TRUE; ++ close(fd); ++ } } #else foundMouse = TRUE; ++++++ p_ia64-console.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:37.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:37.000000000 +0200 @@ -1,11 +1,32 @@ -Index: linux/lnx_init.c +Index: shared/VTsw_usl.c =================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v -retrieving revision 1.9 -diff -u -r1.9 lnx_init.c ---- linux/lnx_init.c 26 Aug 2005 07:35:55 -0000 1.9 -+++ linux/lnx_init.c 29 Jun 2006 09:33:05 -0000 -@@ -243,9 +243,6 @@ +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v +retrieving revision 1.5 +diff -u -r1.5 VTsw_usl.c +--- shared/VTsw_usl.c 3 Jul 2005 07:01:35 -0000 1.5 ++++ shared/VTsw_usl.c 29 Jun 2006 09:33:05 -0000 +@@ -64,15 +64,15 @@ + xf86VTSwitchAway() + { + xf86Info.vtRequestsPending = FALSE; ++#ifdef OSSWITCHAWAY ++ OSSWITCHAWAY; ++#endif + if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0) + { + return(FALSE); + } + else + { +-#ifdef OSSWITCHAWAY +- OSSWITCHAWAY; +-#endif + return(TRUE); + } + } +--- linux/lnx_init.c.orig 2007-08-23 21:04:53.000000000 +0200 ++++ linux/lnx_init.c 2007-09-29 16:19:53.771798500 +0200 +@@ -240,9 +240,6 @@ if (!ShareVTs) { @@ -13,20 +34,20 @@ - lnx_savefont(); -#endif /* - * now get the VT + * now get the VT. This _must_ succeed, or else fail completely. */ -@@ -256,7 +253,9 @@ - if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0) - xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed: %s\n", - strerror(errno)); -- +@@ -254,6 +251,10 @@ + FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n", + strerror(errno)); + +#if defined(DO_OS_FONTRESTORE) + lnx_savefont(); +#endif ++ if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", strerror(errno)); -@@ -345,6 +344,11 @@ +@@ -342,6 +343,11 @@ if (VTSwitch) { @@ -38,7 +59,7 @@ /* * Perform a switch back to the active VT when we were started */ -@@ -355,11 +359,6 @@ +@@ -356,11 +362,6 @@ activeVT = -1; } @@ -50,29 +71,3 @@ } close(xf86Info.consoleFd); /* make the vt-manager happy */ -Index: shared/VTsw_usl.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v -retrieving revision 1.5 -diff -u -r1.5 VTsw_usl.c ---- shared/VTsw_usl.c 3 Jul 2005 07:01:35 -0000 1.5 -+++ shared/VTsw_usl.c 29 Jun 2006 09:33:05 -0000 -@@ -64,15 +64,15 @@ - xf86VTSwitchAway() - { - xf86Info.vtRequestsPending = FALSE; -+#ifdef OSSWITCHAWAY -+ OSSWITCHAWAY; -+#endif - if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0) - { - return(FALSE); - } - else - { --#ifdef OSSWITCHAWAY -- OSSWITCHAWAY; --#endif - return(TRUE); - } - } ++++++ pixman.diff ++++++ --- configure.ac.orig 2007-09-29 18:10:34.558821750 +0200 +++ configure.ac 2007-09-29 18:10:44.487442250 +0200 @@ -606,7 +606,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la' XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' -PIXMAN="[pixman-1 >= 0.9.5]" +PIXMAN="[pixman >= 0.9.5]" PKG_CHECK_MODULES(PIXMAN, $PIXMAN) AC_SUBST(PIXMAN_CFLAGS) ++++++ p_pci-off-by-one.diff.ia64 ++++++ --- hw/xfree86/os-support/bus/linuxPci.c +++ hw/xfree86/os-support/bus/linuxPci.c @@ -550,7 +550,7 @@ xf86GetPciDomain(PCITAG Tag) return result; if (!pPCI || pPCI->fakeDevice) - return 1; /* Domain 0 is reserved */ + return 0; if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0) return 0; @@ -558,7 +558,7 @@ xf86GetPciDomain(PCITAG Tag) if ((result = ioctl(fd, PCIIOC_CONTROLLER, 0)) < 0) return 0; - return result + 1; /* Domain 0 is reserved */ + return result; } static pointer @@ -628,7 +628,7 @@ linuxMapPci(int ScreenNum, int Flags, PC return NULL; } -#define MAX_DOMAINS 257 +#define MAX_DOMAINS 256 static pointer DomainMmappedIO[MAX_DOMAINS]; static int @@ -649,11 +649,10 @@ linuxOpenLegacy(PCITAG Tag, char *name) domain = xf86GetPciDomain(Tag); bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag)); - /* Domain 0 is reserved -- see xf86GetPciDomain() */ - if ((domain <= 0) || (domain >= MAX_DOMAINS)) + if ((domain < 0) || (domain >= MAX_DOMAINS)) FatalError("linuxOpenLegacy(): domain out of range\n"); - sprintf(path, PREFIX, domain - 1, bus, name); + sprintf(path, PREFIX, domain, bus, name); fd = open(path, O_RDWR); if (fd >= 0) { xfree(path); @@ -685,7 +684,6 @@ _X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, unsigned long Size) { - int domain = xf86GetPciDomain(Tag); int fd; pointer addr; @@ -733,7 +731,7 @@ xf86MapDomainIO(int ScreenNum, int Flags int domain = xf86GetPciDomain(Tag); int fd; - if ((domain <= 0) || (domain >= MAX_DOMAINS)) + if ((domain < 0) || (domain >= MAX_DOMAINS)) FatalError("xf86MapDomainIO(): domain out of range\n"); if (DomainMmappedIO[domain]) ++++++ p_vga-crashfix.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:37.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:37.000000000 +0200 @@ -1,19 +1,3 @@ -Index: programs/Xserver/miext/cw/cw.c -=================================================================== -RCS file: /home/eich/cvs/xc/programs/Xserver/miext/cw/cw.c,v -retrieving revision 1.1.1.5 -diff -u -r1.1.1.5 cw.c ---- programs/Xserver/miext/cw/cw.c 25 Nov 2005 10:05:47 -0000 1.1.1.5 -+++ programs/Xserver/miext/cw/cw.c 28 Nov 2005 18:24:10 -0000 -@@ -659,7 +659,7 @@ - SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap); - - #ifdef RENDER -- if (GetPictureScreen (pScreen)) -+ if (GetPictureScreenIfSet (pScreen)) - cwInitializeRender(pScreen); - #endif - } Index: programs/Xserver/render/picture.c =================================================================== RCS file: /home/eich/cvs/xc/programs/Xserver/render/picture.c,v ++++++ xephyr.diff ++++++ --- /var/tmp/diff_new_pack.S15017/_old 2007-10-03 01:20:37.000000000 +0200 +++ /var/tmp/diff_new_pack.S15017/_new 2007-10-03 01:20:37.000000000 +0200 @@ -2,12 +2,12 @@ +++ hw/kdrive/Makefile.am 2006-10-23 16:23:34.000000000 +0200 @@ -1,10 +1,9 @@ if KDRIVEVESA --VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ +-VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \ - smi via +VESA_SUBDIRS = endif - if KDRIVEFBDEV + if BUILD_KDRIVEFBDEVLIB -FBDEV_SUBDIRS = fbdev +FBDEV_SUBDIRS = endif @@ -18,7 +18,7 @@ $(FBDEV_SUBDIRS) \ $(VESA_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ -- fake +- $(XFAKE_SUBDIRS) + $(XEPHYR_SUBDIRS) DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ ++++++ xorg-server-1.3.0.0.tar.bz2 -> xorg-server-1.4.tar.bz2 ++++++ ++++ 380666 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org