summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Carlier2017-01-14 21:22:26 +0100
committerLaurent Carlier2017-01-14 21:22:26 +0100
commit9a5e5ab2a28037ce9b54337512448986a23210cb (patch)
tree535c389013621775cd21afc276940464c0c51da9
downloadaur-9a5e5ab2a28037ce9b54337512448986a23210cb.tar.gz
moved from extra
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD37
-rw-r--r--git-fixes.patch28
3 files changed, 89 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..065cd358ea7e
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,24 @@
+pkgbase = xf86-video-i740
+ pkgdesc = X.org Intel i740 video driver
+ pkgver = 1.3.5
+ pkgrel = 1
+ url = https://xorg.freedesktop.org/
+ arch = i686
+ arch = x86_64
+ license = custom
+ makedepends = xorg-server-devel
+ makedepends = X-ABI-VIDEODRV_VERSION=23
+ depends = glibc
+ conflicts = xorg-server<1.19
+ conflicts = X-ABI-VIDEODRV_VERSION<23
+ conflicts = X-ABI-VIDEODRV_VERSION>=24
+ source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-i740-1.3.5.tar.bz2
+ source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-i740-1.3.5.tar.bz2.sig
+ source = git-fixes.patch
+ validpgpkeys = 3BB639E56F861FA2E86505690FDD682D974CA72A
+ sha256sums = 1ce02dd0a11fbf6b43b8bca6663c67149d7d740c8985ae18bd956eddeaffe324
+ sha256sums = SKIP
+ sha256sums = 5abbbd7d008dac0958b8bc628165864cfc03ffe76375fe1de02cd6857222b71e
+
+pkgname = xf86-video-i740
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..8a3f7096c461
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 281781 2016-11-21 18:46:36Z lcarlier $
+#Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-i740
+pkgver=1.3.5
+pkgrel=1
+pkgdesc="X.org Intel i740 video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+ git-fixes.patch)
+sha256sums=('1ce02dd0a11fbf6b43b8bca6663c67149d7d740c8985ae18bd956eddeaffe324'
+ 'SKIP'
+ '5abbbd7d008dac0958b8bc628165864cfc03ffe76375fe1de02cd6857222b71e')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/git-fixes.patch b/git-fixes.patch
new file mode 100644
index 000000000000..ae7d22df862e
--- /dev/null
+++ b/git-fixes.patch
@@ -0,0 +1,28 @@
+From 74e5a49cbf3b99ce0eb2b78a47a9008a1900bcf4 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+--
+cgit v0.10.2
+