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/recipes-graphics/xorg-lib | |
parent | d957e045c04e026e87d6325735c3e07029d32423 (diff) | |
download | meta-openembedded-contrib-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/recipes-graphics/xorg-lib')
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 1a30e345f9..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), -+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") -+ -+if test x$KEYSYMDEFDIR = x; then -+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - 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 9763313975..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: libX11-1.3.4/src/util/Makefile.am -=================================================================== ---- libX11-1.3.4.orig/src/util/Makefile.am -+++ libX11-1.3.4/src/util/Makefile.am -@@ -1,24 +1 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --CC = @CC_FOR_BUILD@ --CPPFLAGS = @CPPFLAGS_FOR_BUILD@ --CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -- - EXTRA_DIST = mkks.sh -- --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --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 9f7e990ef7..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libx11.inc +++ /dev/null @@ -1,52 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Base X libs." -DEPENDS += "util-macros xtrans libxdmcp libxau \ - bigreqsproto xproto xextproto xcmiscproto \ - xf86bigfontproto kbproto inputproto libxcb \ - xproto-native" - -FILESPATHPKG .= ":libx11-${PV}:libx11" -BBCLASSEXTEND = "native nativesdk" -PROVIDES = "virtual/libx11" -PE = "1" - -PACKAGES =+ "${PN}-xcb" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - -XORG_PN = "libX11" - -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11 --with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs" - -# Below option is added to overcome the GCC bug on ARM -# see http://gcc.gnu.org/PR42981 for further details. -# We could potentially take it off when its fixed in gcc 4.5 - -CFLAGS_append_arm = " -fforward-propagate " - -SRC_URI += " file://keysymdef_include.patch \ - file://x11_disable_makekeys.patch \ -" - -do_compile_prepend() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; - mv makekeys.c.orig makekeys.c || true - # MIN_REHASH 10 is only in 1.0.1 - sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c - sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c - touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys - # mv to stop it getting rebuilt - mv makekeys.c makekeys.c.orig - cd ../../ - ) || exit 1 -} - -python () { - if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): - raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") -} 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 3c6a170ebe..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require libx11.inc - -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - -#--without-xcb is not an option anymore -#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8 -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "85e942627aaa020813e0eb8433353563" -SRC_URI[sha256sum] = "38b5ddd93291714a46a02cb8a5dd94b995a04ed76a608551c44d1598e113635a" |