diff --git a/MesaLib-7.0.3-rc2.tar.bz2 b/MesaLib-7.0.3-rc2.tar.bz2 deleted file mode 100644 index 4508eb4..0000000 --- a/MesaLib-7.0.3-rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc840b65a8e8ac648f8e1ea40fc1c28f716d34f794c1d899e0d2db55cb9580e0 -size 3392773 diff --git a/MesaLib-7.0.3-rc3.tar.bz2 b/MesaLib-7.0.3-rc3.tar.bz2 new file mode 100644 index 0000000..a2966f5 --- /dev/null +++ b/MesaLib-7.0.3-rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe1914115bcb3aeebfd0ea24a8a4bb715de14737866c9bb72aa1cfc4f3509ca0 +size 3427910 diff --git a/confine_to_shape.diff b/confine_to_shape.diff new file mode 100644 index 0000000..d2fce3c --- /dev/null +++ b/confine_to_shape.diff @@ -0,0 +1,111 @@ +Index: events.c +=================================================================== +RCS file: /home/eich/cvs/xc/programs/Xserver/dix/events.c,v +retrieving revision 1.1.1.19 +diff -u -r1.1.1.19 events.c +--- dix/events.c.orig 26 Aug 2004 12:09:13 -0000 1.1.1.19 ++++ dix/events.c 2 Mar 2005 20:04:13 -0000 +@@ -656,35 +656,79 @@ + { + BoxRec box; + int x = *px, y = *py; +- int incx = 1, incy = 1; +- ++ int nbox; ++ BoxPtr pbox; ++ int d, min = (~0U >> 1), dx2, dy2, x_r, y_r; ++ + if (POINT_IN_REGION(sprite.hot.pScreen, shape, x, y, &box)) + return; +- box = *REGION_EXTENTS(sprite.hot.pScreen, shape); +- /* this is rather crude */ +- do { +- x += incx; +- if (x >= box.x2) +- { +- incx = -1; +- x = *px - 1; ++ ++ for (nbox = REGION_NUM_RECTS (shape), ++ pbox = REGION_RECTS(shape); ++ nbox--; ++ pbox++) ++ { ++ if (pbox->x1 < x && pbox->x2 > x) { ++ d = pbox->y1 - y; ++ if (d >= 0) { ++ d *= d; ++ if (d < min) { ++ *px = x; ++ *py = pbox->y1 + 1; ++ min = d; ++ } ++ } else { ++ d = pbox->y2 - y; d *= d; ++ if (d < min) { ++ *px = x; ++ *py = pbox->y2 - 1; ++ min = d; ++ } ++ } + } +- else if (x < box.x1) +- { +- incx = 1; +- x = *px; +- y += incy; +- if (y >= box.y2) +- { +- incy = -1; +- y = *py - 1; ++ else if (pbox->y1 < y && pbox->y2 > y) { ++ d = pbox->x1 - x; ++ if (d >= 0) { ++ d *= d; ++ if (d < min) { ++ *px = pbox->x1 + 1; ++ *py = y; ++ min = d; ++ } ++ } else { ++ d = pbox->x2 - x; d *= d; ++ if (d < min) { ++ *px = pbox->x2 - 1; ++ *py = y; ++ min = d; ++ } ++ } ++ ++ } else { ++ dx2 = pbox->x1 - x; ++ if (dx2 >= 0) { ++ dx2 *= dx2; ++ x_r = pbox->x1 + 1; ++ } else { ++ dx2 = pbox->x2 - x; dx2 *= dx2; ++ x_r = pbox->x2 - 1; ++ } ++ dy2 = pbox->y1 - y; ++ if (dy2 >= 0) { ++ dy2 *= dy2; ++ y_r = pbox->y1 + 1; ++ } else { ++ dy2 = pbox->y2 - y; dy2 *= dy2; ++ y_r = pbox->y2 - 1; ++ } ++ if ((d = dx2 + dy2) < min) { ++ *px = x_r; ++ *py = y_r; ++ min = d; + } +- else if (y < box.y1) +- return; /* should never get here! */ + } +- } while (!POINT_IN_REGION(sprite.hot.pScreen, shape, x, y, &box)); +- *px = x; +- *py = y; ++ } ++ + } + #endif + diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 5538871..d1a7e6d 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Apr 2 09:37:56 CEST 2008 - sndirsch@suse.de + +- update to Mesa bugfix release 7.0.3 RC3 sources + +------------------------------------------------------------------- +Mon Mar 31 22:50:21 CEST 2008 - sndirsch@suse.de + +- confine_to_shape.diff + * fixes XGrabPointer's confine_to with shaped windows (bnc #62146) + ------------------------------------------------------------------- Thu Mar 20 14:51:20 CET 2008 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index ca619c4..a37f50f 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -22,7 +22,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 78 +Release: 83 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -36,7 +36,7 @@ Provides: xorg-x11-server-glx Obsoletes: xorg-x11-server-glx Summary: X.Org Server Source: xorg-server-%{dirsuffix}.tar.bz2 -Source1: MesaLib-7.0.3-rc2.tar.bz2 +Source1: MesaLib-7.0.3-rc3.tar.bz2 Source3: README.updates Source4: xorgcfg.tar.bz2 %if %suse_version > 1010 @@ -108,6 +108,7 @@ Patch99: commit-50e80c3.diff Patch100: commit-a6a7fad.diff Patch101: zap_warning_xserver.diff Patch102: xorg-server-1.4-vnc-memory.diff +Patch103: confine_to_shape.diff %description This package contains the X.Org Server. @@ -115,6 +116,7 @@ This package contains the X.Org Server. %package extra +License: X11/MIT Summary: Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb) Group: System/X11/Servers/XF86_4 Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xdmx @@ -130,6 +132,7 @@ This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb). %ifnarch s390 s390x %package sdk +License: X11/MIT Summary: X.Org Server SDK. Group: System/Libraries Provides: xorg-x11-sdk @@ -146,6 +149,7 @@ This package contains the X.Org Server SDK. %if %vnc %package -n xorg-x11-Xvnc +License: GPL v2 or later Summary: VNC Server for the X Window System Group: System/X11/Servers/XF86_4 Requires: xorg-x11-fonts-core xorg-x11 @@ -169,8 +173,8 @@ An X Window System server for Virtual Network Computing (VNC). test -s hw/xfree86/os-support/shared/ia64Pci.h || \ cp $RPM_SOURCE_DIR/ia64Pci.h hw/xfree86/os-support/shared/ia64Pci.h # make legal department happy (Bug #204110) -test -f ../Mesa-7.0.3-rc2/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 -test -f ../Mesa-7.0.3-rc2/progs/ggi/asc-view.c && exit 1 +test -f ../Mesa-7.0.3-rc3/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 +test -f ../Mesa-7.0.3-rc3/progs/ggi/asc-view.c && exit 1 # remove wrongly prebuilt files (Bug #328201) mv hw/xfree86/xf1bpp/mfbmodule.c . rm hw/xfree86/xf1bpp/*.c @@ -242,6 +246,7 @@ popd %patch99 -p1 %patch100 -p1 %patch101 -p1 +%patch103 %build pushd xorg-docs-* @@ -307,7 +312,7 @@ autoreconf -fi --with-log-dir="/var/log" \ --with-os-name="openSUSE" \ --with-os-vendor="SUSE LINUX" \ - --with-mesa-source=$RPM_BUILD_DIR/Mesa-7.0.3-rc2 \ + --with-mesa-source=$RPM_BUILD_DIR/Mesa-7.0.3-rc3 \ --with-fontdir="/usr/share/fonts" \ --with-xkb-path="/usr/share/X11/xkb" \ --with-xkb-output="/var/lib/xkb/compiled" @@ -548,6 +553,11 @@ exit 0 %endif %changelog +* Wed Apr 02 2008 sndirsch@suse.de +- update to Mesa bugfix release 7.0.3 RC3 sources +* Tue Apr 01 2008 sndirsch@suse.de +- confine_to_shape.diff + * fixes XGrabPointer's confine_to with shaped windows (bnc #62146) * Thu Mar 20 2008 sndirsch@suse.de - zap_warning_xserver.diff * implements FATE #302988: ZapWarning (Luc Verhaegen) @@ -618,7 +628,7 @@ exit 0 * CVE-2008-0006 - PCF Font parser buffer overflow. * Thu Dec 13 2007 sndirsch@suse.de - xorg-server 1.4.0.90 (prerelease of 1.4.1) -* Fri Nov 30 2007 sndirsch@suse.de +* Sat Dec 01 2007 sndirsch@suse.de - pixman.diff * fixed include path for pixman.h * Thu Nov 29 2007 sndirsch@suse.de @@ -639,7 +649,7 @@ exit 0 - pixman.diff no longer required * Sun Nov 18 2007 sndirsch@suse.de - s390(x): allow mfb build without Xorg server being built -* Thu Nov 15 2007 sndirsch@suse.de +* Fri Nov 16 2007 sndirsch@suse.de - commit-29e0e18.diff * Make config file preferred mode override monitor preferred mode. @@ -825,10 +835,10 @@ exit 0 - disabled build of Xprt - moved Xdmx, Xephyr, Xnest and Xvfb to new subpackage xorg-x11-server-extra -* Wed May 02 2007 sndirsch@suse.de +* Thu May 03 2007 sndirsch@suse.de - commit-c09e68c: * Paper over a crash at exit during GLX teardown -* Mon Apr 30 2007 sndirsch@suse.de +* Tue May 01 2007 sndirsch@suse.de - updated to Mesa 6.5.3 sources - obsoletes the following patches: * bug-211314_mesa-destroy_buffers.diff @@ -920,7 +930,7 @@ exit 0 * Thu Apr 05 2007 sndirsch@suse.de - bug-243978_xcmisc.diff: * mem corruption in ProcXCMiscGetXIDList (CVE-2007-1003, Bug #243978) -* Wed Apr 04 2007 sndirsch@suse.de +* Thu Apr 05 2007 sndirsch@suse.de - bug-211314_mesa-refcount-memleak-fixes.diff: * Fix for memleaks and refount bugs (Bug #211314) * Fri Mar 30 2007 sndirsch@suse.de @@ -961,13 +971,13 @@ exit 0 or DirectColor. * Add per-drawable Xv colour key helper function. * Bump video driver ABI version to 1.2. -* Mon Mar 19 2007 sndirsch@suse.de +* Tue Mar 20 2007 sndirsch@suse.de - no longer apply bug-211314_mesa-context.diff, bug-211314_p_drawable_privclean.diff (Bug #211314, comment #114) - added different Mesa patches (Bug #211314, comments #114/#115) * Thu Mar 15 2007 schwab@suse.de - Remove bug197190-ia64.diff, fix x86emu instead. -* Wed Mar 14 2007 sndirsch@suse.de +* Thu Mar 15 2007 sndirsch@suse.de - xserver 1.2.99.902 release: * Xprint: shorten font filename to fit in tar length limit * Move xf86SetSingleMode into X server from intel driver. @@ -1068,7 +1078,7 @@ exit 0 * Wed Jan 17 2007 sndirsch@suse.de - bug-211314_mesa-context.diff: * fixes Xserver crash in software rendering fallback (Bug #211314) -* Tue Jan 16 2007 sndirsch@suse.de +* Wed Jan 17 2007 sndirsch@suse.de - 0018-vnc-support.txt.diff * fixed unresolved symbols vncRandomBytes/deskey in VNC module (terminated Xserver when client connected) @@ -1104,7 +1114,7 @@ exit 0 * hopefully fixes AIGLX issues (X.Org Bug #8991) * Fri Dec 08 2006 sndirsch@suse.de - another 64bit warning fix -* Sat Dec 02 2006 sndirsch@suse.de +* Sun Dec 03 2006 sndirsch@suse.de - X.Org 7.2RC3 release * Add a -showDefaultModulePath option. * Add a -showDefaultLibPath option. @@ -1136,7 +1146,7 @@ exit 0 - acpi_events.diff: * distinguish between general and input devices also for APM (Bug #197858) -* Tue Nov 14 2006 sndirsch@suse.de +* Wed Nov 15 2006 sndirsch@suse.de - removed /etc/X11/Xsession.d/92xprint-xpserverlist (Bug #220733) * Tue Nov 14 2006 sndirsch@suse.de - mouse-fix.diff: @@ -1255,7 +1265,7 @@ exit 0 * fixes warning for undefined behaviour * Tue Oct 17 2006 aj@suse.de - Own /etc/X11/Xsession.d directory. -* Mon Oct 16 2006 aj@suse.de +* Tue Oct 17 2006 aj@suse.de - Use /etc/X11/Xsession.d. * Sat Oct 14 2006 sndirsch@suse.de - updated to X.Org 7.2RC1 @@ -1328,7 +1338,7 @@ exit 0 --disable-xorg - changed os-name to "openSUSE" instead of "Linux" before - fake release version for fglrx driver :-( -* Thu Aug 17 2006 sndirsch@suse.de +* Fri Aug 18 2006 sndirsch@suse.de - xinerama-sig11.diff: * prevents Xserver Sig11 with broken Xinerama config (Bug #135002) * Tue Aug 15 2006 sndirsch@suse.de @@ -1382,7 +1392,7 @@ exit 0 (SLED10 Blocker Bugs #180535, #170991, #158806) - p_ia64-console.diff: * fixes MCA after start of second Xserver (Bug #177011) -* Sat Aug 05 2006 sndirsch@suse.de +* Sun Aug 06 2006 sndirsch@suse.de - p_mouse_misc.diff: * fix X server crashes with synaptics driver (Bug #61702) - pu_fixes.diff @@ -1400,7 +1410,7 @@ exit 0 - add /var/X11R6/bin directory for now (Bug #197188) * Wed Aug 02 2006 sndirsch@suse.de - fix setup line -* Mon Jul 31 2006 sndirsch@suse.de +* Tue Aug 01 2006 sndirsch@suse.de - fixed fatal compiler warnings * Mon Jul 31 2006 sndirsch@suse.de - always (and only) patch xorg.conf if necessary