Wed Oct 24 01:47:51 PDT 2012

12 files changed, 232 insertions, 64 deletions

diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index 3a6ca6ec9..bbd3a3814 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168597 2012-10-13 11:46:36Z andyrtr $
+# $Id: PKGBUILD 169579 2012-10-23 20:01:18Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
-pkgver=2.20
+pkgver=2.21
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64')
 url="http://asymptote.sourceforge.net/"
 license=("GPL3")
 depends=('texlive-core' 'gc' 'freeglut' 'glu' 'gsl' 'fftw' 'libsigsegv')
-makedepends=('ghostscript' 'imagemagick')
+makedepends=('ghostscript' 'imagemagick'
+             'mesa' # For OpenGL headers
+            )
 optdepends=('python2:           for the xasy GUI'
             'python-imaging:    for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
-sha1sums=('4c86ab71cff57a592944303b11d9bb6ec34f1cbd')
+sha1sums=('946269c63b7aa3a7d2875f5faa8a0b8d3d36628c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/bin86/PKGBUILD b/extra/bin86/PKGBUILD
index a5dbd1c25..a398fd4df 100644
--- a/extra/bin86/PKGBUILD
+++ b/extra/bin86/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 142339 2011-11-08 16:07:12Z dreisner $
+# $Id: PKGBUILD 169577 2012-10-23 19:27:38Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=bin86
-pkgver=0.16.18
-pkgrel=3
+pkgver=0.16.19
+pkgrel=1
 pkgdesc="A complete 8086 assembler and loader"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.debath.co.uk/"
 depends=('glibc')
-source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz"
+source=("http://www.debath.co.uk/dev86/$pkgname-$pkgver.tar.gz"
         bin86-0.16.17-x86_64-1.patch)
-md5sums=('914068fb649b93642d1cf21857b75699'
+md5sums=('0a20d79765a6855ce7c8c2d02b23a0f0'
          '92bdce7b0655cd2e9f83c83fc56d128e')
 
 build() {
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 50056ddf0..2be8a6b1e 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168356 2012-10-09 06:48:14Z andrea $
+# $Id: PKGBUILD 169575 2012-10-23 17:21:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.3.90
-_pkgver=4.3.90
+pkgver=1.4.0
+_pkgver=4.4.0
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64')
@@ -13,21 +13,20 @@ depends=('kdevelop-pg-qt')
 makedepends=('cmake' 'automoc4')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('11f9b3d2d27ad93aa666edae60d08f64ea82bb8d'
-          'f11194f5672d78406b6c54d53b10c02384e5bf99')
+source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
+sha1sums=('c899aae94755dbc3f4fb72edfcb5b01a9f0eca43'
+          'd06df690ea70d02707388851b61077bea8f9db1d')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
+  cd ../
 
   # kdevelop-php-docs
-  cd "${srcdir}"
   mkdir build-docs
   cd build-docs
   cmake ../${pkgname}-docs-${pkgver} \
@@ -37,10 +36,11 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
+  cd ../
 
   # kdevelop-php-docs
-  cd "${srcdir}"/build-docs
+  cd build-docs
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 6efc30aa5..20bf24c2c 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168354 2012-10-09 06:46:57Z andrea $
+# $Id: PKGBUILD 169573 2012-10-23 17:20:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.3.90
+pkgver=4.4.0
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64')
@@ -12,11 +12,10 @@ license=('GPL')
 depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('18ed2dccdeef8abe41c135cd3038038790b4e50a')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('271a6ab3dd6063175e9ce18810bed7437d451ecf')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index c7370bce0..07671abe4 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168355 2012-10-09 06:47:34Z andrea $
+# $Id: PKGBUILD 169569 2012-10-23 17:17:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.3.90
-_pkgver=4.3.90
+pkgver=1.4.0
+_pkgver=4.4.0
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64')
@@ -14,11 +14,10 @@ depends=('kdelibs' 'subversion' 'qjson')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('88300217681caa5c69f09b6428f2a6298cbd4733')
+source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('2db4fc073385c49d82de526273272da648a0af60')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \
@@ -28,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD
index 728d627ff..1f19f4400 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 149549 2012-02-08 14:00:43Z tpowa $
+# $Id: PKGBUILD 169553 2012-10-23 13:47:25Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=tdb
-pkgver=1.2.9
-pkgrel=2
-pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits"
+pkgver=1.2.10
+pkgrel=1
+pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
 arch=(i686 x86_64)
 license=('GPL3')
 url="http://tdb.samba.org/"
@@ -31,4 +31,4 @@ package() {
    cd ${srcdir}/${pkgname}-${pkgver}
    make DESTDIR=$pkgdir/ install
 }
-md5sums=('4d97d18bbe9040038d4e003495bb8cd1')
+md5sums=('cc28048309df19782b04359282e9f98b')
diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD
index e131c153f..21369ef29 100644
--- a/extra/usbview/PKGBUILD
+++ b/extra/usbview/PKGBUILD
@@ -1,23 +1,19 @@
-# $Id: PKGBUILD 169432 2012-10-21 07:40:08Z giovanni $
+# $Id: PKGBUILD 169543 2012-10-23 11:13:44Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=usbview
-pkgver=1.1
-pkgrel=4
+pkgver=2.0
+pkgrel=2
 pkgdesc="Display the topology of devices on the USB bus"
 arch=('i686' 'x86_64')
-url="http://www.kroah.com/linux-usb/"
+url="http://www.kroah.com/linux/usb/"
 license=('GPL')
 depends=('gtk3' 'desktop-file-utils')
 makedepends=('pkg-config' 'gendesk')
 install=${pkgname}.install
-source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz"
-        'usbview-1.1-gtk3-port.patch'
-        'usbview-1.1-missing-usbfs.patch')
-md5sums=('8bf5e66351156356f3ad07454123affa'
-         '578ed1099228f205b728ee2d46ed6f56'
-         '02e4313887423d0057a7f4f15b7f37d4')
+source=("http://www.kroah.com/linux/usb/${pkgname}-${pkgver}.tar.gz")
+md5sums=('565f2e79f3924d14ab5b4d8aced557e5')
 
 build() {
   cd "${srcdir}"
@@ -26,10 +22,6 @@ build() {
 
   cd "${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/usbview-1.1-gtk3-port.patch"
-  patch -Np1 -i "${srcdir}/usbview-1.1-missing-usbfs.patch"
-
-  autoreconf
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var
diff --git a/extra/usbview/usbview.install b/extra/usbview/usbview.install
index e111ef946..b7f7e849b 100644
--- a/extra/usbview/usbview.install
+++ b/extra/usbview/usbview.install
@@ -1,5 +1,10 @@
 post_install() {
   update-desktop-database -q
+  echo ">>> Debugfs must be mounted in order to use usbview."
+  echo ">>> As root execute:"
+  echo ">>> \"mount -t debugfs none /sys/kernel/debug\" or add"
+  echo ">>> \"none /sys/kernel/debug debugfs defaults 0 0\""
+  echo ">>> to /etc/fstab"
 }
 
 post_upgrade() {
@@ -7,5 +12,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  post_install
+  update-desktop-database -q
 }
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 52ed7381d..1a5e41a37 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169487 2012-10-22 02:10:39Z tdziedzic $
+# $Id: PKGBUILD 169591 2012-10-24 01:48:33Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=709
-__hgrev=06e088d016ad
+_patchlevel=712
+__hgrev=57e8b75298d6
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,10 +21,10 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('7a42c72b07e8bfe6795197a303b21d53'
-         '5c5723f3c39aaa716bd868d7edf9f563'
+md5sums=('368435a6494a2559565ce4d668c4513c'
+         '1613bbbd2a794cd321db09c6cfe2d35f'
          '6e7adfbd5d26c1d161030ec203a7f243'
-         'e57777374891063b9ca48a1fe392ac05'
+         '20fceda56badf201695c57999b0bc609'
          '10353a61aadc3f276692d0e17db1478e'
          'd90413bd21f400313a785bb4010120cd')
 
diff --git a/extra/vim/vimrc b/extra/vim/vimrc
index 92d3ff980..fc18d2d5b 100644
--- a/extra/vim/vimrc
+++ b/extra/vim/vimrc
@@ -11,6 +11,6 @@
 runtime! archlinux.vim
 
 " If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
-" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual
+" Or better yet, read /usr/share/vim/vim73/vimrc_example.vim or the vim manual
 " and configure vim to your own liking!
 
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD
index 3a2915274..cb909513b 100644
--- a/extra/xf86-video-neomagic/PKGBUILD
+++ b/extra/xf86-video-neomagic/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 168579 2012-10-13 11:45:15Z andyrtr $
+# $Id: PKGBUILD 169532 2012-10-23 10:08:56Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+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')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
+            '38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  autoreconf
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-neomagic/git-fixes.patch b/extra/xf86-video-neomagic/git-fixes.patch
new file mode 100644
index 000000000..5ae5c7c1e
--- /dev/null
+++ b/extra/xf86-video-neomagic/git-fixes.patch
@@ -0,0 +1,167 @@
+diff --git a/configure.ac b/configure.ac
+index 29cf772..a6eafa3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,7 +24,7 @@
+ AC_PREREQ([2.60])
+ AC_INIT([xf86-video-neomagic],
+         [1.2.7],
+-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
++        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic],
+         [xf86-video-neomagic])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
+@@ -53,14 +53,6 @@ AC_ARG_WITH(xorg-module-dir,
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+ 
+-
+-# Store the list of server defined optional extensions in REQUIRED_MODULES
+-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+-XORG_DRIVER_CHECK_EXT(XV, videoproto)
+-XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+-XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+-
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+ 
+diff --git a/src/neo.h b/src/neo.h
+index 6aecc33..6812e7a 100644
+--- a/src/neo.h
++++ b/src/neo.h
+@@ -320,3 +320,14 @@ typedef struct {
+ #define PROBED_NM2097	0x83
+ #define PROBED_NM2160	0x44
+ #define PROBED_NM2200	0x45
++
++#define PCI_VENDOR_NEOMAGIC		0x10C8
++#define PCI_CHIP_NM2070			0x0001
++#define PCI_CHIP_NM2090			0x0002
++#define PCI_CHIP_NM2093			0x0003
++#define PCI_CHIP_NM2097			0x0083
++#define PCI_CHIP_NM2160			0x0004
++#define PCI_CHIP_NM2200			0x0005
++#define PCI_CHIP_NM2230			0x0025
++#define PCI_CHIP_NM2360			0x0006
++#define PCI_CHIP_NM2380			0x0016
+diff --git a/src/neo_2090.c b/src/neo_2090.c
+index 5049ab4..2f1efc8 100644
+--- a/src/neo_2090.c
++++ b/src/neo_2090.c
+@@ -42,7 +42,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+ #include "compiler.h"
+-#include "xf86PciInfo.h"
+ 
+ /* Drivers that use XAA need this */
+ #include "xf86fbman.h"
+diff --git a/src/neo_dga.c b/src/neo_dga.c
+index b6346c5..c5d60d5 100644
+--- a/src/neo_dga.c
++++ b/src/neo_dga.c
+@@ -29,7 +29,6 @@
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+ #include "neo.h"
+ #include "neo_reg.h"
+ #include "dgaproc.h"
+@@ -38,10 +37,10 @@
+ static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+ 					int *, int *, int *);
+ static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr);
+-static void NEO_Sync(ScrnInfoPtr);
+ static int  NEO_GetViewport(ScrnInfoPtr);
+ static void NEO_SetViewport(ScrnInfoPtr, int, int, int);
+ #ifdef HAVE_XAA_H
++static void NEO_Sync(ScrnInfoPtr);
+ static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+ static void NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+ #if 0
+@@ -57,8 +56,8 @@ DGAFunctionRec NEODGAFuncs = {
+    NEO_SetMode,
+    NEO_SetViewport,
+    NEO_GetViewport,
+-   NEO_Sync,
+ #ifdef HAVE_XAA_H
++   NEO_Sync,
+    NEO_FillRect,
+    NEO_BlitRect,
+ #if 0
+@@ -219,17 +218,14 @@ NEO_FillRect (
+     }
+ }
+ 
+-
+ static void 
+ NEO_Sync(
+    ScrnInfoPtr pScrn
+ ){
+     NEOPtr pNEO = NEOPTR(pScrn);
+-#ifdef HAVE_XAA_H
+     if(pNEO->AccelInfoRec) {
+ 	(*pNEO->AccelInfoRec->Sync)(pScrn);
+     }
+-#endif
+ }
+ 
+ static void 
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index d7369e2..a17b925 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "xf86RAC.h"
+ #endif
+ 
+-/* Drivers for PCI hardware need this */
+-#include "xf86PciInfo.h"
+-
+ /* Drivers that need to access the PCI config space directly need this */
+ #include "xf86Pci.h"
+ 
+@@ -72,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ /* 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 colormap manipulation need this */
+ #include "micmap.h"
+ 
+@@ -1621,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
+                    "Acceleration %s Initialized\n",ret ? "" : "not");
+     } 
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/neo_i2c.c b/src/neo_i2c.c
+index 82d1f2a..5bbb3fb 100644
+--- a/src/neo_i2c.c
++++ b/src/neo_i2c.c
+@@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "compiler.h"
+ 
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+ 
+ #include "vgaHW.h"
+ 
+diff --git a/src/neo_shadow.c b/src/neo_shadow.c
+index 2df7657..04efe4f 100644
+--- a/src/neo_shadow.c
++++ b/src/neo_shadow.c
+@@ -10,7 +10,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "shadowfb.h"
+ #include "servermd.h"