* [PATCH 00/14] 16-May-2011 Consolidated Pull Request
@ 2011-05-16 21:43 Saul Wold
2011-05-16 21:44 ` [PATCH 01/14] task-core-nfs: fix a bitbake error Saul Wold
` (14 more replies)
0 siblings, 15 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:43 UTC (permalink / raw)
To: openembedded-core
From: Saul Wold <sgw@linux.intel.com>
Richard,
This contains the Kernel updates, Upstream-Status updates along with
some changes from Nitin, Khem, Tom and myself.
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/stage
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Thanks,
Saul Wold <sgw@linux.intel.com>
---
Bruce Ashfield (2):
linux-yocto: detect and avoid branch revision checking for AUTOREV
linux-yocto: update meta SRCREV
Khem Raj (3):
opkg: Bump SRCREV to 609
e2fsprogs_1.41.14.bb: Package libraries into separate packages
base.bbclass: Fix PR increment bug when PR number is a single digit
Mei Lei (1):
Add a new task checklicense and fix some bugs in distro_check.py
Nitin A Kamble (1):
task-core-nfs: fix a bitbake error
Saul Wold (1):
mutter: Recipe Update for clutter 1.6 update
Scott Garman (1):
recipes: Add Upstream-Status to various recipe patches
Tom Rini (2):
openssh: Don't use ${libdir}exec
perl-native: create_wrapper on perl${PV} too
Yu Ke (2):
xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1
Upstream-Status update for several recipes
Zhai Edwin (1):
Upstream-Status: Update patch upstream-status for libfm, eggdbus,
screenshot...
meta/classes/base.bbclass | 19 +-
meta/classes/distrodata.bbclass | 177 ++++---
meta/classes/kernel-yocto.bbclass | 7 +
meta/lib/oe/distro_check.py | 27 +-
meta/recipes-bsp/keymaps/files/GPLv2.patch | 2 +
meta/recipes-bsp/libacpi/files/makefile-fix.patch | 2 +
.../openssh/openssh-5.6p1/nostrip.patch | 9 +-
meta/recipes-connectivity/openssh/openssh_5.6p1.bb | 4 +-
.../console-tools-0.3.2/codepage.patch | 1 +
.../console-tools-0.3.2/compile.patch | 2 +
.../console-tools-0.3.2/configure.patch | 1 +
.../console-tools-0.3.2/kbdrate.patch | 2 +
.../console-tools-0.3.2/uclibc-fileno.patch | 2 +
.../dbus/dbus-glib-0.92/no-examples.patch | 9 +-
meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch | 2 +
meta/recipes-core/eggdbus/eggdbus/marshal.patch | 2 +
.../recipes-core/expat/expat-2.0.1/autotools.patch | 10 +-
.../initscripts/initscripts-1.0/GPLv2.patch | 2 +
meta/recipes-core/tasks/task-core-nfs.bb | 4 +-
.../e2fsprogs/e2fsprogs_1.41.14.bb | 6 +
.../opensp/opensp/attributevalue.patch | 3 +
.../opensp/opensp/fix-docdir.patch | 3 +
meta/recipes-devtools/opensp/opensp/m4.patch | 3 +
.../opensp/opensp/rangmap-fix.patch | 3 +
meta/recipes-devtools/opkg/opkg.inc | 8 +-
meta/recipes-devtools/opkg/opkg_svn.bb | 3 +-
meta/recipes-devtools/perl/perl-native_5.12.3.bb | 1 +
.../qemu/qemu-git/enable-i386-linux-user.patch | 2 +
meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch | 2 +
.../qemu/qemu-git/linker-flags.patch | 3 +
meta/recipes-devtools/qemu/qemu-git/no-strip.patch | 2 +
.../qemu/qemu-git/qemu-git-qemugl-host.patch | 2 +
.../qemu/qemu-git/qemu-vmware-vga-depth.patch | 3 +
.../qemu-git/qemugl-allow-glxcontext-release.patch | 2 +
.../sgml-common/sgml-common-0.6.3/autohell.patch | 3 +
.../sgml-common/sgml-common-0.6.3/license.patch | 3 +
meta/recipes-extended/at/at-3.1.12/configure.patch | 8 +-
.../at/at-3.1.12/fix_parallel_build_error.patch | 4 +
meta/recipes-extended/cpio/cpio-2.11/statdef.patch | 8 +-
.../pam/libpam/pam-no-innetgr.patch | 5 +
meta/recipes-extended/sudo/files/libtool.patch | 10 +-
.../gtk+/gtk+-2.12.7/filechooser-props.patch | 2 +
.../clutter-box2d/fix-disable-introspection.patch | 2 +
.../mesa-demos/dso_linking_change_build_fix.patch | 1 +
meta/recipes-graphics/mutter/mutter.inc | 2 +-
.../mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch | 47 ++
meta/recipes-graphics/mutter/mutter_2.28.1.bb | 9 +-
meta/recipes-graphics/mutter/mutter_git.bb | 1 +
.../enable-builtin-fonts.patch | 12 -
.../xserver-kdrive-1.3.0.0/enable-epson.patch | 11 -
.../xserver-kdrive-1.3.0.0/enable-tslib.patch | 12 -
.../xserver-kdrive-1.3.0.0/enable-xcalibrate.patch | 110 -----
.../xserver-kdrive-1.3.0.0/fbdev_use_current.patch | 41 --
.../hide-cursor-and-ppm-root.patch | 307 ------------
.../xserver-kdrive-1.3.0.0/kdrive-evdev.patch | 515 --------------------
.../xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch | 54 --
.../xserver-kdrive-1.3.0.0/optional-xkb.patch | 58 ---
.../report-correct-randr12.patch | 29 --
.../xserver-kdrive-1.3.0.0/scheduler.patch | 151 ------
.../xserver-kdrive-1.3.0.0/xcalibrate_coords.patch | 122 -----
.../xserver-kdrive-1.7.99.2/crosscompile.patch | 19 -
.../xserver-kdrive-1.7.99.2/disable-apm.patch | 20 -
.../enable-builtin-fonts.patch | 12 -
.../enable-xcalibrate.patch | 148 ------
.../xserver-kdrive-1.7.99.2/extra-kmodes.patch | 83 ----
.../fbdev_xrandr_ioctl.patch | 61 ---
.../fix-newer-xorg-headers.patch | 18 -
.../xserver-kdrive-1.7.99.2/kdrive-evdev.patch | 515 --------------------
.../xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch | 54 --
.../no-serial-probing.patch | 13 -
.../xserver-kdrive-1.7.99.2/nodolt.patch | 12 -
.../xserver-kdrive-1.7.99.2/optional-xkb.patch | 58 ---
.../xorg-xserver/xserver-kdrive.inc | 2 +-
.../xorg-xserver/xserver-kdrive/crosscompile.patch | 22 +
.../xorg-xserver/xserver-kdrive/disable-apm.patch | 20 +-
.../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 39 --
.../xorg-xserver/xserver-kdrive/extra-kmodes.patch | 33 +-
.../xserver-kdrive/fbdev_xrandr_ioctl.patch | 25 +-
.../fix-newer-xorg-headers.patch | 0
.../hide-cursor-and-ppm-root.patch | 68 ++--
.../keyboard-resume-workaround.patch | 0
.../xorg-xserver/xserver-kdrive_1.10.1.bb | 22 +
.../xorg-xserver/xserver-kdrive_1.7.99.2.bb | 29 --
.../fix_open_max_preprocessor_error.patch | 2 +
.../kern-tools/kern-tools-native_git.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_git.bb | 2 +-
.../module-init-tools/files/disable_man.patch | 2 +
.../files/grab_module_memset.patch | 2 +
.../files/ignore_arch_directory.patch | 2 +
.../files/modutils_extension.patch | 3 +
.../files/no-static-binaries.patch | 2 +
meta/recipes-kernel/modutils/files/PD.patch | 2 +
meta/recipes-kernel/modutils/files/armeb.patch | 2 +
meta/recipes-kernel/modutils/files/configure.patch | 1 +
meta/recipes-kernel/modutils/files/gcc4.patch | 2 +
meta/recipes-kernel/modutils/files/lex.l.diff | 2 +
.../modutils/files/modutils-notest.patch | 2 +
.../modutils/files/program_prefix.patch | 2 +
.../modutils/modutils-cross/module.h.diff | 2 +
.../screenshot/files/fix_ldadd_order.patch | 3 +
meta/recipes-support/icu/files/gccfix.patch | 6 +
meta/recipes-support/icu/files/noldlibpath.patch | 5 +
.../icu/files/use-g++-for-linking.patch | 7 +
.../libfm/libfm-0.1.14/use_deprecate_func.patch | 2 +
104 files changed, 480 insertions(+), 2705 deletions(-)
create mode 100644 meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-kdrive-1.3.0.0 => xserver-kdrive}/fix-newer-xorg-headers.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-kdrive-1.7.99.2 => xserver-kdrive}/hide-cursor-and-ppm-root.patch (79%)
rename meta/recipes-graphics/xorg-xserver/{xserver-kdrive-1.7.99.2 => xserver-kdrive}/keyboard-resume-workaround.patch (100%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 01/14] task-core-nfs: fix a bitbake error
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:56 ` Koen Kooi
2011-05-16 21:44 ` [PATCH 02/14] opkg: Bump SRCREV to 609 Saul Wold
` (13 subsequent siblings)
14 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
THis fixes following issue:
NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils']
NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils']
[sgw: moved space to _append line]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/tasks/task-core-nfs.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb
index d5d8291..20e042b 100644
--- a/meta/recipes-core/tasks/task-core-nfs.bb
+++ b/meta/recipes-core/tasks/task-core-nfs.bb
@@ -22,5 +22,5 @@ RDEPENDS_task-core-nfs-server = "\
# rpcinfo can be useful but only with glibc images
GLIBC_DEPENDENCIES = "glibc-utils"
-RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}"
-RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_task-core-nfs-server_append_linux = " ${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = " ${GLIBC_DEPENDENCIES}"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 02/14] opkg: Bump SRCREV to 609
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
2011-05-16 21:44 ` [PATCH 01/14] task-core-nfs: fix a bitbake error Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 03/14] e2fsprogs_1.41.14.bb: Package libraries into separate packages Saul Wold
` (12 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Disable curl gpg ssl sha
Backported from OE
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/opkg/opkg.inc | 8 ++++++--
meta/recipes-devtools/opkg/opkg_svn.bb | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 50f1afc..a649213 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -7,7 +7,6 @@ BUGTRACKER = "http://code.google.com/p/opkg/issues/list"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba"
-DEPENDS = "curl gpgme openssl"
DEPENDS_virtclass-native = "curl-native"
DEPENDS_virtclass-nativesdk = "curl-nativesdk"
@@ -21,9 +20,14 @@ do_configure_prepend() {
}
inherit autotools pkgconfig
+EXTRA_OECONF += " --disable-gpg \
+ --disable-openssl \
+ --disable-ssl-curl \
+ --disable-curl \
+ --disable-sha256"
target_localstatedir := "${localstatedir}"
-EXTRA_OECONF = "--with-opkglibdir=${localstatedir}/lib"
+EXTRA_OECONF += "--with-opkglibdir=${localstatedir}/lib"
EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 5664a09..5964a47 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -7,6 +7,7 @@ RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
RDEPENDS_${PN}_virtclass-native = ""
RDEPENDS_${PN}_virtclass-nativesdk = ""
PACKAGE_ARCH_update-alternatives-cworth = "all"
+RREPLACES_${PN} = "opkg-nogpg"
SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
file://add_vercmp.patch \
@@ -15,7 +16,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
S = "${WORKDIR}/trunk"
-SRCREV = "596"
+SRCREV = "609"
PV = "0.1.8+svnr${SRCPV}"
PR = "r2"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 03/14] e2fsprogs_1.41.14.bb: Package libraries into separate packages
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
2011-05-16 21:44 ` [PATCH 01/14] task-core-nfs: fix a bitbake error Saul Wold
2011-05-16 21:44 ` [PATCH 02/14] opkg: Bump SRCREV to 609 Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:58 ` Koen Kooi
2011-05-16 21:44 ` [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1 Saul Wold
` (11 subsequent siblings)
14 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
add libcomerr libss libe2p libext2fs packages
helps in reducing the root file system size
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../e2fsprogs/e2fsprogs_1.41.14.bb | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
index d493f6f..91a783d 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
@@ -39,11 +39,17 @@ do_install () {
RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks"
PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
+PACKAGES =+ "libcomerr libss libe2p libext2fs"
+
FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
+FILES_libcomerr = "${libdir}/libcom_err.so.*"
+FILES_libss = "${libdir}/libss.so.*"
+FILES_libe2p = "${libdir}/libe2p.so.*"
+FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
BBCLASSEXTEND = "native"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (2 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 03/14] e2fsprogs_1.41.14.bb: Package libraries into separate packages Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 23:36 ` Richard Purdie
2011-05-16 21:44 ` [PATCH 05/14] mutter: Recipe Update for clutter 1.6 update Saul Wold
` (10 subsequent siblings)
14 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
- remove the patches
* xserver-kdrive-1.3.0.0/*: no longer used
* disable-xf86-dga-xorgcfg.patch: no longer used
* nodolt.patch: already in upstream
* enable-xcalibrate.patch: it is invalid now, because XCALIBRATE
extension has been removed since commit edcceedb
* kdrive-evdev.patch: no longer used
* kdrive-use-evdev.patch: no longer used
* enable-builtin-fonts.patch: no longer used
* optional-xkb.patch: no longer used
- rebase patches for 1.10.1
* extra-kmodes.patch
* hide-cursor-and-ppm-root.patch
* fbdev_xrandr_ioctl.patch
* crosscompile.patch
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../enable-builtin-fonts.patch | 12 -
.../xserver-kdrive-1.3.0.0/enable-epson.patch | 11 -
.../xserver-kdrive-1.3.0.0/enable-tslib.patch | 12 -
.../xserver-kdrive-1.3.0.0/enable-xcalibrate.patch | 110 -----
.../xserver-kdrive-1.3.0.0/fbdev_use_current.patch | 41 --
.../hide-cursor-and-ppm-root.patch | 307 ------------
.../xserver-kdrive-1.3.0.0/kdrive-evdev.patch | 515 --------------------
.../xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch | 54 --
.../xserver-kdrive-1.3.0.0/optional-xkb.patch | 58 ---
.../report-correct-randr12.patch | 29 --
.../xserver-kdrive-1.3.0.0/scheduler.patch | 151 ------
.../xserver-kdrive-1.3.0.0/xcalibrate_coords.patch | 122 -----
.../xserver-kdrive-1.7.99.2/crosscompile.patch | 19 -
.../xserver-kdrive-1.7.99.2/disable-apm.patch | 20 -
.../enable-builtin-fonts.patch | 12 -
.../enable-xcalibrate.patch | 148 ------
| 83 ----
.../fbdev_xrandr_ioctl.patch | 61 ---
| 18 -
.../xserver-kdrive-1.7.99.2/kdrive-evdev.patch | 515 --------------------
.../xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch | 54 --
.../no-serial-probing.patch | 13 -
.../xserver-kdrive-1.7.99.2/nodolt.patch | 12 -
.../xserver-kdrive-1.7.99.2/optional-xkb.patch | 58 ---
.../xorg-xserver/xserver-kdrive.inc | 2 +-
.../xorg-xserver/xserver-kdrive/crosscompile.patch | 22 +
.../xorg-xserver/xserver-kdrive/disable-apm.patch | 20 +-
.../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 39 --
| 33 +-
.../xserver-kdrive/fbdev_xrandr_ioctl.patch | 25 +-
| 0
.../hide-cursor-and-ppm-root.patch | 68 ++--
.../keyboard-resume-workaround.patch | 0
.../xorg-xserver/xserver-kdrive_1.10.1.bb | 22 +
.../xorg-xserver/xserver-kdrive_1.7.99.2.bb | 29 --
35 files changed, 117 insertions(+), 2578 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-kdrive-1.3.0.0 => xserver-kdrive}/fix-newer-xorg-headers.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-kdrive-1.7.99.2 => xserver-kdrive}/hide-cursor-and-ppm-root.patch (79%)
rename meta/recipes-graphics/xorg-xserver/{xserver-kdrive-1.7.99.2 => xserver-kdrive}/keyboard-resume-workaround.patch (100%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch
deleted file mode 100644
index 13a6c2c..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200
-+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200
-@@ -52,8 +52,8 @@
- /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
-
- #define NEED_REPLIES
- #ifdef HAVE_DIX_CONFIG_H
--#include <dix-config.h>
-+#include <kdrive-config.h>
- #endif
-
- #include <X11/X.h>
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
deleted file mode 100644
index 8ec3a37..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: xorg-server-1.2.0/hw/kdrive/Makefile.am
-===================================================================
---- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200
-+++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200
-@@ -1,5 +1,5 @@
- if KDRIVEFBDEV
--FBDEV_SUBDIRS = fbdev
-+FBDEV_SUBDIRS = fbdev epson
- endif
-
- if KDRIVEIMAGEON
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
deleted file mode 100644
index 9a59530..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xorg-server-1.2.0/configure.ac
-===================================================================
---- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200
-+++ xorg-server-1.2.0/configure.ac 2007-03-29 13:28:35.000000000 +0200
-@@ -1517,6 +1517,7 @@
- AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
- fi
- AC_DEFINE(TSLIB, 1, [Have tslib support])
-+ AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support])
- fi
-
- # damage shadow extension glx (NOTYET) fb mi
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
deleted file mode 100644
index 5a97100..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
+++ /dev/null
@@ -1,110 +0,0 @@
----
- Xext/Makefile.am | 6 ++++++
- configure.ac | 11 +++++++++--
- include/kdrive-config.h.in | 3 +++
- mi/miinitext.c | 6 ++++++
- 4 files changed, 24 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.3.0.0/mi/miinitext.c
-===================================================================
---- xorg-server-1.3.0.0.orig/mi/miinitext.c 2006-11-16 18:01:26.000000000 +0000
-+++ xorg-server-1.3.0.0/mi/miinitext.c 2008-01-11 13:45:57.000000000 +0000
-@@ -372,6 +372,9 @@ extern void ResExtensionInit(INITARGS);
- #ifdef DMXEXT
- extern void DMXExtensionInit(INITARGS);
- #endif
-+#ifdef XCALIBRATE
-+extern void XCalibrateExtensionInit(INITARGS);
-+#endif
- #ifdef XEVIE
- extern void XevieExtensionInit(INITARGS);
- #endif
-@@ -663,6 +666,9 @@ InitExtensions(argc, argv)
- #ifdef DAMAGE
- if (!noDamageExtension) DamageExtensionInit();
- #endif
-+#ifdef XCALIBRATE
-+ XCalibrateExtensionInit ();
-+#endif
- }
-
- void
-Index: xorg-server-1.3.0.0/configure.ac
-===================================================================
---- xorg-server-1.3.0.0.orig/configure.ac 2008-01-11 13:45:57.000000000 +0000
-+++ xorg-server-1.3.0.0/configure.ac 2008-01-11 13:45:58.000000000 +0000
-@@ -421,6 +421,7 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_ST
- AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
- AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
- AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=$XACE])
-+AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
- AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
- AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
- AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
-@@ -653,6 +654,12 @@ if test "x$XCSECURITY" = xyes; then
- AC_DEFINE(XCSECURITY, 1, [Build Security extension])
- fi
-
-+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
-+if test "x$XCALIBRATE" = xyes; then
-+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
-+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
-+fi
-+
- AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
- if test "x$XEVIE" = xyes; then
- AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
-@@ -1519,7 +1526,7 @@ if test "$KDRIVE" = yes; then
-
- # tslib...
- if test "x$TSLIB" = xyes; then
-- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
-+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
- if test "x$HAVE_TSLIB" = xno; then
- AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
- fi
-@@ -1547,7 +1554,7 @@ if test "$KDRIVE" = yes; then
- ;;
- esac
- KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
-- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS"
-+ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS"
-
- # check if we can build Xephyr
- PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
-Index: xorg-server-1.3.0.0/include/kdrive-config.h.in
-===================================================================
---- xorg-server-1.3.0.0.orig/include/kdrive-config.h.in 2006-11-16 18:01:26.000000000 +0000
-+++ xorg-server-1.3.0.0/include/kdrive-config.h.in 2008-01-11 13:45:57.000000000 +0000
-@@ -25,4 +25,7 @@
- /* Verbose debugging output hilarity */
- #undef DEBUG
-
-+/* Enable XCalibrate extension */
-+#undef XCALIBRATE
-+
- #endif /* _KDRIVE_CONFIG_H_ */
-Index: xorg-server-1.3.0.0/Xext/Makefile.am
-===================================================================
---- xorg-server-1.3.0.0.orig/Xext/Makefile.am 2006-10-25 01:25:19.000000000 +0100
-+++ xorg-server-1.3.0.0/Xext/Makefile.am 2008-01-11 13:45:57.000000000 +0000
-@@ -91,6 +91,11 @@ BUILTIN_SRCS += $(XCALIBRATE_SRCS)
- # XCalibrare needs tslib
- endif
-
-+XCALIBRATE_SRCS = xcalibrate.c
-+if XCALIBRATE
-+BUILTIN_SRCS += $(XCALIBRATE_SRCS)
-+endif
-+
- # X EVent Interception Extension: allows accessibility helpers & composite
- # managers to intercept events from input devices and transform as needed
- # before the clients see them.
-@@ -169,6 +174,7 @@ EXTRA_DIST = \
- $(XCSECURITY_SRCS) \
- $(XCALIBRATE_SRCS) \
- $(XINERAMA_SRCS) \
-+ $(XCALIBRATE_SRCS) \
- $(XEVIE_SRCS) \
- $(XPRINT_SRCS) \
- $(APPGROUP_SRCS) \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
deleted file mode 100644
index dc957cc..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
+++ /dev/null
@@ -1,41 +0,0 @@
----
- hw/kdrive/fbdev/fbdev.c | 24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
-
-Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-01-11 14:40:16.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-01-11 14:40:59.000000000 +0000
-@@ -182,16 +182,24 @@ fbdevScreenInitialize (KdScreenInfo *scr
- screen->rate = 103; /* FIXME: should get proper value from fb driver */
- }
- if (!screen->fb[0].depth)
-- screen->fb[0].depth = 16;
-+ {
-+ if (k >= 0)
-+ screen->fb[0].depth = var.bits_per_pixel;
-+ else
-+ screen->fb[0].depth = 16;
-+ }
-
-- t = KdFindMode (screen, fbdevModeSupported);
-- screen->rate = t->rate;
-- screen->width = t->horizontal;
-- screen->height = t->vertical;
-+ if ((screen->width != var.xres) || (screen->height != var.yres))
-+ {
-+ t = KdFindMode (screen, fbdevModeSupported);
-+ screen->rate = t->rate;
-+ screen->width = t->horizontal;
-+ screen->height = t->vertical;
-
-- /* Now try setting the mode */
-- if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres))
-- fbdevConvertMonitorTiming (t, &var);
-+ /* Now try setting the mode */
-+ if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres))
-+ fbdevConvertMonitorTiming (t, &var);
-+ }
-
- var.activate = FB_ACTIVATE_NOW;
- var.bits_per_pixel = screen->fb[0].depth;
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
deleted file mode 100644
index c160cd4..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-diff -u -r xorg-server-X11R7.1-1.1.0.orig/dix/window.c xorg-server-X11R7.1-1.1.0/dix/window.c
---- xorg-server-X11R7.1-1.1.0.orig/dix/window.c 2007-01-08 14:30:38.000000000 +0000
-+++ xorg-server-X11R7.1-1.1.0/dix/window.c 2007-01-16 17:16:19.000000000 +0000
-@@ -185,6 +185,8 @@
- _X_EXPORT int numSaveUndersViewable = 0;
- _X_EXPORT int deltaSaveUndersViewable = 0;
-
-+char* RootPPM = NULL;
-+
- #ifdef DEBUG
- /******
- * PrintWindowTree
-@@ -311,6 +313,115 @@
- #endif
- }
-
-+static int
-+get_int(FILE *fp)
-+{
-+ int c = 0;
-+
-+ while ((c = getc(fp)) != EOF)
-+ {
-+ if (isspace(c))
-+ continue;
-+
-+ if (c == '#')
-+ while (c = getc(fp))
-+ if (c == EOF)
-+ return 0;
-+ else if (c == '\n')
-+ break;
-+
-+ if (isdigit(c))
-+ {
-+ int val = c - '0';
-+ while ((c = getc(fp)) && isdigit(c))
-+ val = (val * 10) + (c - '0');
-+ return val;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+static unsigned char*
-+ppm_load (const char* path, int depth, int *width, int *height)
-+{
-+ FILE *fp;
-+ int max, n = 0, w, h, i, j, bytes_per_line;
-+ unsigned char *data, *res, h1, h2;
-+
-+ if (depth < 16 || depth > 32)
-+ return NULL;
-+
-+ if (depth > 16)
-+ depth = 32;
-+
-+ fp = fopen (path, "r");
-+ if (fp == NULL)
-+ return FALSE;
-+
-+ h1 = getc(fp);
-+ h2 = getc(fp);
-+
-+ /* magic is 'P6' for raw ppm */
-+ if (h1 != 'P' && h2 != '6')
-+ goto fail;
-+
-+ w = get_int(fp);
-+ h = get_int(fp);
-+
-+ if (w == 0 || h == 0)
-+ goto fail;
-+
-+ max = get_int(fp);
-+
-+ if (max != 255)
-+ goto fail;
-+
-+ bytes_per_line = ((w * depth + 31) >> 5) << 2;
-+
-+ res = data = malloc(bytes_per_line * h);
-+
-+ for (i=0; i<h; i++)
-+ {
-+ for (j=0; j<w; j++)
-+ {
-+ unsigned char buf[3];
-+ fread(buf, 1, 3, fp);
-+
-+ switch (depth)
-+ {
-+ case 24:
-+ case 32:
-+ *data = buf[2];
-+ *(data+1) = buf[1];
-+ *(data+2) = buf[0];
-+ data += 4;
-+ break;
-+ case 16:
-+ default:
-+ *(unsigned short*)data
-+ = ((buf[0] >> 3) << 11) | ((buf[1] >> 2) << 5) | (buf[2] >> 3);
-+ data += 2;
-+ break;
-+ }
-+ }
-+ data += (bytes_per_line - (w*(depth>>3)));
-+ }
-+
-+ data = res;
-+
-+ *width = w;
-+ *height = h;
-+
-+ fclose(fp);
-+
-+ return res;
-+
-+ fail:
-+ fclose(fp);
-+ return NULL;
-+}
-+
- static void
- MakeRootTile(WindowPtr pWin)
- {
-@@ -321,6 +432,36 @@
- register unsigned char *from, *to;
- register int i, j;
-
-+ if (RootPPM != NULL)
-+ {
-+ int w, h;
-+ unsigned char *data;
-+
-+ if ((data = ppm_load (RootPPM, pScreen->rootDepth, &w, &h)) != NULL)
-+ {
-+ pWin->background.pixmap
-+ = (*pScreen->CreatePixmap)(pScreen, w, h, pScreen->rootDepth);
-+
-+ pWin->backgroundState = BackgroundPixmap;
-+ pGC = GetScratchGC(pScreen->rootDepth, pScreen);
-+ if (!pWin->background.pixmap || !pGC)
-+ FatalError("could not create root tile");
-+
-+ ValidateGC((DrawablePtr)pWin->background.pixmap, pGC);
-+
-+ (*pGC->ops->PutImage)((DrawablePtr)pWin->background.pixmap,
-+ pGC,
-+ pScreen->rootDepth,
-+ 0, 0, w, h, 0, ZPixmap, (char *)data);
-+ FreeScratchGC(pGC);
-+
-+ free(data);
-+ return;
-+ }
-+ else
-+ ErrorF("Unable to load root window image.");
-+ }
-+
- pWin->background.pixmap = (*pScreen->CreatePixmap)(pScreen, 4, 4,
- pScreen->rootDepth);
-
-@@ -357,6 +498,7 @@
-
- }
-
-+
- WindowPtr
- AllocateWindow(ScreenPtr pScreen)
- {
-diff -u -r xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.c xorg-server-X11R7.1-1.1.0/hw/kdrive/src/kdrive.c
---- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.c 2007-01-08 14:30:38.000000000 +0000
-+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/src/kdrive.c 2007-01-15 17:53:06.000000000 +0000
-@@ -58,6 +58,9 @@
- { 32, 32 }
- };
-
-+int
-+ProcXFixesHideCursor (ClientPtr client) ;
-+
- #define NUM_KD_DEPTHS (sizeof (kdDepths) / sizeof (kdDepths[0]))
-
- int kdScreenPrivateIndex;
-@@ -84,6 +87,9 @@
- KdOsFuncs *kdOsFuncs;
- extern WindowPtr *WindowTable;
-
-+extern Bool CursorInitiallyHidden; /* See Xfixes cursor.c */
-+extern char* RootPPM; /* dix/window.c */
-+
- void
- KdSetRootClip (ScreenPtr pScreen, BOOL enable)
- {
-@@ -312,6 +318,7 @@
- KdSetRootClip (pScreen, TRUE);
- if (pScreenPriv->card->cfuncs->dpms)
- (*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);
-+
- return TRUE;
- }
-
-@@ -686,10 +693,14 @@
- ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
- ErrorF("-switchCmd Command to execute on vt switch\n");
- ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n");
-+ ErrorF("-hide-cursor Start with cursor hidden\n");
-+ ErrorF("-root-ppm [path] Specify ppm file to use as root window background.\n");
- ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
- #ifdef PSEUDO8
- p8UseMsg ();
- #endif
-+
-+
- }
-
- int
-@@ -761,6 +772,19 @@
- kdSoftCursor = TRUE;
- return 1;
- }
-+ if (!strcmp (argv[i], "-hide-cursor"))
-+ {
-+ CursorInitiallyHidden = TRUE;
-+ return 1;
-+ }
-+ if (!strcmp (argv[i], "-root-ppm"))
-+ {
-+ if ((i+1) < argc)
-+ RootPPM = argv[i+1];
-+ else
-+ UseMsg ();
-+ return 2;
-+ }
- if (!strcmp (argv[i], "-videoTest"))
- {
- kdVideoTest = TRUE;
-diff -u -r xorg-server-X11R7.1-1.1.0.orig/xfixes/cursor.c xorg-server-X11R7.1-1.1.0/xfixes/cursor.c
---- xorg-server-X11R7.1-1.1.0.orig/xfixes/cursor.c 2007-01-08 14:30:38.000000000 +0000
-+++ xorg-server-X11R7.1-1.1.0/xfixes/cursor.c 2007-01-11 16:33:00.000000000 +0000
-@@ -59,9 +59,12 @@
- static RESTYPE CursorWindowType;
- static int CursorScreenPrivateIndex = -1;
- static int CursorGeneration;
-+static Bool CursorGloballyHidden;
- static CursorPtr CursorCurrent;
- static CursorPtr pInvisibleCursor = NULL;
-
-+Bool CursorInitiallyHidden = FALSE;
-+
- static void deleteCursorHideCountsForScreen (ScreenPtr pScreen);
-
- #define VERIFY_CURSOR(pCursor, cursor, client, access) { \
-@@ -130,7 +133,7 @@
-
- Unwrap (cs, pScreen, DisplayCursor);
-
-- if (cs->pCursorHideCounts != NULL) {
-+ if (cs->pCursorHideCounts != NULL || CursorGloballyHidden) {
- ret = (*pScreen->DisplayCursor) (pScreen, pInvisibleCursor);
- } else {
- ret = (*pScreen->DisplayCursor) (pScreen, pCursor);
-@@ -848,6 +851,12 @@
- return BadWindow;
- }
-
-+ /* Is cursor set to be initially hidden ?, if so reset this
-+ * flag as now visibility assumed under control of client.
-+ */
-+ if (CursorGloballyHidden)
-+ CursorGloballyHidden = FALSE;
-+
- /*
- * Has client hidden the cursor before on this screen?
- * If so, just increment the count.
-@@ -899,9 +908,19 @@
- return BadWindow;
- }
-
-+ /* X was started with cursor hidden, therefore just reset our flag
-+ * (returning to normal client control) and cause cursor to now be
-+ * shown.
-+ */
-+ if (CursorGloballyHidden == TRUE)
-+ {
-+ CursorGloballyHidden = FALSE;
-+ return (client->noClientException);
-+ }
-+
- /*
- * Has client hidden the cursor on this screen?
-- * If not, generate an error.
-+ * If so, generate an error.
- */
- pChc = findCursorHideCount(client, pWin->drawable.pScreen);
- if (pChc == NULL) {
-@@ -1009,6 +1028,8 @@
- XFixesCursorInit (void)
- {
- int i;
-+
-+ CursorGloballyHidden = CursorInitiallyHidden;
-
- if (CursorGeneration != serverGeneration)
- {
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch
deleted file mode 100644
index 2dc22bf..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch
+++ /dev/null
@@ -1,515 +0,0 @@
-# Kdrive evdev support patch, posted by Ander Conselvan de Oliveira at
-# http://lists.freedesktop.org/archives/xorg/2005-December/011635.html
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/linux/evdev.c xserver/hw/kdrive/linux/evdev.c
---- xserver.original/hw/kdrive/linux/evdev.c 2005-12-16 10:36:05.000000000 -0200
-+++ xserver/hw/kdrive/linux/evdev.c 2005-12-16 10:40:51.077410192 -0200
-@@ -31,9 +31,11 @@
- #include <X11/X.h>
- #include <X11/Xproto.h>
- #include <X11/Xpoll.h>
-+#include <X11/keysym.h>
- #include "inputstr.h"
- #include "scrnintstr.h"
- #include "kdrive.h"
-+#include "kkeymap.h"
-
- #define NUM_EVENTS 128
- #define ABS_UNSET -65535
-@@ -105,9 +107,10 @@
- {
- KdMouseInfo *mi = closure;
- Kevdev *ke = mi->driver;
-- int i;
-+ int i, j;
- struct input_event events[NUM_EVENTS];
- int n;
-+ int flags;
-
- n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
- if (n <= 0)
-@@ -115,22 +118,64 @@
- n /= sizeof (struct input_event);
- for (i = 0; i < n; i++)
- {
-+ flags = KD_MOUSE_DELTA | kdMouseInfo->buttonState;
- switch (events[i].type) {
- case EV_SYN:
- break;
- case EV_KEY:
-- EvdevMotion (mi);
-- ASSIGNBIT(ke->key,events[i].code, events[i].value);
-- if (events[i].code < 0x100)
-- ErrorF ("key %d %d\n", events[i].code, events[i].value);
-- else
-- ErrorF ("key 0x%x %d\n", events[i].code, events[i].value);
-+ if (events[i].code >= BTN_MOUSE && events[i].code < BTN_JOYSTICK) {
-+ switch (events[i].code) {
-+ case BTN_LEFT:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_1;
-+ else
-+ flags &= ~KD_BUTTON_1;
-+ break;
-+ case BTN_MIDDLE:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_2;
-+ else
-+ flags &= ~KD_BUTTON_2;
-+ break;
-+ case BTN_RIGHT:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_3;
-+ else
-+ flags &= ~KD_BUTTON_3;
-+ break;
-+ default:
-+ /* Unknow button */
-+ break;
-+ }
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+ }
- break;
- case EV_REL:
-- ke->rel[events[i].code] += events[i].value;
-+ if (events[i].code == REL_X) {
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, events[i].value, 0);
-+ }
-+ else if (events[i].code == REL_Y) {
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, events[i].value);
-+ }
-+ else if (events[i].code == REL_WHEEL) {
-+ for (j = 0; j < abs (events[i].value); j++) {
-+ if (events[i].value > 0)
-+ flags |= KD_BUTTON_4;
-+ else
-+ flags |= KD_BUTTON_5;
-+
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+
-+ if (events[i].value > 0)
-+ flags &= ~KD_BUTTON_4;
-+ else
-+ flags &= ~KD_BUTTON_5;
-+
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+ } /* events[i].code == REL_WHEEL */
-+ }
- break;
- case EV_ABS:
-- ke->abs[events[i].code] = events[i].value;
- break;
- }
- }
-@@ -173,6 +218,12 @@
- fd = open (kdefaultEvdev[i], 2);
- if (fd >= 0)
- {
-+ if (ioctl (fd, EVIOCGRAB, 1) < 0)
-+ {
-+ close (fd);
-+ continue;
-+ }
-+
- mi->name = KdSaveString (kdefaultEvdev[i]);
- break;
- }
-@@ -287,7 +338,319 @@
- EvdevFini,
- };
-
--#if 0
-+/* Keyboard */
-+
-+int kbd_fd = -1;
-+int EvdevInputType = 0;
-+
-+KeySym evdevKeymap[(194 - 1 + 1) * 2] = {
-+/* These are directly mapped from DOS scanset 0 */
-+/* 1 8 */ XK_Escape, NoSymbol,
-+/* 2 9 */ XK_1, XK_exclam,
-+/* 3 10 */ XK_2, XK_at,
-+/* 4 11 */ XK_3, XK_numbersign,
-+/* 5 12 */ XK_4, XK_dollar,
-+/* 6 13 */ XK_5, XK_percent,
-+/* 7 14 */ XK_6, XK_asciicircum,
-+/* 8 15 */ XK_7, XK_ampersand,
-+/* 9 16 */ XK_8, XK_asterisk,
-+/* 10 17 */ XK_9, XK_parenleft,
-+/* 11 18 */ XK_0, XK_parenright,
-+/* 12 19 */ XK_minus, XK_underscore,
-+/* 13 20 */ XK_equal, XK_plus,
-+/* 14 21 */ XK_BackSpace, NoSymbol,
-+/* 15 22 */ XK_Tab, NoSymbol,
-+/* 16 23 */ XK_Q, NoSymbol,
-+/* 17 24 */ XK_W, NoSymbol,
-+/* 18 25 */ XK_E, NoSymbol,
-+/* 19 26 */ XK_R, NoSymbol,
-+/* 20 27 */ XK_T, NoSymbol,
-+/* 21 28 */ XK_Y, NoSymbol,
-+/* 22 29 */ XK_U, NoSymbol,
-+/* 23 30 */ XK_I, NoSymbol,
-+/* 24 31 */ XK_O, NoSymbol,
-+/* 25 32 */ XK_P, NoSymbol,
-+/* 26 33 */ XK_bracketleft, XK_braceleft,
-+/* 27 34 */ XK_bracketright, XK_braceright,
-+/* 28 35 */ XK_Return, NoSymbol,
-+/* 29 36 */ XK_Control_L, NoSymbol,
-+/* 30 37 */ XK_A, NoSymbol,
-+/* 31 38 */ XK_S, NoSymbol,
-+/* 32 39 */ XK_D, NoSymbol,
-+/* 33 40 */ XK_F, NoSymbol,
-+/* 34 41 */ XK_G, NoSymbol,
-+/* 35 42 */ XK_H, NoSymbol,
-+/* 36 43 */ XK_J, NoSymbol,
-+/* 37 44 */ XK_K, NoSymbol,
-+/* 38 45 */ XK_L, NoSymbol,
-+/* 39 46 */ XK_semicolon, XK_colon,
-+/* 40 47 */ XK_apostrophe, XK_quotedbl,
-+/* 41 48 */ XK_grave, XK_asciitilde,
-+/* 42 49 */ XK_Shift_L, NoSymbol,
-+/* 43 50 */ XK_backslash, XK_bar,
-+/* 44 51 */ XK_Z, NoSymbol,
-+/* 45 52 */ XK_X, NoSymbol,
-+/* 46 53 */ XK_C, NoSymbol,
-+/* 47 54 */ XK_V, NoSymbol,
-+/* 48 55 */ XK_B, NoSymbol,
-+/* 49 56 */ XK_N, NoSymbol,
-+/* 50 57 */ XK_M, NoSymbol,
-+/* 51 58 */ XK_comma, XK_less,
-+/* 52 59 */ XK_period, XK_greater,
-+/* 53 60 */ XK_slash, XK_question,
-+/* 54 61 */ XK_Shift_R, NoSymbol,
-+/* 55 62 */ XK_KP_Multiply, NoSymbol,
-+/* 56 63 */ XK_Alt_L, XK_Meta_L,
-+/* 57 64 */ XK_space, NoSymbol,
-+/* 58 65 */ XK_Caps_Lock, NoSymbol,
-+/* 59 66 */ XK_F1, NoSymbol,
-+/* 60 67 */ XK_F2, NoSymbol,
-+/* 61 68 */ XK_F3, NoSymbol,
-+/* 62 69 */ XK_F4, NoSymbol,
-+/* 63 70 */ XK_F5, NoSymbol,
-+/* 64 71 */ XK_F6, NoSymbol,
-+/* 65 72 */ XK_F7, NoSymbol,
-+/* 66 73 */ XK_F8, NoSymbol,
-+/* 67 74 */ XK_F9, NoSymbol,
-+/* 68 75 */ XK_F10, NoSymbol,
-+/* 69 76 */ XK_Break, XK_Pause,
-+/* 70 77 */ XK_Scroll_Lock, NoSymbol,
-+/* 71 78 */ XK_KP_Home, XK_KP_7,
-+/* 72 79 */ XK_KP_Up, XK_KP_8,
-+/* 73 80 */ XK_KP_Page_Up, XK_KP_9,
-+/* 74 81 */ XK_KP_Subtract, NoSymbol,
-+/* 75 82 */ XK_KP_Left, XK_KP_4,
-+/* 76 83 */ XK_KP_5, NoSymbol,
-+/* 77 84 */ XK_KP_Right, XK_KP_6,
-+/* 78 85 */ XK_KP_Add, NoSymbol,
-+/* 79 86 */ XK_KP_End, XK_KP_1,
-+/* 80 87 */ XK_KP_Down, XK_KP_2,
-+/* 81 88 */ XK_KP_Page_Down, XK_KP_3,
-+/* 82 89 */ XK_KP_Insert, XK_KP_0,
-+/* 83 90 */ XK_KP_Delete, XK_KP_Decimal,
-+/* 84 91 */ NoSymbol, NoSymbol,
-+/* 85 92 */ NoSymbol, NoSymbol,
-+/* 86 93 */ NoSymbol, NoSymbol,
-+/* 87 94 */ XK_F11, NoSymbol,
-+/* 88 95 */ XK_F12, NoSymbol,
-+
-+/* These are remapped from the extended set (using ExtendMap) */
-+
-+/* 89 96 */ XK_Control_R, NoSymbol,
-+/* 90 97 */ XK_KP_Enter, NoSymbol,
-+/* 91 98 */ XK_KP_Divide, NoSymbol,
-+/* 92 99 */ XK_Sys_Req, XK_Print,
-+/* 93 100 */ XK_Alt_R, XK_Meta_R,
-+/* 94 101 */ XK_Num_Lock, NoSymbol,
-+/* 95 102 */ XK_Home, NoSymbol,
-+/* 96 103 */ XK_Up, NoSymbol,
-+/* 97 104 */ XK_Page_Up, NoSymbol,
-+/* 98 105 */ XK_Left, NoSymbol,
-+/* 99 106 */ XK_Right, NoSymbol,
-+/* 100 107 */ XK_End, NoSymbol,
-+/* 101 108 */ XK_Down, NoSymbol,
-+/* 102 109 */ XK_Page_Down, NoSymbol,
-+/* 103 110 */ XK_Insert, NoSymbol,
-+/* 104 111 */ XK_Delete, NoSymbol,
-+/* 105 112 */ XK_Super_L, NoSymbol,
-+/* 106 113 */ XK_Super_R, NoSymbol,
-+/* 107 114 */ XK_Menu, NoSymbol,
-+/* 108 115 */ NoSymbol, NoSymbol,
-+/* 109 116 */ NoSymbol, NoSymbol,
-+/* 110 117 */ NoSymbol, NoSymbol,
-+/* 111 118 */ NoSymbol, NoSymbol,
-+/* 112 119 */ NoSymbol, NoSymbol,
-+
-+/* 113 120 */ NoSymbol, NoSymbol,
-+/* 114 121 */ NoSymbol, NoSymbol,
-+/* 115 122 */ NoSymbol, NoSymbol,
-+/* 116 123 */ NoSymbol, NoSymbol,
-+/* 117 124 */ NoSymbol, NoSymbol,
-+/* 118 125 */ NoSymbol, NoSymbol,
-+/* 119 126 */ NoSymbol, NoSymbol,
-+/* 120 127 */ NoSymbol, NoSymbol,
-+/* 121 128 */ NoSymbol, NoSymbol,
-+/* 122 129 */ NoSymbol, NoSymbol,
-+/* 123 130 */ NoSymbol, NoSymbol,
-+/* 124 131 */ NoSymbol, NoSymbol,
-+/* 125 132 */ NoSymbol, NoSymbol,
-+/* 126 133 */ NoSymbol, NoSymbol,
-+/* 127 134 */ NoSymbol, NoSymbol,
-+/* 128 135 */ NoSymbol, NoSymbol,
-+/* 129 136 */ NoSymbol, NoSymbol,
-+/* 130 137 */ NoSymbol, NoSymbol,
-+/* 131 138 */ NoSymbol, NoSymbol,
-+/* 132 139 */ NoSymbol, NoSymbol,
-+/* 133 140 */ NoSymbol, NoSymbol,
-+/* 134 141 */ NoSymbol, NoSymbol,
-+/* 135 142 */ NoSymbol, NoSymbol,
-+/* 136 143 */ NoSymbol, NoSymbol,
-+/* 137 144 */ NoSymbol, NoSymbol,
-+/* 138 145 */ NoSymbol, NoSymbol,
-+/* 139 146 */ NoSymbol, NoSymbol,
-+/* 140 147 */ NoSymbol, NoSymbol,
-+/* 141 148 */ NoSymbol, NoSymbol,
-+/* 142 149 */ NoSymbol, NoSymbol,
-+/* 143 150 */ NoSymbol, NoSymbol,
-+/* 144 151 */ NoSymbol, NoSymbol,
-+/* 145 152 */ NoSymbol, NoSymbol,
-+/* 146 153 */ NoSymbol, NoSymbol,
-+/* 147 154 */ NoSymbol, NoSymbol,
-+/* 148 155 */ NoSymbol, NoSymbol,
-+/* 149 156 */ NoSymbol, NoSymbol,
-+/* 150 157 */ NoSymbol, NoSymbol,
-+/* 151 158 */ NoSymbol, NoSymbol,
-+/* 152 159 */ NoSymbol, NoSymbol,
-+/* 153 160 */ NoSymbol, NoSymbol,
-+/* 154 161 */ NoSymbol, NoSymbol,
-+/* 155 162 */ NoSymbol, NoSymbol,
-+/* 156 163 */ NoSymbol, NoSymbol,
-+/* 157 164 */ NoSymbol, NoSymbol,
-+/* 158 165 */ NoSymbol, NoSymbol,
-+/* 159 166 */ NoSymbol, NoSymbol,
-+/* 160 167 */ NoSymbol, NoSymbol,
-+/* 161 168 */ NoSymbol, NoSymbol,
-+/* 162 169 */ NoSymbol, NoSymbol,
-+/* 163 170 */ NoSymbol, NoSymbol,
-+/* 164 171 */ NoSymbol, NoSymbol,
-+/* 165 172 */ NoSymbol, NoSymbol,
-+/* 166 173 */ NoSymbol, NoSymbol,
-+/* 167 174 */ NoSymbol, NoSymbol,
-+/* 168 175 */ NoSymbol, NoSymbol,
-+/* 169 176 */ NoSymbol, NoSymbol,
-+/* 170 177 */ NoSymbol, NoSymbol,
-+/* 171 178 */ NoSymbol, NoSymbol,
-+/* 172 179 */ NoSymbol, NoSymbol,
-+/* 173 180 */ NoSymbol, NoSymbol,
-+/* 174 181 */ NoSymbol, NoSymbol,
-+/* 175 182 */ NoSymbol, NoSymbol,
-+/* 176 183 */ NoSymbol, NoSymbol,
-+/* 177 184 */ NoSymbol, NoSymbol,
-+/* 178 185 */ NoSymbol, NoSymbol,
-+/* 179 186 */ NoSymbol, NoSymbol,
-+/* 180 187 */ NoSymbol, NoSymbol,
-+/* 181 188 */ NoSymbol, NoSymbol,
-+/* 182 189 */ NoSymbol, NoSymbol,
-+/* 183 190 */ NoSymbol, NoSymbol,
-+/* 184 191 */ NoSymbol, NoSymbol,
-+/* 185 192 */ NoSymbol, NoSymbol,
-+/* 186 193 */ NoSymbol, NoSymbol,
-+/* 187 194 */ NoSymbol, NoSymbol,
-+/* 188 195 */ NoSymbol, NoSymbol,
-+/* 189 196 */ NoSymbol, NoSymbol,
-+/* 190 197 */ NoSymbol, NoSymbol,
-+/* 191 198 */ NoSymbol, NoSymbol,
-+/* 192 199 */ NoSymbol, NoSymbol,
-+/* 193 200 */ NoSymbol, NoSymbol,
-+/* 194 201 */ NoSymbol, NoSymbol,
-+};
-+
-+static void
-+EvdevKbdRead (int fd, void *closure)
-+{
-+ int i, n;
-+ struct input_event events[NUM_EVENTS];
-+
-+ n = read (fd, &events, NUM_EVENTS * sizeof (struct input_event));
-+ if (n <= 0)
-+ return;
-+
-+ n /= sizeof (struct input_event);
-+
-+ for (i = 0; i < n; i++)
-+ {
-+ if (events[i].type == EV_KEY)
-+ KdEnqueueKeyboardEvent (events[i].code, !events[i].value);
-+ }
-+}
-+
-+static void
-+EvdevKbdLoad (void)
-+{
-+ kdMinScanCode = 0;
-+ kdMaxScanCode = 193;
-+ kdKeymapWidth = 2;
-+ memcpy (kdKeymap, evdevKeymap, sizeof (evdevKeymap));
-+}
-+
-+static int
-+EvdevKbdInit (void)
-+{
-+ int fd, i;
-+
-+ if (!EvdevInputType)
-+ EvdevInputType = KdAllocInputType ();
-+
-+ if (!kdKeyboard)
-+ {
-+ for (i = 0; i < NUM_DEFAULT_EVDEV; i++)
-+ {
-+ fd = open (kdefaultEvdev[i], 2);
-+ if (fd >= 0)
-+ {
-+ kdKeyboard = KdSaveString (kdefaultEvdev[i]);
-+ break;
-+ }
-+ }
-+ }
-+ else
-+ {
-+ fd = open (kdKeyboard, O_RDWR);
-+ if (fd < 0)
-+ return FALSE;
-+ }
-+
-+ if (ioctl (fd, EVIOCGRAB, 1) < 0)
-+ {
-+ close (fd);
-+ return FALSE;
-+ }
-+
-+ if (!KdRegisterFd (EvdevInputType, fd, EvdevKbdRead, NULL))
-+ return FALSE;
-+
-+ kbd_fd = fd;
-+ return TRUE;
-+}
-+
-+static void
-+EvdevKbdFini (void)
-+{
-+}
-+
-+static void
-+EvdevKbdLeds (int leds)
-+{
-+ struct input_event event;
-+
-+ memset(&event, 0, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_CAPSL;
-+ event.value = leds & (1 << 0) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_NUML;
-+ event.value = leds & (1 << 1) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_SCROLLL;
-+ event.value = leds & (1 << 2) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_COMPOSE;
-+ event.value = leds & (1 << 3) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+}
-+
-+static void
-+EvdevKbdBell (int volume, int frequency, int duration)
-+{
-+}
-+
- KdKeyboardFuncs LinuxEvdevKeyboardFuncs = {
- EvdevKbdLoad,
- EvdevKbdInit,
-@@ -296,4 +659,4 @@
- EvdevKbdFini,
- 0,
- };
--#endif
-+
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.c xserver/hw/kdrive/src/kdrive.c
---- xserver.original/hw/kdrive/src/kdrive.c 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kdrive.c 2005-12-16 10:37:09.000000000 -0200
-@@ -73,6 +73,7 @@
- Bool kdEnabled;
- int kdSubpixelOrder;
- int kdVirtualTerminal = -1;
-+char *kdKeyboard = 0;
- Bool kdSwitchPending;
- char *kdSwitchCmd;
- DDXPointRec kdOrigin;
-@@ -795,6 +796,14 @@
- UseMsg ();
- return 2;
- }
-+ if (!strcmp (argv[i], "-keyboard"))
-+ {
-+ if ((i+1) < argc)
-+ kdKeyboard = argv[i+1];
-+ else
-+ UseMsg ();
-+ return 2;
-+ }
- if (!strcmp (argv[i], "-rgba"))
- {
- if ((i+1) < argc)
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.h xserver/hw/kdrive/src/kdrive.h
---- xserver.original/hw/kdrive/src/kdrive.h 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kdrive.h 2005-12-16 10:37:09.000000000 -0200
-@@ -416,6 +416,7 @@
- extern Bool kdDisableZaphod;
- extern Bool kdDontZap;
- extern int kdVirtualTerminal;
-+extern char *kdKeyboard;
- extern char *kdSwitchCmd;
- extern KdOsFuncs *kdOsFuncs;
-
-@@ -769,7 +770,7 @@
- ProcessInputEvents (void);
-
- extern KdMouseFuncs LinuxMouseFuncs;
--extern KdMouseFuncs LinuxEvdevFuncs;
-+extern KdMouseFuncs LinuxEvdevMouseFuncs;
- extern KdMouseFuncs Ps2MouseFuncs;
- extern KdMouseFuncs BusMouseFuncs;
- extern KdMouseFuncs MsMouseFuncs;
-@@ -777,6 +778,7 @@
- extern KdMouseFuncs TsFuncs;
- #endif
- extern KdKeyboardFuncs LinuxKeyboardFuncs;
-+extern KdKeyboardFuncs LinuxEvdevKeyboardFuncs;
- extern KdOsFuncs LinuxFuncs;
-
- extern KdMouseFuncs VxWorksMouseFuncs;
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kinput.c xserver/hw/kdrive/src/kinput.c
---- xserver.original/hw/kdrive/src/kinput.c 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kinput.c 2005-12-16 10:37:09.000000000 -0200
-@@ -1300,6 +1300,7 @@
- xE.u.u.type = KeyPress;
- xE.u.u.detail = key_code;
-
-+#ifndef XKB
- switch (KEYCOL1(key_code))
- {
- case XK_Num_Lock:
-@@ -1313,6 +1314,7 @@
- else
- xE.u.u.type = KeyPress;
- }
-+#endif
-
- /*
- * Check pressed keys which are already down
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch
deleted file mode 100644
index 28d7325..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- xserver/hw/kdrive/fbdev/fbinit.c~ 2006-01-31 17:09:33.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbinit.c 2006-01-31 17:11:55.000000000 +0100
-@@ -28,6 +28,8 @@
- #endif
- #include <fbdev.h>
-
-+extern int use_evdev;
-+
- void
- InitCard (char *name)
- {
-@@ -45,7 +47,10 @@
- void
- InitInput (int argc, char **argv)
- {
-- KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
-+ if (use_evdev)
-+ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs);
-+ else
-+ KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
- #ifdef TOUCHSCREEN
- KdAddMouseDriver (&TsFuncs);
- #endif
---- xserver/hw/kdrive/src/kdrive.c.orig 2006-01-31 17:13:28.000000000 +0100
-+++ xserver/hw/kdrive/src/kdrive.c 2006-01-31 17:15:28.000000000 +0100
-@@ -44,6 +44,8 @@
- #include "dpmsproc.h"
- #endif
-
-+int use_evdev = 0;
-+
- typedef struct _kdDepths {
- CARD8 depth;
- CARD8 bpp;
-@@ -687,6 +689,7 @@
- ErrorF("-videoTest Start the server, pause momentarily and exit\n");
- ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n");
- ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
-+ ErrorF("-use-evdev Use Linux evdev input\n");
- ErrorF("-switchCmd Command to execute on vt switch\n");
- ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n");
- ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
-@@ -796,6 +799,11 @@
- UseMsg ();
- return 2;
- }
-+ if (!strcmp (argv[i], "-use-evdev"))
-+ {
-+ use_evdev = 1;
-+ return 1;
-+ }
- if (!strcmp (argv[i], "-keyboard"))
- {
- if ((i+1) < argc)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
deleted file mode 100644
index a580b50..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: xorg-server-1.2.0/Makefile.am
-===================================================================
---- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100
-+++ xorg-server-1.2.0/Makefile.am 2007-03-28 20:26:19.000000000 +0200
-@@ -30,6 +30,10 @@
- XINPUT_DIR=Xi
- endif
-
-+if XKB
-+XKB_DIR=xkb
-+endif
-+
- if DBE
- DBE_DIR=dbe
- endif
-@@ -46,7 +50,7 @@
- randr \
- render \
- $(XINPUT_DIR) \
-- xkb \
-+ $(XKB_DIR) \
- $(DBE_DIR) \
- $(MFB_DIR) \
- $(AFB_DIR) \
-Index: xorg-server-1.2.0/configure.ac
-===================================================================
---- xorg-server-1.2.0.orig/configure.ac 2007-01-23 06:39:15.000000000 +0100
-+++ xorg-server-1.2.0/configure.ac 2007-03-28 20:27:13.000000000 +0200
-@@ -428,6 +428,7 @@
- AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
- AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
- AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
-+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
-
- dnl DDXes.
- AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -754,12 +755,15 @@
-
- AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
-
--AC_DEFINE(XKB, 1, [Build XKB])
--AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
--AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
--REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
--XKB_LIB='$(top_builddir)/xkb/libxkb.la'
--XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
-+if test "x$XKB" = xyes; then
-+ AC_DEFINE(XKB, 1, [Build XKB])
-+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
-+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
-+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
-+ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
-+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-+fi
-
- AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
- [Do not have `strcasecmp'.]))
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
deleted file mode 100644
index 72c8a18..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Server reports XRandR version provided by libxrandr instead of XRandR
-version implemented. It confuses applications that execute XRandR
-version dependent code (e. g. gtk+ >= 2.18.0).
-
-Index: xorg-server-1.3.0.0/randr/rrdispatch.c
-===================================================================
---- xorg-server-1.3.0.0.orig/randr/rrdispatch.c
-+++ xorg-server-1.3.0.0/randr/rrdispatch.c
-@@ -22,6 +22,9 @@
-
- #include "randrstr.h"
-
-+#define SERVER_RANDR_MAJOR 1
-+#define SERVER_RANDR_MINOR 2
-+
- Bool
- RRClientKnowsRates (ClientPtr pClient)
- {
-@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client)
- * Report the current version; the current
- * spec says they're all compatible after 1.0
- */
-- rep.majorVersion = RANDR_MAJOR;
-- rep.minorVersion = RANDR_MINOR;
-+ rep.majorVersion = SERVER_RANDR_MAJOR;
-+ rep.minorVersion = SERVER_RANDR_MINOR;
- if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch
deleted file mode 100644
index 395bc7d..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch
+++ /dev/null
@@ -1,151 +0,0 @@
->From 48e4d08e99de41047c6b6fde5ba9d12787881c23 Mon Sep 17 00:00:00 2001
-From: root <root@benny.jf.intel.com>
-Date: Sun, 28 Oct 2007 09:37:52 +0100
-Subject: [PATCH] The smart scheduler itimer currently always fires after each request
- (which in turn causes the CPU to wake out of idle, burning precious power).
- Rather than doing this, just stop the timer before going into the select()
- portion of the WaitFor loop. It's a cheap system call, and it will only get
- called if there's no more commands batched up from the active fd.
-
-This change also allows some of the functions to be simplified; setitimer()
-will only fail if it's passed invalid data, and we don't do that... so make
-it void and remove all the conditional code that deals with failure.
-
-The change also allows us to remove a few variables that were used for
-housekeeping between the signal handler and the main loop.
----
- include/dixstruct.h | 6 ++----
- os/WaitFor.c | 11 +++--------
- os/utils.c | 28 +++-------------------------
- 3 files changed, 8 insertions(+), 37 deletions(-)
-
-diff --git a/include/dixstruct.h b/include/dixstruct.h
-index dd6347f..bed31dc 100644
---- a/include/dixstruct.h
-+++ b/include/dixstruct.h
-@@ -150,11 +150,9 @@ extern long SmartScheduleTime;
- extern long SmartScheduleInterval;
- extern long SmartScheduleSlice;
- extern long SmartScheduleMaxSlice;
--extern unsigned long SmartScheduleIdleCount;
- extern Bool SmartScheduleDisable;
--extern Bool SmartScheduleIdle;
--extern Bool SmartScheduleTimerStopped;
--extern Bool SmartScheduleStartTimer(void);
-+extern void SmartScheduleStartTimer(void);
-+extern void SmartScheduleStopTimer(void);
- #define SMART_MAX_PRIORITY (20)
- #define SMART_MIN_PRIORITY (-20)
-
-diff --git a/os/WaitFor.c b/os/WaitFor.c
-index ec1592c..7683477 100644
---- a/os/WaitFor.c
-+++ b/os/WaitFor.c
-@@ -217,7 +217,8 @@ WaitForSomething(int *pClientsReady)
- XFD_COPYSET(&AllSockets, &LastSelectMask);
- #ifdef SMART_SCHEDULE
- }
-- SmartScheduleIdle = TRUE;
-+ SmartScheduleStopTimer ();
-+
- #endif
- BlockHandler((pointer)&wt, (pointer)&LastSelectMask);
- if (NewOutputPending)
-@@ -237,13 +238,7 @@ WaitForSomething(int *pClientsReady)
- selecterr = GetErrno();
- WakeupHandler(i, (pointer)&LastSelectMask);
- #ifdef SMART_SCHEDULE
-- if (i >= 0)
-- {
-- SmartScheduleIdle = FALSE;
-- SmartScheduleIdleCount = 0;
-- if (SmartScheduleTimerStopped)
-- (void) SmartScheduleStartTimer ();
-- }
-+ SmartScheduleStartTimer ();
- #endif
- if (i <= 0) /* An error or timeout occurred */
- {
-diff --git a/os/utils.c b/os/utils.c
-index 31cb0af..6fc1f7d 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -1513,10 +1513,6 @@ XNFstrdup(const char *s)
-
- #ifdef SMART_SCHEDULE
-
--unsigned long SmartScheduleIdleCount;
--Bool SmartScheduleIdle;
--Bool SmartScheduleTimerStopped;
--
- #ifdef SIGVTALRM
- #define SMART_SCHEDULE_POSSIBLE
- #endif
-@@ -1526,7 +1522,7 @@ Bool SmartScheduleTimerStopped;
- #define SMART_SCHEDULE_TIMER ITIMER_REAL
- #endif
-
--static void
-+void
- SmartScheduleStopTimer (void)
- {
- #ifdef SMART_SCHEDULE_POSSIBLE
-@@ -1537,38 +1533,28 @@ SmartScheduleStopTimer (void)
- timer.it_value.tv_sec = 0;
- timer.it_value.tv_usec = 0;
- (void) setitimer (ITIMER_REAL, &timer, 0);
-- SmartScheduleTimerStopped = TRUE;
- #endif
- }
-
--Bool
-+void
- SmartScheduleStartTimer (void)
- {
- #ifdef SMART_SCHEDULE_POSSIBLE
- struct itimerval timer;
-
-- SmartScheduleTimerStopped = FALSE;
- timer.it_interval.tv_sec = 0;
- timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
- timer.it_value.tv_sec = 0;
- timer.it_value.tv_usec = SmartScheduleInterval * 1000;
-- return setitimer (ITIMER_REAL, &timer, 0) >= 0;
-+ setitimer (ITIMER_REAL, &timer, 0);
- #endif
-- return FALSE;
- }
-
- #ifdef SMART_SCHEDULE_POSSIBLE
- static void
- SmartScheduleTimer (int sig)
- {
-- int olderrno = errno;
--
- SmartScheduleTime += SmartScheduleInterval;
-- if (SmartScheduleIdle)
-- {
-- SmartScheduleStopTimer ();
-- }
-- errno = olderrno;
- }
- #endif
-
-@@ -1592,14 +1578,6 @@ SmartScheduleInit (void)
- perror ("sigaction for smart scheduler");
- return FALSE;
- }
-- /* Set up the virtual timer */
-- if (!SmartScheduleStartTimer ())
-- {
-- perror ("scheduling timer");
-- return FALSE;
-- }
-- /* stop the timer and wait for WaitForSomething to start it */
-- SmartScheduleStopTimer ();
- return TRUE;
- #else
- return FALSE;
---
-1.5.3.4
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch
deleted file mode 100644
index e0cca54..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch
+++ /dev/null
@@ -1,122 +0,0 @@
----
- Xext/xcalibrate.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
- hw/kdrive/src/kdrive.h | 3 +++
- hw/kdrive/src/kinput.c | 12 ++++++++++++
- 3 files changed, 61 insertions(+), 1 deletion(-)
-
-Index: xorg-server-1.3.0.0/Xext/xcalibrate.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xext/xcalibrate.c 2007-06-29 17:30:03.000000000 +0100
-+++ xorg-server-1.3.0.0/Xext/xcalibrate.c 2007-06-30 14:04:40.000000000 +0100
-@@ -166,7 +166,6 @@ ProcXCalibrateSetRawMode (ClientPtr clie
- return (client->noClientException);
- }
-
--
- static int
- SProcXCalibrateSetRawMode (ClientPtr client)
- {
-@@ -180,6 +179,47 @@ SProcXCalibrateSetRawMode (ClientPtr cli
- return ProcXCalibrateSetRawMode(client);
- }
-
-+static int
-+ProcXCalibrateScreenToCoord (ClientPtr client)
-+{
-+ REQUEST(xXCalibrateScreenToCoordReq);
-+ xXCalibrateScreenToCoordReply rep;
-+
-+ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
-+
-+ memset (&rep, 0, sizeof (rep));
-+ rep.type = X_Reply;
-+ rep.sequenceNumber = client->sequence;
-+ rep.x = stuff->x;
-+ rep.y = stuff->y;
-+
-+ KdScreenToMouseCoords(&rep.x, &rep.y);
-+
-+ if (client->swapped)
-+ {
-+ int n;
-+
-+ swaps (&rep.x, n);
-+ swaps (&rep.y, n);
-+ }
-+ WriteToClient(client, sizeof (rep), (char *) &rep);
-+ return (client->noClientException);
-+}
-+
-+static int
-+SProcXCalibrateScreenToCoord (ClientPtr client)
-+{
-+ REQUEST(xXCalibrateScreenToCoordReq);
-+ int n;
-+
-+ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
-+
-+ swaps(&stuff->x, n);
-+ swaps(&stuff->y, n);
-+
-+ return ProcXCalibrateScreenToCoord(client);
-+}
-+
- static void
- XCalibrateResetProc (ExtensionEntry *extEntry)
- {
-@@ -194,6 +234,9 @@ ProcXCalibrateDispatch (ClientPtr client
- return ProcXCalibrateQueryVersion(client);
- case X_XCalibrateRawMode:
- return ProcXCalibrateSetRawMode(client);
-+ case X_XCalibrateScreenToCoord:
-+ return ProcXCalibrateScreenToCoord(client);
-+
- default: break;
- }
-
-@@ -213,6 +256,8 @@ SProcXCalibrateDispatch (ClientPtr clien
- return SProcXCalibrateQueryVersion(client);
- case X_XCalibrateRawMode:
- return SProcXCalibrateSetRawMode(client);
-+ case X_XCalibrateScreenToCoord:
-+ return SProcXCalibrateScreenToCoord(client);
-
- default: break;
- }
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kdrive.h
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kdrive.h 2007-06-30 13:43:45.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kdrive.h 2007-06-30 13:45:03.000000000 +0100
-@@ -746,6 +746,9 @@ void
- KdSetMouseMatrix (KdMouseMatrix *matrix);
-
- void
-+KdScreenToMouseCoords (int *x, int *y);
-+
-+void
- KdComputeMouseMatrix (KdMouseMatrix *matrix, Rotation randr, int width, int height);
-
- void
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kinput.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kinput.c 2007-06-29 17:30:16.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kinput.c 2007-06-30 15:52:16.000000000 +0100
-@@ -381,6 +381,18 @@ KdSetMouseMatrix (KdMouseMatrix *matrix)
- }
-
- void
-+KdScreenToMouseCoords (int *x, int *y)
-+{
-+ int (*m)[3] = kdMouseMatrix.matrix;
-+ int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];
-+ int sx = *x;
-+ int sy = *y;
-+
-+ *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;
-+ *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;
-+}
-+
-+void
- KdComputeMouseMatrix (KdMouseMatrix *m, Rotation randr, int width, int height)
- {
- int x_dir = 1, y_dir = 1;
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch
deleted file mode 100644
index 2341e40..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: xorg-server-1.7.99.2/configure.ac
-===================================================================
---- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000
-+++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000
-@@ -503,14 +503,10 @@
-
- dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR
--AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
-- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
-- [
- DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
- case $host_os in
- darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
- esac
-- ])
- AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
- [ FONTPATH="$withval" ],
- [ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch
deleted file mode 100644
index bd88427..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
-+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
-@@ -342,7 +342,7 @@
- /*
- * Open the APM driver
- */
-- LinuxApmFd = open ("/dev/apm_bios", 2);
-+ /*LinuxApmFd = open ("/dev/apm_bios", 2);
- if (LinuxApmFd < 0 && errno == ENOENT)
- LinuxApmFd = open ("/dev/misc/apm_bios", 2);
- if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
- RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
- AddEnabledDevice (LinuxApmFd);
- }
--
-+ */
- /*
- * now get the VT
- */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch
deleted file mode 100644
index 13a6c2c..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200
-+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200
-@@ -52,8 +52,8 @@
- /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
-
- #define NEED_REPLIES
- #ifdef HAVE_DIX_CONFIG_H
--#include <dix-config.h>
-+#include <kdrive-config.h>
- #endif
-
- #include <X11/X.h>
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
deleted file mode 100644
index 9794e98..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
+++ /dev/null
@@ -1,148 +0,0 @@
----
- Xext/Makefile.am | 6 ++++++
- configure.ac | 11 +++++++++--
- include/kdrive-config.h.in | 3 +++
- mi/miinitext.c | 6 ++++++
- 4 files changed, 24 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.7.99.2/mi/miinitext.c
-===================================================================
---- xorg-server-1.7.99.2.orig/mi/miinitext.c 2010-02-10 18:54:11.959086237 +0000
-+++ xorg-server-1.7.99.2/mi/miinitext.c 2010-02-10 18:54:12.429078513 +0000
-@@ -264,6 +264,9 @@
- #ifdef DMXEXT
- extern void DMXExtensionInit(INITARGS);
- #endif
-+#ifdef XCALIBRATE
-+extern void XCalibrateExtensionInit(INITARGS);
-+#endif
- #ifdef XFIXES
- extern void XFixesExtensionInit(INITARGS);
- #endif
-@@ -493,6 +496,9 @@
- GlxPushProvider(&__glXDRISWRastProvider);
- if (!noGlxExtension) GlxExtensionInit();
- #endif
-+#ifdef XCALIBRATE
-+ XCalibrateExtensionInit ();
-+#endif
- }
-
- #else /* XFree86LOADER */
-Index: xorg-server-1.7.99.2/configure.ac
-===================================================================
---- xorg-server-1.7.99.2.orig/configure.ac 2010-02-10 18:54:11.959086237 +0000
-+++ xorg-server-1.7.99.2/configure.ac 2010-02-11 11:49:50.710736962 +0000
-@@ -1985,7 +1985,7 @@
- fi
-
-
-- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
-+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
- if test "x$HAVE_TSLIB" = xno; then
- AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
- fi
-@@ -2039,7 +2039,7 @@
- KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
- KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
- KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
-- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
-+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $TSLIB_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
-
- AC_SUBST([XEPHYR_LIBS])
- AC_SUBST([XEPHYR_INCS])
-Index: xorg-server-1.7.99.2/include/kdrive-config.h.in
-===================================================================
---- xorg-server-1.7.99.2.orig/include/kdrive-config.h.in 2010-02-10 18:54:11.959086237 +0000
-+++ xorg-server-1.7.99.2/include/kdrive-config.h.in 2010-02-10 18:54:12.429078513 +0000
-@@ -28,4 +28,7 @@
- /* Have execinfo.h for backtrace(). */
- #undef HAVE_EXECINFO_H
-
-+/* Enable XCalibrate extension */
-+#undef XCALIBRATE
-+
- #endif /* _KDRIVE_CONFIG_H_ */
-Index: xorg-server-1.7.99.2/hw/kdrive/linux/tslib.c
-===================================================================
---- xorg-server-1.7.99.2.orig/hw/kdrive/linux/tslib.c 2010-02-10 18:58:12.669078495 +0000
-+++ xorg-server-1.7.99.2/hw/kdrive/linux/tslib.c 2010-02-10 19:04:56.927828767 +0000
-@@ -50,12 +50,15 @@
- int fd;
- int lastx, lasty;
- struct tsdev *tsDev;
-- void (*raw_event_hook)(int x, int y, int pressure, void *closure);
-- void *raw_event_closure;
- int phys_screen;
- };
-
-
-+/* For XCalibrate extension */
-+void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
-+void *tslib_raw_event_closure;
-+
-+
- static void
- TsRead (int fd, void *closure)
- {
-@@ -65,10 +68,10 @@
- long x = 0, y = 0;
- unsigned long flags;
-
-- if (private->raw_event_hook) {
-+ if (tslib_raw_event_hook) {
- while (ts_read_raw(private->tsDev, &event, 1) == 1)
-- private->raw_event_hook (event.x, event.y, event.pressure,
-- private->raw_event_closure);
-+ tslib_raw_event_hook (event.x, event.y, event.pressure,
-+ tslib_raw_event_closure);
- return;
- }
-
-@@ -111,8 +114,8 @@
- {
- struct TslibPrivate *private = pi->driverPrivate;
-
-- private->raw_event_hook = NULL;
-- private->raw_event_closure = NULL;
-+ tslib_raw_event_hook = NULL;
-+ tslib_raw_event_closure = NULL;
- if (!pi->path) {
- pi->path = strdup("/dev/input/touchscreen0");
- ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path);
-Index: xorg-server-1.7.99.2/Xext/xcalibrate.c
-===================================================================
---- xorg-server-1.7.99.2.orig/Xext/xcalibrate.c 2010-02-10 18:59:24.097829840 +0000
-+++ xorg-server-1.7.99.2/Xext/xcalibrate.c 2010-02-11 11:51:00.930735731 +0000
-@@ -115,6 +115,7 @@
-
- memset (&rep, 0, sizeof (rep));
- rep.type = X_Reply;
-+ rep.length = 0;
- rep.sequenceNumber = client->sequence;
-
- if (stuff->on)
-@@ -158,6 +159,7 @@
-
- swaps (&rep.sequenceNumber, n);
- swaps (&rep.status, n);
-+ swapl (&rep.length, n);
- }
- WriteToClient(client, sizeof (rep), (char *) &rep);
- return (client->noClientException);
-@@ -186,6 +188,7 @@
-
- memset (&rep, 0, sizeof (rep));
- rep.type = X_Reply;
-+ rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.x = stuff->x;
- rep.y = stuff->y;
-@@ -198,6 +201,7 @@
-
- swaps (&rep.x, n);
- swaps (&rep.y, n);
-+ swapl (&rep.length, n);
- }
- WriteToClient(client, sizeof (rep), (char *) &rep);
- return (client->noClientException);
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch
deleted file mode 100644
index 14cf990..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Add some extra video modes and change the default to VGA.
-
----
- hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 39 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.000000000 +0000
-@@ -32,6 +32,31 @@ const KdMonitorTiming kdMonitorTimings[
- /* H V Hz KHz */
- /* FP BP BLANK POLARITY */
-
-+ /* Treo 650 */
-+
-+ { 320, 320, 64, 16256,
-+ 17, 12, 32, KdSyncNegative,
-+ 1, 11, 14, KdSyncNegative,
-+ },
-+
-+ { 320, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
-+ /* LifeDrive/T3/TX modes */
-+
-+ { 320, 480, 64, 16256,
-+ 17, 12, 32, KdSyncNegative,
-+ 1, 11, 14, KdSyncNegative,
-+ },
-+
-+ { 480, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
-+
- /* IPAQ modeline:
- *
- * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
-@@ -41,6 +66,11 @@ const KdMonitorTiming kdMonitorTimings[
- 1, 11, 14, KdSyncNegative,
- },
-
-+ { 240, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
- /* Other VESA modes */
- { 640, 350, 85, 31500, /* VESA */
- 32, 96, 192, KdSyncPositive, /* 26.413 */
-@@ -76,10 +106,19 @@ const KdMonitorTiming kdMonitorTimings[
- 16, 120, 176, KdSyncNegative, /* 37.861 */
- 1, 20, 24, KdSyncNegative, /* 72.809 */
- },
-+ /* DEFAULT */
-+#define MONITOR_TIMING_DEFAULT 13
- { 640, 480, 60, 25175, /* VESA */
- 16, 48, 160, KdSyncNegative, /* 31.469 */
- 10, 33, 45, KdSyncNegative, /* 59.940 */
- },
-+
-+
-+ { 480, 640, 60, 0, /* VESA */
-+ 0, 0, 0, KdSyncNegative, /* 31.469 */
-+ 0, 0, 0, KdSyncNegative, /* 59.940 */
-+ },
-+
-
- /* 800x600 modes */
- { 800, 600, 85, 56250, /* VESA */
-@@ -90,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
- 16, 160, 256, KdSyncPositive, /* 46.875 */
- 1, 21, 25, KdSyncPositive, /* 75.000 */
- },
-- /* DEFAULT */
--#define MONITOR_TIMING_DEFAULT 9
- { 800, 600, 72, 50000, /* VESA */
- 56, 64, 240, KdSyncPositive, /* 48.077 */
- 37, 23, 66, KdSyncPositive, /* 72.188 */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch
deleted file mode 100644
index a5c22a5..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:46.000000000 +0100
-@@ -498,6 +498,7 @@
- KdScreenInfo *screen = pScreenPriv->screen;
- FbdevScrPriv *scrpriv = screen->driver;
- Bool wasEnabled = pScreenPriv->enabled;
-+ FbdevPriv *priv = screen->card->driver;
- FbdevScrPriv oldscr;
- int oldwidth;
- int oldheight;
-@@ -525,11 +526,46 @@
- oldheight = screen->height;
- oldmmwidth = pScreen->mmWidth;
- oldmmheight = pScreen->mmHeight;
--
-+
- /*
- * Set new configuration
- */
--
-+
-+ if (newwidth != oldwidth || newheight != oldheight)
-+ {
-+ struct fb_var_screeninfo var;
-+ int k;
-+
-+ k = ioctl (priv->fd, FBIOGET_VSCREENINFO, &var);
-+
-+ if (k < 0)
-+ {
-+ ErrorF("Error with framebuffer ioctl FBIOGET_VSCREENINFO: %s", strerror (errno));
-+ return FALSE;
-+ }
-+
-+ var.xres = newwidth;
-+ var.yres = newheight;
-+ var.activate = FB_ACTIVATE_NOW;
-+
-+ k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
-+
-+ if (k >= 0)
-+ {
-+ if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0)
-+ {
-+ perror("Error with framebuffer ioctl FIOGET_FSCREENINFO");
-+ close (priv->fd);
-+ return FALSE;
-+ }
-+ if ((k=ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var)) < 0) {
-+ perror("Error framebuffer ioctl FIOGET_VSCREENINFO");
-+ close (priv->fd);
-+ return FALSE;
-+ }
-+ }
-+ }
-+
- scrpriv->randr = KdAddRotation (screen->randr, randr);
-
- KdOffscreenSwapOut (screen->pScreen);
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch
deleted file mode 100644
index eb98fb8..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- render/glyphstr.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- xorg-server-1.3.0.0.orig/render/glyphstr.h
-+++ xorg-server-1.3.0.0/render/glyphstr.h
-@@ -23,10 +23,11 @@
- */
-
- #ifndef _GLYPHSTR_H_
- #define _GLYPHSTR_H_
-
-+#include <X11/X.h>
- #include <X11/extensions/renderproto.h>
- #include "picture.h"
- #include "screenint.h"
- #include "regionstr.h"
- #include "miscstruct.h"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch
deleted file mode 100644
index 2dc22bf..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch
+++ /dev/null
@@ -1,515 +0,0 @@
-# Kdrive evdev support patch, posted by Ander Conselvan de Oliveira at
-# http://lists.freedesktop.org/archives/xorg/2005-December/011635.html
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/linux/evdev.c xserver/hw/kdrive/linux/evdev.c
---- xserver.original/hw/kdrive/linux/evdev.c 2005-12-16 10:36:05.000000000 -0200
-+++ xserver/hw/kdrive/linux/evdev.c 2005-12-16 10:40:51.077410192 -0200
-@@ -31,9 +31,11 @@
- #include <X11/X.h>
- #include <X11/Xproto.h>
- #include <X11/Xpoll.h>
-+#include <X11/keysym.h>
- #include "inputstr.h"
- #include "scrnintstr.h"
- #include "kdrive.h"
-+#include "kkeymap.h"
-
- #define NUM_EVENTS 128
- #define ABS_UNSET -65535
-@@ -105,9 +107,10 @@
- {
- KdMouseInfo *mi = closure;
- Kevdev *ke = mi->driver;
-- int i;
-+ int i, j;
- struct input_event events[NUM_EVENTS];
- int n;
-+ int flags;
-
- n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
- if (n <= 0)
-@@ -115,22 +118,64 @@
- n /= sizeof (struct input_event);
- for (i = 0; i < n; i++)
- {
-+ flags = KD_MOUSE_DELTA | kdMouseInfo->buttonState;
- switch (events[i].type) {
- case EV_SYN:
- break;
- case EV_KEY:
-- EvdevMotion (mi);
-- ASSIGNBIT(ke->key,events[i].code, events[i].value);
-- if (events[i].code < 0x100)
-- ErrorF ("key %d %d\n", events[i].code, events[i].value);
-- else
-- ErrorF ("key 0x%x %d\n", events[i].code, events[i].value);
-+ if (events[i].code >= BTN_MOUSE && events[i].code < BTN_JOYSTICK) {
-+ switch (events[i].code) {
-+ case BTN_LEFT:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_1;
-+ else
-+ flags &= ~KD_BUTTON_1;
-+ break;
-+ case BTN_MIDDLE:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_2;
-+ else
-+ flags &= ~KD_BUTTON_2;
-+ break;
-+ case BTN_RIGHT:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_3;
-+ else
-+ flags &= ~KD_BUTTON_3;
-+ break;
-+ default:
-+ /* Unknow button */
-+ break;
-+ }
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+ }
- break;
- case EV_REL:
-- ke->rel[events[i].code] += events[i].value;
-+ if (events[i].code == REL_X) {
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, events[i].value, 0);
-+ }
-+ else if (events[i].code == REL_Y) {
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, events[i].value);
-+ }
-+ else if (events[i].code == REL_WHEEL) {
-+ for (j = 0; j < abs (events[i].value); j++) {
-+ if (events[i].value > 0)
-+ flags |= KD_BUTTON_4;
-+ else
-+ flags |= KD_BUTTON_5;
-+
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+
-+ if (events[i].value > 0)
-+ flags &= ~KD_BUTTON_4;
-+ else
-+ flags &= ~KD_BUTTON_5;
-+
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+ } /* events[i].code == REL_WHEEL */
-+ }
- break;
- case EV_ABS:
-- ke->abs[events[i].code] = events[i].value;
- break;
- }
- }
-@@ -173,6 +218,12 @@
- fd = open (kdefaultEvdev[i], 2);
- if (fd >= 0)
- {
-+ if (ioctl (fd, EVIOCGRAB, 1) < 0)
-+ {
-+ close (fd);
-+ continue;
-+ }
-+
- mi->name = KdSaveString (kdefaultEvdev[i]);
- break;
- }
-@@ -287,7 +338,319 @@
- EvdevFini,
- };
-
--#if 0
-+/* Keyboard */
-+
-+int kbd_fd = -1;
-+int EvdevInputType = 0;
-+
-+KeySym evdevKeymap[(194 - 1 + 1) * 2] = {
-+/* These are directly mapped from DOS scanset 0 */
-+/* 1 8 */ XK_Escape, NoSymbol,
-+/* 2 9 */ XK_1, XK_exclam,
-+/* 3 10 */ XK_2, XK_at,
-+/* 4 11 */ XK_3, XK_numbersign,
-+/* 5 12 */ XK_4, XK_dollar,
-+/* 6 13 */ XK_5, XK_percent,
-+/* 7 14 */ XK_6, XK_asciicircum,
-+/* 8 15 */ XK_7, XK_ampersand,
-+/* 9 16 */ XK_8, XK_asterisk,
-+/* 10 17 */ XK_9, XK_parenleft,
-+/* 11 18 */ XK_0, XK_parenright,
-+/* 12 19 */ XK_minus, XK_underscore,
-+/* 13 20 */ XK_equal, XK_plus,
-+/* 14 21 */ XK_BackSpace, NoSymbol,
-+/* 15 22 */ XK_Tab, NoSymbol,
-+/* 16 23 */ XK_Q, NoSymbol,
-+/* 17 24 */ XK_W, NoSymbol,
-+/* 18 25 */ XK_E, NoSymbol,
-+/* 19 26 */ XK_R, NoSymbol,
-+/* 20 27 */ XK_T, NoSymbol,
-+/* 21 28 */ XK_Y, NoSymbol,
-+/* 22 29 */ XK_U, NoSymbol,
-+/* 23 30 */ XK_I, NoSymbol,
-+/* 24 31 */ XK_O, NoSymbol,
-+/* 25 32 */ XK_P, NoSymbol,
-+/* 26 33 */ XK_bracketleft, XK_braceleft,
-+/* 27 34 */ XK_bracketright, XK_braceright,
-+/* 28 35 */ XK_Return, NoSymbol,
-+/* 29 36 */ XK_Control_L, NoSymbol,
-+/* 30 37 */ XK_A, NoSymbol,
-+/* 31 38 */ XK_S, NoSymbol,
-+/* 32 39 */ XK_D, NoSymbol,
-+/* 33 40 */ XK_F, NoSymbol,
-+/* 34 41 */ XK_G, NoSymbol,
-+/* 35 42 */ XK_H, NoSymbol,
-+/* 36 43 */ XK_J, NoSymbol,
-+/* 37 44 */ XK_K, NoSymbol,
-+/* 38 45 */ XK_L, NoSymbol,
-+/* 39 46 */ XK_semicolon, XK_colon,
-+/* 40 47 */ XK_apostrophe, XK_quotedbl,
-+/* 41 48 */ XK_grave, XK_asciitilde,
-+/* 42 49 */ XK_Shift_L, NoSymbol,
-+/* 43 50 */ XK_backslash, XK_bar,
-+/* 44 51 */ XK_Z, NoSymbol,
-+/* 45 52 */ XK_X, NoSymbol,
-+/* 46 53 */ XK_C, NoSymbol,
-+/* 47 54 */ XK_V, NoSymbol,
-+/* 48 55 */ XK_B, NoSymbol,
-+/* 49 56 */ XK_N, NoSymbol,
-+/* 50 57 */ XK_M, NoSymbol,
-+/* 51 58 */ XK_comma, XK_less,
-+/* 52 59 */ XK_period, XK_greater,
-+/* 53 60 */ XK_slash, XK_question,
-+/* 54 61 */ XK_Shift_R, NoSymbol,
-+/* 55 62 */ XK_KP_Multiply, NoSymbol,
-+/* 56 63 */ XK_Alt_L, XK_Meta_L,
-+/* 57 64 */ XK_space, NoSymbol,
-+/* 58 65 */ XK_Caps_Lock, NoSymbol,
-+/* 59 66 */ XK_F1, NoSymbol,
-+/* 60 67 */ XK_F2, NoSymbol,
-+/* 61 68 */ XK_F3, NoSymbol,
-+/* 62 69 */ XK_F4, NoSymbol,
-+/* 63 70 */ XK_F5, NoSymbol,
-+/* 64 71 */ XK_F6, NoSymbol,
-+/* 65 72 */ XK_F7, NoSymbol,
-+/* 66 73 */ XK_F8, NoSymbol,
-+/* 67 74 */ XK_F9, NoSymbol,
-+/* 68 75 */ XK_F10, NoSymbol,
-+/* 69 76 */ XK_Break, XK_Pause,
-+/* 70 77 */ XK_Scroll_Lock, NoSymbol,
-+/* 71 78 */ XK_KP_Home, XK_KP_7,
-+/* 72 79 */ XK_KP_Up, XK_KP_8,
-+/* 73 80 */ XK_KP_Page_Up, XK_KP_9,
-+/* 74 81 */ XK_KP_Subtract, NoSymbol,
-+/* 75 82 */ XK_KP_Left, XK_KP_4,
-+/* 76 83 */ XK_KP_5, NoSymbol,
-+/* 77 84 */ XK_KP_Right, XK_KP_6,
-+/* 78 85 */ XK_KP_Add, NoSymbol,
-+/* 79 86 */ XK_KP_End, XK_KP_1,
-+/* 80 87 */ XK_KP_Down, XK_KP_2,
-+/* 81 88 */ XK_KP_Page_Down, XK_KP_3,
-+/* 82 89 */ XK_KP_Insert, XK_KP_0,
-+/* 83 90 */ XK_KP_Delete, XK_KP_Decimal,
-+/* 84 91 */ NoSymbol, NoSymbol,
-+/* 85 92 */ NoSymbol, NoSymbol,
-+/* 86 93 */ NoSymbol, NoSymbol,
-+/* 87 94 */ XK_F11, NoSymbol,
-+/* 88 95 */ XK_F12, NoSymbol,
-+
-+/* These are remapped from the extended set (using ExtendMap) */
-+
-+/* 89 96 */ XK_Control_R, NoSymbol,
-+/* 90 97 */ XK_KP_Enter, NoSymbol,
-+/* 91 98 */ XK_KP_Divide, NoSymbol,
-+/* 92 99 */ XK_Sys_Req, XK_Print,
-+/* 93 100 */ XK_Alt_R, XK_Meta_R,
-+/* 94 101 */ XK_Num_Lock, NoSymbol,
-+/* 95 102 */ XK_Home, NoSymbol,
-+/* 96 103 */ XK_Up, NoSymbol,
-+/* 97 104 */ XK_Page_Up, NoSymbol,
-+/* 98 105 */ XK_Left, NoSymbol,
-+/* 99 106 */ XK_Right, NoSymbol,
-+/* 100 107 */ XK_End, NoSymbol,
-+/* 101 108 */ XK_Down, NoSymbol,
-+/* 102 109 */ XK_Page_Down, NoSymbol,
-+/* 103 110 */ XK_Insert, NoSymbol,
-+/* 104 111 */ XK_Delete, NoSymbol,
-+/* 105 112 */ XK_Super_L, NoSymbol,
-+/* 106 113 */ XK_Super_R, NoSymbol,
-+/* 107 114 */ XK_Menu, NoSymbol,
-+/* 108 115 */ NoSymbol, NoSymbol,
-+/* 109 116 */ NoSymbol, NoSymbol,
-+/* 110 117 */ NoSymbol, NoSymbol,
-+/* 111 118 */ NoSymbol, NoSymbol,
-+/* 112 119 */ NoSymbol, NoSymbol,
-+
-+/* 113 120 */ NoSymbol, NoSymbol,
-+/* 114 121 */ NoSymbol, NoSymbol,
-+/* 115 122 */ NoSymbol, NoSymbol,
-+/* 116 123 */ NoSymbol, NoSymbol,
-+/* 117 124 */ NoSymbol, NoSymbol,
-+/* 118 125 */ NoSymbol, NoSymbol,
-+/* 119 126 */ NoSymbol, NoSymbol,
-+/* 120 127 */ NoSymbol, NoSymbol,
-+/* 121 128 */ NoSymbol, NoSymbol,
-+/* 122 129 */ NoSymbol, NoSymbol,
-+/* 123 130 */ NoSymbol, NoSymbol,
-+/* 124 131 */ NoSymbol, NoSymbol,
-+/* 125 132 */ NoSymbol, NoSymbol,
-+/* 126 133 */ NoSymbol, NoSymbol,
-+/* 127 134 */ NoSymbol, NoSymbol,
-+/* 128 135 */ NoSymbol, NoSymbol,
-+/* 129 136 */ NoSymbol, NoSymbol,
-+/* 130 137 */ NoSymbol, NoSymbol,
-+/* 131 138 */ NoSymbol, NoSymbol,
-+/* 132 139 */ NoSymbol, NoSymbol,
-+/* 133 140 */ NoSymbol, NoSymbol,
-+/* 134 141 */ NoSymbol, NoSymbol,
-+/* 135 142 */ NoSymbol, NoSymbol,
-+/* 136 143 */ NoSymbol, NoSymbol,
-+/* 137 144 */ NoSymbol, NoSymbol,
-+/* 138 145 */ NoSymbol, NoSymbol,
-+/* 139 146 */ NoSymbol, NoSymbol,
-+/* 140 147 */ NoSymbol, NoSymbol,
-+/* 141 148 */ NoSymbol, NoSymbol,
-+/* 142 149 */ NoSymbol, NoSymbol,
-+/* 143 150 */ NoSymbol, NoSymbol,
-+/* 144 151 */ NoSymbol, NoSymbol,
-+/* 145 152 */ NoSymbol, NoSymbol,
-+/* 146 153 */ NoSymbol, NoSymbol,
-+/* 147 154 */ NoSymbol, NoSymbol,
-+/* 148 155 */ NoSymbol, NoSymbol,
-+/* 149 156 */ NoSymbol, NoSymbol,
-+/* 150 157 */ NoSymbol, NoSymbol,
-+/* 151 158 */ NoSymbol, NoSymbol,
-+/* 152 159 */ NoSymbol, NoSymbol,
-+/* 153 160 */ NoSymbol, NoSymbol,
-+/* 154 161 */ NoSymbol, NoSymbol,
-+/* 155 162 */ NoSymbol, NoSymbol,
-+/* 156 163 */ NoSymbol, NoSymbol,
-+/* 157 164 */ NoSymbol, NoSymbol,
-+/* 158 165 */ NoSymbol, NoSymbol,
-+/* 159 166 */ NoSymbol, NoSymbol,
-+/* 160 167 */ NoSymbol, NoSymbol,
-+/* 161 168 */ NoSymbol, NoSymbol,
-+/* 162 169 */ NoSymbol, NoSymbol,
-+/* 163 170 */ NoSymbol, NoSymbol,
-+/* 164 171 */ NoSymbol, NoSymbol,
-+/* 165 172 */ NoSymbol, NoSymbol,
-+/* 166 173 */ NoSymbol, NoSymbol,
-+/* 167 174 */ NoSymbol, NoSymbol,
-+/* 168 175 */ NoSymbol, NoSymbol,
-+/* 169 176 */ NoSymbol, NoSymbol,
-+/* 170 177 */ NoSymbol, NoSymbol,
-+/* 171 178 */ NoSymbol, NoSymbol,
-+/* 172 179 */ NoSymbol, NoSymbol,
-+/* 173 180 */ NoSymbol, NoSymbol,
-+/* 174 181 */ NoSymbol, NoSymbol,
-+/* 175 182 */ NoSymbol, NoSymbol,
-+/* 176 183 */ NoSymbol, NoSymbol,
-+/* 177 184 */ NoSymbol, NoSymbol,
-+/* 178 185 */ NoSymbol, NoSymbol,
-+/* 179 186 */ NoSymbol, NoSymbol,
-+/* 180 187 */ NoSymbol, NoSymbol,
-+/* 181 188 */ NoSymbol, NoSymbol,
-+/* 182 189 */ NoSymbol, NoSymbol,
-+/* 183 190 */ NoSymbol, NoSymbol,
-+/* 184 191 */ NoSymbol, NoSymbol,
-+/* 185 192 */ NoSymbol, NoSymbol,
-+/* 186 193 */ NoSymbol, NoSymbol,
-+/* 187 194 */ NoSymbol, NoSymbol,
-+/* 188 195 */ NoSymbol, NoSymbol,
-+/* 189 196 */ NoSymbol, NoSymbol,
-+/* 190 197 */ NoSymbol, NoSymbol,
-+/* 191 198 */ NoSymbol, NoSymbol,
-+/* 192 199 */ NoSymbol, NoSymbol,
-+/* 193 200 */ NoSymbol, NoSymbol,
-+/* 194 201 */ NoSymbol, NoSymbol,
-+};
-+
-+static void
-+EvdevKbdRead (int fd, void *closure)
-+{
-+ int i, n;
-+ struct input_event events[NUM_EVENTS];
-+
-+ n = read (fd, &events, NUM_EVENTS * sizeof (struct input_event));
-+ if (n <= 0)
-+ return;
-+
-+ n /= sizeof (struct input_event);
-+
-+ for (i = 0; i < n; i++)
-+ {
-+ if (events[i].type == EV_KEY)
-+ KdEnqueueKeyboardEvent (events[i].code, !events[i].value);
-+ }
-+}
-+
-+static void
-+EvdevKbdLoad (void)
-+{
-+ kdMinScanCode = 0;
-+ kdMaxScanCode = 193;
-+ kdKeymapWidth = 2;
-+ memcpy (kdKeymap, evdevKeymap, sizeof (evdevKeymap));
-+}
-+
-+static int
-+EvdevKbdInit (void)
-+{
-+ int fd, i;
-+
-+ if (!EvdevInputType)
-+ EvdevInputType = KdAllocInputType ();
-+
-+ if (!kdKeyboard)
-+ {
-+ for (i = 0; i < NUM_DEFAULT_EVDEV; i++)
-+ {
-+ fd = open (kdefaultEvdev[i], 2);
-+ if (fd >= 0)
-+ {
-+ kdKeyboard = KdSaveString (kdefaultEvdev[i]);
-+ break;
-+ }
-+ }
-+ }
-+ else
-+ {
-+ fd = open (kdKeyboard, O_RDWR);
-+ if (fd < 0)
-+ return FALSE;
-+ }
-+
-+ if (ioctl (fd, EVIOCGRAB, 1) < 0)
-+ {
-+ close (fd);
-+ return FALSE;
-+ }
-+
-+ if (!KdRegisterFd (EvdevInputType, fd, EvdevKbdRead, NULL))
-+ return FALSE;
-+
-+ kbd_fd = fd;
-+ return TRUE;
-+}
-+
-+static void
-+EvdevKbdFini (void)
-+{
-+}
-+
-+static void
-+EvdevKbdLeds (int leds)
-+{
-+ struct input_event event;
-+
-+ memset(&event, 0, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_CAPSL;
-+ event.value = leds & (1 << 0) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_NUML;
-+ event.value = leds & (1 << 1) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_SCROLLL;
-+ event.value = leds & (1 << 2) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_COMPOSE;
-+ event.value = leds & (1 << 3) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+}
-+
-+static void
-+EvdevKbdBell (int volume, int frequency, int duration)
-+{
-+}
-+
- KdKeyboardFuncs LinuxEvdevKeyboardFuncs = {
- EvdevKbdLoad,
- EvdevKbdInit,
-@@ -296,4 +659,4 @@
- EvdevKbdFini,
- 0,
- };
--#endif
-+
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.c xserver/hw/kdrive/src/kdrive.c
---- xserver.original/hw/kdrive/src/kdrive.c 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kdrive.c 2005-12-16 10:37:09.000000000 -0200
-@@ -73,6 +73,7 @@
- Bool kdEnabled;
- int kdSubpixelOrder;
- int kdVirtualTerminal = -1;
-+char *kdKeyboard = 0;
- Bool kdSwitchPending;
- char *kdSwitchCmd;
- DDXPointRec kdOrigin;
-@@ -795,6 +796,14 @@
- UseMsg ();
- return 2;
- }
-+ if (!strcmp (argv[i], "-keyboard"))
-+ {
-+ if ((i+1) < argc)
-+ kdKeyboard = argv[i+1];
-+ else
-+ UseMsg ();
-+ return 2;
-+ }
- if (!strcmp (argv[i], "-rgba"))
- {
- if ((i+1) < argc)
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.h xserver/hw/kdrive/src/kdrive.h
---- xserver.original/hw/kdrive/src/kdrive.h 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kdrive.h 2005-12-16 10:37:09.000000000 -0200
-@@ -416,6 +416,7 @@
- extern Bool kdDisableZaphod;
- extern Bool kdDontZap;
- extern int kdVirtualTerminal;
-+extern char *kdKeyboard;
- extern char *kdSwitchCmd;
- extern KdOsFuncs *kdOsFuncs;
-
-@@ -769,7 +770,7 @@
- ProcessInputEvents (void);
-
- extern KdMouseFuncs LinuxMouseFuncs;
--extern KdMouseFuncs LinuxEvdevFuncs;
-+extern KdMouseFuncs LinuxEvdevMouseFuncs;
- extern KdMouseFuncs Ps2MouseFuncs;
- extern KdMouseFuncs BusMouseFuncs;
- extern KdMouseFuncs MsMouseFuncs;
-@@ -777,6 +778,7 @@
- extern KdMouseFuncs TsFuncs;
- #endif
- extern KdKeyboardFuncs LinuxKeyboardFuncs;
-+extern KdKeyboardFuncs LinuxEvdevKeyboardFuncs;
- extern KdOsFuncs LinuxFuncs;
-
- extern KdMouseFuncs VxWorksMouseFuncs;
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kinput.c xserver/hw/kdrive/src/kinput.c
---- xserver.original/hw/kdrive/src/kinput.c 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kinput.c 2005-12-16 10:37:09.000000000 -0200
-@@ -1300,6 +1300,7 @@
- xE.u.u.type = KeyPress;
- xE.u.u.detail = key_code;
-
-+#ifndef XKB
- switch (KEYCOL1(key_code))
- {
- case XK_Num_Lock:
-@@ -1313,6 +1314,7 @@
- else
- xE.u.u.type = KeyPress;
- }
-+#endif
-
- /*
- * Check pressed keys which are already down
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
deleted file mode 100644
index 28d7325..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- xserver/hw/kdrive/fbdev/fbinit.c~ 2006-01-31 17:09:33.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbinit.c 2006-01-31 17:11:55.000000000 +0100
-@@ -28,6 +28,8 @@
- #endif
- #include <fbdev.h>
-
-+extern int use_evdev;
-+
- void
- InitCard (char *name)
- {
-@@ -45,7 +47,10 @@
- void
- InitInput (int argc, char **argv)
- {
-- KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
-+ if (use_evdev)
-+ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs);
-+ else
-+ KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
- #ifdef TOUCHSCREEN
- KdAddMouseDriver (&TsFuncs);
- #endif
---- xserver/hw/kdrive/src/kdrive.c.orig 2006-01-31 17:13:28.000000000 +0100
-+++ xserver/hw/kdrive/src/kdrive.c 2006-01-31 17:15:28.000000000 +0100
-@@ -44,6 +44,8 @@
- #include "dpmsproc.h"
- #endif
-
-+int use_evdev = 0;
-+
- typedef struct _kdDepths {
- CARD8 depth;
- CARD8 bpp;
-@@ -687,6 +689,7 @@
- ErrorF("-videoTest Start the server, pause momentarily and exit\n");
- ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n");
- ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
-+ ErrorF("-use-evdev Use Linux evdev input\n");
- ErrorF("-switchCmd Command to execute on vt switch\n");
- ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n");
- ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
-@@ -796,6 +799,11 @@
- UseMsg ();
- return 2;
- }
-+ if (!strcmp (argv[i], "-use-evdev"))
-+ {
-+ use_evdev = 1;
-+ return 1;
-+ }
- if (!strcmp (argv[i], "-keyboard"))
- {
- if ((i+1) < argc)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch
deleted file mode 100644
index 35ccada..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700
-+++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700
-@@ -927,8 +927,10 @@ char *kdefaultMouse[] = {
- "/dev/psaux",
- "/dev/input/mice",
- "/dev/adbmouse",
-+#ifdef BREAK_MY_SERIAL_CONSOLE
- "/dev/ttyS0",
- "/dev/ttyS1",
-+#endif
- };
-
- #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
deleted file mode 100644
index 6b34032..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000
-+++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000
-@@ -62,7 +62,6 @@
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- AC_PROG_LEX
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch
deleted file mode 100644
index a580b50..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: xorg-server-1.2.0/Makefile.am
-===================================================================
---- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100
-+++ xorg-server-1.2.0/Makefile.am 2007-03-28 20:26:19.000000000 +0200
-@@ -30,6 +30,10 @@
- XINPUT_DIR=Xi
- endif
-
-+if XKB
-+XKB_DIR=xkb
-+endif
-+
- if DBE
- DBE_DIR=dbe
- endif
-@@ -46,7 +50,7 @@
- randr \
- render \
- $(XINPUT_DIR) \
-- xkb \
-+ $(XKB_DIR) \
- $(DBE_DIR) \
- $(MFB_DIR) \
- $(AFB_DIR) \
-Index: xorg-server-1.2.0/configure.ac
-===================================================================
---- xorg-server-1.2.0.orig/configure.ac 2007-01-23 06:39:15.000000000 +0100
-+++ xorg-server-1.2.0/configure.ac 2007-03-28 20:27:13.000000000 +0200
-@@ -428,6 +428,7 @@
- AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
- AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
- AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
-+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
-
- dnl DDXes.
- AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -754,12 +755,15 @@
-
- AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
-
--AC_DEFINE(XKB, 1, [Build XKB])
--AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
--AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
--REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
--XKB_LIB='$(top_builddir)/xkb/libxkb.la'
--XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
-+if test "x$XKB" = xyes; then
-+ AC_DEFINE(XKB, 1, [Build XKB])
-+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
-+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
-+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
-+ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
-+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-+fi
-
- AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
- [Do not have `strcasecmp'.]))
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
index 52b63ed..cc9acaa 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
@@ -4,7 +4,7 @@ DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \
libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans bigreqsproto \
xcmiscproto libdrm openssl"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
PROVIDES = "virtual/xserver"
PACKAGES =+ "xserver-kdrive-fbdev \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/crosscompile.patch
new file mode 100644
index 0000000..2f98bb8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/crosscompile.patch
@@ -0,0 +1,22 @@
+Upstream-Status: Inappropriate [configuration]
+
+diff --git a/configure.ac b/configure.ac
+index b3b752c..600500b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+ dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
+ dnl compiling, assume default font path uses standard FONTROOTDIR directories.
+ DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+-if test "$cross_compiling" != yes; then
+- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+- [case $host_os in
++ case $host_os in
+ darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+- esac])
+-fi
++ esac
+ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+ [ FONTPATH="$withval" ],
+ [ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
index bd88427..458f19a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
@@ -1,20 +1,24 @@
---- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
-+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
-@@ -342,7 +342,7 @@
+Upstream-Status: Inappropriate [disable feature]
+
+diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
+index 9863c14..adbfbaa 100644
+--- a/hw/kdrive/linux/linux.c
++++ b/hw/kdrive/linux/linux.c
+@@ -251,7 +251,7 @@ LinuxEnable (void)
/*
* Open the APM driver
*/
- LinuxApmFd = open ("/dev/apm_bios", 2);
-+ /*LinuxApmFd = open ("/dev/apm_bios", 2);
++/* LinuxApmFd = open ("/dev/apm_bios", 2);
if (LinuxApmFd < 0 && errno == ENOENT)
- LinuxApmFd = open ("/dev/misc/apm_bios", 2);
+ LinuxApmFd = open ("/dev/misc/apm_bios", 2);
if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
+@@ -261,7 +261,7 @@ LinuxEnable (void)
RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
AddEnabledDevice (LinuxApmFd);
}
--
-+ */
+-
++*/
/*
* now get the VT
*/
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
deleted file mode 100644
index ccc1913..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: xorg-server-1.3.0.0/configure.ac
-===================================================================
---- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200
-+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200
-@@ -520,7 +520,11 @@
- XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
-
- dnl Core modules for most extensions, et al.
-+if test "$KDRIVE" = yes; then
-+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
-+else
- REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
-+fi
- REQUIRED_LIBS="xfont xau fontenc"
-
- AM_CONDITIONAL(XV, [test "x$XV" = xyes])
-@@ -1603,7 +1607,9 @@
- AC_SUBST(XKB_COMPILED_DIR)
-
- dnl and the rest of these are generic, so they're in config.h
-+if test ! x"$KDRIVE" = xyes; then
- AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
-+fi
- AC_DEFINE(XResExtension, 1, [Build XRes extension])
-
- AC_TRY_COMPILE([
-@@ -1616,10 +1622,12 @@
-
- AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
-
-+if test ! "x$KDRIVE" = xyes ; then
- dnl xorgconfig CLI configuration utility
- PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
- AC_SUBST(XORGCONFIG_DEP_CFLAGS)
- AC_SUBST(XORGCONFIG_DEP_LIBS)
-+fi
-
- dnl xorgcfg GUI configuration utility
- AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
--git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
index 14cf990..4cde6ab 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
@@ -1,14 +1,12 @@
Add some extra video modes and change the default to VGA.
----
- hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 39 insertions(+), 2 deletions(-)
+Upstream-Status: Inappropriate [embedded specific]
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.000000000 +0000
-@@ -32,6 +32,31 @@ const KdMonitorTiming kdMonitorTimings[
+diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c
+index 38b7bc8..d569444 100644
+--- a/hw/kdrive/src/kmode.c
++++ b/hw/kdrive/src/kmode.c
+@@ -30,6 +30,31 @@ const KdMonitorTiming kdMonitorTimings[] = {
/* H V Hz KHz */
/* FP BP BLANK POLARITY */
@@ -40,10 +38,10 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
/* IPAQ modeline:
*
* Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
-@@ -41,6 +66,11 @@ const KdMonitorTiming kdMonitorTimings[
+@@ -39,6 +64,11 @@ const KdMonitorTiming kdMonitorTimings[] = {
1, 11, 14, KdSyncNegative,
},
-
+
+ { 240, 320, 64, 0,
+ 0, 0, 0, KdSyncNegative,
+ 0, 0, 0, KdSyncNegative,
@@ -52,7 +50,7 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
/* Other VESA modes */
{ 640, 350, 85, 31500, /* VESA */
32, 96, 192, KdSyncPositive, /* 26.413 */
-@@ -76,10 +106,19 @@ const KdMonitorTiming kdMonitorTimings[
+@@ -74,11 +104,18 @@ const KdMonitorTiming kdMonitorTimings[] = {
16, 120, 176, KdSyncNegative, /* 37.861 */
1, 20, 24, KdSyncNegative, /* 72.809 */
},
@@ -62,17 +60,16 @@ Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
16, 48, 160, KdSyncNegative, /* 31.469 */
10, 33, 45, KdSyncNegative, /* 59.940 */
},
-+
-+
-+ { 480, 640, 60, 0, /* VESA */
+
++ { 480, 640, 60, 0, /* VESA */
+ 0, 0, 0, KdSyncNegative, /* 31.469 */
+ 0, 0, 0, KdSyncNegative, /* 59.940 */
-+ },
-+
-
++ },
++
/* 800x600 modes */
{ 800, 600, 85, 56250, /* VESA */
-@@ -90,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
+ 32, 152, 248, KdSyncPositive, /* 53.674 */
+@@ -88,8 +125,6 @@ const KdMonitorTiming kdMonitorTimings[] = {
16, 160, 256, KdSyncPositive, /* 46.875 */
1, 21, 25, KdSyncPositive, /* 75.000 */
},
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
index a5c22a5..125d126 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
@@ -1,8 +1,10 @@
-Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:46.000000000 +0100
-@@ -498,6 +498,7 @@
+Upstream-Status: Pending
+
+diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
+index 2c7fa91..7f6b6f9 100644
+--- a/hw/kdrive/fbdev/fbdev.c
++++ b/hw/kdrive/fbdev/fbdev.c
+@@ -485,6 +485,7 @@ fbdevRandRSetConfig (ScreenPtr pScreen,
KdScreenInfo *screen = pScreenPriv->screen;
FbdevScrPriv *scrpriv = screen->driver;
Bool wasEnabled = pScreenPriv->enabled;
@@ -10,17 +12,10 @@ Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
FbdevScrPriv oldscr;
int oldwidth;
int oldheight;
-@@ -525,11 +526,46 @@
- oldheight = screen->height;
- oldmmwidth = pScreen->mmWidth;
- oldmmheight = pScreen->mmHeight;
--
-+
- /*
+@@ -517,6 +518,41 @@ fbdevRandRSetConfig (ScreenPtr pScreen,
* Set new configuration
*/
--
-+
+
+ if (newwidth != oldwidth || newheight != oldheight)
+ {
+ struct fb_var_screeninfo var;
@@ -58,4 +53,4 @@ Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
+
scrpriv->randr = KdAddRotation (screen->randr, randr);
- KdOffscreenSwapOut (screen->pScreen);
+ fbdevUnmapFramebuffer (screen);
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fix-newer-xorg-headers.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-kdrive/fix-newer-xorg-headers.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/hide-cursor-and-ppm-root.patch
similarity index 79%
rename from meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-kdrive/hide-cursor-and-ppm-root.patch
index 73f30ee..c949123 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/hide-cursor-and-ppm-root.patch
@@ -1,8 +1,10 @@
-Index: xorg-server-1.7.99.2/dix/window.c
-===================================================================
---- xorg-server-1.7.99.2.orig/dix/window.c 2009-11-04 16:25:50.000000000 +0000
-+++ xorg-server-1.7.99.2/dix/window.c 2010-02-10 17:42:22.719078216 +0000
-@@ -179,6 +179,8 @@
+Upstream-Status: Pending
+
+diff --git a/dix/window.c b/dix/window.c
+index cd28d05..4f782e4 100644
+--- a/dix/window.c
++++ b/dix/window.c
+@@ -176,6 +176,8 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
#define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
@@ -11,7 +13,7 @@ Index: xorg-server-1.7.99.2/dix/window.c
#ifdef DEBUG
/******
* PrintWindowTree
-@@ -304,6 +306,115 @@
+@@ -305,6 +307,115 @@ SetWindowToDefaults(WindowPtr pWin)
#endif
}
@@ -127,7 +129,7 @@ Index: xorg-server-1.7.99.2/dix/window.c
static void
MakeRootTile(WindowPtr pWin)
{
-@@ -314,6 +425,36 @@
+@@ -315,6 +426,36 @@ MakeRootTile(WindowPtr pWin)
unsigned char *from, *to;
int i, j;
@@ -164,7 +166,7 @@ Index: xorg-server-1.7.99.2/dix/window.c
pWin->background.pixmap = (*pScreen->CreatePixmap)(pScreen, 4, 4,
pScreen->rootDepth, 0);
-@@ -530,6 +671,7 @@
+@@ -530,6 +671,7 @@ RegisterRealChildHeadProc (RealChildHeadProc proc)
}
@@ -172,11 +174,11 @@ Index: xorg-server-1.7.99.2/dix/window.c
WindowPtr
RealChildHead(WindowPtr pWin)
{
-Index: xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c
-===================================================================
---- xorg-server-1.7.99.2.orig/hw/kdrive/src/kdrive.c 2010-02-10 17:36:36.000000000 +0000
-+++ xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c 2010-02-10 17:43:07.797828099 +0000
-@@ -60,6 +60,9 @@
+diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
+index f034ce4..660e2c9 100644
+--- a/hw/kdrive/src/kdrive.c
++++ b/hw/kdrive/src/kdrive.c
+@@ -60,6 +60,9 @@ KdDepths kdDepths[] = {
{ 32, 32 }
};
@@ -186,7 +188,7 @@ Index: xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c
#define NUM_KD_DEPTHS (sizeof (kdDepths) / sizeof (kdDepths[0]))
#define KD_DEFAULT_BUTTONS 5
-@@ -92,6 +95,9 @@
+@@ -91,6 +94,9 @@ static Bool kdCaughtSignal = FALSE;
KdOsFuncs *kdOsFuncs;
@@ -194,17 +196,17 @@ Index: xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c
+extern char* RootPPM; /* dix/window.c */
+
void
- KdSetRootClip (ScreenPtr pScreen, BOOL enable)
+ KdDisableScreen (ScreenPtr pScreen)
{
-@@ -275,6 +281,7 @@
- KdSetRootClip (pScreen, TRUE);
+@@ -185,6 +191,7 @@ KdEnableScreen (ScreenPtr pScreen)
+ SetRootClip (pScreen, TRUE);
if (pScreenPriv->card->cfuncs->dpms)
(*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);
+
return TRUE;
}
-@@ -553,6 +560,8 @@
+@@ -454,6 +461,8 @@ KdUseMsg (void)
ErrorF("-switchCmd Command to execute on vt switch\n");
ErrorF("-zap Terminate server on Ctrl+Alt+Backspace\n");
ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
@@ -213,7 +215,7 @@ Index: xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c
}
int
-@@ -616,6 +625,19 @@
+@@ -517,6 +526,19 @@ KdProcessArgument (int argc, char **argv, int i)
kdSoftCursor = TRUE;
return 1;
}
@@ -233,19 +235,19 @@ Index: xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c
if (!strcmp (argv[i], "-videoTest"))
{
kdVideoTest = TRUE;
-Index: xorg-server-1.7.99.2/xfixes/cursor.c
-===================================================================
---- xorg-server-1.7.99.2.orig/xfixes/cursor.c 2009-12-19 01:43:53.000000000 +0000
-+++ xorg-server-1.7.99.2/xfixes/cursor.c 2010-02-10 17:45:02.089079491 +0000
+diff --git a/xfixes/cursor.c b/xfixes/cursor.c
+index fb608f6..d217619 100644
+--- a/xfixes/cursor.c
++++ b/xfixes/cursor.c
@@ -57,6 +57,7 @@
static RESTYPE CursorClientType;
static RESTYPE CursorHideCountType;
static RESTYPE CursorWindowType;
+static Bool CursorGloballyHidden;
static CursorPtr CursorCurrent[MAXDEVICES];
- static CursorPtr pInvisibleCursor = NULL;
-@@ -65,6 +66,8 @@
+ static DevPrivateKeyRec CursorScreenPrivateKeyRec;
+@@ -64,6 +65,8 @@ static DevPrivateKeyRec CursorScreenPrivateKeyRec;
static void deleteCursorHideCountsForScreen (ScreenPtr pScreen);
@@ -254,17 +256,17 @@ Index: xorg-server-1.7.99.2/xfixes/cursor.c
#define VERIFY_CURSOR(pCursor, cursor, client, access) \
do { \
int err; \
-@@ -150,7 +153,7 @@
+@@ -146,7 +149,7 @@ CursorDisplayCursor (DeviceIntPtr pDev,
if (ConnectionInfo)
CursorVisible = EnableCursor;
- if (cs->pCursorHideCounts != NULL || !CursorVisible) {
+ if (cs->pCursorHideCounts != NULL || !CursorVisible || CursorGloballyHidden) {
- ret = ((*pScreen->RealizeCursor)(pDev, pScreen, pInvisibleCursor) &&
- (*pScreen->DisplayCursor) (pDev, pScreen, pInvisibleCursor));
+ ret = (*pScreen->DisplayCursor) (pDev, pScreen, NullCursor);
} else {
-@@ -887,6 +890,12 @@
- return (ret == BadValue) ? BadWindow : ret;
+ ret = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor);
+@@ -880,6 +883,12 @@ ProcXFixesHideCursor (ClientPtr client)
+ return ret;
}
+ /* Is cursor set to be initially hidden ?, if so reset this
@@ -276,8 +278,8 @@ Index: xorg-server-1.7.99.2/xfixes/cursor.c
/*
* Has client hidden the cursor before on this screen?
* If so, just increment the count.
-@@ -950,9 +959,19 @@
- return (rc == BadValue) ? BadWindow : rc;
+@@ -943,9 +952,19 @@ ProcXFixesShowCursor (ClientPtr client)
+ return rc;
}
+ /* X was started with cursor hidden, therefore just reset our flag
@@ -297,7 +299,7 @@ Index: xorg-server-1.7.99.2/xfixes/cursor.c
*/
pChc = findCursorHideCount(client, pWin->drawable.pScreen);
if (pChc == NULL) {
-@@ -1068,6 +1087,8 @@
+@@ -1034,6 +1053,8 @@ XFixesCursorInit (void)
{
int i;
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/keyboard-resume-workaround.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-kdrive/keyboard-resume-workaround.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.10.1.bb
new file mode 100644
index 0000000..b1340fb
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.10.1.bb
@@ -0,0 +1,22 @@
+require xserver-kdrive.inc
+
+DEPENDS += "libxkbfile libxcalibrate font-util pixman"
+
+RDEPENDS_${PN} += "xkeyboard-config"
+
+EXTRA_OECONF += "--disable-glx"
+
+PE = "1"
+PR = "r0"
+
+SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+ file://extra-kmodes.patch; \
+ file://disable-apm.patch; \
+ file://no-serial-probing.patch; \
+ file://keyboard-resume-workaround.patch; \
+ file://hide-cursor-and-ppm-root.patch; \
+ file://fbdev_xrandr_ioctl.patch; \
+ file://fix-newer-xorg-headers.patch;\
+ file://crosscompile.patch;"
+
+S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
deleted file mode 100644
index b7e5520..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require xserver-kdrive.inc
-
-DEPENDS += "libxkbfile libxcalibrate font-util pixman"
-
-RDEPENDS_${PN} += "xkeyboard-config"
-
-EXTRA_OECONF += "--disable-glx"
-
-PE = "1"
-PR = "r26"
-
-SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
- file://extra-kmodes.patch;patch=1 \
- file://disable-apm.patch;patch=1 \
- file://no-serial-probing.patch;patch=1 \
- file://keyboard-resume-workaround.patch;patch=1 \
- file://enable-xcalibrate.patch;patch=1 \
- file://hide-cursor-and-ppm-root.patch;patch=1 \
- file://fbdev_xrandr_ioctl.patch;patch=1 \
- file://fix-newer-xorg-headers.patch;patch=1 \
- file://crosscompile.patch;patch=1 \
- file://nodolt.patch;patch=1"
-# file://kdrive-evdev.patch;patch=1
-# file://kdrive-use-evdev.patch;patch=1
-# file://enable-builtin-fonts.patch;patch=1
-# file://optional-xkb.patch;patch=1
-
-
-S = "${WORKDIR}/xorg-server-${PV}"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 05/14] mutter: Recipe Update for clutter 1.6 update
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (3 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1 Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 06/14] recipes: Add Upstream-Status to various recipe patches Saul Wold
` (9 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Saul Wold <sgw@linux.intel.com>
set DEFAULT_PREFERENCE to -1 for git recipe
Update from clutter-1.4 to clutter-1.6
add fix_CGL_TEXTURE_RECTANGLE_ARB.patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-graphics/mutter/mutter.inc | 2 +-
.../mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch | 47 ++++++++++++++++++++
meta/recipes-graphics/mutter/mutter_2.28.1.bb | 9 +++-
meta/recipes-graphics/mutter/mutter_git.bb | 1 +
4 files changed, 55 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index 60ceed4..d87c30e 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
LICENSE = "GPLv2"
-DEPENDS = "startup-notification gtk+ gconf clutter-1.4 gdk-pixbuf-native intltool glib-2.0-native"
+DEPENDS = "startup-notification gtk+ gconf clutter-1.6 gdk-pixbuf-native intltool glib-2.0-native"
# gobject-introspection
inherit gnome update-alternatives
diff --git a/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch
new file mode 100644
index 0000000..13197e5
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch
@@ -0,0 +1,47 @@
+Update the usage of CGL_TEXTURE_RECTANGLE_ARB to GL_TEXTURE_RECTANGLE_ARB
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c
+===================================================================
+--- mutter-2.28.1_0.0.orig/src/compositor/mutter-shaped-texture.c
++++ mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c
+@@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter
+ cogl_texture_get_gl_texture (priv->mask_texture,
+ &mask_gl_tex, &mask_gl_target);
+
+- if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB)
++ if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB)
+ glDeleteTextures (1, &mask_gl_tex);
+
+ cogl_texture_unref (priv->mask_texture);
+@@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte
+
+ cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);
+
+- if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB)
++ if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB)
+ {
+ GLuint tex;
+
+ glGenTextures (1, &tex);
+- glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex);
++ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
+ glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width);
+ glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+ glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
+ glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
+- glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0,
++ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
+ GL_ALPHA, tex_width, tex_height,
+ 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data);
+
+ priv->mask_texture
+ = cogl_texture_new_from_foreign (tex,
+- CGL_TEXTURE_RECTANGLE_ARB,
++ GL_TEXTURE_RECTANGLE_ARB,
+ tex_width, tex_height,
+ 0, 0,
+ COGL_PIXEL_FORMAT_A_8);
diff --git a/meta/recipes-graphics/mutter/mutter_2.28.1.bb b/meta/recipes-graphics/mutter/mutter_2.28.1.bb
index e4c185a..50f2647 100644
--- a/meta/recipes-graphics/mutter/mutter_2.28.1.bb
+++ b/meta/recipes-graphics/mutter/mutter_2.28.1.bb
@@ -1,11 +1,14 @@
require mutter.inc
+PR = "r1"
+
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "http://download.moblin.org/sources/mutter/2.28/mutter-2.28.1_0.0.tar.bz2 \
- file://nodocs.patch;patch=1 \
- file://nozenity.patch;patch=1 \
- file://fix_pkgconfig.patch;patch=1 \
+ file://nodocs.patch \
+ file://nozenity.patch \
+ file://fix_pkgconfig.patch \
+ file://fix_CGL_TEXTURE_RECTANGLE_ARB.patch \
"
S = "${WORKDIR}/mutter-2.28.1_0.0"
diff --git a/meta/recipes-graphics/mutter/mutter_git.bb b/meta/recipes-graphics/mutter/mutter_git.bb
index 8d308f1..c3ba32e 100644
--- a/meta/recipes-graphics/mutter/mutter_git.bb
+++ b/meta/recipes-graphics/mutter/mutter_git.bb
@@ -18,3 +18,4 @@ SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
+DEFAULT_PREFERENCE = "-1"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 06/14] recipes: Add Upstream-Status to various recipe patches
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (4 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 05/14] mutter: Recipe Update for clutter 1.6 update Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 07/14] Upstream-Status update for several recipes Saul Wold
` (8 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Scott Garman <scott.a.garman@intel.com>
Add Upstream-Status tag to patches for the following recipes:
openssh
dbus-glib
expat
opensp
sgml-common
at
cpio (GPLv3 version)
libpam
icu
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
.../openssh/openssh-5.6p1/nostrip.patch | 9 ++++++---
.../dbus/dbus-glib-0.92/no-examples.patch | 9 ++++++---
.../recipes-core/expat/expat-2.0.1/autotools.patch | 10 +++++++---
.../opensp/opensp/attributevalue.patch | 3 +++
.../opensp/opensp/fix-docdir.patch | 3 +++
meta/recipes-devtools/opensp/opensp/m4.patch | 3 +++
.../opensp/opensp/rangmap-fix.patch | 3 +++
.../sgml-common/sgml-common-0.6.3/autohell.patch | 3 +++
.../sgml-common/sgml-common-0.6.3/license.patch | 3 +++
meta/recipes-extended/at/at-3.1.12/configure.patch | 8 ++++++--
.../at/at-3.1.12/fix_parallel_build_error.patch | 4 ++++
meta/recipes-extended/cpio/cpio-2.11/statdef.patch | 8 ++++++--
.../pam/libpam/pam-no-innetgr.patch | 5 +++++
meta/recipes-extended/sudo/files/libtool.patch | 10 +++++++---
meta/recipes-support/icu/files/gccfix.patch | 6 ++++++
meta/recipes-support/icu/files/noldlibpath.patch | 5 +++++
.../icu/files/use-g++-for-linking.patch | 7 +++++++
17 files changed, 83 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch b/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch
index a88e18e..7970b6d 100644
--- a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch
+++ b/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch
@@ -1,6 +1,9 @@
-# Disable stripping binaries during make install.
-#
-# Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+Disable stripping binaries during make install.
+
+Upstream-Status: Inappropriate [Other]
+Build system specific.
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff -ur openssh-5.6p1.orig/Makefile.in openssh-5.6p1/Makefile.in
--- openssh-5.6p1.orig/Makefile.in 2010-05-11 23:51:39.000000000 -0700
diff --git a/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch
index 32609b9..fbb4967 100644
--- a/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch
+++ b/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch
@@ -1,6 +1,9 @@
-# disable compiling examples
-#
-# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
+Disable compiling examples
+
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Kevin Tian <kevin.tian@intel.com>
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
index ff1578f..c0ac10b 100644
--- a/meta/recipes-core/expat/expat-2.0.1/autotools.patch
+++ b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
@@ -1,6 +1,10 @@
-# avoid to use expat's own *.m4
-#
-# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-07
+Avoid using expat's m4 files
+
+Upstream-Status: Inappropriate [Other]
+Workaround specific to our build system.
+
+Signed-off-by: Kevin Tian <kevin.tian@intel.com>
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
--- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.000000000 -0600
diff --git a/meta/recipes-devtools/opensp/opensp/attributevalue.patch b/meta/recipes-devtools/opensp/opensp/attributevalue.patch
index 4f3507e..92f5898 100644
--- a/meta/recipes-devtools/opensp/opensp/attributevalue.patch
+++ b/meta/recipes-devtools/opensp/opensp/attributevalue.patch
@@ -1,6 +1,9 @@
Patch obtained from OpenEmbedded.
+Upstream-Status: Pending
+
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
--- OpenSP-1.5/include/Attribute.h~attributevalue 2000-03-09 13:30:56.000000000 -0500
+++ OpenSP-1.5/include/Attribute.h 2004-01-20 14:11:36.000000000 -0500
@@ -31,6 +31,28 @@
diff --git a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch
index 5e2fc8b..c78b9ad 100644
--- a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch
+++ b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch
@@ -1,6 +1,9 @@
Patch obtained from OpenEmbedded.
+Upstream-Status: Pending
+
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
Index: OpenSP-1.5/doc/Makefile.am
===================================================================
--- OpenSP-1.5.orig/doc/Makefile.am 2000-05-06 09:10:32.000000000 +1000
diff --git a/meta/recipes-devtools/opensp/opensp/m4.patch b/meta/recipes-devtools/opensp/opensp/m4.patch
index a8504c5..96a782c 100644
--- a/meta/recipes-devtools/opensp/opensp/m4.patch
+++ b/meta/recipes-devtools/opensp/opensp/m4.patch
@@ -1,6 +1,9 @@
Patch obtained from OpenEmbedded.
+Upstream-Status: Pending
+
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
--- /dev/null 2003-09-23 18:19:32.000000000 -0400
+++ OpenSP-1.5/m4/codeset.m4 2004-01-20 03:01:28.000000000 -0500
@@ -0,0 +1,23 @@
diff --git a/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch b/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
index cc849ca..da31411 100644
--- a/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
+++ b/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
@@ -1,6 +1,9 @@
Patch obtained from OpenEmbedded.
+Upstream-Status: Pending
+
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
Index: OpenSP-1.5/include/RangeMap.cxx
===================================================================
--- OpenSP-1.5.orig/include/RangeMap.cxx 2000-02-26 03:55:21.000000000 +1100
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
index 1366ada..1f39b03 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
+++ b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch
@@ -1,6 +1,9 @@
Patch obtained from OpenEmbedded.
+Upstream-Status: Pending
+
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
--- sgml-common-0.6.3/bin/Makefile.am~autohell.patch 2001-01-30 15:42:21.000000000 +0100
+++ sgml-common-0.6.3/bin/Makefile.am 2004-06-17 11:51:11.000000000 +0200
@@ -1,6 +1,5 @@
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
index ec66aae..54b3f54 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
+++ b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch
@@ -7,7 +7,10 @@ Upstream was notified about this on 2011-01-24. When upgrading
this recipe, this should be fixed and you should remove this
patch.
+Upstream-Status: Pending
+
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
diff -urN sgml-common-0.6.3.orig/LICENSE-GPLv2 sgml-common-0.6.3/LICENSE-GPLv2
--- sgml-common-0.6.3.orig/LICENSE-GPLv2 1969-12-31 16:00:00.000000000 -0800
+++ sgml-common-0.6.3/LICENSE-GPLv2 2011-01-28 17:05:17.299528001 -0800
diff --git a/meta/recipes-extended/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/at-3.1.12/configure.patch
index 2458ef3..079a6b4 100644
--- a/meta/recipes-extended/at/at-3.1.12/configure.patch
+++ b/meta/recipes-extended/at/at-3.1.12/configure.patch
@@ -1,5 +1,9 @@
-# Fix cross-compilation issues in configure.ac
-# Derived from an OE patch for at-3.1.8
+Fix cross-compilation issues in configure.ac
+Derived from an OE patch for at-3.1.8
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Index: at-3.1.12/configure.ac
===================================================================
diff --git a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch
index 6383660..877be35 100644
--- a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch
+++ b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch
@@ -9,6 +9,10 @@ Fixed the issue by adding a dependancy in the makefile.
Nitin <nitin.a.kamble@intel.com>
2010/09/02
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
Index: at-3.1.12/Makefile.in
===================================================================
--- at-3.1.12.orig/Makefile.in
diff --git a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
index dfa0d91..a6b8e82 100644
--- a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
+++ b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch
@@ -1,5 +1,9 @@
-# Avoid multiple stat definitions
-# Patch taken from cpio mailing list posting 2010-03-19
+Avoid multiple stat definitions
+Patch taken from cpio mailing list posting 2010-03-19
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h
--- cpio-2.11.orig/src/filetypes.h 2010-02-12 02:19:23.000000000 -0800
diff --git a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
index e622a0d..5e551ac 100644
--- a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
+++ b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
@@ -2,6 +2,11 @@ innetgr may not be there so make sure that when innetgr is not present
then we inform about it and not use it.
-Khem
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
Index: Linux-PAM-1.1.3/modules/pam_group/pam_group.c
===================================================================
--- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c
diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch
index 2375fc6..22fda53 100644
--- a/meta/recipes-extended/sudo/files/libtool.patch
+++ b/meta/recipes-extended/sudo/files/libtool.patch
@@ -1,6 +1,10 @@
-# Fix path to libtool scripts so autoreconf can succeed.
-#
-# Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+Fix path to libtool scripts so autoreconf can succeed.
+
+Upstream-Status: Inappropriate [Other]
+Workaround specific to our build system.
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4
--- sudo-1.7.4p4.orig//aclocal.m4 2010-08-06 07:17:36.000000000 -0700
+++ sudo-1.7.4p4//aclocal.m4 2010-11-22 14:38:20.360957038 -0800
diff --git a/meta/recipes-support/icu/files/gccfix.patch b/meta/recipes-support/icu/files/gccfix.patch
index 9291e92..755341f 100644
--- a/meta/recipes-support/icu/files/gccfix.patch
+++ b/meta/recipes-support/icu/files/gccfix.patch
@@ -1,3 +1,9 @@
+Fixes an error which prevents compilation
+
+Upstream-Status: Pending
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
Index: source/layoutex/ParagraphLayout.cpp
===================================================================
--- source.orig/layoutex/ParagraphLayout.cpp 2009-06-30 11:48:47.000000000 +0100
diff --git a/meta/recipes-support/icu/files/noldlibpath.patch b/meta/recipes-support/icu/files/noldlibpath.patch
index eba3d80..8543044 100644
--- a/meta/recipes-support/icu/files/noldlibpath.patch
+++ b/meta/recipes-support/icu/files/noldlibpath.patch
@@ -4,6 +4,11 @@ harmless. This is a hack.
RP 10/6/2010
+Upstream-Status: Inappropriate [Other]
+Hacky workaround not likely to be accepted upstream.
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
Index: source/config/Makefile.inc.in
===================================================================
--- source.orig/config/Makefile.inc.in 2010-06-10 21:49:19.000000000 +0100
diff --git a/meta/recipes-support/icu/files/use-g++-for-linking.patch b/meta/recipes-support/icu/files/use-g++-for-linking.patch
index 4702abc..f477dad 100644
--- a/meta/recipes-support/icu/files/use-g++-for-linking.patch
+++ b/meta/recipes-support/icu/files/use-g++-for-linking.patch
@@ -1,3 +1,10 @@
+Use g++ for linking.
+
+Upstream-Status: Inappropriate [Other]
+Build system specific
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
---
tools/genccode/Makefile.in | 2 +-
tools/gencmn/Makefile.in | 2 +-
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 07/14] Upstream-Status update for several recipes
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (5 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 06/14] recipes: Add Upstream-Status to various recipe patches Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 08/14] Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot Saul Wold
` (7 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
- modutils
- module-init-tools
- libacpi
- keymaps
- initscripts
- console-tools
- mesa-demos
- xserver-xf86-lite
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
meta/recipes-bsp/keymaps/files/GPLv2.patch | 2 ++
meta/recipes-bsp/libacpi/files/makefile-fix.patch | 2 ++
.../console-tools-0.3.2/codepage.patch | 1 +
.../console-tools-0.3.2/compile.patch | 2 ++
.../console-tools-0.3.2/configure.patch | 1 +
.../console-tools-0.3.2/kbdrate.patch | 2 ++
.../console-tools-0.3.2/uclibc-fileno.patch | 2 ++
.../initscripts/initscripts-1.0/GPLv2.patch | 2 ++
.../mesa-demos/dso_linking_change_build_fix.patch | 1 +
.../fix_open_max_preprocessor_error.patch | 2 ++
.../module-init-tools/files/disable_man.patch | 2 ++
.../files/grab_module_memset.patch | 2 ++
.../files/ignore_arch_directory.patch | 2 ++
.../files/modutils_extension.patch | 3 +++
.../files/no-static-binaries.patch | 2 ++
meta/recipes-kernel/modutils/files/PD.patch | 2 ++
meta/recipes-kernel/modutils/files/armeb.patch | 2 ++
meta/recipes-kernel/modutils/files/configure.patch | 1 +
meta/recipes-kernel/modutils/files/gcc4.patch | 2 ++
meta/recipes-kernel/modutils/files/lex.l.diff | 2 ++
.../modutils/files/modutils-notest.patch | 2 ++
.../modutils/files/program_prefix.patch | 2 ++
.../modutils/modutils-cross/module.h.diff | 2 ++
23 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-bsp/keymaps/files/GPLv2.patch b/meta/recipes-bsp/keymaps/files/GPLv2.patch
index 2611f22..1ee8181 100644
--- a/meta/recipes-bsp/keymaps/files/GPLv2.patch
+++ b/meta/recipes-bsp/keymaps/files/GPLv2.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d511905
diff --git a/meta/recipes-bsp/libacpi/files/makefile-fix.patch b/meta/recipes-bsp/libacpi/files/makefile-fix.patch
index 9193929..c34ef34 100644
--- a/meta/recipes-bsp/libacpi/files/makefile-fix.patch
+++ b/meta/recipes-bsp/libacpi/files/makefile-fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
---
Makefile | 6 +++---
config.mk | 3 ++-
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
index f6bd91e..c287014 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
index 29012fe..c93f511 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- console-tools-0.3.2/kbdtools/showkey.c~compile 1999-08-25 17:20:08.000000000 -0400
+++ console-tools-0.3.2/kbdtools/showkey.c 2004-05-09 03:03:23.000000000 -0400
@@ -264,7 +264,6 @@
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
index f5b7532..60ee8ff 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
index 47d7ea5..f370be8 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
@@ -1,6 +1,8 @@
Patch from Matthias Goebl <oe@m.goebl.net>
Added via OE bugtracker: bug #478
+Upstream-Status: Pending
+
--- console-tools-0.3.2/kbdtools/kbd_mode.c.orig
+++ console-tools-0.3.2/kbdtools/kbd_mode.c
@@ -29,11 +29,16 @@
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
index c73d8a3..0c95068 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
@@ -1,6 +1,8 @@
Fixing the locale issues isn't enough, console-tools also does a couple of
other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)),
+Upstream-Status: Pending
+
--- console-tools-0.3.2/lib/cfont/fontstruct.c.ark 2005-05-22 19:12:38.000000000 +0000
+++ console-tools-0.3.2/lib/cfont/fontstruct.c 2005-05-22 19:13:23.000000000 +0000
@@ -50,8 +50,7 @@
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch b/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
index 2611f22..1ee8181 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
+++ b/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d511905
diff --git a/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch b/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
index aa2faf9..9b5e952 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
@@ -11,6 +11,7 @@ This patch avoids these linking errors:
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/02/03
+Upstream-Status: Pending
Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am
===================================================================
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
index 565832e..2f62972 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: git/os/osdep.h
===================================================================
--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
diff --git a/meta/recipes-kernel/module-init-tools/files/disable_man.patch b/meta/recipes-kernel/module-init-tools/files/disable_man.patch
index daf5824..95ad9cf 100644
--- a/meta/recipes-kernel/module-init-tools/files/disable_man.patch
+++ b/meta/recipes-kernel/module-init-tools/files/disable_man.patch
@@ -2,6 +2,8 @@
#
# by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
+Upstream-Status: Inappropriate [disable feature]
+
diff --git a/Makefile.am b/Makefile.am
index 6f83c12..32972a8 100644
--- a/Makefile.am
diff --git a/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch b/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
index 9550255..31dc0e9 100644
--- a/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
+++ b/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
@@ -5,6 +5,8 @@
#
# Kevin Tian <kevin.tian@intel.com>, 2010-08-06
+Upstream-Status: Pending
+
diff --git a/depmod.c b/depmod.c
index 647e5e6..46e03e0 100644
--- a/depmod.c
diff --git a/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch b/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
index 7b30824..d29957d 100644
--- a/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
+++ b/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
@@ -2,6 +2,8 @@
#
# comments added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
+Upstream-Status: Pending
+
diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8
--- module-init-tools-3.12/modprobe.8.orig
+++ module-init-tools-3.12/modprobe.8
diff --git a/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch b/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
index 128c953..4a6e0fe 100644
--- a/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
+++ b/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
@@ -1,6 +1,9 @@
# poky uses new name to differentiate from modutils, so reflect this new name in source
#
# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
+
+Upstream-Status: Inappropriate [embedded specific]
+
--- module-init-tools-3.0-pre10.orig/generate-modprobe.conf
+++ module-init-tools-3.0-pre10/generate-modprobe.conf
@@ -45,12 +45,12 @@
diff --git a/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch b/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
index ca83ec0..33fb6e0 100644
--- a/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
+++ b/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
@@ -9,6 +9,8 @@
#
# by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
+Upstream-Status: Pending
+
Index: module-init-tools-3.2.2/Makefile.am
===================================================================
--- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400
diff --git a/meta/recipes-kernel/modutils/files/PD.patch b/meta/recipes-kernel/modutils/files/PD.patch
index 6e7b76a..21ac49c 100644
--- a/meta/recipes-kernel/modutils/files/PD.patch
+++ b/meta/recipes-kernel/modutils/files/PD.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
Index: modutils-initscripts-1.0/LICENSE
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/meta/recipes-kernel/modutils/files/armeb.patch b/meta/recipes-kernel/modutils/files/armeb.patch
index a26a3a2..3198553 100644
--- a/meta/recipes-kernel/modutils/files/armeb.patch
+++ b/meta/recipes-kernel/modutils/files/armeb.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- modutils-2.4.27/include/elf_arm.h.orig 2004-09-21 18:37:00.000000000 -0400
+++ modutils-2.4.27/include/elf_arm.h 2004-09-21 18:38:18.000000000 -0400
@@ -1,7 +1,11 @@
diff --git a/meta/recipes-kernel/modutils/files/configure.patch b/meta/recipes-kernel/modutils/files/configure.patch
index cdf5015..63e80d7 100644
--- a/meta/recipes-kernel/modutils/files/configure.patch
+++ b/meta/recipes-kernel/modutils/files/configure.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
diff --git a/meta/recipes-kernel/modutils/files/gcc4.patch b/meta/recipes-kernel/modutils/files/gcc4.patch
index 53750bc..4507b03 100644
--- a/meta/recipes-kernel/modutils/files/gcc4.patch
+++ b/meta/recipes-kernel/modutils/files/gcc4.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: modutils-2.4.27/depmod/depmod.c
===================================================================
--- modutils-2.4.27.orig/depmod/depmod.c
diff --git a/meta/recipes-kernel/modutils/files/lex.l.diff b/meta/recipes-kernel/modutils/files/lex.l.diff
index 65904b6..b2419a4 100644
--- a/meta/recipes-kernel/modutils/files/lex.l.diff
+++ b/meta/recipes-kernel/modutils/files/lex.l.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- modutils-2.4.26.orig/genksyms/lex.l
+++ modutils-2.4.26/genksyms/lex.l
@@ -130,6 +130,7 @@
diff --git a/meta/recipes-kernel/modutils/files/modutils-notest.patch b/meta/recipes-kernel/modutils/files/modutils-notest.patch
index 0e15a10..ab100f2 100644
--- a/meta/recipes-kernel/modutils/files/modutils-notest.patch
+++ b/meta/recipes-kernel/modutils/files/modutils-notest.patch
@@ -2,6 +2,8 @@ This test disables the annoying
Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep
message.
+Upstream-Status: Inappropriate [disable feature]
+
--- modutils-2.4.6/insmod/modprobe.c~notest Mon Feb 26 02:07:17 2001
+++ modutils-2.4.6/insmod/modprobe.c Wed Feb 19 14:31:52 2003
@@ -785,7 +785,6 @@
diff --git a/meta/recipes-kernel/modutils/files/program_prefix.patch b/meta/recipes-kernel/modutils/files/program_prefix.patch
index 2927a23..973705e 100644
--- a/meta/recipes-kernel/modutils/files/program_prefix.patch
+++ b/meta/recipes-kernel/modutils/files/program_prefix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- modutils-2.4.25/Makefile.common.in Sun Nov 24 21:23:35 2002
+++ modutils-2.4.25/Makefile.common.in Thu Jan 29 17:16:30 2004
@@ -7,6 +7,7 @@
diff --git a/meta/recipes-kernel/modutils/modutils-cross/module.h.diff b/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
index 077baaf..e9f1224 100644
--- a/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
+++ b/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h
--- modutils-2.4.27.orig/include/module.h 2003-01-27 11:22:02.000000000 -0500
+++ modutils-2.4.27/include/module.h 2004-08-23 19:52:34.756772712 -0400
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 08/14] Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot...
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (6 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 07/14] Upstream-Status update for several recipes Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 09/14] linux-yocto: detect and avoid branch revision checking for AUTOREV Saul Wold
` (6 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch | 2 ++
meta/recipes-core/eggdbus/eggdbus/marshal.patch | 2 ++
.../qemu/qemu-git/enable-i386-linux-user.patch | 2 ++
meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch | 2 ++
.../qemu/qemu-git/linker-flags.patch | 3 +++
meta/recipes-devtools/qemu/qemu-git/no-strip.patch | 2 ++
.../qemu/qemu-git/qemu-git-qemugl-host.patch | 2 ++
.../qemu/qemu-git/qemu-vmware-vga-depth.patch | 3 +++
.../qemu-git/qemugl-allow-glxcontext-release.patch | 2 ++
.../gtk+/gtk+-2.12.7/filechooser-props.patch | 2 ++
.../clutter-box2d/fix-disable-introspection.patch | 2 ++
.../screenshot/files/fix_ldadd_order.patch | 3 +++
.../libfm/libfm-0.1.14/use_deprecate_func.patch | 2 ++
13 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
index 0999a85..abd7ff4 100644
--- a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
+++ b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: eggdbus-0.6/docs/eggdbus/Makefile.am
===================================================================
--- eggdbus-0.6.orig/docs/eggdbus/Makefile.am
diff --git a/meta/recipes-core/eggdbus/eggdbus/marshal.patch b/meta/recipes-core/eggdbus/eggdbus/marshal.patch
index 2b2cb49..a605a34 100644
--- a/meta/recipes-core/eggdbus/eggdbus/marshal.patch
+++ b/meta/recipes-core/eggdbus/eggdbus/marshal.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: eggdbus-0.6/src/eggdbus/Makefile.am
===================================================================
--- eggdbus-0.6.orig/src/eggdbus/Makefile.am
diff --git a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch
index 3cf0953..76ed3a8 100644
--- a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch
+++ b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch
@@ -2,6 +2,8 @@ Enable i386-linux-user
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
diff --git a/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch b/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch
index 0219cc8..5a65039 100644
--- a/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch
+++ b/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
diff --git a/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch
index 470cf80..4569643 100644
--- a/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch
+++ b/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch
@@ -7,6 +7,9 @@ More information is available on the Fedora Wiki:
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
JL - 15/06/10
+
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
diff --git a/meta/recipes-devtools/qemu/qemu-git/no-strip.patch b/meta/recipes-devtools/qemu/qemu-git/no-strip.patch
index cf0d659..098070a 100644
--- a/meta/recipes-devtools/qemu/qemu-git/no-strip.patch
+++ b/meta/recipes-devtools/qemu/qemu-git/no-strip.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile
===================================================================
--- qemu-0.14.0.orig/Makefile
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch
index 92467a7..bbc9c9e 100644
--- a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch
+++ b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [other] - qemugl patch need huge changes for upstream
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch
index 42ec98f..c4c5424 100644
--- a/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch
+++ b/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch
@@ -1,6 +1,9 @@
# fix VMware VGA driver depth calculation error, which may cause segmentation fault
#
# ktian1, 06/29/2010
+
+Upstream-Status: Pending
+
Index: qemu-0.14.0/console.h
===================================================================
--- qemu-0.14.0.orig/console.h
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch b/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch
index 478b204..837af5b 100644
--- a/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch
+++ b/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch
@@ -10,6 +10,8 @@ committer Andrzej Zaborowski <andrew.zaborowski@intel.com> Tue, 16 Jun 2009 22:2
target-i386/opengl_exec.c | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/target-i386/opengl_exec.c
===================================================================
--- qemu-0.14.0.orig/target-i386/opengl_exec.c
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
index 7d55f3c..53a0894 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: gtk+-2.12.3/gtk/gtkfilechooser.c
===================================================================
--- gtk+-2.12.3.orig/gtk/gtkfilechooser.c 2007-12-04 16:52:08.000000000 +0000
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
index cfb50dc..58f2729 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
+++ b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
@@ -6,6 +6,8 @@ introspection is disabled.
JL 28/03/11
josh@linux.intel.com
+Upstream-Status: Inappropriate [configuration]
+
Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am
===================================================================
--- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am
diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
index 726d590..7d9689e 100644
--- a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
+++ b/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
@@ -1,6 +1,9 @@
Fix the ordering of LDADD options to fix a compilation failure.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
--- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700
+++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800
diff --git a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
index fade195..79fc9ce 100644
--- a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
+++ b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
--- libfm-0.1.14-orig//src/Makefile.am 2011-04-26 10:01:44.297664993 +0800
+++ libfm-0.1.14/src/Makefile.am 2011-04-26 10:02:10.637665004 +0800
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 09/14] linux-yocto: detect and avoid branch revision checking for AUTOREV
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (7 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 08/14] Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 10/14] Add a new task checklicense and fix some bugs in distro_check.py Saul Wold
` (5 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
When a BSP or layer specifies an AUTOREV for SRCREV, the logic
that matches expected vs real branch heads doesn't apply. We
always want the latest.
To solve the issues with invalid git revs causing validation
failures, we detect the AUTOINC value and do a early return,
skipping validation.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 7 +++++++
.../kern-tools/kern-tools-native_git.bb | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 818a07e..536434f 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -136,6 +136,13 @@ do_validate_branches() {
return
fi
+ # nothing to do if SRCREV=${AUTOREV}
+ if [ "${SRCREV_machine}" = "AUTOINC" ]; then
+ # restore the branch for builds
+ git checkout -f ${KBRANCH}
+ return
+ fi
+
branch_head=`git show-ref -s --heads ${KBRANCH}`
meta_head=`git show-ref -s --heads ${KMETA}`
target_branch_head="${SRCREV_machine}"
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 829d105..f7600ca 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
-SRCREV = "ecbdf3cdf6705a63dcb3c50bb24c311046f0b35c"
+SRCREV = "f8eb067b023d590b6cd8deddf6f96d6a820997af"
PR = r10
PV = "0.1+git${SRCPV}"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 10/14] Add a new task checklicense and fix some bugs in distro_check.py
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (8 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 09/14] linux-yocto: detect and avoid branch revision checking for AUTOREV Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 11/14] base.bbclass: Fix PR increment bug when PR number is a single digit Saul Wold
` (4 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Mei Lei <lei.mei@intel.com>
distro_check.py: Create a new function called create_log_file to reduce a lot of repeat code in distrodata.bbclass.
We needn't to create log file in function save_distro_check_result, because the log file has been generated in check_eventhandler.
Another bug is that we maybe access the /tmp/Meego-1.0 before we create this file.
Add a judge statement to decide whether we need to create this file firstly.
distrodata.bbclass: Add a new task checklicense to collect missing text license information.
This can help package-report system to know how many recipes are missing license text.
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
meta/classes/distrodata.bbclass | 177 ++++++++++++++++++++++-----------------
meta/lib/oe/distro_check.py | 27 ++++--
2 files changed, 119 insertions(+), 85 deletions(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 905dad7..f24cff8 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -4,19 +4,9 @@ addhandler distro_eventhandler
python distro_eventhandler() {
if bb.event.getName(e) == "BuildStarted":
- """initialize log files."""
- logpath = bb.data.getVar('LOG_DIR', e.data, 1)
- bb.utils.mkdirhier(logpath)
- logfile = os.path.join(logpath, "distrodata.%s.csv" % bb.data.getVar('DATETIME', e.data, 1))
- if not os.path.exists(logfile):
- slogfile = os.path.join(logpath, "distrodata.csv")
- if os.path.exists(slogfile):
- os.remove(slogfile)
- os.system("touch %s" % logfile)
- os.symlink(logfile, slogfile)
- bb.data.setVar('LOG_FILE', logfile, e.data)
-
- lf = bb.utils.lockfile(logfile + ".lock")
+ import oe.distro_check as dc
+ logfile = dc.create_log_file(e.data, "distrodata.csv")
+ lf = bb.utils.lockfile("%s.lock" % logfile)
f = open(logfile, "a")
f.write("Package,Description,Owner,License,ChkSum,Status,VerMatch,Version,Upsteam,Non-Update,Reason,Recipe Status\n")
f.close()
@@ -33,9 +23,9 @@ python do_distrodata_np() {
bb.note("Package Name: %s" % pn)
import oe.distro_check as dist_check
- tmpdir = bb.data.getVar('TMPDIR', d, 1)
+ tmpdir = bb.data.getVar('TMPDIR', d, True)
distro_check_dir = os.path.join(tmpdir, "distro_check")
- datetime = bb.data.getVar('DATETIME', localdata, 1)
+ datetime = bb.data.getVar('DATETIME', localdata, True)
dist_check.update_distro_data(distro_check_dir, datetime)
if pn.find("-native") != -1:
@@ -111,15 +101,15 @@ python do_distrodata_np() {
addtask distrodata
do_distrodata[nostamp] = "1"
python do_distrodata() {
- logpath = bb.data.getVar('LOG_DIR', d, 1)
+ logpath = bb.data.getVar('LOG_DIR', d, True)
bb.utils.mkdirhier(logpath)
logfile = os.path.join(logpath, "distrodata.csv")
import oe.distro_check as dist_check
localdata = bb.data.createCopy(d)
- tmpdir = bb.data.getVar('TMPDIR', d, 1)
+ tmpdir = bb.data.getVar('TMPDIR', d, True)
distro_check_dir = os.path.join(tmpdir, "distro_check")
- datetime = bb.data.getVar('DATETIME', localdata, 1)
+ datetime = bb.data.getVar('DATETIME', localdata, True)
dist_check.update_distro_data(distro_check_dir, datetime)
pn = bb.data.getVar("PN", d, True)
@@ -189,7 +179,7 @@ python do_distrodata() {
# do the comparison
result = dist_check.compare_in_distro_packages_list(distro_check_dir, localdata)
- lf = bb.utils.lockfile(logfile + ".lock")
+ lf = bb.utils.lockfile("%s.lock" % logfile)
f = open(logfile, "a")
f.write("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s," % \
(pname, pdesc, maintainer, plicense, pchksum, hasrstatus, vermatch, pcurver, pupver, noupdate, noupdate_reason, rstatus))
@@ -211,19 +201,10 @@ do_distrodataall() {
addhandler checkpkg_eventhandler
python checkpkg_eventhandler() {
if bb.event.getName(e) == "BuildStarted":
- """initialize log files."""
- logpath = bb.data.getVar('LOG_DIR', e.data, 1)
- bb.utils.mkdirhier(logpath)
- logfile = os.path.join(logpath, "checkpkg.%s.csv" % bb.data.getVar('DATETIME', e.data, 1))
- if not os.path.exists(logfile):
- slogfile = os.path.join(logpath, "checkpkg.csv")
- if os.path.exists(slogfile):
- os.remove(slogfile)
- os.system("touch %s" % logfile)
- os.symlink(logfile, slogfile)
- bb.data.setVar('LOG_FILE', logfile, e.data)
-
- lf = bb.utils.lockfile(logfile + ".lock")
+ import oe.distro_check as dc
+ logfile = dc.create_log_file(e.data, "checkpkg.csv")
+
+ lf = bb.utils.lockfile("%s.lock" % logfile)
f = open(logfile, "a")
f.write("Package\tVersion\tUpver\tLicense\tSection\tHome\tRelease\tPriority\tDepends\tBugTracker\tPE\tDescription\tStatus\tTracking\tURI\tMAINTAINER\n")
f.close()
@@ -304,7 +285,7 @@ python do_checkpkg() {
Clear internal url cache as it's a temporary check. Not doing so will have
bitbake check url multiple times when looping through a single url
"""
- fn = bb.data.getVar('FILE', d, 1)
+ fn = bb.data.getVar('FILE', d, True)
bb.fetch2.urldata_cache[fn] = {}
"""
@@ -335,7 +316,7 @@ python do_checkpkg() {
Return new version if success, or else error in "Errxxxx" style
"""
def check_new_dir(url, curver, d):
- pn = bb.data.getVar('PN', d, 1)
+ pn = bb.data.getVar('PN', d, True)
f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-1-" % pn)
status = internal_fetch_wget(url, d, f)
fhtml = f.read()
@@ -394,7 +375,7 @@ python do_checkpkg() {
"""possible to have no version in pkg name, such as spectrum-fw"""
if not re.search("\d+", curname):
return pcurver
- pn = bb.data.getVar('PN', d, 1)
+ pn = bb.data.getVar('PN', d, True)
f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-2-" % pn)
status = internal_fetch_wget(url, d, f)
fhtml = f.read()
@@ -437,35 +418,35 @@ python do_checkpkg() {
f.close()
"""if host hasn't directory information, no need to save tmp file"""
if status != "ErrHostNoDir" and re.match("Err", status):
- logpath = bb.data.getVar('LOG_DIR', d, 1)
+ logpath = bb.data.getVar('LOG_DIR', d, True)
os.system("cp %s %s/" % (f.name, logpath))
os.unlink(f.name)
return status
"""first check whether a uri is provided"""
- src_uri = bb.data.getVar('SRC_URI', d, 1)
+ src_uri = bb.data.getVar('SRC_URI', d, True)
if not src_uri:
return
"""initialize log files."""
- logpath = bb.data.getVar('LOG_DIR', d, 1)
+ logpath = bb.data.getVar('LOG_DIR', d, True)
bb.utils.mkdirhier(logpath)
logfile = os.path.join(logpath, "checkpkg.csv")
"""generate package information from .bb file"""
- pname = bb.data.getVar('PN', d, 1)
- pdesc = bb.data.getVar('DESCRIPTION', d, 1)
- pgrp = bb.data.getVar('SECTION', d, 1)
- pversion = bb.data.getVar('PV', d, 1)
- plicense = bb.data.getVar('LICENSE',d,1)
- psection = bb.data.getVar('SECTION',d,1)
- phome = bb.data.getVar('HOMEPAGE', d, 1)
- prelease = bb.data.getVar('PR',d,1)
- ppriority = bb.data.getVar('PRIORITY',d,1)
- pdepends = bb.data.getVar('DEPENDS',d,1)
- pbugtracker = bb.data.getVar('BUGTRACKER',d,1)
- ppe = bb.data.getVar('PE',d,1)
- psrcuri = bb.data.getVar('SRC_URI',d,1)
+ pname = bb.data.getVar('PN', d, True)
+ pdesc = bb.data.getVar('DESCRIPTION', d, True)
+ pgrp = bb.data.getVar('SECTION', d, True)
+ pversion = bb.data.getVar('PV', d, True)
+ plicense = bb.data.getVar('LICENSE', d, True)
+ psection = bb.data.getVar('SECTION', d, True)
+ phome = bb.data.getVar('HOMEPAGE', d, True)
+ prelease = bb.data.getVar('PR', d, True)
+ ppriority = bb.data.getVar('PRIORITY', d, True)
+ pdepends = bb.data.getVar('DEPENDS', d, True)
+ pbugtracker = bb.data.getVar('BUGTRACKER', d, True)
+ ppe = bb.data.getVar('PE', d, True)
+ psrcuri = bb.data.getVar('SRC_URI', d, True)
found = 0
for uri in src_uri.split():
@@ -483,9 +464,9 @@ python do_checkpkg() {
(type, host, path, user, pswd, parm) = bb.decodeurl(uri)
if type in ['http', 'https', 'ftp']:
- pcurver = bb.data.getVar('PV', d, 1)
+ pcurver = bb.data.getVar('PV', d, True)
else:
- pcurver = bb.data.getVar("SRCREV", d, 1)
+ pcurver = bb.data.getVar("SRCREV", d, True)
if type in ['http', 'https', 'ftp']:
newver = pcurver
@@ -509,7 +490,7 @@ python do_checkpkg() {
newver = check_new_dir(alturi, dirver, d)
altpath = path
if not re.match("Err", newver) and dirver != newver:
- altpath = altpath.replace(dirver, newver, 1)
+ altpath = altpath.replace(dirver, newver, True)
"""Now try to acquire all remote files in current directory"""
if not re.match("Err", newver):
@@ -625,7 +606,7 @@ python do_checkpkg() {
pstatus += ":%s%s" % (host, path)
"""Read from manual distro tracking fields as alternative"""
- pmver = bb.data.getVar("RECIPE_LATEST_VERSION", d, 1)
+ pmver = bb.data.getVar("RECIPE_LATEST_VERSION", d, True)
if not pmver:
pmver = "N/A"
pmstatus = "ErrNoRecipeData"
@@ -639,7 +620,7 @@ python do_checkpkg() {
psrcuri = psrcuri.split()[0]
pdepends = "".join(pdepends.split("\t"))
pdesc = "".join(pdesc.split("\t"))
- lf = bb.utils.lockfile(logfile + ".lock")
+ lf = bb.utils.lockfile("%s.lock" % logfile)
f = open(logfile, "a")
f.write("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" % \
(pname,pversion,pupver,plicense,psection, phome,prelease, ppriority,pdepends,pbugtracker,ppe,pdesc,pstatus,pmver,psrcuri,maintainer))
@@ -654,25 +635,12 @@ do_checkpkgall() {
:
}
-#addhandler check_eventhandler
-python check_eventhandler() {
+addhandler distro_check_eventhandler
+python distro_check_eventhandler() {
if bb.event.getName(e) == "BuildStarted":
- import oe.distro_check as dc
- tmpdir = bb.data.getVar('TMPDIR', e.data, 1)
- distro_check_dir = os.path.join(tmpdir, "distro_check")
- datetime = bb.data.getVar('DATETIME', e.data, 1)
"""initialize log files."""
- logpath = bb.data.getVar('LOG_DIR', e.data, 1)
- bb.utils.mkdirhier(logpath)
- logfile = os.path.join(logpath, "distrocheck.%s.csv" % bb.data.getVar('DATETIME', e.data, 1))
- if not os.path.exists(logfile):
- slogfile = os.path.join(logpath, "distrocheck.csv")
- if os.path.exists(slogfile):
- os.remove(slogfile)
- os.system("touch %s" % logfile)
- os.symlink(logfile, slogfile)
- bb.data.setVar('LOG_FILE', logfile, e.data)
-
+ import oe.distro_check as dc
+ result_file = dc.create_log_file(e.data, "distrocheck.csv")
return
}
@@ -681,18 +649,23 @@ do_distro_check[nostamp] = "1"
python do_distro_check() {
"""checks if the package is present in other public Linux distros"""
import oe.distro_check as dc
+ import bb
+ import shutil
localdata = bb.data.createCopy(d)
bb.data.update_data(localdata)
- tmpdir = bb.data.getVar('TMPDIR', d, 1)
+ tmpdir = bb.data.getVar('TMPDIR', d, True)
distro_check_dir = os.path.join(tmpdir, "distro_check")
- datetime = bb.data.getVar('DATETIME', localdata, 1)
+ logpath = bb.data.getVar('LOG_DIR', d, True)
+ bb.utils.mkdirhier(logpath)
+ result_file = os.path.join(logpath, "distrocheck.csv")
+ datetime = bb.data.getVar('DATETIME', localdata, True)
dc.update_distro_data(distro_check_dir, datetime)
# do the comparison
result = dc.compare_in_distro_packages_list(distro_check_dir, d)
# save the results
- dc.save_distro_check_result(result, datetime, d)
+ dc.save_distro_check_result(result, datetime, result_file, d)
}
addtask distro_checkall after do_distro_check
@@ -701,3 +674,55 @@ do_distro_checkall[nostamp] = "1"
do_distro_checkall() {
:
}
+#
+#Check Missing License Text.
+#Use this task to generate the missing license text data for pkg-report system,
+#then we can search those recipes which license text isn't exsit in common-licenses directory
+#
+addhandler checklicense_eventhandler
+python checklicense_eventhandler() {
+ if bb.event.getName(e) == "BuildStarted":
+ """initialize log files."""
+ import oe.distro_check as dc
+ logfile = dc.create_log_file(e.data, "missinglicense.csv")
+ lf = bb.utils.lockfile("%s.lock" % logfile)
+ f = open(logfile, "a")
+ f.write("Package\tLicense\tMissingLicense\n")
+ f.close()
+ bb.utils.unlockfile(lf)
+ return
+}
+
+addtask checklicense
+do_checklicense[nostamp] = "1"
+python do_checklicense() {
+ import os
+ import bb
+ import shutil
+ logpath = bb.data.getVar('LOG_DIR', d, True)
+ bb.utils.mkdirhier(logpath)
+ pn = bb.data.getVar('PN', d, True)
+ logfile = os.path.join(logpath, "missinglicense.csv")
+ generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True)
+ license_types = bb.data.getVar('LICENSE', d, True)
+ for license_type in ((license_types.replace('+', '').replace('|', '&')
+ .replace('(', '').replace(')', '').replace(';', '')
+ .replace(',', '').replace(" ", "").split("&"))):
+ if not os.path.isfile(os.path.join(generic_directory, license_type)):
+ lf = bb.utils.lockfile("%s.lock" % logfile)
+ f = open(logfile, "a")
+ f.write("%s\t%s\t%s\n" % \
+ (pn,license_types,license_type))
+ f.close()
+ bb.utils.unlockfile(lf)
+ return
+}
+
+addtask checklicenseall after do_checklicense
+do_checklicenseall[recrdeptask] = "do_checklicense"
+do_checklicenseall[nostamp] = "1"
+do_checklicenseall() {
+ :
+}
+
+
diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py
index c85d4fb..55cdcad 100644
--- a/meta/lib/oe/distro_check.py
+++ b/meta/lib/oe/distro_check.py
@@ -73,7 +73,8 @@ def clean_package_list(package_list):
def get_latest_released_meego_source_package_list():
"Returns list of all the name os packages in the latest meego distro"
-
+ if not os.path.isfile("/tmp/Meego-1.0"):
+ os.mknod("/tmp/Meego-1.0")
f = open("/tmp/Meego-1.0", "r")
package_names = []
for line in f:
@@ -341,7 +342,22 @@ def compare_in_distro_packages_list(distro_check_dir, d):
bb.note("Matching: %s" % matching_distros)
return matching_distros
-def save_distro_check_result(result, datetime, d):
+def create_log_file(d, logname):
+ logpath = bb.data.getVar('LOG_DIR', d, True)
+ bb.utils.mkdirhier(logpath)
+ logfn, logsuffix = os.path.splitext(logname)
+ logfile = os.path.join(logpath, "%s.%s%s" % (logfn, bb.data.getVar('DATETIME', d, True), logsuffix))
+ if not os.path.exists(logfile):
+ slogfile = os.path.join(logpath, logname)
+ if os.path.exists(slogfile):
+ os.remove(slogfile)
+ os.system("touch %s" % logfile)
+ os.symlink(logfile, slogfile)
+ bb.data.setVar('LOG_FILE', logfile, d)
+ return logfile
+
+
+def save_distro_check_result(result, datetime, result_file, d):
pn = bb.data.getVar('PN', d, True)
logdir = bb.data.getVar('LOG_DIR', d, True)
if not logdir:
@@ -349,16 +365,9 @@ def save_distro_check_result(result, datetime, d):
return
if not os.path.isdir(logdir):
os.makedirs(logdir)
- result_file = os.path.join(logdir, "distrocheck.%s.csv" % datetime)
line = pn
for i in result:
line = line + "," + i
- if not os.path.exists(result_file):
- sresult_file = os.path.join(logdir, "distrocheck.csv")
- if os.path.exists(sresult_file):
- os.remove(sresult_file)
- os.system("touch %s" % result_file)
- os.symlink(result_file, sresult_file)
f = open(result_file, "a")
import fcntl
fcntl.lockf(f, fcntl.LOCK_EX)
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 11/14] base.bbclass: Fix PR increment bug when PR number is a single digit
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (9 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 10/14] Add a new task checklicense and fix some bugs in distro_check.py Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 12/14] openssh: Don't use ${libdir}exec Saul Wold
` (3 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
PRINC which should add to base PR value has a problem when
the PR is single digit e.g. r0 - r9. Current algorithm
needed atleasts 2 digits to successfully populate end and begin
markers.
We reimplement the incrementing algorithm using regular expressions
which addressed the above mentioned problem and
simplifies the logic a bit and gets rid of loops and conditionals
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/base.bbclass | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d9ed15f..23095ec 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -233,25 +233,18 @@ do_build () {
}
python () {
- import exceptions, string
+ import exceptions, string, re
# If PRINC is set, try and increase the PR value by the amount specified
princ = bb.data.getVar('PRINC', d, True)
if princ:
pr = bb.data.getVar('PR', d, True)
- start = -1
- end = -1
- for i in range(len(pr)):
- if pr[i] in string.digits:
- if start == -1:
- start = i
- else:
- end = i
- if start == -1 or end == -1:
+ pr_prefix = re.search("\D+",pr)
+ prval = re.search("\d+",pr)
+ if pr_prefix is None or prval is None:
bb.error("Unable to analyse format of PR variable: %s" % pr)
- prval = pr[start:end+1]
- prval = int(prval) + int(princ)
- pr = pr[0:start] + str(prval) + pr[end:len(pr)-1]
+ nval = int(prval.group(0)) + int(princ)
+ pr = pr_prefix.group(0) + str(nval) + pr[prval.end():]
bb.data.setVar('PR', pr, d)
pn = bb.data.getVar('PN', d, 1)
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 12/14] openssh: Don't use ${libdir}exec
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (10 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 11/14] base.bbclass: Fix PR increment bug when PR number is a single digit Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-16 21:44 ` [PATCH 13/14] perl-native: create_wrapper on perl${PV} too Saul Wold
` (2 subsequent siblings)
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
This is 1259e0289ce53198cc6c57a9616c8a1623be502a in OE.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/recipes-connectivity/openssh/openssh_5.6p1.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
index d93a773..df7fcad 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
@@ -75,8 +75,8 @@ FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config"
FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
FILES_${PN}-sftp = "${bindir}/sftp"
-FILES_${PN}-sftp-server = "${libdir}exec/sftp-server"
-FILES_${PN}-misc = "${bindir}/ssh* ${libdir}exec/ssh*"
+FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
+FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
FILES_${PN}-keygen = "${bindir}/ssh-keygen"
RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 13/14] perl-native: create_wrapper on perl${PV} too
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (11 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 12/14] openssh: Don't use ${libdir}exec Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-21 23:57 ` Leon Woestenberg
2011-05-16 21:44 ` [PATCH 14/14] linux-yocto: update meta SRCREV Saul Wold
2011-05-17 13:42 ` [PATCH 00/14] 16-May-2011 Consolidated Pull Request Richard Purdie
14 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
perl${PV} becomes hostperl when building for the target so we need a wrapper
on that too.
This is 1e255fbd296e95ff178d66c4a1fe4875a988d7e1 in OE.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/recipes-devtools/perl/perl-native_5.12.3.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
index f477679..cbb4e78 100644
--- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
@@ -97,4 +97,5 @@ do_install () {
done
create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
+ create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
}
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 14/14] linux-yocto: update meta SRCREV
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (12 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 13/14] perl-native: create_wrapper on perl${PV} too Saul Wold
@ 2011-05-16 21:44 ` Saul Wold
2011-05-17 13:42 ` [PATCH 00/14] 16-May-2011 Consolidated Pull Request Richard Purdie
14 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-16 21:44 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the meta branch to pickup two recent commits for
BSP support:
[
commit 79669230fd82a3e7e254cf8b596a2388a4333e62
Author: Tom Zanussi <tom.zanussi@intel.com>
Date: Fri Apr 22 15:55:12 2011 -0500
bsp/crownbay: merge emgd branch
Add scc commands to merge the yocto/emgd branch into the crownbay BSP.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
:100644 100644 89a0725... 0d02b98... M meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
commit ceb1744ec55408cb637929a3f154379e42642890
Author: Tom Zanussi <tom.zanussi@intel.com>
Date: Mon Apr 25 18:15:14 2011 -0500
meta/romley: create initial BSP infrastructure
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
:000000 100644 0000000... 54ec614... A meta/cfg/kernel-cache/bsp/romley/romley-standard.scc
:000000 100644 0000000... 61e5506... A meta/cfg/kernel-cache/bsp/romley/romley.cfg
:000000 100644 0000000... 1c4a657... A meta/cfg/kernel-cache/bsp/romley/romley.scc
commit ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb
index f54033d..3e828c2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_git.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_git.bb
@@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = "7eb6c68d977d9039a2b5a734172b064a9d19cdc1"
SRCREV_machine_qemux86 = "ad62d1aab734513cd96c8f4517f816420a218e77"
SRCREV_machine_qemux86-64 = "b906f358fd404a1e74a961f25079274e0d933ee1"
SRCREV_machine = "b906f358fd404a1e74a961f25079274e0d933ee1"
-SRCREV_meta = "ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5"
+SRCREV_meta = "79669230fd82a3e7e254cf8b596a2388a4333e62"
PR = "r18"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 01/14] task-core-nfs: fix a bitbake error
2011-05-16 21:44 ` [PATCH 01/14] task-core-nfs: fix a bitbake error Saul Wold
@ 2011-05-16 21:56 ` Koen Kooi
0 siblings, 0 replies; 24+ messages in thread
From: Koen Kooi @ 2011-05-16 21:56 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 16 mei 2011, om 23:44 heeft Saul Wold het volgende geschreven:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> THis fixes following issue:
>
> NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils']
> NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils']
>
> [sgw: moved space to _append line]
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-core/tasks/task-core-nfs.bb | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb
> index d5d8291..20e042b 100644
> --- a/meta/recipes-core/tasks/task-core-nfs.bb
> +++ b/meta/recipes-core/tasks/task-core-nfs.bb
> @@ -22,5 +22,5 @@ RDEPENDS_task-core-nfs-server = "\
> # rpcinfo can be useful but only with glibc images
> GLIBC_DEPENDENCIES = "glibc-utils"
>
> -RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}"
> -RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
> +RRECOMMENDS_task-core-nfs-server_append_linux = " ${GLIBC_DEPENDENCIES}"
> +RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = " ${GLIBC_DEPENDENCIES}"
As said in my other mail, those should use the libc-glibc overrides
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 03/14] e2fsprogs_1.41.14.bb: Package libraries into separate packages
2011-05-16 21:44 ` [PATCH 03/14] e2fsprogs_1.41.14.bb: Package libraries into separate packages Saul Wold
@ 2011-05-16 21:58 ` Koen Kooi
0 siblings, 0 replies; 24+ messages in thread
From: Koen Kooi @ 2011-05-16 21:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 16 mei 2011, om 23:44 heeft Saul Wold het volgende geschreven:
> From: Khem Raj <raj.khem@gmail.com>
>
> add libcomerr libss libe2p libext2fs packages
> helps in reducing the root file system size
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../e2fsprogs/e2fsprogs_1.41.14.bb | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
> index d493f6f..91a783d 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
> @@ -39,11 +39,17 @@ do_install () {
> RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks"
>
> PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
> +PACKAGES =+ "libcomerr libss libe2p libext2fs"
> +
> FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
> FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
> FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
> FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
> FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
> FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
> +FILES_libcomerr = "${libdir}/libcom_err.so.*"
> +FILES_libss = "${libdir}/libss.so.*"
> +FILES_libe2p = "${libdir}/libe2p.so.*"
> +FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
That's missing a PR bump
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1
2011-05-16 21:44 ` [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1 Saul Wold
@ 2011-05-16 23:36 ` Richard Purdie
2011-05-17 4:59 ` Martin Jansa
2011-05-17 9:58 ` Phil Blundell
0 siblings, 2 replies; 24+ messages in thread
From: Richard Purdie @ 2011-05-16 23:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-05-16 at 14:44 -0700, Saul Wold wrote:
> From: Yu Ke <ke.yu@intel.com>
>
> - remove the patches
> * xserver-kdrive-1.3.0.0/*: no longer used
> * disable-xf86-dga-xorgcfg.patch: no longer used
> * nodolt.patch: already in upstream
> * enable-xcalibrate.patch: it is invalid now, because XCALIBRATE
> extension has been removed since commit edcceedb
Er, has anyone actually tried touchscreens with these changes,
particularly trying to calibrate a touchscreen under X with xtscal?
As far as I can tell, we can throw away xtscal, libxcalibrate, and
calibrateproto after that change since they need that X extension. Its a
good example of why changes need to get upstream as if the build fix was
there, they'd have had less reason to remove it. We probably are going
to need to rewrite xtscal to use XI2 at this point :/.
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1
2011-05-16 23:36 ` Richard Purdie
@ 2011-05-17 4:59 ` Martin Jansa
2011-05-17 9:58 ` Phil Blundell
1 sibling, 0 replies; 24+ messages in thread
From: Martin Jansa @ 2011-05-17 4:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]
On Tue, May 17, 2011 at 12:36:11AM +0100, Richard Purdie wrote:
> On Mon, 2011-05-16 at 14:44 -0700, Saul Wold wrote:
> > From: Yu Ke <ke.yu@intel.com>
> >
> > - remove the patches
> > * xserver-kdrive-1.3.0.0/*: no longer used
> > * disable-xf86-dga-xorgcfg.patch: no longer used
> > * nodolt.patch: already in upstream
> > * enable-xcalibrate.patch: it is invalid now, because XCALIBRATE
> > extension has been removed since commit edcceedb
>
> Er, has anyone actually tried touchscreens with these changes,
> particularly trying to calibrate a touchscreen under X with xtscal?
>
> As far as I can tell, we can throw away xtscal, libxcalibrate, and
> calibrateproto after that change since they need that X extension. Its a
> good example of why changes need to get upstream as if the build fix was
> there, they'd have had less reason to remove it. We probably are going
> to need to rewrite xtscal to use XI2 at this point :/.
Cannot we use xinput-calibrator like with xserver-xorg?
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1
2011-05-16 23:36 ` Richard Purdie
2011-05-17 4:59 ` Martin Jansa
@ 2011-05-17 9:58 ` Phil Blundell
1 sibling, 0 replies; 24+ messages in thread
From: Phil Blundell @ 2011-05-17 9:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-05-17 at 00:36 +0100, Richard Purdie wrote:
> As far as I can tell, we can throw away xtscal, libxcalibrate, and
> calibrateproto after that change since they need that X extension. Its a
> good example of why changes need to get upstream as if the build fix was
> there, they'd have had less reason to remove it.
It is a bit of a shame that XCALIBRATE has been removed upstream, but
it's fairly self-contained and it wouldn't be all that hard for
oe[-core] to patch it back in again.
> We probably are going to need to rewrite xtscal to use XI2 at this
> point :/.
Yes, or that might be a better answer in the long term. I do have a
certain fondness for XCALIBRATE but it was never an especially elegant
solution to the problem. If XI2 can do the same thing more neatly then
updating xtscal to use it is probably the right thing. Patches welcome
I guess :-}
p.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/14] 16-May-2011 Consolidated Pull Request
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
` (13 preceding siblings ...)
2011-05-16 21:44 ` [PATCH 14/14] linux-yocto: update meta SRCREV Saul Wold
@ 2011-05-17 13:42 ` Richard Purdie
14 siblings, 0 replies; 24+ messages in thread
From: Richard Purdie @ 2011-05-17 13:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-05-16 at 14:43 -0700, Saul Wold wrote:
> This contains the Kernel updates, Upstream-Status updates along with
> some changes from Nitin, Khem, Tom and myself.
>
>
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
> Branch: sgw/stage
> Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
I took most of this except:
Yu Ke (2):
xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1
which I've commented on. xcalibrate needs to be reinstated short term
and we either need to use a different calibration app or patch xtscal to
use XI2 longer term.
> Khem Raj (3):
> e2fsprogs_1.41.14.bb: Package libraries into separate packages
> Tom Rini (2):
> openssh: Don't use ${libdir}exec
I added PR bumps to these...
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 13/14] perl-native: create_wrapper on perl${PV} too
2011-05-16 21:44 ` [PATCH 13/14] perl-native: create_wrapper on perl${PV} too Saul Wold
@ 2011-05-21 23:57 ` Leon Woestenberg
2011-05-22 5:12 ` Khem Raj
0 siblings, 1 reply; 24+ messages in thread
From: Leon Woestenberg @ 2011-05-21 23:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hello,
On Mon, May 16, 2011 at 11:44 PM, Saul Wold <sgw@linux.intel.com> wrote:
> From: Tom Rini <tom_rini@mentor.com>
>
> perl${PV} becomes hostperl when building for the target so we need a wrapper
> on that too.
>
> This is 1e255fbd296e95ff178d66c4a1fe4875a988d7e1 in OE.
>
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
> ---
> meta/recipes-devtools/perl/perl-native_5.12.3.bb | 1 +
> create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
> + create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
> }
> --
Heads up:
Andreas Mueller today reported that this commit breaks his perl build.
See http://article.gmane.org/gmane.comp.handhelds.openembedded/45640
Regards,
--
Leon
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 13/14] perl-native: create_wrapper on perl${PV} too
2011-05-21 23:57 ` Leon Woestenberg
@ 2011-05-22 5:12 ` Khem Raj
2011-05-22 11:52 ` Leon Woestenberg
0 siblings, 1 reply; 24+ messages in thread
From: Khem Raj @ 2011-05-22 5:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Cc: Patches and discussions about the oe-core layer
On May 21, 2011, at 4:57 PM, Leon Woestenberg <leon.woestenberg@gmail.com> wrote:
> Hello,
>
> On Mon, May 16, 2011 at 11:44 PM, Saul Wold <sgw@linux.intel.com> wrote:
>> From: Tom Rini <tom_rini@mentor.com>
>>
>> perl${PV} becomes hostperl when building for the target so we need a wrapper
>> on that too.
>>
>> This is 1e255fbd296e95ff178d66c4a1fe4875a988d7e1 in OE.
>>
>> Signed-off-by: Tom Rini <tom_rini@mentor.com>
>> ---
>> meta/recipes-devtools/perl/perl-native_5.12.3.bb | 1 +
>> create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
>> + create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
>> }
>> --
>
> Heads up:
>
> Andreas Mueller today reported that this commit breaks his perl build.
>
> See http://article.gmane.org/gmane.comp.handhelds.openembedded/45640
>
http://git.openembedded.org/cgit.cgi/openembedded-core/commit/?id=a10bd976f4cef54ac50b0c82f885c17a26e5989f
Has already fixed it in oe-core few days back
> Regards,
> --
> Leon
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 13/14] perl-native: create_wrapper on perl${PV} too
2011-05-22 5:12 ` Khem Raj
@ 2011-05-22 11:52 ` Leon Woestenberg
0 siblings, 0 replies; 24+ messages in thread
From: Leon Woestenberg @ 2011-05-22 11:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hello Khem,
On Sun, May 22, 2011 at 7:12 AM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Andreas Mueller today reported that this commit breaks his perl build.
>>
>> See http://article.gmane.org/gmane.comp.handhelds.openembedded/45640
>>
> http://git.openembedded.org/cgit.cgi/openembedded-core/commit/?id=a10bd976f4cef54ac50b0c82f885c17a26e5989f
>
> Has already fixed it in oe-core few days back
Thanks, the tipping point for oe-core becomes evident :)
Regards,
--
Leon
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2011-05-22 11:55 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-16 21:43 [PATCH 00/14] 16-May-2011 Consolidated Pull Request Saul Wold
2011-05-16 21:44 ` [PATCH 01/14] task-core-nfs: fix a bitbake error Saul Wold
2011-05-16 21:56 ` Koen Kooi
2011-05-16 21:44 ` [PATCH 02/14] opkg: Bump SRCREV to 609 Saul Wold
2011-05-16 21:44 ` [PATCH 03/14] e2fsprogs_1.41.14.bb: Package libraries into separate packages Saul Wold
2011-05-16 21:58 ` Koen Kooi
2011-05-16 21:44 ` [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1 Saul Wold
2011-05-16 23:36 ` Richard Purdie
2011-05-17 4:59 ` Martin Jansa
2011-05-17 9:58 ` Phil Blundell
2011-05-16 21:44 ` [PATCH 05/14] mutter: Recipe Update for clutter 1.6 update Saul Wold
2011-05-16 21:44 ` [PATCH 06/14] recipes: Add Upstream-Status to various recipe patches Saul Wold
2011-05-16 21:44 ` [PATCH 07/14] Upstream-Status update for several recipes Saul Wold
2011-05-16 21:44 ` [PATCH 08/14] Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot Saul Wold
2011-05-16 21:44 ` [PATCH 09/14] linux-yocto: detect and avoid branch revision checking for AUTOREV Saul Wold
2011-05-16 21:44 ` [PATCH 10/14] Add a new task checklicense and fix some bugs in distro_check.py Saul Wold
2011-05-16 21:44 ` [PATCH 11/14] base.bbclass: Fix PR increment bug when PR number is a single digit Saul Wold
2011-05-16 21:44 ` [PATCH 12/14] openssh: Don't use ${libdir}exec Saul Wold
2011-05-16 21:44 ` [PATCH 13/14] perl-native: create_wrapper on perl${PV} too Saul Wold
2011-05-21 23:57 ` Leon Woestenberg
2011-05-22 5:12 ` Khem Raj
2011-05-22 11:52 ` Leon Woestenberg
2011-05-16 21:44 ` [PATCH 14/14] linux-yocto: update meta SRCREV Saul Wold
2011-05-17 13:42 ` [PATCH 00/14] 16-May-2011 Consolidated Pull Request Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.