summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-09-08 13:45:52 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-09-08 13:45:52 -0300
commit88b2bd9521ebeaf26e50190c04e373c204912d9d (patch)
tree311090531f8bcb87520d1e8852a4eaaa7d01e7e5
parentae0fc98f878108a4b7d349bc16403906db42b212 (diff)
parent7906b24bf08c82fbbb61fc43221e79c3052d66e6 (diff)
Merge branch 'master' of ssh://gparabola/abslibre
-rw-r--r--libre/sdl-libre/PKGBUILD9
-rw-r--r--libre/sdl-libre/no-riva-accel.patch24
2 files changed, 30 insertions, 3 deletions
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 6d1767ec6..20f6ece4b 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=sdl-libre
pkgver=1.2.14
-pkgrel=7
+pkgrel=7.1
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"
@@ -19,17 +19,20 @@ options=('!libtool')
source=(http://repo.parabolagnulinux.org/other/SDL-${pkgver}-libre.tar.gz
sdl-1.2.14-joystick-crash.diff
sdl-1.2.14-fix-mouse-clicking.patch
- sdl-1.2.14-fix-disappearing-cursor.patch)
+ sdl-1.2.14-fix-disappearing-cursor.patch
+ no-riva-accel.patch)
md5sums=('b8ac7254fe5425a0fb238fb535d3d14c'
'9d8890b3817736a5d365f7497f096634'
'04d8c179f125e04bcd4c9d60e013c2d7'
- 'a6cf3e71b653aa97d0d8ae6c0a789807')
+ 'a6cf3e71b653aa97d0d8ae6c0a789807'
+ 'eb2f5899db608ad27b379faa5e0beb80')
build() {
cd ${srcdir}/SDL-${pkgver}-libre
patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch
+ patch -Np0 -i $srcdir/no-riva-accel.patch
./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
--with-x --disable-rpath
make
diff --git a/libre/sdl-libre/no-riva-accel.patch b/libre/sdl-libre/no-riva-accel.patch
new file mode 100644
index 000000000..89f8ebeed
--- /dev/null
+++ b/libre/sdl-libre/no-riva-accel.patch
@@ -0,0 +1,24 @@
+--- 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");