merge of '602d19aed9d02d401cb3e6abec9352a3eeb76eb6'

     and 'b55671f42355ca7d007393b54ff28e7bb5396af5'

9 files changed, 75 insertions, 12 deletions

diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/.mtn2git_empty
diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch
index 4b7e41e3e9..4b7e41e3e9 100644
--- a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch
+++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/disable-xf86-dga-xorgcfg.patch
diff --git a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch
index 8ec3a37c78..8ec3a37c78 100644
--- a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch
+++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-epson.patch
diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch
new file mode 100644
index 0000000000..1e72a3ea53
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch
@@ -0,0 +1,28 @@
+Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am
+===================================================================
+--- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am	2007-03-29 11:53:24.000000000 +0200
++++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am	2007-03-29 11:53:27.000000000 +0200
+@@ -6,6 +6,10 @@
+ 
+ bin_PROGRAMS = Xfbdev
+ 
++if TSLIB
++TSLIB_FLAG = -lts
++endif
++
+ libfbdev_a_SOURCES =	\
+ 	fbdev.c		\
+ 	fbdev.h
+@@ -16,7 +20,10 @@
+ Xfbdev_LDADD = 						\
+ 	libfbdev.a					\
+ 	@KDRIVE_LIBS@					\
+-	@XSERVER_LIBS@					
++	@XSERVER_LIBS@					\
++	$(TSLIB_FLAG)
+ 
+ Xfbdev_DEPENDENCIES =					\
+-	libfbdev.a
++	libfbdev.a					\
++	@KDRIVE_LIBS@					
++
diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch
new file mode 100644
index 0000000000..aec94a3a6d
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch
@@ -0,0 +1,24 @@
+Index: xorg-server-1.2.0/mi/miinitext.c
+===================================================================
+--- xorg-server-1.2.0.orig/mi/miinitext.c	2007-03-29 11:32:40.000000000 +0200
++++ xorg-server-1.2.0/mi/miinitext.c	2007-03-29 11:33:22.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
diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc
index 3cb038648e..72c2a87b32 100644
--- a/packages/xorg-xserver/xserver-kdrive-common.inc
+++ b/packages/xorg-xserver/xserver-kdrive-common.inc
@@ -96,7 +96,10 @@ KDRIVE_COMMON_PATCHES = " \
 	file://kdrive-use-evdev.patch;patch=1  \
 	file://fbdev-not-fix.patch;patch=1  \
 	file://enable-builtin-fonts.patch;patch=1 \
+	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
 	file://optional-xkb.patch;patch=1 \
+	file://enable-epson.patch;patch=1 \
+	file://enable-tslib.patch;patch=1 \
 	file://kmode-palm.patch;patch=1 \
 	"
 
diff --git a/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch b/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch
new file mode 100644
index 0000000000..f919b48f0e
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch
@@ -0,0 +1,18 @@
+Index: git/composite/compext.c
+===================================================================
+--- git.orig/composite/compext.c	2007-03-28 16:25:12.000000000 +0200
++++ git/composite/compext.c	2007-03-28 16:25:15.000000000 +0200
+@@ -696,11 +696,13 @@
+ 	if (GetPictureScreenIfSet(pScreen) == NULL)
+ 	    return;
+     }
++#ifdef PANORAMIX
+     /* Xinerama's rewriting of window drawing before Composite gets to it
+      * breaks Composite.
+      */
+     if (!noPanoramiXExtension)
+ 	return;
++#endif
+ 
+     CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow);
+     if (!CompositeClientWindowType)
diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
index ac276a8e60..d4c01f240a 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -3,19 +3,12 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r1"
-
-PACKAGES =+ "xserver-kdrive-imageon"
+PR = "r2"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \
-	file://enable-epson-1.2.patch;patch=1 \
-        file://kdrive-vidmemarea.patch;patch=1 \
-        file://kdrive-imageon.patch;patch=1 \
+	file://enable-xcalibrate.patch;patch=1 \
 	"
 
 S = "${WORKDIR}/xorg-server-${PV}"
 
-IMAGEON_OECONF = "--disable-imageon"
-IMAGEON_OECONF_arm = "--enable-imageon"
diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index 1aff9cdf79..3f97527553 100644
--- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -8,10 +8,7 @@ PACKAGES =+ "xserver-kdrive-w100"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
 	file://xcalibrate.patch;patch=1 \
-	file://enable-epson.patch;patch=1 \
-	file://enable-tslib.patch;patch=1 \
 	file://w100.patch;patch=1 \
 	"