libx11: convert to BBCLASSEXTEND

* common patches in new libx11.inc (some needed to be renamed to keep
  same name across version)
* keep one common dir with diet-x11/libx11-trip variants
* enable xcb again for non-native non-sdk versions newer than 1.3 and
  add libx11-xcb package, XCB seems more popular then in 2007
  (xls* projects were coverted lately, so this actually reverts patch from bug #3372)
* also xcb enabled makes mesa build after libxcb was staged (mesa itself
  has xcb disabled, but if it founds libxcb, then it expects to find
  libx11 with xcb too)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/xorg-lib/diet-x11_1.1.1.bb b/recipes/xorg-lib/diet-x11_1.1.1.bb
index 486faf0..89e472d 100644 (file)
--- a/recipes/xorg-lib/diet-x11_1.1.1.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.1.bb
@@ -1,11 +1,8 @@
-SECTION = "x11/base"
 require libx11_${PV}.bb
 
-EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb"
+EXTRA_OECONF += "--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
 SRC_URI += "file://X18NCMSstubs.diff \
            file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch \

diff --git a/recipes/xorg-lib/diet-x11_1.1.2.bb b/recipes/xorg-lib/diet-x11_1.1.2.bb
index 0d8dbd5..5773dde 100644 (file)
--- a/recipes/xorg-lib/diet-x11_1.1.2.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.2.bb
@@ -1,13 +1,8 @@
 require libx11_${PV}.bb
 
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
 SRC_URI += "file://X18NCMSstubs.diff \
            file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI[archive.md5sum] = "710bf38a9477a5a1b235bc94f1d0593c"
-SRC_URI[archive.sha256sum] = "b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e"

diff --git a/recipes/xorg-lib/diet-x11_1.1.3.bb b/recipes/xorg-lib/diet-x11_1.1.3.bb
index 149d543..5773dde 100644 (file)
--- a/recipes/xorg-lib/diet-x11_1.1.3.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.3.bb
@@ -1,13 +1,8 @@
 require libx11_${PV}.bb
 
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
 SRC_URI += "file://X18NCMSstubs.diff \
            file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI[archive.md5sum] = "4d43d3e472c552d2f191ecdd4e75112c"
-SRC_URI[archive.sha256sum] = "4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a"

diff --git a/recipes/xorg-lib/diet-x11_1.1.4.bb b/recipes/xorg-lib/diet-x11_1.1.4.bb
index 516ca03..c6f080c 100644 (file)
--- a/recipes/xorg-lib/diet-x11_1.1.4.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.4.bb
@@ -1,13 +1,8 @@
 require libx11_${PV}.bb
 
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
 SRC_URI += "file://X18NCMSstubs.diff \
             file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3"
-SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c"

diff --git a/recipes/xorg-lib/diet-x11_1.1.5.bb b/recipes/xorg-lib/diet-x11_1.1.5.bb
index 4f7e51b..c6f080c 100644 (file)
--- a/recipes/xorg-lib/diet-x11_1.1.5.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.5.bb
@@ -1,10 +1,8 @@
 require libx11_${PV}.bb
 
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
 SRC_URI += "file://X18NCMSstubs.diff \
             file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"

diff --git a/recipes/xorg-lib/libx11/include_fix.patch b/recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch
similarity index 100%
rename from recipes/xorg-lib/libx11/include_fix.patch
rename to recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch

diff --git a/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
new file mode 100644 (file)
index 0000000..ad8b6fc
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
@@ -0,0 +1,15 @@
+Index: libX11-1.0.1/src/util/Makefile.am
+===================================================================
+--- libX11-1.0.1.old/src/util/Makefile.am
++++ libX11-1.0.1/src/util/Makefile.am
+@@ -1,10 +1 @@
+-# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ EXTRA_DIST = mkks.sh

diff --git a/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch
new file mode 100644 (file)
index 0000000..5653088
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac |   44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac     2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac  2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+-      case "$KEYSYMDEF" in
+-      "")
+-              case "$flag" in
+-              *-I*)
+-                      dir=`echo "$flag" | sed 's/ *-I//'`
+-                      file="$dir/X11/keysymdef.h"
+-                      if test -f "$file"; then
+-                              KEYSYMDEF="$file"
+-                      fi
++AC_ARG_WITH(keysymdef,
++      AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),  
++      KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++      for flag in $XPROTO_CFLAGS -I/usr/include; do
++              case "$KEYSYMDEF" in
++              "")
++                      case "$flag" in
++                      *-I*)
++                              dir=`echo "$flag" | sed 's/ *-I//'`
++                              file="$dir/X11/keysymdef.h"
++                              if test -f "$file"; then
++                                      KEYSYMDEF="$file"
++                              fi
++                              ;;
++                      esac
+                       ;;
+               esac
+-              ;;
+-      esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+-      AC_MSG_ERROR([Cannot find keysymdef.h])
+-      ;;
+-*)
++      done
++fi
++
++if test -f "$KEYSYMDEF"; then
+       AC_MSG_RESULT([$KEYSYMDEF])
+-        ;;
+-esac
++else
++      AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+ 
+ AC_ARG_ENABLE(udc,

diff --git a/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
new file mode 100644 (file)
index 0000000..ad8b6fc
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
@@ -0,0 +1,15 @@
+Index: libX11-1.0.1/src/util/Makefile.am
+===================================================================
+--- libX11-1.0.1.old/src/util/Makefile.am
++++ libX11-1.0.1/src/util/Makefile.am
+@@ -1,10 +1 @@
+-# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ EXTRA_DIST = mkks.sh

diff --git a/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch
new file mode 100644 (file)
index 0000000..5653088
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac |   44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac     2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac  2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+-      case "$KEYSYMDEF" in
+-      "")
+-              case "$flag" in
+-              *-I*)
+-                      dir=`echo "$flag" | sed 's/ *-I//'`
+-                      file="$dir/X11/keysymdef.h"
+-                      if test -f "$file"; then
+-                              KEYSYMDEF="$file"
+-                      fi
++AC_ARG_WITH(keysymdef,
++      AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),  
++      KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++      for flag in $XPROTO_CFLAGS -I/usr/include; do
++              case "$KEYSYMDEF" in
++              "")
++                      case "$flag" in
++                      *-I*)
++                              dir=`echo "$flag" | sed 's/ *-I//'`
++                              file="$dir/X11/keysymdef.h"
++                              if test -f "$file"; then
++                                      KEYSYMDEF="$file"
++                              fi
++                              ;;
++                      esac
+                       ;;
+               esac
+-              ;;
+-      esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+-      AC_MSG_ERROR([Cannot find keysymdef.h])
+-      ;;
+-*)
++      done
++fi
++
++if test -f "$KEYSYMDEF"; then
+       AC_MSG_RESULT([$KEYSYMDEF])
+-        ;;
+-esac
++else
++      AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+ 
+ AC_ARG_ENABLE(udc,

diff --git a/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch
new file mode 100644 (file)
index 0000000..5653088
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac |   44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac     2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac  2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+-      case "$KEYSYMDEF" in
+-      "")
+-              case "$flag" in
+-              *-I*)
+-                      dir=`echo "$flag" | sed 's/ *-I//'`
+-                      file="$dir/X11/keysymdef.h"
+-                      if test -f "$file"; then
+-                              KEYSYMDEF="$file"
+-                      fi
++AC_ARG_WITH(keysymdef,
++      AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),  
++      KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++      for flag in $XPROTO_CFLAGS -I/usr/include; do
++              case "$KEYSYMDEF" in
++              "")
++                      case "$flag" in
++                      *-I*)
++                              dir=`echo "$flag" | sed 's/ *-I//'`
++                              file="$dir/X11/keysymdef.h"
++                              if test -f "$file"; then
++                                      KEYSYMDEF="$file"
++                              fi
++                              ;;
++                      esac
+                       ;;
+               esac
+-              ;;
+-      esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+-      AC_MSG_ERROR([Cannot find keysymdef.h])
+-      ;;
+-*)
++      done
++fi
++
++if test -f "$KEYSYMDEF"; then
+       AC_MSG_RESULT([$KEYSYMDEF])
+-        ;;
+-esac
++else
++      AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+ 
+ AC_ARG_ENABLE(udc,

diff --git a/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch
new file mode 100644 (file)
index 0000000..5653088
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac |   44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac     2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac  2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+-      case "$KEYSYMDEF" in
+-      "")
+-              case "$flag" in
+-              *-I*)
+-                      dir=`echo "$flag" | sed 's/ *-I//'`
+-                      file="$dir/X11/keysymdef.h"
+-                      if test -f "$file"; then
+-                              KEYSYMDEF="$file"
+-                      fi
++AC_ARG_WITH(keysymdef,
++      AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),  
++      KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++      for flag in $XPROTO_CFLAGS -I/usr/include; do
++              case "$KEYSYMDEF" in
++              "")
++                      case "$flag" in
++                      *-I*)
++                              dir=`echo "$flag" | sed 's/ *-I//'`
++                              file="$dir/X11/keysymdef.h"
++                              if test -f "$file"; then
++                                      KEYSYMDEF="$file"
++                              fi
++                              ;;
++                      esac
+                       ;;
+               esac
+-              ;;
+-      esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+-      AC_MSG_ERROR([Cannot find keysymdef.h])
+-      ;;
+-*)
++      done
++fi
++
++if test -f "$KEYSYMDEF"; then
+       AC_MSG_RESULT([$KEYSYMDEF])
+-        ;;
+-esac
++else
++      AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+ 
+ AC_ARG_ENABLE(udc,

diff --git a/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch
new file mode 100644 (file)
index 0000000..5653088
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac |   44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac     2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac  2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+-      case "$KEYSYMDEF" in
+-      "")
+-              case "$flag" in
+-              *-I*)
+-                      dir=`echo "$flag" | sed 's/ *-I//'`
+-                      file="$dir/X11/keysymdef.h"
+-                      if test -f "$file"; then
+-                              KEYSYMDEF="$file"
+-                      fi
++AC_ARG_WITH(keysymdef,
++      AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),  
++      KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++      for flag in $XPROTO_CFLAGS -I/usr/include; do
++              case "$KEYSYMDEF" in
++              "")
++                      case "$flag" in
++                      *-I*)
++                              dir=`echo "$flag" | sed 's/ *-I//'`
++                              file="$dir/X11/keysymdef.h"
++                              if test -f "$file"; then
++                                      KEYSYMDEF="$file"
++                              fi
++                              ;;
++                      esac
+                       ;;
+               esac
+-              ;;
+-      esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+-      AC_MSG_ERROR([Cannot find keysymdef.h])
+-      ;;
+-*)
++      done
++fi
++
++if test -f "$KEYSYMDEF"; then
+       AC_MSG_RESULT([$KEYSYMDEF])
+-        ;;
+-esac
++else
++      AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+ 
+ AC_ARG_ENABLE(udc,

diff --git a/recipes/xorg-lib/libx11-1.3.2/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.2/x11_disable_makekeys.patch
new file mode 100644 (file)
index 0000000..5d0a24c
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.2/x11_disable_makekeys.patch
@@ -0,0 +1,23 @@
+diff -uNr libX11-1.3.3.orig/src/util/Makefile.am libX11-1.3.3/src/util/Makefile.am
+--- libX11-1.3.3.orig/src/util/Makefile.am     2010-01-15 02:11:36.000000000 +0100
++++ libX11-1.3.3/src/util/Makefile.am  2010-01-18 14:48:27.000000000 +0100
+@@ -1,19 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-CC = @CC_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/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
new file mode 100644 (file)
index 0000000..7e96075
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
@@ -0,0 +1,22 @@
+Index: libX11-1.3.4/m4/dolt.m4
+===================================================================
+--- libX11-1.3.4/m4/dolt.m4
++++ libX11-1.3.4/m4/dolt.m4
+@@ -155,7 +155,7 @@ dnl without '=', because automake does n
+     cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
+ #!$DOLT_BASH
+ __DOLTLIBTOOL__EOF__
+-    cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
++    cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
+ top_builddir_slash="${0%%doltlibtool}"
+ : ${top_builddir_slash:=./}
+ args=()
+@@ -171,7 +171,7 @@ done
+ if $modeok && $tagok ; then
+     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+-    exec ${top_builddir_slash}libtool "$[]@"
++    exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
+ fi
+ __DOLTLIBTOOL__EOF__
+ 

diff --git a/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
new file mode 100644 (file)
index 0000000..07487b6
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac     2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac  2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++      AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++      KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++      dir=`pkg-config --variable=includedir xproto`
++      KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+-        AC_MSG_RESULT([$KEYSYMDEF])
++      AC_MSG_RESULT([$KEYSYMDEF])
+ else
+       AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+ 
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)

diff --git a/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
new file mode 100644 (file)
index 0000000..0739632
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
@@ -0,0 +1,26 @@
+Index: git/src/util/Makefile.am
+===================================================================
+--- git.orig/src/util/Makefile.am
++++ git/src/util/Makefile.am
+@@ -1,21 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+-      $(X11_CFLAGS) \
+-      $(CWARNFLAGS)
+-
+-CC = @CC_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/recipes/xorg-lib/libx11-native_1.0.1.bb b/recipes/xorg-lib/libx11-native_1.0.1.bb
deleted file mode 100644 (file)
index 73afd4c..0000000
--- a/recipes/xorg-lib/libx11-native_1.0.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-PE = "1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "x11-native virtual/libx11-native"
-
-XORG_PN = "libX11"
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.0.1.tar.bz2"
-S = "${WORKDIR}/libX11-${PV}"
-
-inherit native autotools pkgconfig
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD
-               oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
-       )
-       rm -f ${STAGING_INCDIR}/X11/Xlib.h
-       oe_runmake
-}
-
-SRC_URI[md5sum] = "58f0537f21183e27149cf906a1b6bef9"
-SRC_URI[sha256sum] = "f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294"

diff --git a/recipes/xorg-lib/libx11-native_1.0.3.bb b/recipes/xorg-lib/libx11-native_1.0.3.bb
deleted file mode 100644 (file)
index eeff892..0000000
--- a/recipes/xorg-lib/libx11-native_1.0.3.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-PE = "1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "x11-native virtual/libx11-native"
-
-XORG_PN = "libX11"
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
-S = "${WORKDIR}/libX11-${PV}"
-
-inherit native autotools pkgconfig
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD
-               oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
-       )
-       rm -f ${STAGING_INCDIR}/X11/Xlib.h
-       oe_runmake
-}
-
-SRC_URI[md5sum] = "60b787a812c92d33f71860e4e19cb59d"
-SRC_URI[sha256sum] = "fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac"

diff --git a/recipes/xorg-lib/libx11-native_1.1.1.bb b/recipes/xorg-lib/libx11-native_1.1.1.bb
deleted file mode 100644 (file)
index 3d28238..0000000
--- a/recipes/xorg-lib/libx11-native_1.1.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-PE = "1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "x11-native virtual/libx11-native"
-
-XORG_PN = "libX11"
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.tar.bz2"
-S = "${WORKDIR}/libX11-${PV}"
-
-inherit native autotools pkgconfig
-
-EXTRA_OECONF += "--without-xcb"
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD
-               oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
-       )
-       rm -f ${STAGING_INCDIR}/X11/Xlib.h
-       oe_runmake
-}
-
-SRC_URI[md5sum] = "848b80f77b20ae1fa5c882bbfa531ebc"
-SRC_URI[sha256sum] = "5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541"

diff --git a/recipes/xorg-lib/libx11-native_1.1.4.bb b/recipes/xorg-lib/libx11-native_1.1.4.bb
deleted file mode 100644 (file)
index a7dee0d..0000000
--- a/recipes/xorg-lib/libx11-native_1.1.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "virtual/libx11-native"
-
-inherit native
-
-SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3"
-SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c"

diff --git a/recipes/xorg-lib/libx11-native_1.1.5.bb b/recipes/xorg-lib/libx11-native_1.1.5.bb
deleted file mode 100644 (file)
index 3863cef..0000000
--- a/recipes/xorg-lib/libx11-native_1.1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "virtual/libx11-native"
-
-inherit native
-
-SRC_URI[archive.md5sum] = "d1512d65dadd4f48c779d4749e7753a8"
-SRC_URI[archive.sha256sum] = "da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82"

diff --git a/recipes/xorg-lib/libx11-native_1.2.bb b/recipes/xorg-lib/libx11-native_1.2.bb
deleted file mode 100644 (file)
index e3a7172..0000000
--- a/recipes/xorg-lib/libx11-native_1.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "virtual/libx11-native"
-
-inherit native
-
-#fake it here for the libtool mess
-TARGET_PREFIX = "${TARGET_SYS}-"
-
-SRC_URI[archive.md5sum] = "c6265b59ea2b594fd68e33f9125b4d20"
-SRC_URI[archive.sha256sum] = "e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051"

diff --git a/recipes/xorg-lib/libx11-native_1.3.2.bb b/recipes/xorg-lib/libx11-native_1.3.2.bb
deleted file mode 100644 (file)
index db2d682..0000000
--- a/recipes/xorg-lib/libx11-native_1.3.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "virtual/libx11-native"
-
-inherit native

diff --git a/recipes/xorg-lib/libx11-native_1.3.3.bb b/recipes/xorg-lib/libx11-native_1.3.3.bb
deleted file mode 100644 (file)
index db2d682..0000000
--- a/recipes/xorg-lib/libx11-native_1.3.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "virtual/libx11-native"
-
-inherit native

diff --git a/recipes/xorg-lib/libx11-native_1.3.4.bb b/recipes/xorg-lib/libx11-native_1.3.4.bb
deleted file mode 100644 (file)
index db2d682..0000000
--- a/recipes/xorg-lib/libx11-native_1.3.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = "virtual/libx11-native"
-
-inherit native

diff --git a/recipes/xorg-lib/libx11-sdk_1.1.4.bb b/recipes/xorg-lib/libx11-sdk_1.1.4.bb
deleted file mode 100644 (file)
index 6140d13..0000000
--- a/recipes/xorg-lib/libx11-sdk_1.1.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native"
-PROVIDES = ""
-
-inherit sdk

diff --git a/recipes/xorg-lib/libx11-trim/include_fix.patch b/recipes/xorg-lib/libx11-trim/include_fix.patch
deleted file mode 100644 (file)
index 99ed571..0000000
--- a/recipes/xorg-lib/libx11-trim/include_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
----
- configure.ac |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- libX11-1.1.5.orig/configure.ac
-+++ libX11-1.1.5/configure.ac
-@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
- AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
- 
- #
- # Find keysymdef.h
- #
--AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+      AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+      KEYSYMDEF=$withval, KEYSYMDEF="")
- if test -f "$KEYSYMDEF"; then
-         AC_MSG_RESULT([$KEYSYMDEF])
- else
-       AC_MSG_ERROR([Cannot find keysymdef.h])
- fi

diff --git a/recipes/xorg-lib/libx11-trim_1.1.5.bb b/recipes/xorg-lib/libx11-trim_1.1.5.bb
index f7c40e2..ed22749 100644 (file)
--- a/recipes/xorg-lib/libx11-trim_1.1.5.bb
+++ b/recipes/xorg-lib/libx11-trim_1.1.5.bb
@@ -1,37 +1,7 @@
-require xorg-lib-common.inc
+require libx11_${PV}.bb
 
-DESCRIPTION = "X11 protocol and utility library"
-DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto"
+EXTRA_OECONF += "--disable-xcms"
 
-#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-#SRC_URI += "file://X18NCMSstubs.diff "
+SRC_URI += " file://makekeys-update.patch"
 
-PROVIDES = "virtual/libx11"
-
-PE = "1"
 PR = "r1"
-
-XORG_PN = "libX11"
-LEAD_SONAME = "libX11.so"
-
-SRC_URI += "file://include_fix.patch \
-            file://makekeys-update.patch"
-
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb"
-EXTRA_OECONF += "--disable-xcms --with-xcb"
-
-do_compile() {
-        (
-         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-         cd ../../
-        ) || exit 1
-        oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB "
-
-
-SRC_URI[archive.md5sum] = "d1512d65dadd4f48c779d4749e7753a8"
-SRC_URI[archive.sha256sum] = "da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82"

diff --git a/recipes/xorg-lib/libx11.inc b/recipes/xorg-lib/libx11.inc
new file mode 100644 (file)
index 0000000..3a1ad95
--- /dev/null
+++ b/recipes/xorg-lib/libx11.inc
@@ -0,0 +1,52 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+COMMON_DEPENDS = "util-macros xtrans libxdmcp libxau \
+                  bigreqsproto xproto xextproto xcmiscproto \
+                  xf86bigfontproto kbproto inputproto xproto-native"
+
+DEPENDS = "libxcb ${COMMON_DEPENDS}"             
+DEPENDS_virtclass-native = "${COMMON_DEPENDS}"
+DEPENDS_virtclass-nativesdk = "${COMMON_DEPENDS}"
+
+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-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+EXTRA_OECONF_virtclass-native = " --without-xcb"
+EXTRA_OECONF_virtclass-nativesdk = " --without-xcb"
+
+# 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
+}

diff --git a/recipes/xorg-lib/libx11-trim/makekeys-update.patch b/recipes/xorg-lib/libx11/makekeys-update.patch
similarity index 100%
rename from recipes/xorg-lib/libx11-trim/makekeys-update.patch
rename to recipes/xorg-lib/libx11/makekeys-update.patch

diff --git a/recipes/xorg-lib/libx11/makekeys.diff b/recipes/xorg-lib/libx11/makekeys.diff
deleted file mode 100644 (file)
index cea0872..0000000
--- a/recipes/xorg-lib/libx11/makekeys.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru libX11-X11R7.1-1.0.1.org/src/util/makekeys.c libX11-X11R7.1-1.0.1/src/util/makekeys.c
---- libX11-X11R7.1-1.0.1.org/src/util/makekeys.c       2007-03-08 14:34:34.000000000 +0100
-+++ libX11-X11R7.1-1.0.1/src/util/makekeys.c   2007-03-08 14:34:58.000000000 +0100
-@@ -49,7 +49,7 @@
-     KeySym    val;
- } info[KTNUM];
- 
--#define MIN_REHASH 10
-+#define MIN_REHASH 15
- #define MATCHES 10
- 
- char tab[KTNUM];

diff --git a/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch b/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch
deleted file mode 100644 (file)
index 4358f79..0000000
--- a/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr libX11-1.2.99.901.orig/src/util/Makefile.am libX11-1.2.99.901/src/util/Makefile.am
---- libX11-1.2.99.901.orig/src/util/Makefile.am        2009-08-12 13:21:19.000000000 +0200
-+++ libX11-1.2.99.901/src/util/Makefile.am     2009-08-12 13:22:21.000000000 +0200
-@@ -1,20 +1,3 @@
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
- 
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS=$(X11_CFLAGS)
--
--CC = @CC_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/recipes/xorg-lib/libx11_1.0.1.bb b/recipes/xorg-lib/libx11_1.0.1.bb
new file mode 100644 (file)
index 0000000..90bbfa8
--- /dev/null
+++ b/recipes/xorg-lib/libx11_1.0.1.bb
@@ -0,0 +1,11 @@
+require libx11.inc
+LICENSE = "XFree86"
+PR = "r7"
+
+DEPENDS = "${COMMON_DEPENDS}"
+EXTRA_OECONF += " --without-xcb"
+
+SRC_URI += " file://ruutf8.patch"
+
+SRC_URI[archive.md5sum] = "58f0537f21183e27149cf906a1b6bef9"
+SRC_URI[archive.sha256sum] = "f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294"

diff --git a/recipes/xorg-lib/libx11_1.0.3.bb b/recipes/xorg-lib/libx11_1.0.3.bb
new file mode 100644 (file)
index 0000000..f06da81
--- /dev/null
+++ b/recipes/xorg-lib/libx11_1.0.3.bb
@@ -0,0 +1,11 @@
+require libx11.inc
+LICENSE = "XFree86"
+PR = "r7"
+
+DEPENDS = "${COMMON_DEPENDS}"
+EXTRA_OECONF += " --without-xcb"
+
+SRC_URI += " file://ruutf8.patch"
+
+SRC_URI[archive.md5sum] = "60b787a812c92d33f71860e4e19cb59d"
+SRC_URI[archive.sha256sum] = "fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac"

diff --git a/recipes/xorg-lib/libx11_1.1.1.bb b/recipes/xorg-lib/libx11_1.1.1.bb
index 0ecf6cd..37c819f 100644 (file)
--- a/recipes/xorg-lib/libx11_1.1.1.bb
+++ b/recipes/xorg-lib/libx11_1.1.1.bb
@@ -1,29 +1,10 @@
-require xorg-lib-common.inc
-PE = "1"
-PR = "r5"
+require libx11.inc
+PR = "r7"
 
-DESCRIPTION = "Base X libs."
-DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-       libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "virtual/libx11"
-
-XORG_PN = "libX11"
-
-EXTRA_OECONF += "--without-xcb"
+DEPENDS = "${COMMON_DEPENDS}"
+EXTRA_OECONF += " --without-xcb"
 
 SRC_URI += " file://ruutf8.patch"
 
-do_compile() {
-        (
-         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-         cd ../../
-        ) || exit 1
-        oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-
 SRC_URI[archive.md5sum] = "848b80f77b20ae1fa5c882bbfa531ebc"
 SRC_URI[archive.sha256sum] = "5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541"

diff --git a/recipes/xorg-lib/libx11_1.1.2.bb b/recipes/xorg-lib/libx11_1.1.2.bb
index a02fb0e..b516736 100644 (file)
--- a/recipes/xorg-lib/libx11_1.1.2.bb
+++ b/recipes/xorg-lib/libx11_1.1.2.bb
@@ -1,29 +1,8 @@
-require xorg-lib-common.inc
+require libx11.inc
+PR = "r7"
 
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "virtual/libx11"
-PE = "1"
-PR = "r3"
-
-XORG_PN = "libX11"
-
-SRC_URI += "file://include_fix.patch" 
-
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-               cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-               cd ../../
-       ) || exit 1
-       oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+DEPENDS = "${COMMON_DEPENDS}"
+EXTRA_OECONF += " --without-xcb"
 
 SRC_URI[archive.md5sum] = "710bf38a9477a5a1b235bc94f1d0593c"
 SRC_URI[archive.sha256sum] = "b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e"

diff --git a/recipes/xorg-lib/libx11_1.1.3.bb b/recipes/xorg-lib/libx11_1.1.3.bb
index 8100baa..659fa89 100644 (file)
--- a/recipes/xorg-lib/libx11_1.1.3.bb
+++ b/recipes/xorg-lib/libx11_1.1.3.bb
@@ -1,29 +1,8 @@
-require xorg-lib-common.inc
+require libx11.inc
+PR = "r7"
 
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "virtual/libx11"
-PE = "1"
-PR = "r3"
-
-XORG_PN = "libX11"
-
-SRC_URI += "file://include_fix.patch" 
-
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-               cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-               cd ../../
-       ) || exit 1
-       oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+DEPENDS = "${COMMON_DEPENDS}"
+EXTRA_OECONF += " --without-xcb"
 
 SRC_URI[archive.md5sum] = "4d43d3e472c552d2f191ecdd4e75112c"
 SRC_URI[archive.sha256sum] = "4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a"

diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb
index 6949a3f..fb45668 100644 (file)
--- a/recipes/xorg-lib/libx11_1.1.4.bb
+++ b/recipes/xorg-lib/libx11_1.1.4.bb
@@ -1,35 +1,8 @@
-require xorg-lib-common.inc
+require libx11.inc
+PR = "r7"
 
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-PROVIDES = "virtual/libx11"
-PE = "1"
-PR = "r3"
-
-XORG_PN = "libX11"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
-            file://include_fix.patch" 
-
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-               cd src/util; 
-               mv makekeys.c.orig makekeys.c || true
-               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
-       oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+DEPENDS = "${COMMON_DEPENDS}"
+EXTRA_OECONF += " --without-xcb"
 
 SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3"
 SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c"

diff --git a/recipes/xorg-lib/libx11_1.1.5.bb b/recipes/xorg-lib/libx11_1.1.5.bb
index fa33157..c9b047e 100644 (file)
--- a/recipes/xorg-lib/libx11_1.1.5.bb
+++ b/recipes/xorg-lib/libx11_1.1.5.bb
@@ -1,35 +1,8 @@
-require xorg-lib-common.inc
+require libx11.inc
+PR = "r7"
 
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-PROVIDES = "virtual/libx11"
-PE = "1"
-PR = "r4"
-
-XORG_PN = "libX11"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
-            file://keysymdef_include.patch"
-
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-               cd src/util; 
-               mv makekeys.c.orig makekeys.c || true
-               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
-       oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+DEPENDS = "${COMMON_DEPENDS}"
+EXTRA_OECONF += " --without-xcb"
 
 SRC_URI[archive.md5sum] = "d1512d65dadd4f48c779d4749e7753a8"
 SRC_URI[archive.sha256sum] = "da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82"

diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb
index b496563..0328bc8 100644 (file)
--- a/recipes/xorg-lib/libx11_1.2.bb
+++ b/recipes/xorg-lib/libx11_1.2.bb
@@ -1,39 +1,10 @@
-require xorg-lib-common.inc
+require libx11.inc
+PR = "r7"
 
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-PROVIDES = "virtual/libx11"
-PE = "1"
+DEPENDS = "${COMMON_DEPENDS}"
+EXTRA_OECONF += " --without-xcb"
 
-XORG_PN = "libX11"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
-            file://keysymdef_include.patch"
-
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-# Dolt gets used on x86 and ppc and hardcodes 'libtool'
-do_configure_append() {
-        cp ${TARGET_PREFIX}libtool libtool || true
-}
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-               cd src/util; 
-               mv makekeys.c.orig makekeys.c || true
-               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
-       oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+SRC_URI += " file://dolt-fix.patch"
 
 SRC_URI[archive.md5sum] = "c6265b59ea2b594fd68e33f9125b4d20"
 SRC_URI[archive.sha256sum] = "e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051"

diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
index 291486b..438bba6 100644 (file)
--- a/recipes/xorg-lib/libx11_1.3.2.bb
+++ b/recipes/xorg-lib/libx11_1.3.2.bb
@@ -1,41 +1,7 @@
-require xorg-lib-common.inc
+require libx11.inc
+PR = "r7"
 
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-PROVIDES = "virtual/libx11"
-PE = "1"
-PR = "r4"
-
-XORG_PN = "libX11"
-
-SRC_URI += "file://x11_disable_makekeys.1.6.3.patch \
-            file://dolt-fix.patch \
-            file://keysymdef_include.patch"
-
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-# 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 "
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-               cd src/util; 
-               mv makekeys.c.orig makekeys.c || true
-               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
-       oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+SRC_URI += " file://dolt-fix.patch"
 
 SRC_URI[archive.md5sum] = "001d780829f936e34851ef7cd37b4dfd"
 SRC_URI[archive.sha256sum] = "4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2"

diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
index b4c2477..89c5723 100644 (file)
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ b/recipes/xorg-lib/libx11_1.3.3.bb
@@ -1,43 +1,7 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-PROVIDES = "virtual/libx11"
-PE = "1"
+require libx11.inc
 PR = "r7"
 
-XORG_PN = "libX11"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
-            file://dolt-fix.patch \
-            ${@['file://keysymdef_include.patch', ''][(bb.data.inherits_class('native', d))]} \
-"
-
-# --with-keysymdef has intentionally no effect in native build without without keysymdef_include.patch
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-# 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 "
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-               cd src/util; 
-               mv makekeys.c.orig makekeys.c || true
-               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
-       oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+SRC_URI += " file://dolt-fix.patch"
 
 SRC_URI[archive.md5sum] = "5d74971360f194ce33d2bd2e4d9b066c"
 SRC_URI[archive.sha256sum] = "8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac"

diff --git a/recipes/xorg-lib/libx11_1.3.4.bb b/recipes/xorg-lib/libx11_1.3.4.bb
index be1702a..e3c444d 100644 (file)
--- a/recipes/xorg-lib/libx11_1.3.4.bb
+++ b/recipes/xorg-lib/libx11_1.3.4.bb
@@ -1,43 +1,7 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-PROVIDES = "virtual/libx11"
-PE = "1"
+require libx11.inc
 PR = "r7"
 
-XORG_PN = "libX11"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
-            file://dolt-fix.patch \
-            ${@['file://keysymdef_include.patch', ''][(bb.data.inherits_class('native', d))]} \
-"
-
-# --with-keysymdef has intentionally no effect in native build without without keysymdef_include.patch
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-# 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 "
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-               cd src/util; 
-               mv makekeys.c.orig makekeys.c || true
-               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
-       oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+SRC_URI += " file://dolt-fix.patch"
 
 SRC_URI[archive.md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
 SRC_URI[archive.sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"

diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb
index 9cd227b..947316d 100644 (file)
--- a/recipes/xorg-lib/libx11_git.bb
+++ b/recipes/xorg-lib/libx11_git.bb
@@ -1,30 +1,12 @@
-DEFAULT_PREFERENCE = "-1"
+require libx11.inc
 
-DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
-PROVIDES = "virtual/libx11"
-RPROVIDES_${PN} = "virtual-libx11"
-SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d"
+DEFAULT_PREFERENCE = "-1"
 PV = "1.3.3+git"
-PR = "r4"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-
+SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d"
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
-       (
-               unset CC LD CXX CCLD
-               oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
-       )
-       oe_runmake
-}
+SRC_URI += " file://keysymdef_include.patch \
+             file://x11_disable_makekeys.patch \
+             file://dolt-fix.patch \
+"
 
+S = "${WORKDIR}/git"