diff options
author | Laurent Carlier | 2017-01-14 21:22:57 +0100 |
---|---|---|
committer | Laurent Carlier | 2017-01-14 21:22:57 +0100 |
commit | 90b5aeb078959481869e60c59bb5f9ccc8f84573 (patch) | |
tree | 071d4760cf407641ce35d9b7963147a2ff16d2d6 | |
download | aur-90b5aeb078959481869e60c59bb5f9ccc8f84573.tar.gz |
moved from extra
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | PKGBUILD | 40 | ||||
-rw-r--r-- | git-fixes.patch | 119 |
3 files changed, 185 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..862998ff349b --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,26 @@ +pkgbase = xf86-video-r128 + pkgdesc = X.org ati Rage128 video driver + pkgver = 6.10.1 + pkgrel = 2 + 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 + depends = glibc + optdepends = r128-dri: DRI1 support from community repo + 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-r128-6.10.1.tar.bz2 + source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-r128-6.10.1.tar.bz2.sig + source = git-fixes.patch + validpgpkeys = 6EA3F3F3B9082632A9CBE931D53A0445B47A0DAB + sha256sums = 5ebfef49831c9b12f7b7011c8314010596ac2ab0d5b9b7cfd17908e93d7de4ea + sha256sums = SKIP + sha256sums = e4da65dab4380efc73a16e4bb09fedb5c838ad285f7d86dd8aeef105c6f1790c + +pkgname = xf86-video-r128 + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..8cdd96b7937e --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 281749 2016-11-21 14:35:12Z lcarlier $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-r128 +pkgver=6.10.1 +pkgrel=2 +pkgdesc="X.org ati Rage128 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') +optdepends=('r128-dri: DRI1 support from community repo') +groups=('xorg-drivers') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig} + git-fixes.patch) +sha256sums=('5ebfef49831c9b12f7b7011c8314010596ac2ab0d5b9b7cfd17908e93d7de4ea' + 'SKIP' + 'e4da65dab4380efc73a16e4bb09fedb5c838ad285f7d86dd8aeef105c6f1790c') +validpgpkeys=('6EA3F3F3B9082632A9CBE931D53A0445B47A0DAB') # Connor Behan <connor.behan@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..95767eaa26db --- /dev/null +++ b/git-fixes.patch @@ -0,0 +1,119 @@ +From 3328547c840664896c12d0fd2db8f63e3a398a62 Mon Sep 17 00:00:00 2001 +From: Kevin Brace <kevinbrace@gmx.com> +Date: Wed, 16 Mar 2016 18:59:23 -0700 +Subject: [PATCH 1/3] xextproto 7.1 support update to the source code + +While the compilation script was updated, for some reason, the source +code did not get the update. + +Signed-off-by: Kevin Brace <kevinbrace@gmx.com> +Reviewed-by: Connor Behan <connor.behan@gmail.com> +--- + src/r128_crtc.c | 6 ++++++ + src/r128_output.c | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/src/r128_crtc.c b/src/r128_crtc.c +index d62cc6a..ed77492 100644 +--- a/src/r128_crtc.c ++++ b/src/r128_crtc.c +@@ -35,7 +35,13 @@ + + #include "xf86.h" + #include "xf86Modes.h" ++ ++#ifdef HAVE_XEXTPROTO_71 + #include "X11/extensions/dpmsconst.h" ++#else ++#define DPMS_SERVER ++#include "X11/extensions/dpms.h" ++#endif + + #include "r128.h" + #include "r128_probe.h" +diff --git a/src/r128_output.c b/src/r128_output.c +index a2c754b..73b4af2 100644 +--- a/src/r128_output.c ++++ b/src/r128_output.c +@@ -35,7 +35,13 @@ + + #include "xf86.h" + #include "xf86Modes.h" ++ ++#ifdef HAVE_XEXTPROTO_71 + #include "X11/extensions/dpmsconst.h" ++#else ++#define DPMS_SERVER ++#include "X11/extensions/dpms.h" ++#endif + + #include "r128.h" + #include "r128_probe.h" +-- +2.10.2 + + +From a589dd6baf7fa26f8ea7008ba6bd533a5ba3e76e Mon Sep 17 00:00:00 2001 +From: Connor Behan <connor.behan@gmail.com> +Date: Wed, 13 Apr 2016 12:41:00 -0400 +Subject: [PATCH 2/3] Remove gatos advertisement + +There are many current working ways to use a TV tuner with Linux. This +is not one of them. +Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=94915 + +Signed-off-by: Connor Behan <connor.behan@gmail.com> +--- + src/r128_driver.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/r128_driver.c b/src/r128_driver.c +index 9a676d5..5695614 100644 +--- a/src/r128_driver.c ++++ b/src/r128_driver.c +@@ -1435,10 +1435,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) + if (info->MMIO) R128UnmapMMIO(pScrn); + info->MMIO = NULL; + +- xf86DrvMsg(pScrn->scrnIndex, X_NOTICE, +- "For information on using the multimedia capabilities\n\tof this" +- " adapter, please see http://gatos.sf.net.\n"); +- + return TRUE; + + fail: +-- +2.10.2 + + +From 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: [PATCH 3/3] Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/compat-api.h | 5 +++++ + 1 file changed, 5 insertions(+) + +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 +-- +2.10.2 + |