diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-05-09 17:05:25 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-05-09 17:05:25 +0000 |
| commit | fbf4ba6b29527b913aa98a1ed5794ebdfb5ef625 (patch) | |
| tree | 4e92eb9a63ac0850735297af979c015a54a8c75d /meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch | |
| parent | 082a34fa0b1840116109c88ad24a11f4bfa51484 (diff) | |
| download | openembedded-core-fbf4ba6b29527b913aa98a1ed5794ebdfb5ef625.tar.gz openembedded-core-fbf4ba6b29527b913aa98a1ed5794ebdfb5ef625.tar.bz2 openembedded-core-fbf4ba6b29527b913aa98a1ed5794ebdfb5ef625.zip | |
xserver-kdrive: added 1.3.0.0
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1684 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 | 51 |
1 files changed, 51 insertions, 0 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 new file mode 100644 index 0000000000..11931f83d6 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch @@ -0,0 +1,51 @@ +Index: xorg-server-1.2.0/mi/miinitext.c +=================================================================== +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-30 11:28:44.000000000 +0200 +@@ -372,6 +372,9 @@ + #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 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void +Index: xorg-server-1.2.0/include/kdrive-config.h.in +=================================================================== +--- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-03-30 11:31:07.000000000 +0200 ++++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-30 11:34:09.000000000 +0200 +@@ -22,6 +22,9 @@ + /* Support tslib touchscreen abstraction library */ + #undef TSLIB + ++/* Build XCalibrate extension */ ++#undef XCALIBRATE ++ + /* Verbose debugging output hilarity */ + #undef DEBUG + +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-30 12:47:25.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-30 12:39:01.000000000 +0200 +@@ -1540,7 +1540,7 @@ + ;; + 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"]) |