rpms/xorg-x11-server/devel xserver-1.3.0-reput-video.patch, NONE, 1.1 xorg-x11-server.spec, 1.232, 1.233
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Mon Jun 11 21:26:40 UTC 2007
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22136
Modified Files:
xorg-x11-server.spec
Added Files:
xserver-1.3.0-reput-video.patch
Log Message:
* Mon Jun 11 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-9
- xserver-1.3.0-reput-video.patch: Don't crash when minimizing an Xv
window. (#241214)
xserver-1.3.0-reput-video.patch:
--- NEW FILE xserver-1.3.0-reput-video.patch ---
From: Michel Dänzer <michel at 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
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- xorg-x11-server.spec 6 Jun 2007 18:44:58 -0000 1.232
+++ xorg-x11-server.spec 11 Jun 2007 21:26:05 -0000 1.233
@@ -9,7 +9,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.3.0.0
-Release: 8%{?dist}
+Release: 9%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -33,6 +33,7 @@
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
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
@@ -284,6 +285,7 @@
%patch21 -p1 -b .xkb-signal-loathing
%patch22 -p1 -b .magic-numbers
%patch23 -p1 -b .ramdac
+%patch24 -p1 -b .reput
%patch100 -p0 -b .no-move-damage
%patch101 -p0 -b .dont-backfill-bg-none
@@ -577,6 +579,10 @@
%changelog
+* Mon Jun 11 2007 Adam Jackson <ajax at 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 at redhat.com> 1.3.0.0-8
- xserver-1.3.0-ramdac-export.patch: Make sure the old ramdac symbols are
exported, since they're in-server now. (#242800)
More information about the scm-commits
mailing list