summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-03 09:47:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:37 +0100
commitdc64df6c176c7e56095c4d09a2d00b8a4d976a7c (patch)
treed635fc18ffcd74209e4614848e1a7e2dfd1f091a /meta
parentef1fce92787c3cc259cd678159bae670b7e5a756 (diff)
downloadpoky-dc64df6c176c7e56095c4d09a2d00b8a4d976a7c.tar.gz
libx11: drop old 1.2.2 git version
(From OE-Core rev: 10c87f3f695215000c218b0dd0a3652ee97738e7) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_git.bb17
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff570
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff16
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch17
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch25
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch14
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch30
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_git.bb13
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_git.bb16
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_git.inc11
10 files changed, 0 insertions, 729 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
deleted file mode 100644
index 4cda779813..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require libx11.inc
2require libx11_git.inc
3
4DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
5this version."
6
7SRC_URI += "file://X18NCMSstubs.diff \
8 file://fix-disable-xlocale.diff \
9 file://fix-utf8-wrong-define.patch"
10
11DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
12 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
13
14SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
15
16EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
17CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
deleted file mode 100644
index b49fc2271b..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
+++ /dev/null
@@ -1,570 +0,0 @@
1Upstream-Status: Pending
2
3---
4 configure.ac | 9 -
5 src/Makefile.am | 5
6 src/X18NCMSstubs.c | 428 +++++++++++++++++++++++++++++++++++++++++++++++++++++
7 src/imConv.c | 4
8 src/locking.c | 4
9 5 files changed, 448 insertions(+), 2 deletions(-)
10
11--- git.orig/configure.ac
12+++ git/configure.ac
13@@ -263,11 +263,18 @@ if test -f "$KEYSYMDEF"; then
14 else
15 AC_MSG_ERROR([Cannot find keysymdef.h])
16 fi
17 AC_SUBST(KEYSYMDEF)
18
19-AM_CONDITIONAL(UDC, test xfalse = xtrue)
20+AC_ARG_ENABLE(udc,
21+ AC_HELP_STRING([--disable-udc],
22+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
23+ [UDC=$enableval],[UDC=yes])
24+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
25+if test x"$UDC" = "xyes"; then
26+ AC_DEFINE(UDC,1,[Include support for UDC])
27+fi
28
29 AC_ARG_ENABLE(xcms,
30 AC_HELP_STRING([--disable-xcms],
31 [Disable Xlib support for CMS *EXPERIMENTAL*]),
32 [XCMS=$enableval],[XCMS=yes])
33--- git.orig/src/Makefile.am
34+++ git/src/Makefile.am
35@@ -329,18 +329,21 @@ endif
36
37 if THRSTUBS
38 libX11_la_SOURCES+=UIThrStubs.c
39 endif
40
41+libX11_la_SOURCES+=X18NCMSstubs.c
42+
43 x11datadir = @X11_DATADIR@
44 x11data_DATA = XKeysymDB XErrorDB
45
46 EXTRA_DIST = \
47 $(x11data_DATA) \
48 os2Stubs.c \
49 udcInf.c \
50- UIThrStubs.c
51+ UIThrStubs.c \
52+ X18NCMSstubs.c
53
54 if XCB
55 libX11_la_SOURCES += \
56 xcb_lock.c \
57 xcb_disp.c \
58--- /dev/null
59+++ git/src/X18NCMSstubs.c
60@@ -0,0 +1,428 @@
61+/*
62+ * X18NCMSstubs.c
63+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
64+ *
65+ * Copyright © 2003 Matthew Allum
66+ *
67+ * Permission to use, copy, modify, distribute, and sell this software and its
68+ * documentation for any purpose is hereby granted without fee, provided that
69+ * the above copyright notice appear in all copies and that both that
70+ * copyright notice and this permission notice appear in supporting
71+ * documentation, and that the name of Matthew Allum not be used in
72+ * advertising or publicity pertaining to distribution of the software without
73+ * specific, written prior permission. Keith Packard and Compaq makes no
74+ * representations about the suitability of this software for any purpose. It
75+ * is provided "as is" without express or implied warranty.
76+ *
77+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
78+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
79+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
80+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
81+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
82+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
83+ * PERFORMANCE OF THIS SOFTWARE.
84+ */
85+
86+#include <stdlib.h>
87+#include "Xlibint.h"
88+#include "Xlcint.h"
89+#include <X11/Xlocale.h>
90+#include <X11/Xos.h>
91+#ifdef WIN32
92+#undef close
93+#endif
94+#include <X11/Xutil.h>
95+#include "XlcPubI.h"
96+
97+#include "Xcmsint.h" /* for XcmsCCC type */
98+#include "XlcPubI.h" /* for XLCd type */
99+#include "config.h"
100+
101+#if ! XLOCALE
102+
103+Bool
104+XSupportsLocale()
105+{
106+ return False;
107+}
108+
109+char *
110+XSetLocaleModifiers(
111+ const char *modifiers)
112+{
113+ return NULL;
114+}
115+
116+XLCd
117+_XOpenLC(
118+ char *name)
119+{
120+ return NULL;
121+}
122+
123+XLCd
124+_XlcCurrentLC()
125+{
126+ return NULL;
127+}
128+
129+void
130+_XlcVaToArgList(
131+ va_list var,
132+ int count,
133+ XlcArgList *args_ret)
134+{
135+ return;
136+}
137+
138+void
139+_XlcCountVaList(
140+ va_list var,
141+ int *count_ret)
142+{
143+ return;
144+}
145+
146+void
147+_XCloseLC(
148+ XLCd lcd)
149+{
150+ return;
151+}
152+
153+int
154+_XlcConvert(
155+ XlcConv conv,
156+ XPointer *from,
157+ int *from_left,
158+ XPointer *to,
159+ int *to_left,
160+ XPointer *args,
161+ int num_args)
162+{
163+ return 0;
164+}
165+
166+/* XIM Stubs */
167+
168+XPointer
169+_XimGetLocaleCode ( _Xconst char* encoding_name )
170+{
171+ return NULL;
172+}
173+
174+int
175+_XimGetCharCode (
176+ XPointer ucs_conv,
177+ KeySym keysym,
178+ unsigned char* buf,
179+ int nbytes)
180+{
181+ return 0;
182+}
183+
184+/* Xrm Stubs */
185+
186+XrmMethods
187+_XrmInitParseInfo(
188+ XPointer *state)
189+{
190+ return (XrmMethods) NULL;
191+}
192+
193+/* Xwc Stubs */
194+
195+int
196+XwcTextExtents(
197+ XFontSet font_set,
198+ _Xconst wchar_t *text,
199+ int text_len,
200+ XRectangle *overall_ink_extents,
201+ XRectangle *overall_logical_extents)
202+{
203+ return 0;
204+}
205+
206+void
207+XwcDrawString(Display *display,
208+ Drawable d,
209+ XFontSet font_set,
210+ GC gc,
211+ int x, int y,
212+ _Xconst wchar_t *string,
213+ int num_wchars)
214+{
215+ ;
216+}
217+
218+void
219+XwcDrawText(
220+ Display *dpy,
221+ Drawable d,
222+ GC gc,
223+ int x,
224+ int y,
225+ XwcTextItem *text_items,
226+ int nitems)
227+{
228+ ;
229+}
230+
231+void
232+XwcDrawImageString(
233+ Display *dpy,
234+ Drawable d,
235+ XFontSet font_set,
236+ GC gc,
237+ int x,
238+ int y,
239+ _Xconst wchar_t *text,
240+ int text_len)
241+{
242+ ;
243+}
244+
245+int
246+XwcTextEscapement(
247+ XFontSet font_set,
248+ _Xconst wchar_t *text,
249+ int text_len)
250+{
251+ return 0;
252+}
253+
254+Status
255+XwcTextPerCharExtents(
256+ XFontSet font_set,
257+ _Xconst wchar_t *text,
258+ int text_len,
259+ XRectangle *ink_extents_buffer,
260+ XRectangle *logical_extents_buffer,
261+ int buffer_size,
262+ int *num_chars,
263+ XRectangle *max_ink_extents,
264+ XRectangle *max_logical_extents)
265+{
266+ ;
267+}
268+
269+int
270+XwcTextPropertyToTextList(
271+ Display *dpy,
272+ const XTextProperty *text_prop,
273+ wchar_t ***list_ret,
274+ int *count_ret)
275+{
276+ return 0;
277+}
278+
279+int
280+XwcTextListToTextProperty(
281+ Display *dpy,
282+ wchar_t **list,
283+ int count,
284+ XICCEncodingStyle style,
285+ XTextProperty *text_prop)
286+{
287+ return 0;
288+}
289+
290+void
291+XwcFreeStringList(wchar_t **list)
292+{
293+ return;
294+}
295+
296+
297+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
298+ Display *dpy,
299+ Window w,
300+ _Xconst char *windowName,
301+ _Xconst char *iconName,
302+ char **argv,
303+ int argc,
304+ XSizeHints *sizeHints,
305+ XWMHints *wmHints,
306+ XClassHint *classHints)
307+{
308+ return;
309+}
310+
311+int
312+XmbTextPropertyToTextList(
313+ Display *dpy,
314+ const XTextProperty *text_prop,
315+ char ***list_ret,
316+ int *count_ret)
317+{
318+ return XLocaleNotSupported;
319+}
320+
321+int
322+XmbTextListToTextProperty(
323+ Display *dpy,
324+ char **list,
325+ int count,
326+ XICCEncodingStyle style,
327+ XTextProperty *text_prop)
328+{
329+ return XLocaleNotSupported;
330+}
331+
332+int
333+XmbTextExtents(
334+ XFontSet font_set,
335+ _Xconst char *text,
336+ int text_len,
337+ XRectangle *overall_ink_extents,
338+ XRectangle *overall_logical_extents)
339+{
340+ return 0;
341+}
342+
343+void
344+XmbDrawText(
345+ Display *dpy,
346+ Drawable d,
347+ GC gc,
348+ int x,
349+ int y,
350+ XmbTextItem *text_items,
351+ int nitems)
352+{
353+ ;
354+}
355+
356+void
357+XmbDrawString(
358+ Display *dpy,
359+ Drawable d,
360+ XFontSet font_set,
361+ GC gc,
362+ int x,
363+ int y,
364+ _Xconst char *text,
365+ int text_len)
366+{
367+ ;
368+}
369+
370+void
371+XmbDrawImageString(
372+ Display *dpy,
373+ Drawable d,
374+ XFontSet font_set,
375+ GC gc,
376+ int x,
377+ int y,
378+ _Xconst char *text,
379+ int text_len)
380+{
381+ ;
382+}
383+
384+int
385+XmbTextEscapement(
386+ XFontSet font_set,
387+ _Xconst char *text,
388+ int text_len)
389+{
390+ return 0;
391+}
392+
393+Status
394+XmbTextPerCharExtents(
395+ XFontSet font_set,
396+ _Xconst char *text,
397+ int text_len,
398+ XRectangle *ink_extents_buffer,
399+ XRectangle *logical_extents_buffer,
400+ int buffer_size,
401+ int *num_chars,
402+ XRectangle *max_ink_extents,
403+ XRectangle *max_logical_extents)
404+{
405+ return 0;
406+}
407+
408+unsigned int
409+KeySymToUcs4(KeySym keysym)
410+{
411+ return 0;
412+}
413+
414+#endif
415+
416+#if ! XCMS
417+
418+XcmsCCC
419+XcmsCCCOfColormap(dpy, cmap)
420+ Display *dpy;
421+ Colormap cmap;
422+{
423+ return NULL;
424+}
425+
426+Status
427+_XcmsResolveColorString (
428+ XcmsCCC ccc,
429+ const char **color_string,
430+ XcmsColor *pColor_exact_return,
431+ XcmsColorFormat result_format)
432+{
433+ return(XcmsFailure);
434+}
435+
436+void
437+_XcmsUnresolveColor(
438+ XcmsCCC ccc,
439+ XcmsColor *pColor)
440+{
441+ return;
442+}
443+
444+void
445+_XUnresolveColor(
446+ XcmsCCC ccc,
447+ XColor *pXColor)
448+{
449+ return;
450+}
451+
452+XcmsCmapRec *
453+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
454+ Display *dpy;
455+ Colormap cmap;
456+ Window windowID;
457+ Visual *visual;
458+{
459+ return NULL;
460+}
461+
462+void
463+_XcmsRGB_to_XColor(
464+ XcmsColor *pColors,
465+ XColor *pXColors,
466+ unsigned int nColors)
467+{
468+ return;
469+}
470+
471+XcmsCmapRec *
472+_XcmsCopyCmapRecAndFree(
473+ Display *dpy,
474+ Colormap src_cmap,
475+ Colormap copy_cmap)
476+{
477+ return NULL;
478+}
479+
480+void
481+_XcmsDeleteCmapRec(
482+ Display *dpy,
483+ Colormap cmap)
484+{
485+ return;
486+}
487+
488+#endif
489--- git.orig/src/imConv.c
490+++ git/src/imConv.c
491@@ -81,10 +81,11 @@ static const struct SubstRec SubstTable[
492 /*
493 * Given the name of a charset, returns the pointer to convertors
494 * from UCS char to specified charset char.
495 * This converter is needed for _XimGetCharCode subroutine.
496 */
497+#ifdef XLOCALE
498 XPointer
499 _XimGetLocaleCode (
500 _Xconst char* encoding_name)
501 {
502 XPointer cvt = _Utf8GetConvByName(encoding_name);
503@@ -94,10 +95,11 @@ _XimGetLocaleCode (
504 if (!strcmp(encoding_name, SubstTable[i].encoding_name))
505 return _Utf8GetConvByName(SubstTable[i].charset_name);
506 }
507 return cvt;
508 }
509+#endif
510
511 /*
512 * Returns the locale dependent representation of a keysym.
513 * The locale's encoding is passed in form of pointer to UCS convertor.
514 * The resulting multi-byte sequence is placed starting at buf (a buffer
515@@ -105,10 +107,11 @@ _XimGetLocaleCode (
516 * Returns the length of the resulting multi-byte sequence, excluding the
517 * terminating NUL byte. Return 0 if the keysym is not representable in the
518 * locale
519 */
520 /*ARGSUSED*/
521+#ifdef XLOCALE
522 int
523 _XimGetCharCode (
524 XPointer ucs_conv,
525 KeySym keysym,
526 unsigned char* buf,
527@@ -133,10 +136,11 @@ _XimGetCharCode (
528 return nbytes;
529 if (count<nbytes)
530 buf[count]= '\0';
531 return count;
532 }
533+#endif
534
535 #ifdef XKB
536 static int lookup_string(
537 XKeyEvent* event,
538 char* buffer,
539--- git.orig/src/locking.c
540+++ git/src/locking.c
541@@ -53,11 +53,13 @@ in this Software without prior written a
542 #endif
543
544 #define NUM_FREE_CVLS 4
545
546 /* in lcWrap.c */
547+#ifdef XLOCALE
548 extern LockInfoPtr _Xi18n_lock;
549+#endif
550
551 #ifdef WIN32
552 static DWORD _X_TlsIndex = (DWORD)-1;
553
554 void _Xthread_init()
555@@ -623,13 +625,15 @@ Status XInitThreads()
556 return 0;
557 }
558 _Xglobal_lock = &global_lock;
559 xmutex_init(_Xglobal_lock->lock);
560 xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
561+#ifdef XLOCALE
562 _Xi18n_lock = &i18n_lock;
563 xmutex_init(_Xi18n_lock->lock);
564 xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
565+#endif
566 _XLockMutex_fn = _XLockMutex;
567 _XUnlockMutex_fn = _XUnlockMutex;
568 _XCreateMutex_fn = _XCreateMutex;
569 _XFreeMutex_fn = _XFreeMutex;
570 _XInitDisplayLock_fn = _XInitDisplayLock;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
deleted file mode 100644
index 7dcdd6af22..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status: Pending
2
3--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
4+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
5@@ -701,7 +701,11 @@
6 }
7 if (l - 2 - (p - charset) < 0)
8 return 0;
9+#ifdef XLOCALE
10 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
11+#else
12+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
13+#endif
14 return 0;
15 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
16 return 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
deleted file mode 100644
index 26d3349bed..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Pending
2
3#
4# Patch managed by http://www.holgerschurig.de/patcher.html
5#
6
7--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
8+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
9@@ -103,7 +103,7 @@
10
11 /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
12 November 2000. Its presence is indicated through the following macro. */
13-#define X_HAVE_UTF8_STRING 1
14+#undef X_HAVE_UTF8_STRING
15
16 typedef char *XPointer;
17
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
deleted file mode 100644
index b3bcbabfeb..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 configure.ac | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7--- libX11-1.1.5.orig/configure.ac
8+++ libX11-1.1.5/configure.ac
9@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
10 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
11
12 #
13 # Find keysymdef.h
14 #
15-AC_MSG_CHECKING([keysymdef.h])
16-dir=`pkg-config --variable=includedir xproto`
17-KEYSYMDEF="$dir/X11/keysymdef.h"
18+AC_ARG_WITH(keysymdef,
19+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
20+ KEYSYMDEF=$withval, KEYSYMDEF="")
21 if test -f "$KEYSYMDEF"; then
22 AC_MSG_RESULT([$KEYSYMDEF])
23 else
24 AC_MSG_ERROR([Cannot find keysymdef.h])
25 fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
deleted file mode 100644
index cc05fdca7e..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libX11-1.2.1/configure.ac
4===================================================================
5--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
6+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
7@@ -20,7 +20,6 @@
8
9 # Checks for programs.
10 AC_PROG_LIBTOOL
11-DOLT
12 AC_PROG_CC
13 XORG_CWARNFLAGS
14
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
deleted file mode 100644
index 5dc6f06689..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 src/util/Makefile.am | 17 -----------------
5 1 file changed, 17 deletions(-)
6
7Index: git/src/util/Makefile.am
8===================================================================
9--- git.orig/src/util/Makefile.am 2010-01-28 22:24:29.000000000 +0000
10+++ git/src/util/Makefile.am 2010-01-28 22:29:26.000000000 +0000
11@@ -1,19 +1,2 @@
12
13-noinst_PROGRAMS=makekeys
14
15-makekeys_CFLAGS=$(X11_CFLAGS)
16-
17-CC = @CC_FOR_BUILD@
18-
19-EXTRA_DIST = mkks.sh
20-
21-if LINT
22-# Check source code with tools like lint & sparse
23-
24-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
25- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
26-
27-lint:
28- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
29-
30-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
deleted file mode 100644
index d1bf67bf77..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require libx11.inc
2require libx11_git.inc
3
4DESCRIPTION += " Support for XCB, and XCMS is disabled in this version."
5
6PR = "r2"
7SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
8
9DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
10
11EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
12CFLAGS += "-D_GNU_SOURCE"
13
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.bb b/meta/recipes-graphics/xorg-lib/libx11_git.bb
deleted file mode 100644
index afa156006d..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1require libx11.inc
2require libx11_git.inc
3
4inherit gettext
5
6SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
7PR = "r2"
8
9DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
10 bigreqsproto xtrans libxau libxcb libxdmcp util-macros"
11
12DEFAULT_PREFERENCE = "-1"
13
14EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
15
16BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.inc b/meta/recipes-graphics/xorg-lib/libx11_git.inc
deleted file mode 100644
index 4de424da0a..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11_git.inc
+++ /dev/null
@@ -1,11 +0,0 @@
1PV = "1.2.1+git${SRCPV}"
2
3SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
4S = "${WORKDIR}/git"
5
6SRC_URI += "file://x11_disable_makekeys.patch \
7 file://include_fix.patch \
8 file://nodolt.patch"
9
10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
11FILESPATH = "${FILE_DIRNAME}/libx11-git"