rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Jun 11 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-9

Browse Source 
- xserver-1.3.0-reput-video.patch: Don't crash when minimizing an Xv
  window. (#241214)
This commit is contained in:
Adam Jackson 2007-06-11 21:26:05 +00:00
parent bff4283f76
commit b8f2e2512c
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xorg-x11-server.spec
View File

@ -9,7 +9,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.3.0.0 Version: 1.3.0.0
Release: 8%{?dist} Release: 9%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -33,6 +33,7 @@ Patch20: xserver-1.3.0-x86emu-imul-int64.patch
Patch21: xserver-1.3.0-xkb-and-loathing.patch Patch21: xserver-1.3.0-xkb-and-loathing.patch
Patch22: xserver-1.3.0-fbdevhw-magic-numbers.patch Patch22: xserver-1.3.0-fbdevhw-magic-numbers.patch
Patch23: xserver-1.3.0-ramdac-export.patch Patch23: xserver-1.3.0-ramdac-export.patch
Patch24: xserver-1.3.0-reput-video.patch
# OpenGL compositing manager feature/optimization patches. # OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
@ -284,6 +285,7 @@ Xserver source code needed to build VNC server (Xvnc)
%patch21 -p1 -b .xkb-signal-loathing %patch21 -p1 -b .xkb-signal-loathing
%patch22 -p1 -b .magic-numbers %patch22 -p1 -b .magic-numbers
%patch23 -p1 -b .ramdac %patch23 -p1 -b .ramdac
%patch24 -p1 -b .reput
%patch100 -p0 -b .no-move-damage %patch100 -p0 -b .no-move-damage
%patch101 -p0 -b .dont-backfill-bg-none %patch101 -p0 -b .dont-backfill-bg-none
@ -577,6 +579,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Jun 11 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-9
- xserver-1.3.0-reput-video.patch: Don't crash when minimizing an Xv
window. (#241214)
* Wed Jun 06 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-8 * Wed Jun 06 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-8
- xserver-1.3.0-ramdac-export.patch: Make sure the old ramdac symbols are - xserver-1.3.0-ramdac-export.patch: Make sure the old ramdac symbols are
exported, since they're in-server now. (#242800) exported, since they're in-server now. (#242800)

54
xserver-1.3.0-reput-video.patch Normal file
View File

@ -0,0 +1,54 @@
From: Michel Dänzer <michel@tungstengraphics.com>
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