diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch')
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch deleted file mode 100644 index 113f1cc584..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- - Xext/Makefile.am | 6 ++++++ - configure.ac | 9 ++++++++- - include/kdrive-config.h.in | 3 +++ - mi/miinitext.c | 6 ++++++ - 4 files changed, 23 insertions(+), 1 deletion(-) - -Index: xorg-server-1.4/mi/miinitext.c -=================================================================== ---- xorg-server-1.4.orig/mi/miinitext.c 2007-08-23 21:04:54.000000000 +0200 -+++ xorg-server-1.4/mi/miinitext.c 2007-09-06 23:25:35.000000000 +0200 -@@ -374,6 +374,9 @@ - #ifdef DMXEXT - extern void DMXExtensionInit(INITARGS); - #endif -+#ifdef XCALIBRATE -+extern void XCalibrateExtensionInit(INITARGS); -+#endif - #ifdef XEVIE - extern void XevieExtensionInit(INITARGS); - #endif -@@ -666,6 +669,9 @@ - #ifdef DAMAGE - if (!noDamageExtension) DamageExtensionInit(); - #endif -+#ifdef XCALIBRATE -+ XCalibrateExtensionInit (); -+#endif - } - - void -Index: xorg-server-1.4/configure.ac -=================================================================== ---- xorg-server-1.4.orig/configure.ac 2007-09-06 23:25:15.000000000 +0200 -+++ xorg-server-1.4/configure.ac 2007-09-06 23:26:40.000000000 +0200 -@@ -500,6 +500,7 @@ - AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto]) - 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]) -@@ -787,6 +788,12 @@ - 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]) -@@ -1841,7 +1848,7 @@ - ;; - esac - KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' -- KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" -+ KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB" - KDRIVE_LIBS="$XSERVERLIBS_LIBS $TSLIB_LIBS $KDRIVE_LOCAL_LIBS" - - # check if we can build Xephyr -Index: xorg-server-1.4/include/kdrive-config.h.in -=================================================================== ---- xorg-server-1.4.orig/include/kdrive-config.h.in 2007-08-23 21:04:54.000000000 +0200 -+++ xorg-server-1.4/include/kdrive-config.h.in 2007-09-06 23:25:35.000000000 +0200 -@@ -31,4 +31,7 @@ - /* Have execinfo.h for backtrace(). */ - #undef HAVE_EXECINFO_H - -+/* Enable XCalibrate extension */ -+#undef XCALIBRATE -+ - #endif /* _KDRIVE_CONFIG_H_ */ |