diff options
Diffstat (limited to 'recipes/xorg-xserver/xserver-kdrive-1.5.3/enable-xcalibrate.patch')
| -rw-r--r-- | recipes/xorg-xserver/xserver-kdrive-1.5.3/enable-xcalibrate.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.5.3/enable-xcalibrate.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/enable-xcalibrate.patch new file mode 100644 index 0000000000..ed6c5dcf8f --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/enable-xcalibrate.patch @@ -0,0 +1,58 @@ +diff -ur xorg-server-1.5.3-blah/configure.ac xorg-server-1.5.3/configure.ac +--- xorg-server-1.5.3-blah/configure.ac 2010-07-01 09:54:18.000000000 +0930 ++++ xorg-server-1.5.3/configure.ac 2010-07-01 09:59:24.000000000 +0930 +@@ -544,6 +544,7 @@ + AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes]) + AC_ARG_ENABLE(xselinux, AS_HELP_STRING([--disable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no]) + AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no]) ++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: disabled)]), [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]) +@@ -906,6 +907,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]) +diff -ur xorg-server-1.5.3-blah/include/kdrive-config.h.in xorg-server-1.5.3/include/kdrive-config.h.in +--- xorg-server-1.5.3-blah/include/kdrive-config.h.in 2010-07-01 09:54:18.000000000 +0930 ++++ xorg-server-1.5.3/include/kdrive-config.h.in 2010-07-01 09:55:02.000000000 +0930 +@@ -31,4 +31,7 @@ + /* Have execinfo.h for backtrace(). */ + #undef HAVE_EXECINFO_H + ++/* Enable XCalibrate extension */ ++#undef XCALIBRATE ++ + #endif /* _KDRIVE_CONFIG_H_ */ +diff -ur xorg-server-1.5.3-blah/mi/miinitext.c xorg-server-1.5.3/mi/miinitext.c +--- xorg-server-1.5.3-blah/mi/miinitext.c 2010-07-01 09:54:17.000000000 +0930 ++++ xorg-server-1.5.3/mi/miinitext.c 2010-07-01 09:55:02.000000000 +0930 +@@ -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 +@@ -664,6 +667,9 @@ + GlxPushProvider(&__glXDRISWRastProvider); + if (!noGlxExtension) GlxExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void |