Date: Monday, November 21, 2016 @ 14:35:12 Author: lcarlier Revision: 281749
upgpkg: xf86-video-r128 6.10.1-2 xorg-server-1.19 rebuild Added: xf86-video-r128/trunk/git-fixes.patch Modified: xf86-video-r128/trunk/PKGBUILD -----------------+ PKGBUILD | 21 ++++++--- git-fixes.patch | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-21 14:27:49 UTC (rev 281748) +++ PKGBUILD 2016-11-21 14:35:12 UTC (rev 281749) @@ -3,21 +3,28 @@ pkgname=xf86-video-r128 pkgver=6.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) -url="http://xorg.freedesktop.org/"; +url="https://xorg.freedesktop.org/"; license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20') -conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21') +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' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +groups=('xorg-drivers') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig} + git-fixes.patch) sha256sums=('5ebfef49831c9b12f7b7011c8314010596ac2ab0d5b9b7cfd17908e93d7de4ea' - 'SKIP') + 'SKIP' + 'e4da65dab4380efc73a16e4bb09fedb5c838ad285f7d86dd8aeef105c6f1790c') validpgpkeys=('6EA3F3F3B9082632A9CBE931D53A0445B47A0DAB') # Connor Behan <[email protected]> +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../git-fixes.patch +} + build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr Added: git-fixes.patch =================================================================== --- git-fixes.patch (rev 0) +++ git-fixes.patch 2016-11-21 14:35:12 UTC (rev 281749) @@ -0,0 +1,119 @@ +From 3328547c840664896c12d0fd2db8f63e3a398a62 Mon Sep 17 00:00:00 2001 +From: Kevin Brace <[email protected]> +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 <[email protected]> +Reviewed-by: Connor Behan <[email protected]> +--- + 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 <[email protected]> +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 <[email protected]> +--- + 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 <[email protected]> +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 <[email protected]> +--- + 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 +
