summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorMichael Hanson <hansonorders@verizon.net>2011-07-21 23:51:32 (GMT)
committerMichael Hanson <hansonorders@verizon.net>2011-07-21 23:51:32 (GMT)
commit84d732804c204e0ebe3204e65d2d4e95b095a7af (patch)
treeb42a7e9515125c51b431c5116f96d9d299e84b75 /abs
parent04b92101f95ef688cc26373e0d5e32704486250c (diff)
downloadlinhes_pkgbuild-84d732804c204e0ebe3204e65d2d4e95b095a7af.zip
linhes_pkgbuild-84d732804c204e0ebe3204e65d2d4e95b095a7af.tar.gz
linhes_pkgbuild-84d732804c204e0ebe3204e65d2d4e95b095a7af.tar.bz2
xf86-video-intel: recompile to not conflict with xorg-server 1.9.2
Diffstat (limited to 'abs')
-rw-r--r--abs/core/xf86-video-intel/PKGBUILD4
-rw-r--r--abs/core/xf86-video-intel/__changelog2
l---------abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz1
3 files changed, 5 insertions, 2 deletions
diff --git a/abs/core/xf86-video-intel/PKGBUILD b/abs/core/xf86-video-intel/PKGBUILD
index 161cc0c..3ef8a54 100644
--- a/abs/core/xf86-video-intel/PKGBUILD
+++ b/abs/core/xf86-video-intel/PKGBUILD
@@ -3,14 +3,14 @@
pkgname=xf86-video-intel
pkgver=2.15.0
-pkgrel=2
+pkgrel=3
pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
makedepends=('xorg-server-devel' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util')
-conflicts=('xorg-server<1.10.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
+conflicts=('xorg-server<1.9.2' 'xf86-video-i810' 'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-intel/__changelog b/abs/core/xf86-video-intel/__changelog
new file mode 100644
index 0000000..a7fc3d0
--- /dev/null
+++ b/abs/core/xf86-video-intel/__changelog
@@ -0,0 +1,2 @@
+# MH
+- Change xorg-server conflicts to xorg-server<1.9.2
diff --git a/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz b/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz
new file mode 120000
index 0000000..ab7d945
--- /dev/null
+++ b/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz
@@ -0,0 +1 @@
+/data/pkg_repo/packages/xf86-video-intel-2.15.0-3.src.tar.gz \ No newline at end of file