diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-11-09 16:23:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-29 13:46:27 +0000 |
commit | 93ca5851a05dfee367e8ef02c19a8c3a57e58320 (patch) | |
tree | b0fb9217ab49357f7de7b97662d8e4d0421d8bf6 /meta/recipes-graphics/libsdl | |
parent | 972b40b32d79421703245dded39c57cb53044a54 (diff) | |
download | poky-93ca5851a05dfee367e8ef02c19a8c3a57e58320.tar.gz |
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>
Diffstat (limited to 'meta/recipes-graphics/libsdl')
-rw-r--r-- | meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch | 35 | ||||
-rw-r--r-- | meta/recipes-graphics/libsdl/files/extra-keys.patch | 55 |
2 files changed, 0 insertions, 90 deletions
diff --git a/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch b/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch deleted file mode 100644 index 3c526a686a..0000000000 --- a/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- 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 | ||
4 | +++ SDL/src/video/directfb/SDL_DirectFB_video.c 2007-02-18 11:00:07.000000000 -0500 | ||
5 | @@ -376,7 +376,7 @@ | ||
6 | { | ||
7 | int i; | ||
8 | DFBResult ret; | ||
9 | - DFBCardCapabilities caps; | ||
10 | + DFBGraphicsDeviceDescription caps; | ||
11 | DFBDisplayLayerConfig dlc; | ||
12 | struct DirectFBEnumRect *rect; | ||
13 | IDirectFB *dfb = NULL; | ||
14 | @@ -448,7 +448,7 @@ | ||
15 | |||
16 | |||
17 | /* Query card capabilities to get the video memory size */ | ||
18 | - dfb->GetCardCapabilities (dfb, &caps); | ||
19 | + dfb->GetDeviceDescription (dfb, &caps); | ||
20 | |||
21 | this->info.wm_available = 1; | ||
22 | this->info.hw_available = 1; | ||
23 | 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 | ||
24 | /SDL_DirectFB_events.c | ||
25 | --- 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 | ||
26 | +++ SDL/src/video/directfb/SDL_DirectFB_events.c 2007-02-18 11:00:07.000000000 -0500 | ||
27 | @@ -161,7 +161,7 @@ | ||
28 | keymap[DIKI_SHIFT_L - DIKI_UNKNOWN] = SDLK_LSHIFT; | ||
29 | keymap[DIKI_SHIFT_R - DIKI_UNKNOWN] = SDLK_RSHIFT; | ||
30 | keymap[DIKI_ALT_L - DIKI_UNKNOWN] = SDLK_LALT; | ||
31 | - keymap[DIKI_ALTGR - DIKI_UNKNOWN] = SDLK_RALT; | ||
32 | + keymap[DIKI_ALT_R - DIKI_UNKNOWN] = SDLK_RALT; | ||
33 | keymap[DIKI_TAB - DIKI_UNKNOWN] = SDLK_TAB; | ||
34 | keymap[DIKI_ENTER - DIKI_UNKNOWN] = SDLK_RETURN; | ||
35 | keymap[DIKI_SPACE - DIKI_UNKNOWN] = SDLK_SPACE; | ||
diff --git a/meta/recipes-graphics/libsdl/files/extra-keys.patch b/meta/recipes-graphics/libsdl/files/extra-keys.patch deleted file mode 100644 index 745b04ef31..0000000000 --- a/meta/recipes-graphics/libsdl/files/extra-keys.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | 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 | ||
4 | --- libsdl1.2-1.2.4/include/SDL_keysym.h 2002-03-06 11:23:01.000000000 +0000 | ||
5 | +++ libsdl1.2-1.2.4-arm/include/SDL_keysym.h 2002-11-08 20:43:09.000000000 +0000 | ||
6 | @@ -286,6 +286,12 @@ typedef enum { | ||
7 | SDLK_EURO = 321, /* Some european keyboards */ | ||
8 | SDLK_UNDO = 322, /* Atari keyboard has Undo */ | ||
9 | |||
10 | + SDLK_RECORD = 322, | ||
11 | + SDLK_CALENDAR = 323, | ||
12 | + SDLK_TELEPHONE = 324, | ||
13 | + SDLK_MAIL = 325, | ||
14 | + SDLK_START = 326, | ||
15 | + | ||
16 | /* Add any other keys here */ | ||
17 | |||
18 | SDLK_LAST | ||
19 | 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 | ||
20 | --- libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c 2002-03-06 11:23:08.000000000 +0000 | ||
21 | +++ libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c 2002-11-08 21:01:41.000000000 +0000 | ||
22 | @@ -34,6 +34,7 @@ static char rcsid = | ||
23 | #include <X11/Xlib.h> | ||
24 | #include <X11/Xutil.h> | ||
25 | #include <X11/keysym.h> | ||
26 | +#include <X11/XF86keysym.h> | ||
27 | #ifdef __SVR4 | ||
28 | #include <X11/Sunkeysym.h> | ||
29 | #endif | ||
30 | @@ -655,6 +656,25 @@ SDL_keysym *X11_TranslateKey(Display *di | ||
31 | case 0xFF: | ||
32 | keysym->sym = MISC_keymap[xsym&0xFF]; | ||
33 | break; | ||
34 | + case 0x1008ff: | ||
35 | + switch (xsym) { | ||
36 | + case XF86XK_AudioRecord: | ||
37 | + keysym->sym = SDLK_RECORD; | ||
38 | + break; | ||
39 | + case XF86XK_PowerDown: | ||
40 | + keysym->sym = SDLK_POWER; | ||
41 | + break; | ||
42 | + case XF86XK_Calendar: | ||
43 | + keysym->sym = SDLK_CALENDAR; | ||
44 | + break; | ||
45 | + case XF86XK_Mail: | ||
46 | + keysym->sym = SDLK_MAIL; | ||
47 | + break; | ||
48 | + case XF86XK_Start: | ||
49 | + keysym->sym = SDLK_START; | ||
50 | + break; | ||
51 | + } | ||
52 | + break; | ||
53 | default: | ||
54 | fprintf(stderr, | ||
55 | "X11: Unknown xsym, sym = 0x%04x\n", | ||