[arch-commits] Commit in xf86-video-chips/repos (10 files)
Date: Wednesday, February 11, 2015 @ 09:50:45
Author: lcarlier
Revision: 231260
db-move: moved xf86-video-chips from [staging] to [testing] (i686, x86_64)
Added:
xf86-video-chips/repos/testing-i686/
xf86-video-chips/repos/testing-i686/PKGBUILD
(from rev 231256, xf86-video-chips/repos/staging-i686/PKGBUILD)
xf86-video-chips/repos/testing-i686/git-fix.diff
(from rev 231256, xf86-video-chips/repos/staging-i686/git-fix.diff)
xf86-video-chips/repos/testing-i686/iopl.h
(from rev 231256, xf86-video-chips/repos/staging-i686/iopl.h)
xf86-video-chips/repos/testing-x86_64/
xf86-video-chips/repos/testing-x86_64/PKGBUILD
(from rev 231256, xf86-video-chips/repos/staging-x86_64/PKGBUILD)
xf86-video-chips/repos/testing-x86_64/git-fix.diff
(from rev 231256, xf86-video-chips/repos/staging-x86_64/git-fix.diff)
xf86-video-chips/repos/testing-x86_64/iopl.h
(from rev 231256, xf86-video-chips/repos/staging-x86_64/iopl.h)
Deleted:
xf86-video-chips/repos/staging-i686/
xf86-video-chips/repos/staging-x86_64/
-+
testing-i686/PKGBUILD | 38 +++
testing-i686/git-fix.diff | 136 ++
testing-i686/iopl.h | 60 ++
testing-x86_64/PKGBUILD | 38 +++
testing-x86_64/git-fix.diff | 136 ++
testing-x86_64/iopl.h | 60 ++
6 files changed, 468 insertions(+)
Copied: xf86-video-chips/repos/testing-i686/PKGBUILD (from rev 231256,
xf86-video-chips/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-02-11 08:50:45 UTC (rev 231260)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot
+# Contributor: Alexander Baldeck
+
+pkgname=xf86-video-chips
+pkgver=1.2.5
+pkgrel=6
+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=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19'
'X-ABI-VIDEODRV_VERSION>=20')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h
git-fix.diff)
+sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
+'d04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670'
+'7c3f454b866ae479b5ab5d7cde4cb1e226b6f4fc070f77c6025864c2a1441ce1')
+
+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/testing-i686/git-fix.diff (from rev 231256,
xf86-video-chips/repos/staging-i686/git-fix.diff)
===
--- testing-i686/git-fix.diff (rev 0)
+++ testing-i686/git-fix.diff 2015-02-11 08:50:45 UTC (rev 231260)
@@ -0,0 +1,136 @@
+From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001
+From: Adam Jackson
+Date: Tue, 25 Sep 2012 12:54:34 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson
+---
+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
+From bb03c06322f875e905dec956e06a99b9674e57aa Mon Sep 17 00:00:00 2001
+From: Adam Jackson
+Date: Wed, 21 May 2014 09:38:35 -0400
+Subject: ddc: Use own thunk function instead of vgaHWddc1SetSpeedWeak
+
+I plan to remove the Weak functions from future servers.
+
+Signed-off-by: Adam Jackson
+
+diff --git a/src/ct_ddc.c b/src/ct_ddc.c
+index 5e2346a..677d840 100644
+--- a/src/ct_ddc.c
b/src/ct_ddc.c
+@@ -33,6 +33,12 @@ chips_ddc1Read(ScrnInfoPtr pScrn)
+ return (tmp & ddc_mask);
+ }
+
++static void
++chips_ddc1SetSpeed(
[arch-commits] Commit in xf86-video-chips/repos (10 files)
Date: Saturday, October 13, 2012 @ 07:44:27
Author: andyrtr
Revision: 168568
db-move: moved xf86-video-chips from [testing] to [extra] (i686, x86_64)
Added:
xf86-video-chips/repos/extra-i686/PKGBUILD
(from rev 168549, xf86-video-chips/repos/testing-i686/PKGBUILD)
xf86-video-chips/repos/extra-i686/iopl.h
(from rev 168549, xf86-video-chips/repos/testing-i686/iopl.h)
xf86-video-chips/repos/extra-x86_64/PKGBUILD
(from rev 168549, xf86-video-chips/repos/testing-x86_64/PKGBUILD)
xf86-video-chips/repos/extra-x86_64/iopl.h
(from rev 168549, xf86-video-chips/repos/testing-x86_64/iopl.h)
Deleted:
xf86-video-chips/repos/extra-i686/PKGBUILD
xf86-video-chips/repos/extra-i686/iopl.h
xf86-video-chips/repos/extra-x86_64/PKGBUILD
xf86-video-chips/repos/extra-x86_64/iopl.h
xf86-video-chips/repos/testing-i686/
xf86-video-chips/repos/testing-x86_64/
---+
extra-i686/PKGBUILD | 67 +-
extra-i686/iopl.h | 120
extra-x86_64/PKGBUILD | 67 +-
extra-x86_64/iopl.h | 120
4 files changed, 186 insertions(+), 188 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-13 11:44:18 UTC (rev 168567)
+++ extra-i686/PKGBUILD 2012-10-13 11:44:27 UTC (rev 168568)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-# Contributor: Alexander Baldeck
-
-pkgname=xf86-video-chips
-pkgver=1.2.5
-pkgrel=1
-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>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h)
-sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
-'d04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- cp ${srcdir}/iopl.h util/
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${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/extra-i686/PKGBUILD (from rev 168549,
xf86-video-chips/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-13 11:44:27 UTC (rev 168568)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot
+# Contributor: Alexander Baldeck
+
+pkgname=xf86-video-chips
+pkgver=1.2.5
+pkgrel=2
+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=13' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13'
'X-ABI-VIDEODRV_VERSION>=14')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h)
+sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
+'d04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ cp ${srcdir}/iopl.h util/
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-i686/iopl.h
===
--- extra-i686/iopl.h 2012-10-13 11:44:18 UTC (rev 168567)
+++ extra-i686/iopl.h 2012-10-13 11:44:27 UTC (rev 168568)
@@ -1,60 +0,0 @@
-#ifdef __NetBSD__
-# include
-# include
-# include
-#else
-# if defined(__linux__)
-/* Can't because provides conflicting inb, outb, etc
- * #include
- */
-int iopl(int level);
-# endif
-# if defined(SVR4) && defined(i386)
-#include
-#ifdef NCR
- /* broken NCR */
-# define __STDC
-# include
-# undef __STDC
-#else
-# include
-#endif
-#ifdef SVR4
-# if !defined(sun)
-#include
-# endif
-#endif
-#include
-#if defined(sun)
-# include
-#endif
-# endif
-# include "AsmMacros.h"
-#endif /* NetBSD */
-
-#include
-#include
-#include
-
-#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(SI86V
