Author: adamwill Update of /cvs/nonfree/rpms/xorg-x11-drv-psb/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv5611 Modified Files: xorg-x11-drv-psb.spec Added Files: xorg-x11-drv-psb-0.32.0-changegc.patch xorg-x11-drv-psb-0.32.0-mibank.patch xorg-x11-drv-psb-0.32.0-null.patch xorg-x11-drv-psb-0.32.0-root_window.patch xorg-x11-drv-psb-0.32.0-symbols.patch Log Message: * Fri Sep 17 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-5 - add various patches from Lubomir Rintel for F14 compatibility xorg-x11-drv-psb-0.32.0-changegc.patch: psb_dga.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE xorg-x11-drv-psb-0.32.0-changegc.patch --- --- a/src/psb_dga.c +++ b/src/psb_dga.c @@ -310,13 +310,13 @@ PSB_FillRect(ScrnInfoPtr pScrn, { GCPtr pGC; DrawablePtr pDrawable; - XID vals[1]; + ChangeGCVal vals[1]; xRectangle r; if (!xf86_dga_get_drawable_and_gc(pScrn, &pDrawable, &pGC)) return; - vals[0] = color; - ChangeGC(pGC, GCForeground, vals); + vals[0].val = color; + ChangeGC(NullClient, pGC, GCForeground, vals); ValidateGC(pDrawable, pGC); r.x = x; r.y = y; xorg-x11-drv-psb-0.32.0-mibank.patch: psb_driver.h | 1 - 1 file changed, 1 deletion(-) --- NEW FILE xorg-x11-drv-psb-0.32.0-mibank.patch --- --- a/src/psb_driver.h +++ b/src/psb_driver.h @@ -43,7 +43,6 @@ #include "xf86DDC.h" #include "shadow.h" #include "xf86int10.h" -#include "mibank.h" #include "dgaproc.h" #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" xorg-x11-drv-psb-0.32.0-null.patch: psb_accel.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- NEW FILE xorg-x11-drv-psb-0.32.0-null.patch --- --- a/src/psb_accel.c +++ b/src/psb_accel.c @@ -509,9 +509,14 @@ psbExaCheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, PicturePtr pDstPicture) { + int w, h; DrawablePtr pDraw = pSrcPicture->pDrawable; - int w = pDraw->width; - int h = pDraw->height; + + if (!pDraw) + return FALSE; + + w = pDraw->width; + h = pDraw->height; if (op > PictOpAdd) return FALSE; xorg-x11-drv-psb-0.32.0-root_window.patch: psb_dga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xorg-x11-drv-psb-0.32.0-root_window.patch --- --- a/src/psb_dga.c +++ b/src/psb_dga.c @@ -298,7 +298,7 @@ static void PSB_Sync(ScrnInfoPtr pScrn) { ScreenPtr pScreen = pScrn->pScreen; - WindowPtr pRoot = WindowTable[pScreen->myNum]; + WindowPtr pRoot = pScreen->root; char buffer[4]; pScreen->GetImage(&pRoot->drawable, 0, 0, 1, 1, ZPixmap, ~0L, buffer); xorg-x11-drv-psb-0.32.0-symbols.patch: psb_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- NEW FILE xorg-x11-drv-psb-0.32.0-symbols.patch --- --- a/src/psb_driver.c +++ b/src/psb_driver.c @@ -301,6 +301,10 @@ static XF86ModuleVersionInfo psbVersionRec = { {0, 0, 0, 0} }; +/* compat cruft */ +_X_EXPORT BoxRec miEmptyBox; +_X_EXPORT RegDataRec miEmptyData, miBrokenData; + /* * This data is accessed by the loader. The name must be the module name * followed by "ModuleData". @@ -312,6 +316,10 @@ psbSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) { static Bool Initialised = FALSE; + miEmptyBox = RegionEmptyBox; + miEmptyData = RegionEmptyData; + miBrokenData = RegionBrokenData; + PSB_DEBUG(-1, 3, "psbSetup\n"); if (!Initialised) { Index: xorg-x11-drv-psb.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-psb/devel/xorg-x11-drv-psb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xorg-x11-drv-psb.spec 17 Sep 2010 10:18:30 -0000 1.2 +++ xorg-x11-drv-psb.spec 17 Sep 2010 10:32:25 -0000 1.3 @@ -5,7 +5,7 @@ Summary: Intel GMA500 (Poulsbo) video driver Name: xorg-x11-drv-psb Version: 0.32.0 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://netbook-remix.archive.canonical.com/updates/pool/public/x/xserver-... Source0: http://netbook-remix.archive.canonical.com/updates/pool/public/x/xserver-... # Causes psb module to be loaded when a GMA500 adapter PCI ID is found @@ -38,6 +38,12 @@ Patch10: xorg-x11-drv-psb-0.32.0-xv.patch # From Yves - fix blank screen when rotating 90 degrees Patch11: xorg-x11-drv-psb-0.32.0-rotate.patch +# From Lubomir Rintel - various fixes for X server 1.9 +Patch12: xorg-x11-drv-psb-0.32.0-root_window.patch +Patch13: xorg-x11-drv-psb-0.32.0-changegc.patch +Patch14: xorg-x11-drv-psb-0.32.0-mibank.patch +Patch15: xorg-x11-drv-psb-0.32.0-symbols.patch +Patch16: xorg-x11-drv-psb-0.32.0-null.patch License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -92,6 +98,11 @@ %patch9 -p1 -b .mixed %patch10 -p1 -b .xv %patch11 -p1 -b .rotate +%patch12 -p1 -b .rootwindow +%patch13 -p1 -b .changegc +%patch14 -p1 -b .mibank +%patch15 -p1 -b .symbols +%patch16 -p1 -b .null iconv -f iso-8859-15 -t utf-8 -o man/psb.man.utf8 man/psb.man && mv man/psb.man.utf8 man/psb.man @@ -146,6 +157,9 @@ %{_mandir}/man4/*.4* %changelog +* Fri Sep 17 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-5 +- add various patches from Lubomir Rintel for F14 compatibility + * Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-4 - add rotate.patch, from Yves: fixes 90 degree rotation