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

9 files changed, 64 insertions, 17 deletions

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 045b4ce629..200ff8c228 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -63,7 +63,7 @@ python sourcepkg_do_dumpdata() {
 	distro = bb.data.getVar('DISTRO', d, 1)
 	s_tree = get_src_tree(d)
 	openembeddeddir = os.path.join(workdir, s_tree, distro)
-	dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}${DISTRO_PR}.showdata.dump",d))
+	dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}.showdata.dump",d))
 	
 	try:
 		os.mkdir(openembeddeddir)
@@ -97,14 +97,20 @@ sourcepkg_do_create_diff_gz(){
 		cp $i $src_tree/${DISTRO}/files
 	done
 	
-	oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}${DISTRO_PR}.diff.gz"
-	LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}${DISTRO_PR}.diff.gz
+	oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz"
+	LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz
 	rm -rf $src_tree.orig
 }
 
 EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
 
+do_create_orig_tgz[deptask] = "do_unpack"
+do_create_diff_gz[deptask] = "do_patch"
+do_archive_bb[deptask] = "do_patch"
+do_dumpdata[deptask] = "do_unpack"
+
 addtask create_orig_tgz after do_unpack before do_patch
 addtask archive_bb after do_patch before do_dumpdata
 addtask dumpdata after do_archive_bb before do_create_diff_gz
-addtask create_diff_gz after do_dump_data before do_configure
+addtask create_diff_gz after do_dumpdata before do_configure
+
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 31e2a662c5..df8149df52 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9262,6 +9262,10 @@ sha256=63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5
 md5=3faf4bc1e2bb9353590d7b1fe50ec306
 sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
 
+[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.5.0.tar.bz2]
+md5=dcc36554aea1338b3813943daf1e9988
+sha256=ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/inputproto-X11R7.0-1.3.2.tar.bz2]
 md5=0da271f396bede5b8d09a61f6d1c4484
 sha256=3b48f495f9af74fc7cca2fe913e10ce3d947d1aa5e677722e87620b32f1068d0
@@ -10326,6 +10330,10 @@ sha256=4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862
 md5=7c510abb0cad8dc20493fb27ff7859d8
 sha256=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.2.0.tar.bz2]
+md5=4b88e07d7dd77ca1e786f09066b58c02
+sha256=7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
 md5=99503799b4d52ec0cac8e203341bb7b3
 sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
@@ -21194,6 +21202,10 @@ sha256=71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd
 md5=ac97e155ea4db87a8393297493f9c406
 sha256=825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.1.0.tar.bz2]
+md5=a6070ead29b2d81b5b386a96df2661b8
+sha256=45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
 md5=d982c6f185f4c75a4b65703ceed7be06
 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 8744cfc20a..f6afab61e9 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
 PREFERRED_VERSION_gtk+		= "2.14.2"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
-PREFERRED_VERSION_inputproto 	= "1.4.4"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
 PREFERRED_VERSION_libosip2	= "2.2.2"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
index cf999a2a4d..a81d5eca71 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -1,3 +1,7 @@
 # This file is for updates after X11R7.4 was released
 
 PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
+PREFERRED_VERSION_libxi ?= "1.2.0"
+PREFERRED_VERSION_inputproto ?= "1.5.0"
+
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.*"