diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-01-11 13:59:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-01-11 13:59:40 +0000 |
| commit | d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac (patch) | |
| tree | f12ce9d720848e595a3a26b20f64df4d63d1d4c0 /meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch | |
| parent | a30424c269479d1e722932c24f1c7e260914c390 (diff) | |
| download | openembedded-core-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.tar.gz openembedded-core-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.tar.bz2 openembedded-core-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.tar.xz openembedded-core-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.zip | |
xserver-kdrive: Remove bogus fbdev patch, merge kmode patches, add a patch to allow the existing framebuffer mode to be reused if appropriate
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3466 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch')
| -rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch index 717e72f93..5a971002c 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch @@ -1,14 +1,14 @@ --- Xext/Makefile.am | 6 ++++++ - configure.ac | 9 ++++++++- + configure.ac | 11 +++++++++-- include/kdrive-config.h.in | 3 +++ mi/miinitext.c | 6 ++++++ - 4 files changed, 23 insertions(+), 1 deletion(-) + 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 2007-05-15 16:05:34.000000000 +0100 -+++ xorg-server-1.3.0.0/mi/miinitext.c 2007-05-15 16:05:39.000000000 +0100 +--- 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); @@ -31,8 +31,8 @@ Index: xorg-server-1.3.0.0/mi/miinitext.c void Index: xorg-server-1.3.0.0/configure.ac =================================================================== ---- xorg-server-1.3.0.0.orig/configure.ac 2007-05-15 16:05:34.000000000 +0100 -+++ xorg-server-1.3.0.0/configure.ac 2007-05-15 16:17:54.000000000 +0100 +--- 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]) @@ -54,6 +54,15 @@ Index: xorg-server-1.3.0.0/configure.ac 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 @@ -65,8 +74,8 @@ Index: xorg-server-1.3.0.0/configure.ac 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 2007-05-15 16:05:34.000000000 +0100 -+++ xorg-server-1.3.0.0/include/kdrive-config.h.in 2007-05-15 16:05:39.000000000 +0100 +--- 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 @@ -77,8 +86,8 @@ Index: xorg-server-1.3.0.0/include/kdrive-config.h.in #endif /* _KDRIVE_CONFIG_H_ */ Index: xorg-server-1.3.0.0/Xext/Makefile.am =================================================================== ---- xorg-server-1.3.0.0.orig/Xext/Makefile.am 2007-05-15 16:05:34.000000000 +0100 -+++ xorg-server-1.3.0.0/Xext/Makefile.am 2007-05-15 16:05:39.000000000 +0100 +--- 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 |