1
0
OBS User unknown 2008-11-07 14:54:35 +00:00 committed by Git OBS Bridge
parent a8e6a31525
commit be5f1f8809
5 changed files with 99 additions and 14 deletions

14
XAA_pixmap_sync.diff Normal file
View File

@ -0,0 +1,14 @@
diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h
index 38c97d7..1799d8e 100644
--- a/hw/xfree86/xaa/xaawrap.h
+++ b/hw/xfree86/xaa/xaawrap.h
@@ -48,7 +48,8 @@
XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDraw));\
GCFuncs *oldFuncs = pGC->funcs;\
pGC->funcs = pGCPriv->wrapFuncs;\
- pGC->ops = pGCPriv->wrapOps
+ pGC->ops = pGCPriv->wrapOps; \
+ SYNC_CHECK(pGC)
#define XAA_PIXMAP_OP_EPILOGUE(pGC)\

View File

@ -0,0 +1,17 @@
--- hw/xfree86/modes/xf86Crtc.c.orig 2008-11-05 17:21:08.000000000 +0100
+++ hw/xfree86/modes/xf86Crtc.c 2008-11-05 17:24:07.000000000 +0100
@@ -1176,10 +1176,12 @@ xf86InitialOutputPositions (ScrnInfoPtr
output->initial_x += xf86ModeWidth (modes[or], relative->initial_rotation);
break;
case OPTION_ABOVE:
- output->initial_y -= xf86ModeHeight (modes[o], relative->initial_rotation);
+ if (modes[o])
+ output->initial_y -= xf86ModeHeight (modes[o], output->initial_rotation);
break;
case OPTION_LEFT_OF:
- output->initial_x -= xf86ModeWidth (modes[o], relative->initial_rotation);
+ if (modes[o])
+ output->initial_x -= xf86ModeWidth (modes[o], output->initial_rotation);
break;
default:
break;

11
vidmode-sig11.diff Normal file
View File

@ -0,0 +1,11 @@
--- hw/xfree86/common/xf86VidMode.c.orig 2008-11-06 17:46:03.000000000 +0100
+++ hw/xfree86/common/xf86VidMode.c 2008-11-06 17:48:54.000000000 +0100
@@ -225,6 +225,8 @@ VidModeGetFirstModeline(int scrnIndex, p
pScrn = xf86Screens[scrnIndex];
pVidMode = VMPTR(pScrn->pScreen);
+ if (!pScrn->modes)
+ return FALSE;
pVidMode->First = pScrn->modes;
pVidMode->Next = pVidMode->First->next;

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Nov 7 15:04:01 CET 2008 - sndirsch@suse.de
- XAA_pixmap_sync.diff
* By adding a line with SYNC_CHECK to the XAA_PIXMAP_OP_PROLOGUE
macro, all XAA pixmap callbacks now properly wait for the
hardware to be synced before calling the (next) unwrapped
callback. This effectively clears up all the drawing issues
we are seeing. (bnc #435791)
-------------------------------------------------------------------
Thu Nov 6 17:51:47 CET 2008 - sndirsch@suse.de
- vidmode-sig11.diff
* fixes Sig11 in vidmode extension (bnc #439354)
-------------------------------------------------------------------
Wed Nov 5 17:18:29 CET 2008 - sndirsch@suse.de
- unplugged_monitor_crashfix.diff
* prevent monitor from crashing during startup if statically
configured external has been unplugged (bfo #18246)
-------------------------------------------------------------------
Tue Nov 4 18:04:15 CET 2008 - sndirsch@suse.de

View File

@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
Release: 12
Release: 13
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -99,6 +99,9 @@ Patch117: acpi-warning.diff
Patch118: exa-greedy.diff
Patch120: dga_cleanup.diff
Patch121: miPointerUpdate-crashfix.diff
Patch122: unplugged_monitor_crashfix.diff
Patch123: vidmode-sig11.diff
Patch124: XAA_pixmap_sync.diff
%description
This package contains the X.Org Server.
@ -213,6 +216,9 @@ popd
%patch118 -p1
%patch120 -p1
%patch121 -p0
%patch122 -p0
%patch123 -p0
%patch124 -p1
%build
pushd xorg-docs-*
@ -529,6 +535,20 @@ exit 0
%endif
%changelog
* Fri Nov 07 2008 sndirsch@suse.de
- XAA_pixmap_sync.diff
* By adding a line with SYNC_CHECK to the XAA_PIXMAP_OP_PROLOGUE
macro, all XAA pixmap callbacks now properly wait for the
hardware to be synced before calling the (next) unwrapped
callback. This effectively clears up all the drawing issues
we are seeing. (bnc #435791)
* Thu Nov 06 2008 sndirsch@suse.de
- vidmode-sig11.diff
* fixes Sig11 in vidmode extension (bnc #439354)
* Wed Nov 05 2008 sndirsch@suse.de
- unplugged_monitor_crashfix.diff
* prevent monitor from crashing during startup if statically
configured external has been unplugged (bfo #18246)
* Tue Nov 04 2008 sndirsch@suse.de
- removed glitz-devel from BuildRequires (bnc #441549)
* Mon Oct 27 2008 sndirsch@suse.de
@ -545,7 +565,7 @@ exit 0
- miPointerUpdate-crashfix.diff
* fixes Xserver crash at startup with ELO touchscreen
(bnc #436435)
* Sun Oct 12 2008 sndirsch@suse.de
* Sat Oct 11 2008 sndirsch@suse.de
- xorg-server 1.5.2
* int10: Remove useless check.
* int10: Don't warn when scanning for devices we don't have.
@ -610,7 +630,7 @@ exit 0
* Tue Aug 05 2008 sndirsch@suse.de
- enabled build of record extension, which has been disabled
upstream for whatever reason
* Sat Aug 02 2008 sndirsch@suse.de
* Fri Aug 01 2008 sndirsch@suse.de
- xorg-server-xf4vnc-abi-version.diff
* raised ABI version for xorg-server 1.5(-pre)
* Thu Jul 24 2008 sndirsch@suse.de
@ -713,7 +733,7 @@ exit 0
- xserver-1.3.0-xkb-and-loathing.patch
* adjusted patches
- xorg-server-1.4-vnc.patch
* Fri Jun 06 2008 sndirsch@suse.de
* Thu Jun 05 2008 sndirsch@suse.de
- bfo-bug15222.diff (bfo #15222, bnc #374318)
* CVE-2008-2360 - RENDER Extension heap buffer overflow
* CVE-2008-2361 - RENDER Extension crash
@ -840,7 +860,7 @@ exit 0
* CVE-2007-6428 - TOG-cup extension memory corruption.
* CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
* CVE-2008-0006 - PCF Font parser buffer overflow.
* Thu Dec 13 2007 sndirsch@suse.de
* Wed Dec 12 2007 sndirsch@suse.de
- xorg-server 1.4.0.90 (prerelease of 1.4.1)
* Fri Nov 30 2007 sndirsch@suse.de
- pixman.diff
@ -859,7 +879,7 @@ exit 0
* Only clear crtc of output if it is the one we're actually working on.
- commit-fa19e84.diff
* Fix initial placement of LeftOf and Above.
* Fri Nov 23 2007 sndirsch@suse.de
* Thu Nov 22 2007 sndirsch@suse.de
- pixman.diff no longer required
* Sun Nov 18 2007 sndirsch@suse.de
- s390(x): allow mfb build without Xorg server being built
@ -877,7 +897,7 @@ exit 0
- ia64linuxPciInit: allocate extra space for fake devices.
* Sat Nov 10 2007 sndirsch@suse.de
- updated to Mesa 7.0.2 (final) sources
* Thu Nov 01 2007 sndirsch@suse.de
* Wed Oct 31 2007 sndirsch@suse.de
- updated to Mesa 7.0.2 RC1 sources
* Tue Oct 23 2007 sndirsch@suse.de
- xorg-server-1.4-vnc-64bit.diff
@ -914,7 +934,7 @@ exit 0
- recreated p_pci-off-by-one.diff.ia64; the default fuzz factor of
patch (2) resulted in a hunk applied to the wrong function and
therefore broke the build :-(
* Sat Sep 29 2007 sndirsch@suse.de
* Fri Sep 28 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
@ -977,10 +997,10 @@ exit 0
- use-composite-for-unequal-depths.patch:
* Use Composite when depths don't match (Bug #309107, X.Org Bug
[#7447])
* Sat Sep 08 2007 schwab@suse.de
* Fri Sep 07 2007 schwab@suse.de
- Update off-by-one patch.
- Remove empty patch.
* Tue Sep 04 2007 sndirsch@suse.de
* Mon Sep 03 2007 sndirsch@suse.de
- fbdevhw.diff:
* ignore pixclock set to 0 by Xen kernel (Bug #285523)
* Fri Aug 31 2007 sndirsch@suse.de
@ -1026,7 +1046,7 @@ exit 0
- build parallel
* Sat Aug 04 2007 sndirsch@suse.de
- updated Mesa source to bugfix release 7.0.1
* Fri Jul 20 2007 sndirsch@suse.de
* Thu Jul 19 2007 sndirsch@suse.de
- xephyr-sig11-fix.diff:
* long vs. CARD32 mismatch in KeySym definitions between client
and server code - this patch seems to fix it (and the input
@ -1141,7 +1161,7 @@ exit 0
* Fri Apr 06 2007 sndirsch@suse.de
- xserver 1.2.99.904 release:
* Don't erase current crtc for outputs on CloseScreen
* Thu Apr 05 2007 sndirsch@suse.de
* Wed Apr 04 2007 sndirsch@suse.de
- bug-243978_xcmisc.diff:
* mem corruption in ProcXCMiscGetXIDList (CVE-2007-1003, Bug #243978)
* Wed Apr 04 2007 sndirsch@suse.de
@ -1508,7 +1528,7 @@ exit 0
tarball (Bug #204110)
- added a check to specfile to make sure that these will not be
reintroduced with the next Mesa update again (Bug #204110)
* Sat Sep 02 2006 sndirsch@suse.de
* Fri Sep 01 2006 sndirsch@suse.de
- moved xf86Parser.h,xf86Optrec.h back to /usr/include/xorg, since
SaX2 build issues have finally been resolved by making use of
"-iquote /usr/include/xorg -I."
@ -1648,7 +1668,7 @@ exit 0
- p_ValidatePci.diff:
* no longer call ValidatePci() to fix i810 driver issues
(Bug #191987)
* Fri Jul 21 2006 sndirsch@suse.de
* Thu Jul 20 2006 sndirsch@suse.de
- fixed build
* Tue Jun 27 2006 sndirsch@suse.de
- created package