summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD21
-rw-r--r--git-fix.diff53
3 files changed, 16 insertions, 76 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d7e39f2ae77d..9425d7ca31b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
pkgbase = xf86-video-i128
pkgdesc = X.org Number 9 I128 video driver
- pkgver = 1.3.6
- pkgrel = 8
+ pkgver = 1.4.0
+ pkgrel = 1
url = https://xorg.freedesktop.org/
arch = i686
arch = x86_64
groups = xorg-drivers
license = custom
makedepends = xorg-server-devel
- makedepends = X-ABI-VIDEODRV_VERSION=23
+ makedepends = X-ABI-VIDEODRV_VERSION=24.0
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-i128-1.3.6.tar.bz2
- source = git-fix.diff
- sha256sums = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
- sha256sums = 3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b
+ source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-i128-1.4.0.tar.bz2
+ source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-i128-1.4.0.tar.bz2.sig
+ validpgpkeys = C922784178BFFDB0
+ sha256sums = 8f2c0a6bf5a169dad3fc07c6dd4537b492d0e44489e4a1297311e617c3bed0ea
+ sha256sums = SKIP
pkgname = xf86-video-i128
diff --git a/PKGBUILD b/PKGBUILD
index 4f3397d99af4..951196552e30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,20 @@
-# $Id: PKGBUILD 281783 2016-11-21 19:12:08Z lcarlier $
-# Maintainer:Jan de Groot <jgc@archlinux.org>
+# Contributor:Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-i128
-pkgver=1.3.6
-pkgrel=8
+pkgver=1.4.0
+pkgrel=1
pkgdesc="X.org Number 9 I128 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0')
groups=('xorg-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
-sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c'
- '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha256sums=('8f2c0a6bf5a169dad3fc07c6dd4537b492d0e44489e4a1297311e617c3bed0ea'
+ 'SKIP')
+validpgpkeys=('C922784178BFFDB0')
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/git-fix.diff
-}
build() {
cd ${pkgname}-${pkgver}
diff --git a/git-fix.diff b/git-fix.diff
deleted file mode 100644
index de3287d1319c..000000000000
--- a/git-fix.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 15 Aug 2012 17:03:11 +0000
-Subject: Don't bother to include vbe.h
-
-Just copied from xf86 boilerplate afaict.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/i128_driver.c b/src/i128_driver.c
-index 66fdee0..a0f08c0 100644
---- a/src/i128_driver.c
-+++ b/src/i128_driver.c
-@@ -55,7 +55,6 @@
- #include "micmap.h"
-
- #include "xf86DDC.h"
--#include "vbe.h"
-
- #include "xf86cmap.h"
- #include "fb.h"
---
-cgit v0.9.0.2-2-gbebe
-From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:54:40 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/i128_driver.c b/src/i128_driver.c
-index a0f08c0..51a4135 100644
---- a/src/i128_driver.c
-+++ b/src/i128_driver.c
-@@ -50,8 +50,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
- #include "micmap.h"
-
- #include "xf86DDC.h"
-@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
- return FALSE;
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
---
-cgit v0.9.0.2-2-gbebe