[xorg-x11-drv-siliconmotion] ABI rebuild smi-1.7.5-vga.patch: Adapt to videoabi 12

[Adam Jackson]

commit 92afc91a773d2b101ad387189d32e2d14ceb4a1b
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Nov 16 20:05:35 2011 -0500

    ABI rebuild
    smi-1.7.5-vga.patch: Adapt to videoabi 12

 smi-1.7.5-vga.patch             |   25 +++++++++++++++++++++++++
 xorg-x11-drv-siliconmotion.spec |   10 +++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/smi-1.7.5-vga.patch b/smi-1.7.5-vga.patch
new file mode 100644
index 0000000..ef353f0
--- /dev/null
+++ b/smi-1.7.5-vga.patch
@@ -0,0 +1,25 @@
+From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 16 Nov 2011 20:03:25 +0000
+Subject: Adapt to missing PIOOffset in videoabi 12
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+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,
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/xorg-x11-drv-siliconmotion.spec b/xorg-x11-drv-siliconmotion.spec
index 022f700..dd39992 100644
--- a/xorg-x11-drv-siliconmotion.spec
+++ b/xorg-x11-drv-siliconmotion.spec
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 siliconmotion video driver
 Name:       xorg-x11-drv-siliconmotion
 Version:    1.7.5
-Release:    3%{?dist}
+Release:    4%{?dist}
 URL:        http://www.x.org
 License:    MIT
 Group:      User Interface/X Hardware Support
@@ -15,6 +15,8 @@ Source1:    siliconmotion.xinf
 Source2:    make-git-snapshot.sh
 Source3:    commitid
 
+Patch0:	    smi-1.7.5-vga.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
@@ -28,11 +30,12 @@ X.Org X11 siliconmotion video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .vga
 
 %build
 autoreconf -v --install || exit 1
 %configure --disable-static
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,8 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/siliconmotion.4*
 
 %changelog
-* Wed Nov 09 2011 ajax <ajax at redhat.com> - 1.7.5-3
+* Wed Nov 16 2011 Adam Jackson <ajax at redhat.com> 1.7.5-4
 - ABI rebuild
+- smi-1.7.5-vga.patch: Adapt to videoabi 12
 
 * Thu Aug 18 2011 Adam Jackson <ajax at redhat.com> - 1.7.5-2
 - Rebuild for xserver 1.11 ABI