From b8f2e2512c3a45a36e36e43e8a4699b4191bed38 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Jun 11 2007 21:26:05 +0000 Subject: * Mon Jun 11 2007 Adam Jackson 1.3.0.0-9 - xserver-1.3.0-reput-video.patch: Don't crash when minimizing an Xv window. (#241214) --- diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1d330d3..5d4248f 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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 @@ Patch20: xserver-1.3.0-x86emu-imul-int64.patch 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 @@ Xserver source code needed to build VNC server (Xvnc) %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 11 2007 Adam Jackson 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 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) diff --git a/xserver-1.3.0-reput-video.patch b/xserver-1.3.0-reput-video.patch new file mode 100644 index 0000000..9f921e6 --- /dev/null +++ b/xserver-1.3.0-reput-video.patch @@ -0,0 +1,54 @@ +From: Michel Dänzer +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