[oe-commits] Graham Gower : xserver-kdrive_1.5.3.bb: enable the XCALIBRATE extension.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: ae74452a585e6295b016d5ea74d394589f4d49eb
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ae74452a585e6295b016d5ea74d394589f4d49eb

Author: Graham Gower <graham.gower at gmail.com>
Date:   Wed Jun 30 14:59:50 2010 +0000

xserver-kdrive_1.5.3.bb: enable the XCALIBRATE extension.

Signed-off-by: Graham Gower <graham.gower at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 .../xserver-kdrive-1.5.3/enable-xcalibrate.patch   |   58 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-kdrive_1.5.3.bb       |    3 +-
 2 files changed, 60 insertions(+), 1 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 0000000..ed6c5dc
--- /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
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
index 7fbdff2..9fa5579 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
@@ -6,7 +6,7 @@ RDEPENDS_${PN} += "hal"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -21,6 +21,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://drmfix.patch \
 	file://no_xkb.patch \
 	file://keyboard_device.patch \
+	file://enable-xcalibrate.patch \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"