diff options
| -rw-r--r-- | libre-multilib/lib32-sdl/PKGBUILD | 71 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/X11_KeyToUnicode.patch | 52 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff | 13 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/libre.patch | 130 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch | 63 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch | 13 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch | 23 | ||||
| -rw-r--r-- | libre-multilib/lib32-sdl/sdl_x11sym.patch | 12 |
8 files changed, 0 insertions, 377 deletions
diff --git a/libre-multilib/lib32-sdl/PKGBUILD b/libre-multilib/lib32-sdl/PKGBUILD deleted file mode 100644 index e9e6f8509..000000000 --- a/libre-multilib/lib32-sdl/PKGBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# $Id: PKGBUILD 114755 2014-07-03 20:47:41Z heftig $ -# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor (Arch): Allan McRae <allan@archlinux.org> -# Contributor (Arch): dorphell <dorphell@archlinux.org> -# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -_pkgbasename=sdl -pkgname=lib32-$_pkgbasename -pkgver=1.2.15 -pkgrel=7.parabola1 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit), without nonfree riva_mmio.h file" -arch=('x86_64') -url="http://www.libsdl.org" -license=('LGPL') -conflicts=('lib32-sdl-libre') -replaces=('lib32-sdl-libre') -depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' 'lib32-glu' gcc-multilib) -optdepends=('lib32-alsa-lib: ALSA audio driver' - 'lib32-libpulse: PulseAudio audio driver') -options=('staticlibs') -source=(https://repo.parabola.nu/other/sdl-libre/SDL-libre-${pkgver}.tar.gz - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-disable-mmx.patch - fix_joystick_misc_axes.diff - libsdl-1.2.15-resizing.patch - sdl_x11sym.patch - X11_KeyToUnicode.patch - libre.patch) -md5sums=('6b9b5ac27428e1a3b96c50604f2b1c40' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'e5c16b7611f62c7cb25f0534eff68852' - '687586a108b597a2a6b73070c1d37e51' - '3dd50347d8856160a9cbd7f80383a1f8' - '148b285bccee9d21bb96db807363b962' - 'edea272dff4698470877c016d818918d' - '71fb007f43825950d0ec7558a30253e0') - -prepare() { - 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 -Np1 -i ../libsdl-1.2.15-resizing.patch - patch -Np0 -i ../sdl_x11sym.patch - patch -Np1 -i ../X11_KeyToUnicode.patch - - patch -Np1 -i ../libre.patch -} - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd SDL-$pkgver - ./configure --prefix=/usr --disable-nasm --enable-alsa \ - --with-x --disable-rpath --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd SDL-$pkgver - make DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/{include,share} - - cd "$pkgdir/usr/bin" - mv sdl-config sdl-config-32 -} diff --git a/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch b/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch deleted file mode 100644 index 5f0f325b1..000000000 --- a/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch +++ /dev/null @@ -1,52 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga <slouken@libsdl.org> -# Date 1327258041 18000 -# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf -# Parent 5273dfd19a5e8c5736a0d417bd441f704c5355f8 -Fixed bug 1390 - X11_KeyToUnicode - -manuel.montezelo 2012-01-22 08:56:18 PST - -We had the following bug report at Debian: -http://bugs.debian.org/376560 - -Same one in Ubuntu: -https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217 - -We've been including a patch since then (attached) to actually export the -symbol, since 2006. In the last release the function seems to be there, alive -and kicking. - -It's affecting other people too: -http://www.garagegames.com/community/forums/viewthread/52287 - -diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c ---- a/src/video/x11/SDL_x11events.c Sat Jan 21 12:06:51 2012 -0500 -+++ b/src/video/x11/SDL_x11events.c Sun Jan 22 13:47:21 2012 -0500 -@@ -1246,8 +1246,11 @@ - * sequences (dead accents, compose key sequences) will not work since the - * state has been irrevocably lost. - */ -+extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod); -+ - Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers) - { -+ static int warning = 0; - struct SDL_VideoDevice *this = current_video; - char keybuf[32]; - int i; -@@ -1255,6 +1258,12 @@ - XKeyEvent xkey; - Uint16 unicode; - -+ if ( warning ) { -+ warning = 0; -+ fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n"); -+ fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n"); -+ } -+ - if ( !this || !SDL_Display ) { - return 0; - } - diff --git a/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff b/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff deleted file mode 100644 index 75e3755c9..000000000 --- a/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff +++ /dev/null @@ -1,13 +0,0 @@ -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-multilib/lib32-sdl/libre.patch b/libre-multilib/lib32-sdl/libre.patch deleted file mode 100644 index dc93bfeeb..000000000 --- a/libre-multilib/lib32-sdl/libre.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/src/video/fbcon/SDL_fbriva.c b/src/video/fbcon/SDL_fbriva.c -index eb4b71f1b..59469759c 100644 ---- a/src/video/fbcon/SDL_fbriva.c -+++ b/src/video/fbcon/SDL_fbriva.c -@@ -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 @@ static void WaitVBL(_THIS) - 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 @@ static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) - { - 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 @@ static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) - 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 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect, - 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 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect, - 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 @@ static int CheckHWBlit(_THIS, SDL_Surface *src, SDL_Surface *dst) - - 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; -diff --git a/src/video/fbcon/SDL_fbvideo.c b/src/video/fbcon/SDL_fbvideo.c -index 5e5880908..dee999cbd 100644 ---- a/src/video/fbcon/SDL_fbvideo.c -+++ b/src/video/fbcon/SDL_fbvideo.c -@@ -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 @@ static int FB_VideoInit(_THIS, SDL_PixelFormat *vformat) - #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-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch b/libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch deleted file mode 100644 index 0655a13e1..000000000 --- a/libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Revert change that breaks window corner resizing - http://bugzilla.libsdl.org/show_bug.cgi?id=1430 -Author: Andrew Caudwell <acaudwell@gmail.com> -Last-Update: 2012-04-10 -Bug-Debian: http://bugs.debian.org/665779 - -diff -r c787fb1b5699 src/video/x11/SDL_x11events.c ---- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 -@@ -57,12 +57,6 @@ - static SDLKey MISC_keymap[256]; - SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); - --/* -- Pending resize target for ConfigureNotify (so outdated events don't -- cause inappropriate resize events) --*/ --int X11_PendingConfigureNotifyWidth = -1; --int X11_PendingConfigureNotifyHeight = -1; - - #ifdef X_HAVE_UTF8_STRING - Uint32 Utf8ToUcs4(const Uint8 *utf8) -@@ -825,16 +819,6 @@ - #ifdef DEBUG_XEVENTS - printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); - #endif -- if ((X11_PendingConfigureNotifyWidth != -1) && -- (X11_PendingConfigureNotifyHeight != -1)) { -- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && -- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { -- /* Event is from before the resize, so ignore. */ -- break; -- } -- X11_PendingConfigureNotifyWidth = -1; -- X11_PendingConfigureNotifyHeight = -1; -- } - if ( SDL_VideoSurface ) { - if ((xevent.xconfigure.width != SDL_VideoSurface->w) || - (xevent.xconfigure.height != SDL_VideoSurface->h)) { -diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h ---- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 -@@ -27,8 +27,3 @@ - extern void X11_InitOSKeymap(_THIS); - extern void X11_PumpEvents(_THIS); - extern void X11_SetKeyboardState(Display *display, const char *key_vec); -- --/* Variables to be exported */ --extern int X11_PendingConfigureNotifyWidth; --extern int X11_PendingConfigureNotifyHeight; -- -diff -r c787fb1b5699 src/video/x11/SDL_x11video.c ---- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 -@@ -1182,8 +1182,6 @@ - current = NULL; - goto done; - } -- X11_PendingConfigureNotifyWidth = width; -- X11_PendingConfigureNotifyHeight = height; - } else { - if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { - current = NULL; diff --git a/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch b/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch deleted file mode 100644 index 1bb6e0e47..000000000 --- a/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch +++ /dev/null @@ -1,13 +0,0 @@ -# and another one from FS#26020 - ---- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 -+++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 -@@ -89,6 +89,8 @@ - #include "SDL_yuvfuncs.h" - #include "SDL_yuv_sw_c.h" - -+#undef __OPTIMIZE__ -+ - /* The functions used to manipulate software video overlays */ - static struct private_yuvhwfuncs sw_yuvfuncs = { - SDL_LockYUV_SW, diff --git a/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch b/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch deleted file mode 100644 index 7d3e5acfc..000000000 --- a/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 -@@ -423,12 +423,15 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( this->input_grab == SDL_GRAB_OFF ) { -- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { -+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ } -+ posted = SDL_PrivateMouseMotion(0, 0, -+ xevent.xcrossing.x, -+ xevent.xcrossing.y); - } -- posted = SDL_PrivateMouseMotion(0, 0, -- xevent.xcrossing.x, -- xevent.xcrossing.y); - } - break; - diff --git a/libre-multilib/lib32-sdl/sdl_x11sym.patch b/libre-multilib/lib32-sdl/sdl_x11sym.patch deleted file mode 100644 index 9aaa2353b..000000000 --- a/libre-multilib/lib32-sdl/sdl_x11sym.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/video/x11/SDL_x11sym.h-orig 2013-07-16 23:56:46.718523385 -0600 -+++ src/video/x11/SDL_x11sym.h 2013-07-16 23:58:27.025186485 -0600 -@@ -165,7 +165,8 @@ - */ - #ifdef LONG64 - SDL_X11_MODULE(IO_32BIT) --SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) -+ -+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) - SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) - #endif - |