mirror of
https://git.yoctoproject.org/poky
synced 2026-03-26 13:02:22 +01:00
libsdl: drop unused files
(From OE-Core rev: 7783516fe7cb55a267110dc98a7595f34949390b) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
972b40b32d
commit
93ca5851a0
@@ -1,35 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
--- tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_DirectFB_video.c 2007-02-18 11:40:38.000000000 -0500
|
||||
+++ SDL/src/video/directfb/SDL_DirectFB_video.c 2007-02-18 11:00:07.000000000 -0500
|
||||
@@ -376,7 +376,7 @@
|
||||
{
|
||||
int i;
|
||||
DFBResult ret;
|
||||
- DFBCardCapabilities caps;
|
||||
+ DFBGraphicsDeviceDescription caps;
|
||||
DFBDisplayLayerConfig dlc;
|
||||
struct DirectFBEnumRect *rect;
|
||||
IDirectFB *dfb = NULL;
|
||||
@@ -448,7 +448,7 @@
|
||||
|
||||
|
||||
/* Query card capabilities to get the video memory size */
|
||||
- dfb->GetCardCapabilities (dfb, &caps);
|
||||
+ dfb->GetDeviceDescription (dfb, &caps);
|
||||
|
||||
this->info.wm_available = 1;
|
||||
this->info.hw_available = 1;
|
||||
diff -u'rNF^function' tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_Direct
|
||||
/SDL_DirectFB_events.c
|
||||
--- tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_DirectFB_events.c 2004-0
|
||||
+++ SDL/src/video/directfb/SDL_DirectFB_events.c 2007-02-18 11:00:07.000000000 -0500
|
||||
@@ -161,7 +161,7 @@
|
||||
keymap[DIKI_SHIFT_L - DIKI_UNKNOWN] = SDLK_LSHIFT;
|
||||
keymap[DIKI_SHIFT_R - DIKI_UNKNOWN] = SDLK_RSHIFT;
|
||||
keymap[DIKI_ALT_L - DIKI_UNKNOWN] = SDLK_LALT;
|
||||
- keymap[DIKI_ALTGR - DIKI_UNKNOWN] = SDLK_RALT;
|
||||
+ keymap[DIKI_ALT_R - DIKI_UNKNOWN] = SDLK_RALT;
|
||||
keymap[DIKI_TAB - DIKI_UNKNOWN] = SDLK_TAB;
|
||||
keymap[DIKI_ENTER - DIKI_UNKNOWN] = SDLK_RETURN;
|
||||
keymap[DIKI_SPACE - DIKI_UNKNOWN] = SDLK_SPACE;
|
||||
@@ -1,55 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
diff -upr --exclude=configure --exclude=Makefile --exclude=Makefile.in libsdl1.2-1.2.4/include/SDL_keysym.h libsdl1.2-1.2.4-arm/include/SDL_keysym.h
|
||||
--- libsdl1.2-1.2.4/include/SDL_keysym.h 2002-03-06 11:23:01.000000000 +0000
|
||||
+++ libsdl1.2-1.2.4-arm/include/SDL_keysym.h 2002-11-08 20:43:09.000000000 +0000
|
||||
@@ -286,6 +286,12 @@ typedef enum {
|
||||
SDLK_EURO = 321, /* Some european keyboards */
|
||||
SDLK_UNDO = 322, /* Atari keyboard has Undo */
|
||||
|
||||
+ SDLK_RECORD = 322,
|
||||
+ SDLK_CALENDAR = 323,
|
||||
+ SDLK_TELEPHONE = 324,
|
||||
+ SDLK_MAIL = 325,
|
||||
+ SDLK_START = 326,
|
||||
+
|
||||
/* Add any other keys here */
|
||||
|
||||
SDLK_LAST
|
||||
diff -upr --exclude=configure --exclude=Makefile --exclude=Makefile.in libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c
|
||||
--- libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c 2002-03-06 11:23:08.000000000 +0000
|
||||
+++ libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c 2002-11-08 21:01:41.000000000 +0000
|
||||
@@ -34,6 +34,7 @@ static char rcsid =
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/keysym.h>
|
||||
+#include <X11/XF86keysym.h>
|
||||
#ifdef __SVR4
|
||||
#include <X11/Sunkeysym.h>
|
||||
#endif
|
||||
@@ -655,6 +656,25 @@ SDL_keysym *X11_TranslateKey(Display *di
|
||||
case 0xFF:
|
||||
keysym->sym = MISC_keymap[xsym&0xFF];
|
||||
break;
|
||||
+ case 0x1008ff:
|
||||
+ switch (xsym) {
|
||||
+ case XF86XK_AudioRecord:
|
||||
+ keysym->sym = SDLK_RECORD;
|
||||
+ break;
|
||||
+ case XF86XK_PowerDown:
|
||||
+ keysym->sym = SDLK_POWER;
|
||||
+ break;
|
||||
+ case XF86XK_Calendar:
|
||||
+ keysym->sym = SDLK_CALENDAR;
|
||||
+ break;
|
||||
+ case XF86XK_Mail:
|
||||
+ keysym->sym = SDLK_MAIL;
|
||||
+ break;
|
||||
+ case XF86XK_Start:
|
||||
+ keysym->sym = SDLK_START;
|
||||
+ break;
|
||||
+ }
|
||||
+ break;
|
||||
default:
|
||||
fprintf(stderr,
|
||||
"X11: Unknown xsym, sym = 0x%04x\n",
|
||||
Reference in New Issue
Block a user