Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 38 insertions, 12 deletions

diff --git a/packages/libxml/libxml2-native.inc b/packages/libxml/libxml2-native.inc
index 5672792db3..603f48d196 100644
--- a/packages/libxml/libxml2-native.inc
+++ b/packages/libxml/libxml2-native.inc
@@ -6,18 +6,16 @@ PR = "r3"
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 S = "${WORKDIR}/libxml2-${PV}"
 
-inherit autotools native pkgconfig
+inherit distutils-base autotools native pkgconfig
 
-def libxml2_native_python_dir(d):
-        import os, bb
-        staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
-        if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
-        if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
-        if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
-        raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
-
-EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/${@libxml2_native_python_dir(d)} \
-                --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
+EXTRA_OECONF = "\
+  --with-python=${STAGING_INCDIR}/${PYTHON_MAJMIN} \
+  --without-debug \
+  --without-legacy \
+  --without-catalog \
+  --without-docbook \
+  --with-c14n \
+"
 
 do_stage () {
 	oe_runmake install
diff --git a/packages/xorg-driver/xf86-input-evdev_2.1.0.bb b/packages/xorg-driver/xf86-input-evdev_2.1.0.bb
new file mode 100644
index 0000000000..792909621a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-evdev_2.1.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
diff --git a/packages/xorg-lib/libxi_1.2.0.bb b/packages/xorg-lib/libxi_1.2.0.bb
new file mode 100644
index 0000000000..31e3b4906d
--- /dev/null
+++ b/packages/xorg-lib/libxi_1.2.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXi"
diff --git a/packages/xorg-proto/inputproto_1.5.0.bb b/packages/xorg-proto/inputproto_1.5.0.bb
new file mode 100644
index 0000000000..e3a8b09f2b
--- /dev/null
+++ b/packages/xorg-proto/inputproto_1.5.0.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
+
+XORG_PN = "inputproto"
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 1cf1dbd072..837d7ff835 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -64,11 +64,21 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
 #  124.0k  libxf1bpp.so
 #  84.0k   libxf4bpp.so
 
-PACKAGES =+ "${PN}-extension-dri ${PN}-extension-glx ${PN}-module-libint10 ${PN}-module-libwfb ${PN}-module-libmfb ${PN}-module-libcfb ${PN}-module-xaa ${PN}-module-libxf1bpp ${PN}-module-libxf4bpp"
+PACKAGES =+ "${PN}-extension-dri \
+             ${PN}-extension-glx \
+             ${PN}-module-libint10 
+             ${PN}-module-libafb \
+             ${PN}-module-libwfb  \
+             ${PN}-module-libmfb \
+             ${PN}-module-libcfb \
+             ${PN}-module-xaa \
+             ${PN}-module-libxf1bpp \
+             ${PN}-module-libxf4bpp"
 
 FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
 FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
 FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.*"
+FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.*"
 FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.*"
 FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.*"
 FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.*"