summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/cups-filters/PKGBUILD6
-rw-r--r--extra/mkvtoolnix/PKGBUILD6
-rw-r--r--extra/smplayer/PKGBUILD12
-rw-r--r--extra/sqlite/PKGBUILD93
-rw-r--r--extra/sqlite/license.txt33
-rw-r--r--extra/xf86-video-nv/PKGBUILD11
-rw-r--r--extra/xf86-video-nv/git_fixes.patch234
7 files changed, 379 insertions, 16 deletions
diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD
index a3e6d0b54..b1eef9fce 100644
--- a/extra/cups-filters/PKGBUILD
+++ b/extra/cups-filters/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155005 2012-04-01 10:10:35Z andyrtr $
+# $Id: PKGBUILD 155821 2012-04-07 06:09:20Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters
-pkgver=1.0.11
+pkgver=1.0.12
pkgrel=1
pkgdesc="OpenPrinting CUPS Filters"
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ backup=()
#options=(!makeflags)
install=
source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz)
-md5sums=('70789c052deaa50fb00cae1b4c24f9f4')
+md5sums=('aace03cc690dde7809d6cb5394accfa4')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 606d419d4..bd4f07597 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152957 2012-03-10 20:16:46Z giovanni $
+# $Id: PKGBUILD 155839 2012-04-07 12:35:14Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: xduugu <xduugu@gmx.com>
pkgbase=mkvtoolnix
pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.4.0
+pkgver=5.5.0
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
@@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('52c0d7f0df55b86022d9d6ed985fd803')
+md5sums=('2c89693b2a2391ece14a5c93ba8a9974')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 36f51b31b..0e8d2e4c0 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151842 2012-03-03 11:22:09Z ibiru $
+# $Id: PKGBUILD 155837 2012-04-07 09:33:18Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
# Contributor: shamrok <szamrok@gmail.com>
pkgname=smplayer
-pkgver=0.7.1
+pkgver=0.8.0
pkgrel=1
pkgdesc="A complete front-end for MPlayer"
arch=('i686' 'x86_64')
@@ -14,16 +14,16 @@ license=('GPL')
depends=('qt' 'mplayer')
install=smplayer.install
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('e50046399ee918bb7b57e98971425c95')
+md5sums=('8f7d3a9c116e956c68976d0e5dbb83dd')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
make PREFIX=/usr
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make PREFIX=${pkgdir}/usr install
+ cd "$pkgname-$pkgver"
+ make PREFIX=$pkgdir/usr install
}
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
new file mode 100644
index 000000000..8b36fc57a
--- /dev/null
+++ b/extra/sqlite/PKGBUILD
@@ -0,0 +1,93 @@
+# $Id: PKGBUILD 155832 2012-04-07 07:57:39Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgbase="sqlite"
+pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc')
+_amalgamationver=3071100
+_amalgamationver2=${_amalgamationver/00/}
+_docver=${_amalgamationver} #3070700
+#pkgver=${_amalgamationver2//0/.}
+pkgver=3.7.11
+pkgrel=2
+pkgdesc="A C library that implements an SQL database engine"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.sqlite.org/"
+makedepends=('tcl' 'readline')
+source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
+ http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
+ #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
+ http://www.sqlite.org/sqlite-doc-${_docver}.zip
+ license.txt)
+options=('!libtool' '!emptydirs')
+md5sums=('0552d71bda98ebdcaea305cd6058221b'
+ 'c1fb48beff33612b2c7f5ae6ab17a601'
+ 'c1cdbc5544034d9012e421e75a5e4890')
+
+build() {
+ export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
+
+ # build sqlite
+ cd "$srcdir"/sqlite-autoconf-$_amalgamationver
+ ./configure --prefix=/usr \
+ --disable-static
+ make
+
+ # build the tcl extension
+ cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
+ ./configure --prefix=/usr \
+ --with-system-sqlite
+ make
+
+}
+
+package_sqlite() {
+
+ pkgdesc="A C library that implements an SQL database engine"
+ depends=('readline')
+ provides=("sqlite3=$pkgver")
+ replaces=("sqlite3=$pkgver")
+
+ cd ${srcdir}/sqlite-autoconf-$_amalgamationver
+ make DESTDIR=${pkgdir} install
+
+ # license
+ install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+}
+
+package_sqlite-tcl() {
+
+ pkgdesc="sqlite Tcl Extension Architecture (TEA)"
+ depends=('sqlite>=3.7.5')
+ provides=("sqlite3-tcl=$pkgver")
+ replaces=("sqlite3-tcl=$pkgver")
+
+ cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
+ make DESTDIR=${pkgdir} install
+}
+
+package_sqlite-doc() {
+
+ pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
+ #arch=('any') - not yet supported
+ provides=("sqlite3-doc=$pkgver")
+ replaces=("sqlite3-doc=$pkgver")
+
+ #cd ${srcdir}/sqlite-doc-${_amalgamationver}
+ cd ${srcdir}/sqlite-doc-${_docver}
+ mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
+ cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/
+
+ # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605
+ find ${pkgdir} -type f -perm 755 -exec ls -lha {} \;
+ find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \;
+
+ find ${pkgdir} -type f -name '*~' -exec ls -lha {} \;
+ find ${pkgdir} -type d -name '*~' -exec ls -lha {} \;
+ find ${pkgdir} -name '*~' -exec rm -f {} \;
+
+ find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite-doc/usr/share/doc/sqlite/images/fileformat/.~lock.indexpage.odg#
+ find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \;
+ find ${pkgdir} -name '.~*' -exec rm -f {} \;
+}
diff --git a/extra/sqlite/license.txt b/extra/sqlite/license.txt
new file mode 100644
index 000000000..118c5d5e6
--- /dev/null
+++ b/extra/sqlite/license.txt
@@ -0,0 +1,33 @@
+SQLite Copyright
+SQLite is in the
+Public Domain
+
+
+All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
+
+The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library.
+
+All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects.
+Obtaining An Explicit License To Use SQLite
+
+Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include:
+You are using SQLite in a jurisdiction that does not recognize the public domain.
+You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain.
+You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite.
+Your legal department tells you that you have to purchase a license.
+
+If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one.
+Contributed Code
+
+In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement:
+The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law.
+
+We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
+Hwaci
+6200 Maple Cove Lane
+Charlotte, NC 28269
+USA
+
+A template copyright release is available in PDF or HTML. You can use this release to make future changes.
+
+see http://www.sqlite.org/copyright.html \ No newline at end of file
diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD
index d29e82627..574579714 100644
--- a/extra/xf86-video-nv/PKGBUILD
+++ b/extra/xf86-video-nv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153352 2012-03-12 20:53:48Z andyrtr $
+# $Id: PKGBUILD 155841 2012-04-07 14:46:07Z andyrtr $
# Maintainer:Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-nv
pkgver=2.1.18
-pkgrel=5
+pkgrel=6
pkgdesc="X.org nv video driver"
arch=(i686 x86_64)
license=('custom')
@@ -13,11 +13,14 @@ makedepends=('xorg-server-devel>=1.11.99.903')
conflicts=('xorg-server<1.11.99.903')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ git_fixes.patch)
+sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2'
+ '07469140e20751a7366017b116a8c4d7d39eaac0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/git_fixes.patch
./configure --prefix=/usr
make
}
diff --git a/extra/xf86-video-nv/git_fixes.patch b/extra/xf86-video-nv/git_fixes.patch
new file mode 100644
index 000000000..059ccf56e
--- /dev/null
+++ b/extra/xf86-video-nv/git_fixes.patch
@@ -0,0 +1,234 @@
+From cb93a9b513b5814b18594de7a3b67bb225fb9c34 Mon Sep 17 00:00:00 2001
+From: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue, 28 Sep 2010 20:29:51 +0000
+Subject: Purge cvs tags.
+
+Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/man/nv.man b/man/nv.man
+index 228f1da..c679803 100644
+--- a/man/nv.man
++++ b/man/nv.man
+@@ -1,4 +1,3 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man,v 1.30 2006/06/16 00:19:32 mvojkovi Exp $
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH NV __drivermansuffix__ __vendorversion__
+--
+cgit v0.9.0.2-2-gbebe
+From d7727e5307c5c3fd0dbc51394893385cb3b01101 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 30 Oct 2010 16:39:39 +0000
+Subject: Sun's copyrights now belong to Oracle
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/man/Makefile.am b/man/Makefile.am
+index b3688ce..e39d1fc 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -1,5 +1,5 @@
+ #
+-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
++# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a
+ # copy of this software and associated documentation files (the "Software"),
+@@ -19,7 +19,7 @@
+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ # DEALINGS IN THE SOFTWARE.
+-#
++#
+
+ drivermandir = $(DRIVER_MAN_DIR)
+
+--
+cgit v0.9.0.2-2-gbebe
+From 95108089e22d33723488baba22467f2f3c4f1bf6 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 30 Oct 2010 16:53:33 +0000
+Subject: Correct copyright date in previous commit
+
+Oops, pasted in the new template and forgot to restore the original date
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/man/Makefile.am b/man/Makefile.am
+index e39d1fc..1ea26b3 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a
+ # copy of this software and associated documentation files (the "Software"),
+--
+cgit v0.9.0.2-2-gbebe
+From 2b17d1ac579ee426f631f4c62c9f0cf617a06e51 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois <kibi@debian.org>
+Date: Wed, 02 Mar 2011 01:09:10 +0000
+Subject: Fix compiler warning.
+
+Get rid of this with CFLAGS="-Wall -Werror":
+| CC g80_display.lo
+| cc1: warnings being treated as errors
+| g80_display.c: In function ‘G80CrtcSetPClk’:
+| g80_display.c:216: error: unused variable ‘i’
+
+Signed-off-by: Cyril Brulebois <kibi@debian.org>
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+Tested-by: Aaron Plattner <aplattner@nvidia.com>
+---
+diff --git a/src/g80_display.c b/src/g80_display.c
+index ae946a8..84e731c 100644
+--- a/src/g80_display.c
++++ b/src/g80_display.c
+@@ -213,7 +213,7 @@ G80CrtcSetPClk(xf86CrtcPtr crtc)
+ if(pNv->architecture <= 0xa0 ||
+ pNv->architecture == 0xaa ||
+ pNv->architecture == 0xac) {
+- int lo_n, lo_m, hi_n, hi_m, p, i;
++ int lo_n, lo_m, hi_n, hi_m, p;
+ CARD32 lo = pNv->reg[(0x00614104+headOff)/4];
+ CARD32 hi = pNv->reg[(0x00614108+headOff)/4];
+
+--
+cgit v0.9.0.2-2-gbebe
+From 4b03459a835ee43d940054cbdaefa7c330bff385 Mon Sep 17 00:00:00 2001
+From: Nicolas Kaiser <nikai@nikai.net>
+Date: Mon, 25 Apr 2011 11:26:33 +0000
+Subject: remove duplicated includes
+
+Remove duplicated includes of guarded headers.
+
+Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
+Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+---
+diff --git a/src/g80_type.h b/src/g80_type.h
+index 9bb07a4..270e383 100644
+--- a/src/g80_type.h
++++ b/src/g80_type.h
+@@ -5,7 +5,6 @@
+ #include <xf86Cursor.h>
+ #include <xf86DDC.h>
+ #include <xf86Crtc.h>
+-#include <xf86int10.h>
+
+ #define G80_NUM_I2C_PORTS 10
+
+diff --git a/src/riva_include.h b/src/riva_include.h
+index 04c35a6..16fd40d 100644
+--- a/src/riva_include.h
++++ b/src/riva_include.h
+@@ -50,7 +50,6 @@
+ #include "vgaHW.h"
+
+ #include "xf86Cursor.h"
+-#include "xf86DDC.h"
+
+ #include "region.h"
+
+--
+cgit v0.9.0.2-2-gbebe
+From 5b7f07f8171dd5ca4f13d7da25d7d91140b036e1 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 19 Dec 2011 21:55:30 +0000
+Subject: Make failure to XAA non-fatal
+
+Fall back to NoAccel on G80 since there's no shadowfb support there,
+otherwise fall to shadowfb.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index 551abe3..35e5d7e 100644
+--- a/src/g80_driver.c
++++ b/src/g80_driver.c
+@@ -429,10 +429,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
+ if(!pNv->NoAccel) {
+ switch(pNv->AccelMethod) {
+ case XAA:
+- if(!xf86LoadSubModule(pScrn, "xaa")) goto fail;
++ if(!xf86LoadSubModule(pScrn, "xaa")) pNv->NoAccel = 1;
+ break;
+ case EXA:
+- if(!xf86LoadSubModule(pScrn, "exa")) goto fail;
++ if(!xf86LoadSubModule(pScrn, "exa")) pNv->NoAccel = 1;
+ break;
+ }
+ }
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 3031f8b..195299a 100644
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -2048,9 +2048,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+ /* Load XAA if needed */
+ if (!pNv->NoAccel) {
+ if (!xf86LoadSubModule(pScrn, "xaa")) {
+- xf86FreeInt10(pNv->pInt);
+- NVFreeRec(pScrn);
+- return FALSE;
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadwwfb\n");
++ pNv->NoAccel = 1;
++ pNv->ShadowFB = 1;
+ }
+ }
+
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e33a7f3..f0fcab4 100644
+--- a/src/riva_driver.c
++++ b/src/riva_driver.c
+@@ -769,9 +769,9 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
+ /* Load XAA if needed */
+ if (!pRiva->NoAccel) {
+ if (!xf86LoadSubModule(pScrn, "xaa")) {
+- xf86FreeInt10(pRiva->pInt);
+- RivaFreeRec(pScrn);
+- return FALSE;
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
++ pRiva->NoAccel = 1;
++ pRiva->ShadowFB = 1;
+ }
+ }
+
+--
+cgit v0.9.0.2-2-gbebe
+From b3d61828837661c9b383378a7d6006752659108b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 19 Dec 2011 21:57:40 +0000
+Subject: Fix for new vgahw ABI
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 195299a..527ae5f 100644
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -1543,6 +1543,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+ xf86FreeInt10(pNv->pInt);
+ return FALSE;
+ }
++ vgaHWSetStdFuncs(VGAHWPTR(pScrn));
+
+ /* We use a programmable clock */
+ pScrn->progClock = TRUE;
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index f0fcab4..b52f476 100644
+--- a/src/riva_driver.c
++++ b/src/riva_driver.c
+@@ -484,6 +484,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
+ xf86FreeInt10(pRiva->pInt);
+ return FALSE;
+ }
++ vgaHWSetStdFuncs(VGAHWPTR(pScrn));
+
+ /* We use a programmable clock */
+ pScrn->progClock = TRUE;
+--
+cgit v0.9.0.2-2-gbebe