Tue Sep 4 00:04:04 UTC 2012

5 files changed, 703 insertions, 111 deletions

diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 20aa8b8e7..e1079d74e 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <andre.paulista@lavabit.com>
+# Maintainer : André Silva <emulatorman@lavabit.com>
 
 # We're getting this from Debian Sid
 _debname=iceape
-_debver=2.7.6
+_debver=2.7.7
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}-2.0-lang.patch
         clrf.patch
         libre.patch)
-md5sums=('7177342dcd4d445b166c36935c1d4ca5'
-         '5adb3b2c718311e664d8541bb4a16304'
+md5sums=('c1b1a38a1ee2d9ea7c4320ab6a45e380'
+         '0cb9bb2194cf4f9e4eb3e3d4281fef6e'
          '60ba9e8f2fafd20e41268af534a55ea7'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 16f117255..47a48dc9c 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,8 +9,8 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=14.0.1
-_debrel=2
+_debver=15.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -20,9 +20,9 @@ pkgbase=iceweasel-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=14.0.1
+_pkgver=15.0
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
@@ -56,90 +56,90 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('5dbcf3c8505ea994eff5d0acb15212e2'
-         '093fb9d627ea2bcc39e95cda8308c07c'
-         '427f4163eae1095e0e3be610f5f846d0'
-         '50119c3ffdac18ae2df52a46e4655e5a'
-         'd0707bb9946c0a27f2b33af081cef4a5'
-         '1ada65da05be04a6ad914fad2aa298bc'
-         '06d3ff7c4204f7b426168fe2d585770a'
-         'd033fdd61508953a0722c6328fe075d8'
-         '67e56c4382d44040f30d2a0e9aa062aa'
-         'e98bc2ddd0c4f14e03def6c2df3957a6'
-         '4b1859cd09bbeecb237c96489900e5cf'
-         '73b919dcf6ae7f99f720e1663d90ea6e'
-         '116c9ff17523c2f266534b525e37d9d6'
-         '7d3b4380052ff083fad73c1d67b5dd44'
-         '90ae8638c6ba5e206d723282e92e2b4a'
-         '382d425cecf79d03122700a49dc0a1e1'
-         '689264c005413858c23ba36d85bc70e9'
-         '296e06f04ad3a4ec08c782679c4648f5'
-         '144ffb16d13c246c1614ed4a47ddb91a'
-         '5a7189208bb083164a37294b0906df6b'
-         '324ce70af22e92d1f27899cb68f73045'
-         '7e8bd44385e0dd1b7fddd24763d53d0d'
-         '9f93cedb8c0944c84b9521d80a8f1df8'
-         'bb86603af183212d7ea21850fc6b29de'
-         '407f885a228a9749f85f0196d91d2fc2'
-         '8d0d5d304b19476469a5e420a0f4cc6c'
-         '0a73d219723c014024adea95e16d1f05'
-         '948e672aecb65d8b106df4a07e69a81e'
-         '8ab485858ffb7d7a2318eb23cdbad9bc'
-         '6d1dece438ee2ef35e7cd18a48a04a6a'
-         'cfb060a8b9587895c892b1741120bd30'
-         '7c9389eb1992d1b90bd3d13bad4ea99e'
-         '7ada62ede579765142804eb7fbf31556'
-         '068454a1f2e4e95a9ca6be00cb7ae679'
-         'd24b9b2bb4924d179f2685735a823054'
-         '5e957199698370322cece21d774c7f68'
-         'a60e60ac350a81b2ac547a7c1fe1c4a0'
-         'd86486dee2f1a316c5a386b39b3bd717'
-         '054229f80d2df10247870c0b65330b67'
-         '1725e81231cc3ff6d95781e749f2b959'
-         'ac404aa939294948ad3d6e70df1cede1'
-         '59c1192284bcbde4656b3319131e2eec'
-         '9f29e2ed16768b1d7a78bf5640ed2332'
-         'd704d145dc15203ab0e5687d0aad8bfe'
-         '53b610ec98c5d8b956f2a893bec24e27'
-         'bff195ac895b92333323c2bf22e1f61e'
-         '69f039841fbd31b32a583ad8737c3aca'
-         '95c70c4c5dd7d1c456ca36ec346a9c12'
-         '24e936478bcb8b8dfe7c905c3ca2a8dc'
-         '306172bd7802fb9d8da86101add3de9c'
-         'c104bb81dd70d6ec3dfe864ef03474c1'
-         '2be0cce97e74762a01b47ee2c647ca4c'
-         '3b2cf401cbce2339f2b7c54bb817af1c'
-         '16815d1d5e2a8748a1074bc878f34919'
-         '231db84b5ef6ee4c1f72cf3eaa920952'
-         '84a5a5e773a9340557d8e4b92031d9f2'
-         'cc8a65ce72f818ce2a65bcba592b5493'
-         'a9e0f71ef5e221b78395da7581eca0c1'
-         '4b9c21aeccd082e2241987ea8a1885bc'
-         '5d7a0e8d58729c4263449044c23b5f09'
-         '7e42a0bf231e4935d3320b102a314da1'
-         '94f318cc46669eeaf67c4367f9701511'
-         '5c70c86327d806e58e6c5f204849ba51'
-         'c569a5c51b711d7403e0f8c99647ea34'
-         '076ca5bc5b46894160e6015f0e888d0f'
-         '252851999ea99ce03cd9c50e6ab6c348'
-         '8db75829b397159116cd06c1992bbc5f'
-         '7516889bc11013f08b95ceea06e57aa2'
-         '915bfc417d1cfd7cb44c2ba571c9b152'
-         '356ba91ec47e31dc22a6898b72010a34'
-         'bca1dcf5cd3be873b6a1e64e33f3c581'
-         'b83cfa17f58a8394bd19253a304a1792'
-         'b40cdb01f00b94ea3ca4d6bf29cf69ba'
-         '88b5c9176131ddf792b94e197094eef4'
-         'a2903206a4b309636ec38d478b268946'
-         'b4ad0c985f48c6fefb125bf7bfc853c6'
-         '764fcdff3486b68b724f0975d4f6451d'
-         '7dd864a7f81dc54534ce3ee4abf8c8e6'
-         'b0dae765abfac086c464c8fe975219e9'
-         'c5d5e5189b9c7bf705b18c8030d09b58'
-         '1bfaa781fe701baa51c9089571686cd1'
-         '27e8c25b11e9e305ca4c3b9f5661936d'
-         'b2b8fbbd0b42bdc79c7abae3443da189'
-         '5210197343b334229fb8f07ad6aa33ea'
-         '06771b3e460077b5fb994d415168b548'
-         '9804d07cb3bc46c490c1c9e7d0d10edc'
-         '0917b254d82079138c76878d10ad631e')
+md5sums=('41a9b0d39466ec63707c77feb010f97c'
+         'a868d76268f52f911683dce647af46b5'
+         '9eec699d60ca812ffbbf5939522b8393'
+         '388f4fbbe2266ba7b4896075c2bdbaef'
+         'c64bc2261a3a5767f714a460255b15d5'
+         '2fc0a0395c1d92dd2529291258b7240b'
+         '0f59e1738c1b37d54b3bb05c2f7853a3'
+         '68ebd3ec4fc55187dafbfe599f62112e'
+         'be4852fbb9c11b36648205f8f1f6cbd1'
+         'e68a36c7cefc90e3c61f7d134bb838c7'
+         'd242789df2d520b65fc88c1d3df0eae0'
+         'e6c527cde3251a8409f16ea0bb278b03'
+         'beeba513659afd8e0887a44a9cc44a57'
+         'e8f4d9eee6eb1c270f99ddf08359c672'
+         '618fa08cfbe2ff33581ace766b2828fb'
+         '0d31f1a718ed91b6b1df885b205c7a75'
+         'd823ae880fb0a193d107bc9546206299'
+         '4c446ef16e61f335f93eace4251f5d8c'
+         '2129b44ef2edd6223ff731e05aae5112'
+         'ca4b27e3b8b9235235b0c59e7fb5e343'
+         'ce2f7887eb064983923d917b094d14c2'
+         '8a5b6b934eb27b706aa52945256f32cf'
+         'd6396fe6459c597572a10d1e02f195eb'
+         '78281b9ebd8a78f37ff6a8af07518cb7'
+         '36add693276f7d5c73f59e927d4645e4'
+         '93cafe70ca3b3b36ba0a56b4b4b4a7f9'
+         '6d911ee10f75ad316861ee6b8c435887'
+         'ccd8d4f9ed54aa56e728508e42ec3538'
+         '4ef4fb5ef6b814bb414e4fed06ca7b14'
+         '7b49e8f2479c32c9435151a8e139f411'
+         '4f5974e5d1ec83a598892b729bbca5dc'
+         '3caf262ec4e12a3166cccbf2e163ec82'
+         'eb4be46606957c856cf5d87c337184ca'
+         '45001918dacec18fb0db953c56e04032'
+         '766c6f9a84f6930317603d2014bd0a84'
+         'bfe20727eb714f616c4a5cdee7300584'
+         'fc6701b477ad209a3edb1429b529027f'
+         '5fb299bd54fd3fa10cf91d88d77df4e0'
+         '3b1988b200c303747aebfde97cb9333d'
+         '79bd597a764676dd1fddcf5e0a2aa646'
+         '9f63e8b4493063c770b835e80f883b66'
+         'e9524c247402faaa8b767a93a5e5773a'
+         '457ae04a4f7437c0b16d1c021be71574'
+         '77828bdeef9d6e9b78719be537cb0491'
+         '4bb2c8bd527aed47ef0c50b3861fb2a4'
+         '4d94a161e882de38616c8344d1d2994a'
+         '098f4d49f2335cab2a5070c35d5f69e4'
+         '0deda71dbfb0b07b378de1de9209e047'
+         '331fab3aae394ef3a3674f4582d0b538'
+         '4daa8de8b393385d03379ed49b421bb3'
+         '60534b0e61dd9499ddb3ff3a29026b2f'
+         '519299dfc4764e987ece840b630fa8c9'
+         'a13a1bc158353eadedd4d9a22f7a78fd'
+         '39804bd399a955cde36db0e7bfc0afd2'
+         '1c24d64463fb742fddb438939302a770'
+         'a3246566714da549faaefed6a082747e'
+         '7d06acae2f3a3bc15344502cdef25bf0'
+         '68b3f9e98df3ddcca5458695297a6581'
+         '6cc30b2ec4e75c45a41bcd328385e285'
+         'a0df4e646a376f8dce539309a057c340'
+         '8745389d916b522df730ea457fcc7b20'
+         '4982a6a88b3bf883b21633e3561a41d7'
+         '41ddec979a26c2fd6b212285cfa26b3c'
+         '7ac36674bd749e11c2a28cb646ed420c'
+         'ba855d101c76ead73e7d4d7a74839a2b'
+         '4f2abadda53b3f0c0eeeb2bbefc96991'
+         '67e448c17a2ee9f981743427e6e69d69'
+         '90a365963d579ecb9d2681f0510b665f'
+         '92d635cf265e0eec023d80034b0d1cd0'
+         'edd7160a59c4210b64bd384ee3196f76'
+         'cd3c038c61d7ce643a01808ed88d92d0'
+         'e5e07573a583ffc660f6ec846658b266'
+         '99e79e501170ca8a452d25eed5cfeab6'
+         'dd6e06943820e0731d3b1697ac12d353'
+         'c263cdeff3879481dc6b7cf44df9364a'
+         '3656bf7eba6a1042f3fa19c8cb494339'
+         '923313a52e0bf228fe2d41345401b296'
+         '1ba11249737fc1e2e61952e17fe764ec'
+         '8103d1b2f18f25df4b7702e3f1fc23ef'
+         '5d9cdf21c5bbd7bab97b10d9784f538e'
+         '4c032777e914f0e30cfeb2d1627f2b14'
+         '45a462e14b8e2c44d064f4bb6dffd3f5'
+         '075d374f6ee205df5b0f56629c0234fa'
+         '49517a540428d07cbf6809d96eecdd85'
+         '60f7b29f1325a6de41c45af2cb2423ba'
+         '8a000cb0afcb6655f7c626c05a313873'
+         '90e94eef2a30d9c20ecb0103d0203981')
\ No newline at end of file
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 662bcba99..c4eabb9db 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,46 +1,47 @@
-# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $
-#mips64el Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 165847 2012-09-01 12:22:15Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
 
 pkgname=sdl-libre
 pkgver=1.2.15
-pkgrel=1.2
+pkgrel=2
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
 license=('LGPL')
 provides=("sdl=${pkgver}")
 conflicts=('sdl')
+replaces=('sdl')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'mesa' 'libpulse')
-replaces=('sdl')
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
         sdl-1.2.14-disable-mmx.patch
-        riva_mmio.patch
-        no-riva-accel.patch)
+        fix_joystick_misc_axes.diff
+        libre.patch)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
          '04d8c179f125e04bcd4c9d60e013c2d7'
          'e5c16b7611f62c7cb25f0534eff68852'
-         'f5ab9ba6ba2bb8df74d0f768f9df3ea8'
-         'eb2f5899db608ad27b379faa5e0beb80')
+         '687586a108b597a2a6b73070c1d37e51'
+         '5c665f72b8a2adc97a91f6db6f2da79a')
 
 build() {
-  cd ${srcdir}/SDL-${pkgver}
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
-  patch -Np0 -i $srcdir/riva_mmio.patch
-  patch -Np0 -i $srcdir/no-riva-accel.patch
+  cd SDL-$pkgver
+  patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
+  patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
+  patch -Np1 -i ../fix_joystick_misc_axes.diff
+  patch -Np0 -i ../libre.patch
   ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
               --with-x --disable-rpath --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd SDL-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/libre/sdl-libre/fix_joystick_misc_axes.diff b/libre/sdl-libre/fix_joystick_misc_axes.diff
new file mode 100644
index 000000000..75e3755c9
--- /dev/null
+++ b/libre/sdl-libre/fix_joystick_misc_axes.diff
@@ -0,0 +1,13 @@
+diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
+index ee43974..80e46e4 100644
+--- a/src/joystick/linux/SDL_sysjoystick.c
++++ b/src/joystick/linux/SDL_sysjoystick.c
+@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
+ 				++joystick->nbuttons;
+ 			}
+ 		}
+-		for ( i=0; i<ABS_MISC; ++i ) {
++		for ( i=0; i<ABS_MAX; ++i ) {
+ 			/* Skip hats */
+ 			if ( i == ABS_HAT0X ) {
+ 				i = ABS_HAT3Y;
diff --git a/libre/sdl-libre/libre.patch b/libre/sdl-libre/libre.patch
new file mode 100644
index 000000000..72f7da56a
--- /dev/null
+++ b/libre/sdl-libre/libre.patch
@@ -0,0 +1,578 @@
+--- src/video/fbcon/riva_mmio.h		2012-01-19 04:30:06.000000000 -0200
++++ /dev/null				2012-04-01 13:58:27.776718756 -0300
+@@ -1,449 +0,0 @@
+-/***************************************************************************\
+-|*                                                                           *|
+-|*       Copyright 1993-1999 NVIDIA, Corporation.  All rights reserved.      *|
+-|*                                                                           *|
+-|*     NOTICE TO USER:   The source code  is copyrighted under  U.S. and     *|
+-|*     international laws.  Users and possessors of this source code are     *|
+-|*     hereby granted a nonexclusive,  royalty-free copyright license to     *|
+-|*     use this code in individual and commercial software.                  *|
+-|*                                                                           *|
+-|*     Any use of this source code must include,  in the user documenta-     *|
+-|*     tion and  internal comments to the code,  notices to the end user     *|
+-|*     as follows:                                                           *|
+-|*                                                                           *|
+-|*       Copyright 1993-1999 NVIDIA, Corporation.  All rights reserved.      *|
+-|*                                                                           *|
+-|*     NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY     *|
+-|*     OF  THIS SOURCE  CODE  FOR ANY PURPOSE.  IT IS  PROVIDED  "AS IS"     *|
+-|*     WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.  NVIDIA, CORPOR-     *|
+-|*     ATION DISCLAIMS ALL WARRANTIES  WITH REGARD  TO THIS SOURCE CODE,     *|
+-|*     INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE-     *|
+-|*     MENT,  AND FITNESS  FOR A PARTICULAR PURPOSE.   IN NO EVENT SHALL     *|
+-|*     NVIDIA, CORPORATION  BE LIABLE FOR ANY SPECIAL,  INDIRECT,  INCI-     *|
+-|*     DENTAL, OR CONSEQUENTIAL DAMAGES,  OR ANY DAMAGES  WHATSOEVER RE-     *|
+-|*     SULTING FROM LOSS OF USE,  DATA OR PROFITS,  WHETHER IN AN ACTION     *|
+-|*     OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  ARISING OUT OF     *|
+-|*     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.     *|
+-|*                                                                           *|
+-|*     U.S. Government  End  Users.   This source code  is a "commercial     *|
+-|*     item,"  as that  term is  defined at  48 C.F.R. 2.101 (OCT 1995),     *|
+-|*     consisting  of "commercial  computer  software"  and  "commercial     *|
+-|*     computer  software  documentation,"  as such  terms  are  used in     *|
+-|*     48 C.F.R. 12.212 (SEPT 1995)  and is provided to the U.S. Govern-     *|
+-|*     ment only as  a commercial end item.   Consistent with  48 C.F.R.     *|
+-|*     12.212 and  48 C.F.R. 227.7202-1 through  227.7202-4 (JUNE 1995),     *|
+-|*     all U.S. Government End Users  acquire the source code  with only     *|
+-|*     those rights set forth herein.                                        *|
+-|*                                                                           *|
+-\***************************************************************************/
+-
+-#ifndef __RIVA_HW_H__
+-#define __RIVA_HW_H__
+-#define RIVA_SW_VERSION 0x00010003
+-
+-/*
+- * Typedefs to force certain sized values.
+- */
+-typedef Uint8  U008;
+-typedef Uint16 U016;
+-typedef Uint32 U032;
+-
+-/*
+- * HW access macros.
+- */
+-#define NV_WR08(p,i,d)  (((U008 *)(p))[i]=(d))
+-#define NV_RD08(p,i)    (((U008 *)(p))[i])
+-#define NV_WR16(p,i,d)  (((U016 *)(p))[(i)/2]=(d))
+-#define NV_RD16(p,i)    (((U016 *)(p))[(i)/2])
+-#define NV_WR32(p,i,d)  (((U032 *)(p))[(i)/4]=(d))
+-#define NV_RD32(p,i)    (((U032 *)(p))[(i)/4])
+-#define VGA_WR08(p,i,d) NV_WR08(p,i,d)
+-#define VGA_RD08(p,i)   NV_RD08(p,i)
+-
+-/*
+- * Define supported architectures.
+- */
+-#define NV_ARCH_03  0x03
+-#define NV_ARCH_04  0x04
+-#define NV_ARCH_10  0x10
+-/***************************************************************************\
+-*                                                                           *
+-*                             FIFO registers.                               *
+-*                                                                           *
+-\***************************************************************************/
+-
+-/*
+- * Raster OPeration. Windows style ROP3.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BB];
+-    U032 Rop3;
+-} RivaRop;
+-/*
+- * 8X8 Monochrome pattern.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BD];
+-    U032 Shape;
+-    U032 reserved03[0x001];
+-    U032 Color0;
+-    U032 Color1;
+-    U032 Monochrome[2];
+-} RivaPattern;
+-/*
+- * Scissor clip rectangle.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BB];
+-    U032 TopLeft;
+-    U032 WidthHeight;
+-} RivaClip;
+-/*
+- * 2D filled rectangle.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop[1];
+-    U032 reserved01[0x0BC];
+-    U032 Color;
+-    U032 reserved03[0x03E];
+-    U032 TopLeft;
+-    U032 WidthHeight;
+-} RivaRectangle;
+-/*
+- * 2D screen-screen BLT.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BB];
+-    U032 TopLeftSrc;
+-    U032 TopLeftDst;
+-    U032 WidthHeight;
+-} RivaScreenBlt;
+-/*
+- * 2D pixel BLT.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop[1];
+-    U032 reserved01[0x0BC];
+-    U032 TopLeft;
+-    U032 WidthHeight;
+-    U032 WidthHeightIn;
+-    U032 reserved02[0x03C];
+-    U032 Pixels;
+-} RivaPixmap;
+-/*
+- * Filled rectangle combined with monochrome expand.  Useful for glyphs.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BB];
+-    U032 reserved03[(0x040)-1];
+-    U032 Color1A;
+-    struct
+-    {
+-        U032 TopLeft;
+-        U032 WidthHeight;
+-    } UnclippedRectangle[64];
+-    U032 reserved04[(0x080)-3];
+-    struct
+-    {
+-        U032 TopLeft;
+-        U032 BottomRight;
+-    } ClipB;
+-    U032 Color1B;
+-    struct
+-    {
+-        U032 TopLeft;
+-        U032 BottomRight;
+-    } ClippedRectangle[64];
+-    U032 reserved05[(0x080)-5];
+-    struct
+-    {
+-        U032 TopLeft;
+-        U032 BottomRight;
+-    } ClipC;
+-    U032 Color1C;
+-    U032 WidthHeightC;
+-    U032 PointC;
+-    U032 MonochromeData1C;
+-    U032 reserved06[(0x080)+121];
+-    struct
+-    {
+-        U032 TopLeft;
+-        U032 BottomRight;
+-    } ClipD;
+-    U032 Color1D;
+-    U032 WidthHeightInD;
+-    U032 WidthHeightOutD;
+-    U032 PointD;
+-    U032 MonochromeData1D;
+-    U032 reserved07[(0x080)+120];
+-    struct
+-    {
+-        U032 TopLeft;
+-        U032 BottomRight;
+-    } ClipE;
+-    U032 Color0E;
+-    U032 Color1E;
+-    U032 WidthHeightInE;
+-    U032 WidthHeightOutE;
+-    U032 PointE;
+-    U032 MonochromeData01E;
+-} RivaBitmap;
+-/*
+- * 3D textured, Z buffered triangle.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BC];
+-    U032 TextureOffset;
+-    U032 TextureFormat;
+-    U032 TextureFilter;
+-    U032 FogColor;
+-/* This is a problem on LynxOS */
+-#ifdef Control
+-#undef Control
+-#endif
+-    U032 Control;
+-    U032 AlphaTest;
+-    U032 reserved02[0x339];
+-    U032 FogAndIndex;
+-    U032 Color;
+-    float ScreenX;
+-    float ScreenY;
+-    float ScreenZ;
+-    float EyeM;
+-    float TextureS;
+-    float TextureT;
+-} RivaTexturedTriangle03;
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BB];
+-    U032 ColorKey;
+-    U032 TextureOffset;
+-    U032 TextureFormat;
+-    U032 TextureFilter;
+-    U032 Blend;
+-/* This is a problem on LynxOS */
+-#ifdef Control
+-#undef Control
+-#endif
+-    U032 Control;
+-    U032 FogColor;
+-    U032 reserved02[0x39];
+-    struct
+-    {
+-        float ScreenX;
+-        float ScreenY;
+-        float ScreenZ;
+-        float EyeM;
+-        U032 Color;
+-        U032 Specular;
+-        float TextureS;
+-        float TextureT;
+-    } Vertex[16];
+-    U032 DrawTriangle3D;
+-} RivaTexturedTriangle05;
+-/*
+- * 2D line.
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop[1];
+-    U032 reserved01[0x0BC];
+-    U032 Color;             /* source color               0304-0307*/
+-    U032 Reserved02[0x03e];
+-    struct {                /* start aliased methods in array   0400-    */
+-        U032 point0;        /* y_x S16_S16 in pixels            0-   3*/
+-        U032 point1;        /* y_x S16_S16 in pixels            4-   7*/
+-    } Lin[16];              /* end of aliased methods in array      -047f*/
+-    struct {                /* start aliased methods in array   0480-    */
+-        U032 point0X;       /* in pixels, 0 at left                0-   3*/
+-        U032 point0Y;       /* in pixels, 0 at top                 4-   7*/
+-        U032 point1X;       /* in pixels, 0 at left                8-   b*/
+-        U032 point1Y;       /* in pixels, 0 at top                 c-   f*/
+-    } Lin32[8];             /* end of aliased methods in array      -04ff*/
+-    U032 PolyLin[32];       /* y_x S16_S16 in pixels         0500-057f*/
+-    struct {                /* start aliased methods in array   0580-    */
+-        U032 x;             /* in pixels, 0 at left                0-   3*/
+-        U032 y;             /* in pixels, 0 at top                 4-   7*/
+-    } PolyLin32[16];        /* end of aliased methods in array      -05ff*/
+-    struct {                /* start aliased methods in array   0600-    */
+-        U032 color;         /* source color                     0-   3*/
+-        U032 point;         /* y_x S16_S16 in pixels            4-   7*/
+-    } ColorPolyLin[16];     /* end of aliased methods in array      -067f*/
+-} RivaLine;
+-/*
+- * 2D/3D surfaces
+- */
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BE];
+-    U032 Offset;
+-} RivaSurface;
+-typedef volatile struct
+-{
+-    U032 reserved00[4];
+-    U016 FifoFree;
+-    U016 Nop;
+-    U032 reserved01[0x0BD];
+-    U032 Pitch;
+-    U032 RenderBufferOffset;
+-    U032 ZBufferOffset;
+-} RivaSurface3D;
+-    
+-/***************************************************************************\
+-*                                                                           *
+-*                        Virtualized RIVA H/W interface.                    *
+-*                                                                           *
+-\***************************************************************************/
+-
+-struct _riva_hw_inst;
+-struct _riva_hw_state;
+-/*
+- * Virtialized chip interface. Makes RIVA 128 and TNT look alike.
+- */
+-typedef struct _riva_hw_inst
+-{
+-    /*
+-     * Chip specific settings.
+-     */
+-    U032 Architecture;
+-    U032 Version;
+-    U032 CrystalFreqKHz;
+-    U032 RamAmountKBytes;
+-    U032 MaxVClockFreqKHz;
+-    U032 RamBandwidthKBytesPerSec;
+-    U032 EnableIRQ;
+-    U032 IO;
+-    U032 VBlankBit;
+-    U032 FifoFreeCount;
+-    U032 FifoEmptyCount;
+-    /*
+-     * Non-FIFO registers.
+-     */
+-    volatile U032 *PCRTC;
+-    volatile U032 *PRAMDAC;
+-    volatile U032 *PFB;
+-    volatile U032 *PFIFO;
+-    volatile U032 *PGRAPH;
+-    volatile U032 *PEXTDEV;
+-    volatile U032 *PTIMER;
+-    volatile U032 *PMC;
+-    volatile U032 *PRAMIN;
+-    volatile U032 *FIFO;
+-    volatile U032 *CURSOR;
+-    volatile U032 *CURSORPOS;
+-    volatile U032 *VBLANKENABLE;
+-    volatile U032 *VBLANK;
+-    volatile U008 *PCIO;
+-    volatile U008 *PVIO;
+-    volatile U008 *PDIO;
+-    /*
+-     * Common chip functions.
+-     */
+-    int  (*Busy)(struct _riva_hw_inst *);
+-    void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int);
+-    void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
+-    void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
+-    void (*SetStartAddress)(struct _riva_hw_inst *,U032);
+-    void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032);
+-    void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032);
+-    int  (*ShowHideCursor)(struct _riva_hw_inst *,int);
+-    void (*LockUnlock)(struct _riva_hw_inst *, int);
+-    /*
+-     * Current extended mode settings.
+-     */
+-    struct _riva_hw_state *CurrentState;
+-    /*
+-     * FIFO registers.
+-     */
+-    RivaRop                 *Rop;
+-    RivaPattern             *Patt;
+-    RivaClip                *Clip;
+-    RivaPixmap              *Pixmap;
+-    RivaScreenBlt           *Blt;
+-    RivaBitmap              *Bitmap;
+-    RivaLine                *Line;
+-    RivaTexturedTriangle03  *Tri03;
+-    RivaTexturedTriangle05  *Tri05;
+-} RIVA_HW_INST;
+-/*
+- * Extended mode state information.
+- */
+-typedef struct _riva_hw_state
+-{
+-    U032 bpp;
+-    U032 width;
+-    U032 height;
+-    U032 repaint0;
+-    U032 repaint1;
+-    U032 screen;
+-    U032 pixel;
+-    U032 horiz;
+-    U032 arbitration0;
+-    U032 arbitration1;
+-    U032 vpll;
+-    U032 pllsel;
+-    U032 general;
+-    U032 config;
+-    U032 cursor0;
+-    U032 cursor1;
+-    U032 cursor2;
+-    U032 offset0;
+-    U032 offset1;
+-    U032 offset2;
+-    U032 offset3;
+-    U032 pitch0;
+-    U032 pitch1;
+-    U032 pitch2;
+-    U032 pitch3;
+-} RIVA_HW_STATE;
+-
+-/*
+- * FIFO Free Count. Should attempt to yield processor if RIVA is busy.
+- */
+-
+-#define RIVA_FIFO_FREE(hwptr,cnt)                                  \
+-{                                                                  \
+-   while (FifoFreeCount < (cnt))                                   \
+-	FifoFreeCount = hwptr->FifoFree >> 2;                      \
+-   FifoFreeCount -= (cnt);                                         \
+-}
+-#endif /* __RIVA_HW_H__ */
+-
+--- src/video/fbcon/SDL_fbriva.c	2012-01-19 04:30:06.000000000 -0200
++++ src/video/fbcon/SDL_fbriva.c	2012-04-01 15:10:10.108451467 -0300
+@@ -24,12 +24,10 @@
+ #include "SDL_video.h"
+ #include "../SDL_blit.h"
+ #include "SDL_fbriva.h"
+-#include "riva_mmio.h"
+ #include "riva_regs.h"
+ 
+ 
+ static int FifoEmptyCount = 0;
+-static int FifoFreeCount = 0;
+ 
+ /* Wait for vertical retrace */
+ static void WaitVBL(_THIS)
+@@ -41,20 +39,6 @@
+ 	while ( !(*port & 0x08) )
+ 		;
+ }
+-static void NV3WaitIdle(_THIS)
+-{
+-	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
+-	while ( (Rop->FifoFree < FifoEmptyCount) ||
+-	        (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) )
+-		;
+-}
+-static void NV4WaitIdle(_THIS)
+-{
+-	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
+-	while ( (Rop->FifoFree < FifoEmptyCount) ||
+-	        (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) )
+-		;
+-}
+ 
+ #if 0 /* Not yet implemented? */
+ /* Sets video mem colorkey and accelerated blit function */
+@@ -74,7 +58,6 @@
+ {
+ 	int dstX, dstY;
+ 	int dstW, dstH;
+-	RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET);
+ 
+ 	/* Don't blit to the display surface when switched away */
+ 	if ( switched_away ) {
+@@ -93,13 +76,6 @@
+ 	dstX += rect->x;
+ 	dstY += rect->y;
+ 
+-	RIVA_FIFO_FREE(Bitmap, 1);
+-	Bitmap->Color1A = color;
+-
+-	RIVA_FIFO_FREE(Bitmap, 2);
+-	Bitmap->UnclippedRectangle[0].TopLeft     = (dstX << 16) | dstY; 
+-	Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH;
+-
+ 	FB_AddBusySurface(dst);
+ 
+ 	if ( dst == this->screen ) {
+@@ -115,7 +91,6 @@
+ 	int srcX, srcY;
+ 	int dstX, dstY;
+ 	int dstW, dstH;
+-	RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET);
+ 
+ 	/* FIXME: For now, only blit to display surface */
+ 	if ( dst->pitch != SDL_VideoSurface->pitch ) {
+@@ -142,11 +117,6 @@
+ 	dstX += dstrect->x;
+ 	dstY += dstrect->y;
+ 
+-	RIVA_FIFO_FREE(Blt, 3);
+-	Blt->TopLeftSrc  = (srcY << 16) | srcX;
+-	Blt->TopLeftDst  = (dstY << 16) | dstX;
+-	Blt->WidthHeight = (dstH  << 16) | dstW;
+-
+ 	FB_AddBusySurface(src);
+ 	FB_AddBusySurface(dst);
+ 
+@@ -185,23 +155,15 @@
+ 
+ void FB_RivaAccel(_THIS, __u32 card)
+ {
+-	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
+ 
+ 	/* We have hardware accelerated surface functions */
+ 	this->CheckHWBlit = CheckHWBlit;
+ 	wait_vbl = WaitVBL;
+ 	switch (card) {
+-	    case FB_ACCEL_NV3:
+-		wait_idle = NV3WaitIdle;
+-		break;
+-	    case FB_ACCEL_NV4:
+-		wait_idle = NV4WaitIdle;
+-		break;
+ 	    default:
+ 		/* Hmm... FIXME */
+ 		break;
+ 	}
+-	FifoEmptyCount = Rop->FifoFree;
+ 
+ 	/* The Riva has an accelerated color fill */
+ 	this->info.blit_fill = 1;
+--- src/video/fbcon/SDL_fbvideo.c.orig	2011-09-08 17:30:03.670583685 +0200
++++ src/video/fbcon/SDL_fbvideo.c	2011-09-08 17:30:24.230582737 +0200
+@@ -46,7 +46,6 @@
+ #include "SDL_fbevents_c.h"
+ #include "SDL_fb3dfx.h"
+ #include "SDL_fbmatrox.h"
+-#include "SDL_fbriva.h"
+ 
+ /*#define FBCON_DEBUG*/
+ 
+@@ -769,13 +768,6 @@
+ #endif
+ 			FB_3DfxAccel(this, finfo.accel);
+ 			break;
+-		    case FB_ACCEL_NV3:
+-		    case FB_ACCEL_NV4:
+-#ifdef FBACCEL_DEBUG
+-			printf("NVidia hardware accelerator!\n");
+-#endif
+-			FB_RivaAccel(this, finfo.accel);
+-			break;
+ 		    default:
+ #ifdef FBACCEL_DEBUG
+ 			printf("Unknown hardware accelerator.\n");