summaryrefslogtreecommitdiff
path: root/extra/xf86-video-sisusb
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-04-12 11:24:37 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-04-12 11:24:37 -0300
commit1f52af629b1911ab027ef9c5d4d5903b48792050 (patch)
treee975475390c79c3dd975c95091f3bb33beff24e5 /extra/xf86-video-sisusb
parent951244a3e5bdc5f2f029f6550b46e5a06d1bfa26 (diff)
parent28b5bbf3fee0627993658e096eadab71c2779912 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/llvm/PKGBUILD community/dsniff/PKGBUILD community/ngrep/PKGBUILD community/virtualbox/PKGBUILD extra/gstreamer0.10-good/PKGBUILD extra/lirc/PKGBUILD extra/mc/PKGBUILD extra/mesa/PKGBUILD extra/xfburn/PKGBUILD testing/gnome-panel/PKGBUILD
Diffstat (limited to 'extra/xf86-video-sisusb')
-rw-r--r--extra/xf86-video-sisusb/PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD
index ca4c86df5..742f88476 100644
--- a/extra/xf86-video-sisusb/PKGBUILD
+++ b/extra/xf86-video-sisusb/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 114529 2011-03-14 09:35:17Z jgc $
+# $Id: PKGBUILD 115377 2011-03-17 18:17:47Z andyrtr $
#Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-sisusb
pkgver=0.9.4
-pkgrel=3
+pkgrel=4
pkgdesc="X.org SiS USB video driver"
arch=(i686 x86_64 'mips64el')
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
makedepends=('xorg-server-devel')
-conflicts=('xorg-server<1.9.0')
+conflicts=('xorg-server<1.10.0')
groups=('xorg-drivers' 'xorg')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)