Date: Friday, July 18, 2014 @ 11:34:15 Author: lcarlier Revision: 217016
archrelease: copy trunk to staging-i686, staging-x86_64 Added: xf86-video-chips/repos/staging-i686/ xf86-video-chips/repos/staging-i686/PKGBUILD (from rev 217015, xf86-video-chips/trunk/PKGBUILD) xf86-video-chips/repos/staging-i686/git-fix.diff (from rev 217015, xf86-video-chips/trunk/git-fix.diff) xf86-video-chips/repos/staging-i686/iopl.h (from rev 217015, xf86-video-chips/trunk/iopl.h) xf86-video-chips/repos/staging-x86_64/ xf86-video-chips/repos/staging-x86_64/PKGBUILD (from rev 217015, xf86-video-chips/trunk/PKGBUILD) xf86-video-chips/repos/staging-x86_64/git-fix.diff (from rev 217015, xf86-video-chips/trunk/git-fix.diff) xf86-video-chips/repos/staging-x86_64/iopl.h (from rev 217015, xf86-video-chips/trunk/iopl.h) -----------------------------+ staging-i686/PKGBUILD | 38 ++++++++++++++++++++++++++ staging-i686/git-fix.diff | 39 +++++++++++++++++++++++++++ staging-i686/iopl.h | 60 ++++++++++++++++++++++++++++++++++++++++++ staging-x86_64/PKGBUILD | 38 ++++++++++++++++++++++++++ staging-x86_64/git-fix.diff | 39 +++++++++++++++++++++++++++ staging-x86_64/iopl.h | 60 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 274 insertions(+) Copied: xf86-video-chips/repos/staging-i686/PKGBUILD (from rev 217015, xf86-video-chips/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2014-07-18 09:34:15 UTC (rev 217016) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> + +pkgname=xf86-video-chips +pkgver=1.2.5 +pkgrel=5 +pkgdesc="X.org Chips and Technologies video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=(glibc) +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff) +sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2' + 'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670' + '36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804') + +prepare() { + cd ${pkgname}-${pkgver} + cp ${srcdir}/iopl.h util/ + patch -Np1 -i ${srcdir}/git-fix.diff +} + +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}/" +} Copied: xf86-video-chips/repos/staging-i686/git-fix.diff (from rev 217015, xf86-video-chips/trunk/git-fix.diff) =================================================================== --- staging-i686/git-fix.diff (rev 0) +++ staging-i686/git-fix.diff 2014-07-18 09:34:15 UTC (rev 217016) @@ -0,0 +1,39 @@ +From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Tue, 25 Sep 2012 12:54:34 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <a...@redhat.com> +--- +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6f3a5d4..effbc60 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -96,9 +96,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi banking wrapper need this */ + #ifdef HAVE_ISA + #include "mibank.h" +@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + pBankInfo = NULL; + return FALSE; + } +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + #ifdef ENABLE_SILKEN_MOUSE + xf86SetSilkenMouse(pScreen); +-- +cgit v0.9.0.2-2-gbebe Copied: xf86-video-chips/repos/staging-i686/iopl.h (from rev 217015, xf86-video-chips/trunk/iopl.h) =================================================================== --- staging-i686/iopl.h (rev 0) +++ staging-i686/iopl.h 2014-07-18 09:34:15 UTC (rev 217016) @@ -0,0 +1,60 @@ +#ifdef __NetBSD__ +# include <sys/types.h> +# include <machine/pio.h> +# include <machine/sysarch.h> +#else +# if defined(__linux__) +/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc + * # include <sys/io.h> + */ +int iopl(int level); +# endif +# if defined(SVR4) && defined(i386) +# include <sys/types.h> +# ifdef NCR + /* broken NCR <sys/sysi86.h> */ +# define __STDC +# include <sys/sysi86.h> +# undef __STDC +# else +# include <sys/sysi86.h> +# endif +# ifdef SVR4 +# if !defined(sun) +# include <sys/seg.h> +# endif +# endif +# include <sys/v86.h> +# if defined(sun) +# include <sys/psw.h> +# endif +# endif +# include "AsmMacros.h" +#endif /* NetBSD */ + +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> + +#ifdef __NetBSD__ +# define SET_IOPL() i386_iopl(3) +# define RESET_IOPL() i386_iopl(0) +#else +# if defined(SVR4) && defined(i386) +# ifndef SI86IOPL +# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) +# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) +# else +# define SET_IOPL() sysi86(SI86IOPL,3) +# define RESET_IOPL() sysi86(SI86IOPL,0) +# endif +# else +# ifdef linux +# define SET_IOPL() iopl(3) +# define RESET_IOPL() iopl(0) +# else +# define SET_IOPL() (void)0 +# define RESET_IOPL() (void)0 +# endif +# endif +#endif Copied: xf86-video-chips/repos/staging-x86_64/PKGBUILD (from rev 217015, xf86-video-chips/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2014-07-18 09:34:15 UTC (rev 217016) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> + +pkgname=xf86-video-chips +pkgver=1.2.5 +pkgrel=5 +pkgdesc="X.org Chips and Technologies video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=(glibc) +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff) +sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2' + 'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670' + '36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804') + +prepare() { + cd ${pkgname}-${pkgver} + cp ${srcdir}/iopl.h util/ + patch -Np1 -i ${srcdir}/git-fix.diff +} + +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}/" +} Copied: xf86-video-chips/repos/staging-x86_64/git-fix.diff (from rev 217015, xf86-video-chips/trunk/git-fix.diff) =================================================================== --- staging-x86_64/git-fix.diff (rev 0) +++ staging-x86_64/git-fix.diff 2014-07-18 09:34:15 UTC (rev 217016) @@ -0,0 +1,39 @@ +From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Tue, 25 Sep 2012 12:54:34 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <a...@redhat.com> +--- +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6f3a5d4..effbc60 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -96,9 +96,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi banking wrapper need this */ + #ifdef HAVE_ISA + #include "mibank.h" +@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + pBankInfo = NULL; + return FALSE; + } +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + #ifdef ENABLE_SILKEN_MOUSE + xf86SetSilkenMouse(pScreen); +-- +cgit v0.9.0.2-2-gbebe Copied: xf86-video-chips/repos/staging-x86_64/iopl.h (from rev 217015, xf86-video-chips/trunk/iopl.h) =================================================================== --- staging-x86_64/iopl.h (rev 0) +++ staging-x86_64/iopl.h 2014-07-18 09:34:15 UTC (rev 217016) @@ -0,0 +1,60 @@ +#ifdef __NetBSD__ +# include <sys/types.h> +# include <machine/pio.h> +# include <machine/sysarch.h> +#else +# if defined(__linux__) +/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc + * # include <sys/io.h> + */ +int iopl(int level); +# endif +# if defined(SVR4) && defined(i386) +# include <sys/types.h> +# ifdef NCR + /* broken NCR <sys/sysi86.h> */ +# define __STDC +# include <sys/sysi86.h> +# undef __STDC +# else +# include <sys/sysi86.h> +# endif +# ifdef SVR4 +# if !defined(sun) +# include <sys/seg.h> +# endif +# endif +# include <sys/v86.h> +# if defined(sun) +# include <sys/psw.h> +# endif +# endif +# include "AsmMacros.h" +#endif /* NetBSD */ + +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> + +#ifdef __NetBSD__ +# define SET_IOPL() i386_iopl(3) +# define RESET_IOPL() i386_iopl(0) +#else +# if defined(SVR4) && defined(i386) +# ifndef SI86IOPL +# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) +# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) +# else +# define SET_IOPL() sysi86(SI86IOPL,3) +# define RESET_IOPL() sysi86(SI86IOPL,0) +# endif +# else +# ifdef linux +# define SET_IOPL() iopl(3) +# define RESET_IOPL() iopl(0) +# else +# define SET_IOPL() (void)0 +# define RESET_IOPL() (void)0 +# endif +# endif +#endif