From 8f83fbaf488b94d22fe52927b573283ba9817de9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 15 May 2007 15:29:03 +0000 Subject: xserver-kdrive 1.3.0: Fix xcalibrate patch, disable w100 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1727 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../xserver-kdrive-1.3.0.0/enable-xcalibrate.patch | 92 +++++++++++++++++----- .../xorg-xserver/xserver-kdrive-common.inc | 2 +- .../xorg-xserver/xserver-kdrive_1.3.0.0.bb | 11 +-- 3 files changed, 74 insertions(+), 31 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 11931f83d..717e72f93 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,8 +1,15 @@ -Index: xorg-server-1.2.0/mi/miinitext.c +--- + 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.3.0.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 @@ +--- 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 +@@ -372,6 +372,9 @@ extern void ResExtensionInit(INITARGS); #ifdef DMXEXT extern void DMXExtensionInit(INITARGS); #endif @@ -12,7 +19,7 @@ Index: xorg-server-1.2.0/mi/miinitext.c #ifdef XEVIE extern void XevieExtensionInit(INITARGS); #endif -@@ -663,6 +666,9 @@ +@@ -663,6 +666,9 @@ InitExtensions(argc, argv) #ifdef DAMAGE if (!noDamageExtension) DamageExtensionInit(); #endif @@ -22,25 +29,32 @@ Index: xorg-server-1.2.0/mi/miinitext.c } void -Index: xorg-server-1.2.0/include/kdrive-config.h.in +Index: xorg-server-1.3.0.0/configure.ac =================================================================== ---- 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 +--- 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 +@@ -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]) + 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]) +@@ -653,6 +654,12 @@ if test "x$XCSECURITY" = xyes; then + AC_DEFINE(XCSECURITY, 1, [Build Security extension]) + fi -+/* Build XCalibrate extension */ -+#undef XCALIBRATE ++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 + - /* 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 @@ + AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) + if test "x$XEVIE" = xyes; then + AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) +@@ -1547,7 +1554,7 @@ if test "$KDRIVE" = yes; then ;; esac KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' @@ -49,3 +63,39 @@ Index: xorg-server-1.2.0/configure.ac # check if we can build Xephyr 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 +@@ -25,4 +25,7 @@ + /* Verbose debugging output hilarity */ + #undef DEBUG + ++/* Enable XCalibrate extension */ ++#undef XCALIBRATE ++ + #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 +@@ -91,6 +91,11 @@ BUILTIN_SRCS += $(XCALIBRATE_SRCS) + # XCalibrare needs tslib + endif + ++XCALIBRATE_SRCS = xcalibrate.c ++if XCALIBRATE ++BUILTIN_SRCS += $(XCALIBRATE_SRCS) ++endif ++ + # X EVent Interception Extension: allows accessibility helpers & composite + # managers to intercept events from input devices and transform as needed + # before the clients see them. +@@ -169,6 +174,7 @@ EXTRA_DIST = \ + $(XCSECURITY_SRCS) \ + $(XCALIBRATE_SRCS) \ + $(XINERAMA_SRCS) \ ++ $(XCALIBRATE_SRCS) \ + $(XEVIE_SRCS) \ + $(XPRINT_SRCS) \ + $(APPGROUP_SRCS) \ diff --git a/meta/packages/xorg-xserver/xserver-kdrive-common.inc b/meta/packages/xorg-xserver/xserver-kdrive-common.inc index f3db2ef0e..ff894586a 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/meta/packages/xorg-xserver/xserver-kdrive-common.inc @@ -117,7 +117,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} ${IMAGEON_OECONF} \ + --disable-dmx \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 831ccec08..59ee2a7c2 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,17 +3,10 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r7" +PR = "r9" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ - file://enable-xcalibrate.patch;patch=1 \ - file://w100.patch;patch=1 \ - file://w100-fix-offscreen-bmp.patch;patch=1 \ - " + file://enable-xcalibrate.patch;patch=1 " S = "${WORKDIR}/xorg-server-${PV}" - -W100_OECONF = "--disable-w100" -W100_OECONF_arm = "--enable-w100" - -- cgit v1.2.3