diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-14 10:24:35 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-14 10:24:35 +0100 |
| commit | a4f3ca8891e50241ac2ca144949e92b26920ffaf (patch) | |
| tree | d31841075429e437c4908580e8ec074f2fe40aa5 /extra/xf86-input-joystick | |
| parent | 3156702a5deccd61451be9f7d8ba0fd212a3043b (diff) | |
| parent | 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aspell-ca/PKGBUILD
community/corkscrew/PKGBUILD
cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/libxi/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/mpc/PKGBUILD
extra/poppler/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
extra/xorg-server/PKGBUILD
gnome-unstable/gconf/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/vte3/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
multilib/lib32-libxft/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/grep/PKGBUILD
testing/sudo/PKGBUILD
testing/xf86-input-joystick/PKGBUILD
testing/xf86-input-wacom/PKGBUILD
Diffstat (limited to 'extra/xf86-input-joystick')
| -rw-r--r-- | extra/xf86-input-joystick/PKGBUILD | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index 7c8fa0ab0..07a404903 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 142923 2011-11-18 09:36:49Z jgc $ +# $Id: PKGBUILD 153305 2012-03-12 20:52:42Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-joystick -pkgver=1.6.0 -pkgrel=3 +pkgver=1.6.1 +pkgrel=1 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') +makedepends=('xorg-server-devel>=1.11.99.902') +conflicts=('xorg-server<1.11.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch + #git-fixes.patch 50-joystick.conf) -sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780' - '7812a34013a2333641bd7c5d044c46179490cb32' +sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' 'e1ff3699a0470c6bb78a53f718df9d8521621e11') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" + #patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr make } |