diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-09-01 09:59:09 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-09-01 09:59:09 -0300 |
| commit | 0ee4203ce138782c238fa933f1588aa454196c45 (patch) | |
| tree | 6d441c072e41a345929049d541db4b7f2cf9feb1 | |
| parent | 6c600786488028c1c91d71a4c6e5d504d79ff66c (diff) | |
| download | abslibre-0ee4203ce138782c238fa933f1588aa454196c45.tar.gz abslibre-0ee4203ce138782c238fa933f1588aa454196c45.tar.bz2 abslibre-0ee4203ce138782c238fa933f1588aa454196c45.zip | |
sdl-libre-1.2.15-1.2: put the patches into libre.patch
| -rw-r--r-- | libre/sdl-libre/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/sdl-libre/libre.patch (renamed from libre/sdl-libre/riva_mmio.patch) | 24 | ||||
| -rw-r--r-- | libre/sdl-libre/no-riva-accel.patch | 24 |
3 files changed, 27 insertions, 30 deletions
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 662bcba99..de989b882 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -21,20 +21,17 @@ 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) + libre.patch) md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' - 'f5ab9ba6ba2bb8df74d0f768f9df3ea8' - 'eb2f5899db608ad27b379faa5e0beb80') + '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 + patch -Np0 -i $srcdir/libre.patch ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ --with-x --disable-rpath --disable-static make diff --git a/libre/sdl-libre/riva_mmio.patch b/libre/sdl-libre/libre.patch index 945d9bf9b..72f7da56a 100644 --- a/libre/sdl-libre/riva_mmio.patch +++ b/libre/sdl-libre/libre.patch @@ -552,3 +552,27 @@ /* 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"); diff --git a/libre/sdl-libre/no-riva-accel.patch b/libre/sdl-libre/no-riva-accel.patch deleted file mode 100644 index 89f8ebeed..000000000 --- a/libre/sdl-libre/no-riva-accel.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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"); |