Date: Monday, March 12, 2012 @ 16:54:19 Author: andyrtr Revision: 153366
db-move: moved xf86-video-siliconmotion from [testing] to [extra] (x86_64) Added: xf86-video-siliconmotion/repos/extra-x86_64/PKGBUILD (from rev 153285, xf86-video-siliconmotion/repos/testing-x86_64/PKGBUILD) xf86-video-siliconmotion/repos/extra-x86_64/smi-1.7.5-vga.patch (from rev 153285, xf86-video-siliconmotion/repos/testing-x86_64/smi-1.7.5-vga.patch) Deleted: xf86-video-siliconmotion/repos/extra-x86_64/PKGBUILD xf86-video-siliconmotion/repos/testing-x86_64/ ---------------------+ PKGBUILD | 63 +++++++++++++++++++++++++++----------------------- smi-1.7.5-vga.patch | 25 +++++++++++++++++++ 2 files changed, 60 insertions(+), 28 deletions(-) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-03-12 20:54:16 UTC (rev 153365) +++ extra-x86_64/PKGBUILD 2012-03-12 20:54:19 UTC (rev 153366) @@ -1,28 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Alexander Baldeck <alexan...@archlinux.org> - -pkgname=xf86-video-siliconmotion -pkgver=1.7.5 -pkgrel=3 -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') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('946acae0822d51da57abe8b7ed049691bd731589') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} Copied: xf86-video-siliconmotion/repos/extra-x86_64/PKGBUILD (from rev 153285, xf86-video-siliconmotion/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-03-12 20:54:19 UTC (rev 153366) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> + +pkgname=xf86-video-siliconmotion +pkgver=1.7.5 +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.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 + 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}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} Copied: xf86-video-siliconmotion/repos/extra-x86_64/smi-1.7.5-vga.patch (from rev 153285, xf86-video-siliconmotion/repos/testing-x86_64/smi-1.7.5-vga.patch) =================================================================== --- extra-x86_64/smi-1.7.5-vga.patch (rev 0) +++ extra-x86_64/smi-1.7.5-vga.patch 2012-03-12 20:54:19 UTC (rev 153366) @@ -0,0 +1,25 @@ +From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Wed, 16 Nov 2011 20:03:25 +0000 +Subject: Adapt to missing PIOOffset in videoabi 12 + +Signed-off-by: Adam Jackson <a...@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