summaryrefslogtreecommitdiff
path: root/extra/xf86-video-openchrome
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-openchrome
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-openchrome')
-rw-r--r--extra/xf86-video-openchrome/PKGBUILD8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index 176cee32b..05282816d 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88694 2010-08-24 13:35:43Z jgc $
+# $Id: PKGBUILD 115345 2011-03-17 18:03:35Z andyrtr $
# Contributor: Paul Mattal <paul@mattal.com>
# Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
pkgname=xf86-video-openchrome
pkgver=0.2.904
-pkgrel=4
+pkgrel=5
pkgdesc="X.Org Openchrome drivers"
arch=(i686 x86_64 'mips64el')
license=('custom')
@@ -12,8 +12,8 @@ url="http://www.openchrome.org"
depends=('libdrm' 'libxvmc' 'unichrome-dri')
makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc')
replaces=('openchrome' 'xf86-video-via')
-options=('!libtool' 'force' '!makeflags')
-conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.9.0')
+options=('!libtool' '!makeflags')
+conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.10.0')
source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
drm_stdint.patch
svn-r839.patch