[arch-commits] Commit in xf86-video-siliconmotion/trunk (PKGBUILD smi-1.7.5-vga.patch)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Feb 11 06:29:35 EST 2012


    Date: Saturday, February 11, 2012 @ 06:29:35
  Author: andyrtr
Revision: 149879

upgpkg: xf86-video-siliconmotion 1.7.5-4

Xorg 1.12 rebuild; add late git fixes, patch from FC

Added:
  xf86-video-siliconmotion/trunk/smi-1.7.5-vga.patch
Modified:
  xf86-video-siliconmotion/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   17 ++++++++++++-----
 smi-1.7.5-vga.patch |   25 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-11 11:24:30 UTC (rev 149878)
+++ PKGBUILD	2012-02-11 11:29:35 UTC (rev 149879)
@@ -4,23 +4,30 @@
 
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org siliconmotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
+makedepends=('xorg-server-devel>=1.11.99.903')
+conflicts=('xorg-server<1.11.99.903')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('946acae0822d51da57abe8b7ed049691bd731589')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        smi-1.7.5-vga.patch)
+sha1sums=('946acae0822d51da57abe8b7ed049691bd731589'
+          '50b0e4aa858d7f8eb6f7e826f62fde23f01afe48')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/smi-1.7.5-vga.patch
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"

Added: smi-1.7.5-vga.patch
===================================================================
--- smi-1.7.5-vga.patch	                        (rev 0)
+++ smi-1.7.5-vga.patch	2012-02-11 11:29:35 UTC (rev 149879)
@@ -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



More information about the arch-commits mailing list