ChangeLog | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ README | 2 - configure.ac | 6 +---- debian/changelog | 8 +++++++ debian/control | 2 - src/smi_driver.c | 9 ++++++-- 6 files changed, 78 insertions(+), 9 deletions(-)
New commits: commit 103fd468eabb1cfb3ce55bda52e4c1e8c933dabe Author: Cyril Brulebois <[email protected]> Date: Tue May 1 19:05:53 2012 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 1f2877a..d9790da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xserver-xorg-video-siliconmotion (1:1.7.6-1) UNRELEASED; urgency=low +xserver-xorg-video-siliconmotion (1:1.7.6-1) unstable; urgency=low * New upstream release: - Fix FTBFS against X server 1.12. * Drop unused x11proto-randr-dev and x11proto-render-dev build-deps. - -- Cyril Brulebois <[email protected]> Tue, 01 May 2012 19:04:16 +0200 + -- Cyril Brulebois <[email protected]> Tue, 01 May 2012 19:05:51 +0200 xserver-xorg-video-siliconmotion (1:1.7.5-1) unstable; urgency=low commit e22d30925e204459ec1b5b3c260b872417ab0cff Author: Cyril Brulebois <[email protected]> Date: Tue May 1 19:05:49 2012 +0200 Drop unused x11proto-randr-dev and x11proto-render-dev build-deps. diff --git a/debian/changelog b/debian/changelog index e02bc13..1f2877a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-siliconmotion (1:1.7.6-1) UNRELEASED; urgency=low * New upstream release: - Fix FTBFS against X server 1.12. + * Drop unused x11proto-randr-dev and x11proto-render-dev build-deps. -- Cyril Brulebois <[email protected]> Tue, 01 May 2012 19:04:16 +0200 diff --git a/debian/control b/debian/control index 016324a..bf89342 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,6 @@ Build-Depends: x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, - x11proto-randr-dev (>= 1.2), - x11proto-render-dev, quilt, xutils-dev (>= 1:7.5+4), Standards-Version: 3.9.1 commit 0a341a7fa6754b942543052a795730a8de5df14c Author: Cyril Brulebois <[email protected]> Date: Tue May 1 19:04:39 2012 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 11fc623..937d67a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,63 @@ +commit e4660be7c12de53cac57c0b7d4e792a071b4fcfc +Author: Alan Coopersmith <[email protected]> +Date: Fri Mar 23 19:49:14 2012 -0700 + + xf86-video-siliconmotion 1.7.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 63afc35a662bc2dc460f6ff6fab65a8462aa5e76 +Author: Matt Turner <[email protected]> +Date: Thu Feb 9 17:14:25 2012 -0500 + + Add &component=Driver/siliconmotion to Bugzilla link + + Signed-off-by: Matt Turner <[email protected]> + +commit 12695ed1edd8c590252e76d530bcecaa0036e109 +Author: Matt Turner <[email protected]> +Date: Thu Feb 9 16:21:59 2012 -0500 + + Don't check for randrproto or renderproto + + The driver supports neither randr or render. + + Signed-off-by: Matt Turner <[email protected]> + +commit 0e7e9cd639196cb42b0a79b2671f6bacc558035f +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 17:26:34 2011 -0500 + + Fix for new vgaHW ABI + + Signed-off-by: Adam Jackson <[email protected]> + +commit 208a703776d6dfbd01babbe2f220a7198dea4f5c +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 17:25:39 2011 -0500 + + Make failure to XAA non-fatal + + No shadowfb support in this driver yet. + + Signed-off-by: Adam Jackson <[email protected]> + +commit 7d9c1a49b87df15cdb78c529db554ea82c77033f +Author: Adam Jackson <[email protected]> +Date: Thu Nov 17 15:53:51 2011 -0500 + + Check ABI major not encoded ABI + + Signed-off-by: Adam Jackson <[email protected]> + +commit 037b839c84ad6dcbe9aade420cf0d3bf06f23119 +Author: Adam Jackson <[email protected]> +Date: Wed Nov 16 15:03:25 2011 -0500 + + Adapt to missing PIOOffset in videoabi 12 + + Signed-off-by: Adam Jackson <[email protected]> + commit 087226bf4e442b83985078f5df481eb91f4f65ed Author: Julien Cristau <[email protected]> Date: Sun Feb 27 17:12:58 2011 +0100 diff --git a/debian/changelog b/debian/changelog index 19178c4..e02bc13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-siliconmotion (1:1.7.6-1) UNRELEASED; urgency=low + + * New upstream release: + - Fix FTBFS against X server 1.12. + + -- Cyril Brulebois <[email protected]> Tue, 01 May 2012 19:04:16 +0200 + xserver-xorg-video-siliconmotion (1:1.7.5-1) unstable; urgency=low * New upstream release. commit e4660be7c12de53cac57c0b7d4e792a071b4fcfc Author: Alan Coopersmith <[email protected]> Date: Fri Mar 23 19:49:14 2012 -0700 xf86-video-siliconmotion 1.7.6 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 4654c64..7a80962 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-siliconmotion], - [1.7.5], + [1.7.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion], [xf86-video-siliconmotion]) commit 63afc35a662bc2dc460f6ff6fab65a8462aa5e76 Author: Matt Turner <[email protected]> Date: Thu Feb 9 17:14:25 2012 -0500 Add &component=Driver/siliconmotion to Bugzilla link Signed-off-by: Matt Turner <[email protected]> diff --git a/README b/README index b3b6674..a8840d8 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ Xorg mailing list: Please submit bug reports to the Xorg bugzilla: - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion The master development code repository can be found at: diff --git a/configure.ac b/configure.ac index aa8f4b9..4654c64 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ([2.60]) AC_INIT([xf86-video-siliconmotion], [1.7.5], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion], [xf86-video-siliconmotion]) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS commit 12695ed1edd8c590252e76d530bcecaa0036e109 Author: Matt Turner <[email protected]> Date: Thu Feb 9 16:21:59 2012 -0500 Don't check for randrproto or renderproto The driver supports neither randr or render. Signed-off-by: Matt Turner <[email protected]> diff --git a/configure.ac b/configure.ac index 9890a76..aa8f4b9 100644 --- a/configure.ac +++ b/configure.ac @@ -55,8 +55,6 @@ AC_ARG_WITH(xorg-module-dir, [moduledir="$libdir/xorg/modules"]) # Store the list of server defined optional extensions in REQUIRED_MODULES -XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) commit 0e7e9cd639196cb42b0a79b2671f6bacc558035f Author: Adam Jackson <[email protected]> Date: Mon Dec 19 17:26:34 2011 -0500 Fix for new vgaHW ABI Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/smi_driver.c b/src/smi_driver.c index a344921..25eb742 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -442,6 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) LEAVE(FALSE); hwp = VGAHWPTR(pScrn); + vgaHWSetStdFuncs(hwp); #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pSmi->PIOBase = hwp->PIOOffset; #else commit 208a703776d6dfbd01babbe2f220a7198dea4f5c Author: Adam Jackson <[email protected]> Date: Mon Dec 19 17:25:39 2011 -0500 Make failure to XAA non-fatal No shadowfb support in this driver yet. Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/smi_driver.c b/src/smi_driver.c index 6508fae..a344921 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -879,8 +879,8 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) if (!pSmi->NoAccel) { if (!pSmi->useEXA) { if (!xf86LoadSubModule(pScrn, "xaa")) { - SMI_FreeRec(pScrn); - LEAVE(FALSE); + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No acceleration\n"); + pSmi->NoAccel = 1; } } else { XF86ModReqInfo req; commit 7d9c1a49b87df15cdb78c529db554ea82c77033f Author: Adam Jackson <[email protected]> Date: Thu Nov 17 15:53:51 2011 -0500 Check ABI major not encoded ABI Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/smi_driver.c b/src/smi_driver.c index 86644c7..6508fae 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -442,7 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) LEAVE(FALSE); hwp = VGAHWPTR(pScrn); -#if ABI_VIDEODRV_VERSION < 12 +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pSmi->PIOBase = hwp->PIOOffset; #else pSmi->PIOBase = 0; commit 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Author: Adam Jackson <[email protected]> Date: Wed Nov 16 15:03:25 2011 -0500 Adapt to missing PIOOffset in videoabi 12 Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/smi_driver.c b/src/smi_driver.c index 9c10e46..86644c7 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) LEAVE(FALSE); hwp = VGAHWPTR(pScrn); +#if ABI_VIDEODRV_VERSION < 12 pSmi->PIOBase = hwp->PIOOffset; +#else + pSmi->PIOBase = 0; +#endif xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, " "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET, -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
