[xorg-x11-drv-siliconmotion] new abi

[Adam Jackson]

commit 4000714c4b8d6732e534c55188b5b4c69f95ecaa
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Dec 2 14:44:00 2010 -0500

    new abi

 smi-1.7.3-pixmapprivate.patch   |   45 +++++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-siliconmotion.spec |    7 +++++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/smi-1.7.3-pixmapprivate.patch b/smi-1.7.3-pixmapprivate.patch
new file mode 100644
index 0000000..e94cfc9
--- /dev/null
+++ b/smi-1.7.3-pixmapprivate.patch
@@ -0,0 +1,45 @@
+diff -up xf86-video-siliconmotion-20100122/src/smi_crtc.c.jx xf86-video-siliconmotion-20100122/src/smi_crtc.c
+--- xf86-video-siliconmotion-20100122/src/smi_crtc.c.jx	2010-01-21 15:09:21.000000000 -0500
++++ xf86-video-siliconmotion-20100122/src/smi_crtc.c	2010-12-02 14:39:14.000000000 -0500
+@@ -23,6 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
+ #include "config.h"
+ #endif
+ 
++#include "xorgVersion.h"
+ #include "smi.h"
+ #include "smi_crtc.h"
+ #include "smilynx.h"
+@@ -210,10 +211,12 @@ SMI_CrtcConfigResize(ScrnInfoPtr       p
+ 	pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
+ 					   -1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
+ 
++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+ 	if(pScrn->pixmapPrivate.ptr)
+ 	    /* The pixmap devPrivate just set may be overwritten by
+ 	       xf86EnableDisableFBAccess */
+ 	    pScrn->pixmapPrivate.ptr = pSmi->FBBase + pSmi->FBOffset;
++#endif
+ 
+ 	/* Modify the screen pitch */
+ 	pScrn->displayWidth = aligned_pitch / pSmi->Bpp;
+diff -up xf86-video-siliconmotion-20100122/src/smi_driver.c.jx xf86-video-siliconmotion-20100122/src/smi_driver.c
+--- xf86-video-siliconmotion-20100122/src/smi_driver.c.jx	2010-01-21 15:09:21.000000000 -0500
++++ xf86-video-siliconmotion-20100122/src/smi_driver.c	2010-12-02 14:38:44.000000000 -0500
+@@ -31,6 +31,7 @@ authorization from The XFree86 Project o
+ #include "config.h"
+ #endif
+ 
++#include "xorgVersion.h"
+ #include "xf86.h"
+ #include "xf86DDC.h"
+ #include "xf86int10.h"
+@@ -927,7 +928,9 @@ SMI_EnterVT(int scrnIndex, int flags)
+     /* FBBase may have changed after remapping the memory */
+     pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
+ 				       -1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+     pScrn->pixmapPrivate.ptr=pSmi->FBBase + pSmi->FBOffset;
++#endif
+ 
+     if(pSmi->useEXA)
+        pSmi->EXADriverPtr->memoryBase=pSmi->FBBase;
diff --git a/xorg-x11-drv-siliconmotion.spec b/xorg-x11-drv-siliconmotion.spec
index 0b037a5..bfbb568 100644
--- a/xorg-x11-drv-siliconmotion.spec
+++ b/xorg-x11-drv-siliconmotion.spec
@@ -6,7 +6,7 @@
 Summary:    Xorg X11 siliconmotion video driver
 Name:       xorg-x11-drv-siliconmotion
 Version:    1.7.3
-Release:    5.%{gitdate}%{?dist}
+Release:    6.%{gitdate}%{?dist}
 URL:        http://www.x.org
 License:    MIT
 Group:      User Interface/X Hardware Support
@@ -16,6 +16,7 @@ Source1:    siliconmotion.xinf
 Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source2:    make-git-snapshot.sh
 Source3:    commitid
+Patch0:	    smi-1.7.3-pixmapprivate.patch
 
 ExcludeArch: s390 s390x
 
@@ -31,6 +32,7 @@ X.Org X11 siliconmotion video driver.
 %prep
 #%setup -q -n %{tarball}-%{version}
 %setup -q -n %{tarball}-%{gitdate}
+%patch0 -p1 -b .pixmap
 
 %build
 autoreconf -v --install || exit 1
@@ -59,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/siliconmotion.4*
 
 %changelog
+* Thu Dec 02 2010 Adam Jackson <ajax at redhat.com> 1.7.3-6.20100122
+- smi-1.7.3-pixmapprivate.patch: Update for new ABI.
+
 * Wed Oct 27 2010 Adam Jackson <ajax at redhat.com> 1.7.3-5.20100122
 - Add ABI requires magic (#542742)