diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-09-07 23:41:43 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-10-12 10:24:44 +0200 |
commit | 65e12fa49aedc9372ce436dcb299296c09eb2a90 (patch) | |
tree | bc99ab16b4fe3e0f1f1d6c82f3e64a5d42cbe46d /meta-oe | |
parent | d957e045c04e026e87d6325735c3e07029d32423 (diff) | |
download | meta-openembedded-65e12fa49aedc9372ce436dcb299296c09eb2a90.tar.gz |
libx11: drop here, 1.4.4 should be in oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
4 files changed, 0 insertions, 111 deletions
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch b/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch deleted file mode 100644 index 1a30e345f..000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac | ||
2 | --- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 | ||
3 | +++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 | ||
4 | @@ -355,7 +355,14 @@ | ||
5 | # Find keysymdef.h | ||
6 | # | ||
7 | AC_MSG_CHECKING([keysym definitions]) | ||
8 | -KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 | ||
9 | +AC_ARG_WITH(keysymdefdir, | ||
10 | + AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), | ||
11 | + KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") | ||
12 | + | ||
13 | +if test x$KEYSYMDEFDIR = x; then | ||
14 | + KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 | ||
15 | +fi | ||
16 | + | ||
17 | FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" | ||
18 | for i in $FILES; do | ||
19 | if test -f "$KEYSYMDEFDIR/$i"; then | ||
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch b/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch deleted file mode 100644 index 976331397..000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Index: libX11-1.3.4/src/util/Makefile.am | ||
2 | =================================================================== | ||
3 | --- libX11-1.3.4.orig/src/util/Makefile.am | ||
4 | +++ libX11-1.3.4/src/util/Makefile.am | ||
5 | @@ -1,24 +1 @@ | ||
6 | - | ||
7 | -noinst_PROGRAMS=makekeys | ||
8 | - | ||
9 | -makekeys_CFLAGS = \ | ||
10 | - $(X11_CFLAGS) \ | ||
11 | - $(CWARNFLAGS) | ||
12 | - | ||
13 | -CC = @CC_FOR_BUILD@ | ||
14 | -CPPFLAGS = @CPPFLAGS_FOR_BUILD@ | ||
15 | -CFLAGS = @CFLAGS_FOR_BUILD@ | ||
16 | -LDFLAGS = @LDFLAGS_FOR_BUILD@ | ||
17 | - | ||
18 | EXTRA_DIST = mkks.sh | ||
19 | - | ||
20 | -if LINT | ||
21 | -# Check source code with tools like lint & sparse | ||
22 | - | ||
23 | -ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
24 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) | ||
25 | - | ||
26 | -lint: | ||
27 | - $(LINT) $(ALL_LINT_FLAGS) makekeys.c | ||
28 | - | ||
29 | -endif LINT | ||
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11.inc b/meta-oe/recipes-graphics/xorg-lib/libx11.inc deleted file mode 100644 index 9f7e990ef..000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libx11.inc +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | DESCRIPTION = "Base X libs." | ||
4 | DEPENDS += "util-macros xtrans libxdmcp libxau \ | ||
5 | bigreqsproto xproto xextproto xcmiscproto \ | ||
6 | xf86bigfontproto kbproto inputproto libxcb \ | ||
7 | xproto-native" | ||
8 | |||
9 | FILESPATHPKG .= ":libx11-${PV}:libx11" | ||
10 | BBCLASSEXTEND = "native nativesdk" | ||
11 | PROVIDES = "virtual/libx11" | ||
12 | PE = "1" | ||
13 | |||
14 | PACKAGES =+ "${PN}-xcb" | ||
15 | |||
16 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" | ||
17 | FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" | ||
18 | FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" | ||
19 | |||
20 | XORG_PN = "libX11" | ||
21 | |||
22 | EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11 --with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs" | ||
23 | |||
24 | # Below option is added to overcome the GCC bug on ARM | ||
25 | # see http://gcc.gnu.org/PR42981 for further details. | ||
26 | # We could potentially take it off when its fixed in gcc 4.5 | ||
27 | |||
28 | CFLAGS_append_arm = " -fforward-propagate " | ||
29 | |||
30 | SRC_URI += " file://keysymdef_include.patch \ | ||
31 | file://x11_disable_makekeys.patch \ | ||
32 | " | ||
33 | |||
34 | do_compile_prepend() { | ||
35 | ( | ||
36 | unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS | ||
37 | cd src/util; | ||
38 | mv makekeys.c.orig makekeys.c || true | ||
39 | # MIN_REHASH 10 is only in 1.0.1 | ||
40 | sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c | ||
41 | sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c | ||
42 | touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys | ||
43 | # mv to stop it getting rebuilt | ||
44 | mv makekeys.c makekeys.c.orig | ||
45 | cd ../../ | ||
46 | ) || exit 1 | ||
47 | } | ||
48 | |||
49 | python () { | ||
50 | if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): | ||
51 | raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") | ||
52 | } | ||
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb b/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb deleted file mode 100644 index 3c6a170eb..000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require libx11.inc | ||
2 | |||
3 | LICENSE = "MIT & MIT-style & BSD" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" | ||
5 | |||
6 | #--without-xcb is not an option anymore | ||
7 | #http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8 | ||
8 | PR = "${INC_PR}.0" | ||
9 | |||
10 | SRC_URI[md5sum] = "85e942627aaa020813e0eb8433353563" | ||
11 | SRC_URI[sha256sum] = "38b5ddd93291714a46a02cb8a5dd94b995a04ed76a608551c44d1598e113635a" | ||