debian/changelog | 9 +++++++++ src/s3.h | 1 - src/s3_Ti.c | 2 ++ src/s3_driver.c | 5 ++++- 4 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit c6980ce26881deeaff5c8096571e9a6711c5a776 Author: Julien Cristau <[email protected]> Date: Wed Mar 20 19:26:58 2013 +0100 Upload to sid diff --git a/debian/changelog b/debian/changelog index 957dab5..caf2a92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -xserver-xorg-video-s3 (1:0.6.3-5) UNRELEASED; urgency=low +xserver-xorg-video-s3 (1:0.6.3-5) unstable; urgency=high + * High urgency upload for RC bug fix. * Add missing call to vbeFree - * Fix for new vgahw ABI (closes: #522747) + * Fix for new vgahw ABI (closes: #522747). Prevents X crash on startup. * Include unistd.h for usleep - -- Julien Cristau <[email protected]> Tue, 19 Mar 2013 19:16:02 +0100 + -- Julien Cristau <[email protected]> Wed, 20 Mar 2013 19:24:32 +0100 xserver-xorg-video-s3 (1:0.6.3-4) unstable; urgency=low commit 852393d67bced275e3a7ad42d837166b43be4b42 Author: Julien Cristau <[email protected]> Date: Tue Mar 19 19:27:21 2013 +0100 Changelog entry diff --git a/debian/changelog b/debian/changelog index 21c41d0..957dab5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-s3 (1:0.6.3-5) UNRELEASED; urgency=low + + * Add missing call to vbeFree + * Fix for new vgahw ABI (closes: #522747) + * Include unistd.h for usleep + + -- Julien Cristau <[email protected]> Tue, 19 Mar 2013 19:16:02 +0100 + xserver-xorg-video-s3 (1:0.6.3-4) unstable; urgency=low * Switch to dh: commit 10fd71c5ef306aa22cc87486491f50684b27dc07 Author: Julien Cristau <[email protected]> Date: Sat May 12 13:47:36 2012 +0200 Include unistd.h for usleep Signed-off-by: Julien Cristau <[email protected]> (cherry picked from commit 6a8cead012e36c9e709f0198af17a94dfae17048) diff --git a/src/s3_Ti.c b/src/s3_Ti.c index 9ea949a..fd83bfb 100644 --- a/src/s3_Ti.c +++ b/src/s3_Ti.c @@ -29,6 +29,8 @@ #include "config.h" #endif +#include <unistd.h> + #include "xf86.h" #include "xf86_OSproc.h" commit ebcf1719e155bc5e8606aad8c604e0675ab66a5e Author: Adam Jackson <[email protected]> Date: Mon Dec 19 17:17:28 2011 -0500 Fix for new vgahw ABI Signed-off-by: Adam Jackson <[email protected]> (cherry picked from commit e5c1c27b83e93d9cb2a74c7c4ee85b36eb1bbdef) diff --git a/src/s3_driver.c b/src/s3_driver.c index 4519b33..6113811 100644 --- a/src/s3_driver.c +++ b/src/s3_driver.c @@ -326,6 +326,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) return FALSE; hwp = VGAHWPTR(pScrn); + vgaHWSetStdFuncs(hwp); vgaHWGetIOBase(hwp); pScrn->monitor = pScrn->confScreen->monitor; commit ca088afc01bbc3d3ec2624c65b5d4c717cbaf7ed Author: Matt Turner <[email protected]> Date: Thu Dec 2 17:09:46 2010 -0500 Add missing call to vbeFree (bug 4417) Reviewed-by: Adam Jackson <[email protected]> Signed-off-by: Matt Turner <[email protected]> (cherry picked from commit 381ace93a17da291d4149fe0f98ee4b7386f67ee) diff --git a/src/s3.h b/src/s3.h index 49b8a54..0875fc9 100644 --- a/src/s3.h +++ b/src/s3.h @@ -113,7 +113,6 @@ typedef struct _S3Rec { XAAInfoRecPtr pXAA; xf86CursorInfoPtr pCurs; xf86Int10InfoPtr pInt10; - vbeInfoPtr pVBE; XF86VideoAdaptorPtr adaptor; S3PortPrivPtr portPrivate; diff --git a/src/s3_driver.c b/src/s3_driver.c index 29e343d..4519b33 100644 --- a/src/s3_driver.c +++ b/src/s3_driver.c @@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) S3Ptr pS3; vgaHWPtr hwp; ClockRangePtr clockRanges; + vbeInfoPtr pVBE; rgb zeros = {0, 0, 0}; Gamma gzeros = {0.0, 0.0, 0.0}; int i, vgaCRIndex, vgaCRReg; @@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) } if (xf86LoadSubModule(pScrn, "vbe")) { - pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index); + pVBE = VBEInit(pS3->pInt10, pEnt->index); + vbeFree(pVBE); } if (pS3->shadowFB) { -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
