summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-05-09 17:05:25 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-05-09 17:05:25 +0000
commitfbf4ba6b29527b913aa98a1ed5794ebdfb5ef625 (patch)
tree4e92eb9a63ac0850735297af979c015a54a8c75d /meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0
parent082a34fa0b1840116109c88ad24a11f4bfa51484 (diff)
downloadpoky-fbf4ba6b29527b913aa98a1ed5794ebdfb5ef625.tar.gz
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')
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch39
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch11
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch12
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch51
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch58
5 files changed, 171 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch
new file mode 100644
index 0000000000..ccc19139c8
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch
@@ -0,0 +1,39 @@
1Index: xorg-server-1.3.0.0/configure.ac
2===================================================================
3--- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200
4+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200
5@@ -520,7 +520,11 @@
6 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
7
8 dnl Core modules for most extensions, et al.
9+if test "$KDRIVE" = yes; then
10+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
11+else
12 REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
13+fi
14 REQUIRED_LIBS="xfont xau fontenc"
15
16 AM_CONDITIONAL(XV, [test "x$XV" = xyes])
17@@ -1603,7 +1607,9 @@
18 AC_SUBST(XKB_COMPILED_DIR)
19
20 dnl and the rest of these are generic, so they're in config.h
21+if test ! x"$KDRIVE" = xyes; then
22 AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
23+fi
24 AC_DEFINE(XResExtension, 1, [Build XRes extension])
25
26 AC_TRY_COMPILE([
27@@ -1616,10 +1622,12 @@
28
29 AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
30
31+if test ! "x$KDRIVE" = xyes ; then
32 dnl xorgconfig CLI configuration utility
33 PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
34 AC_SUBST(XORGCONFIG_DEP_CFLAGS)
35 AC_SUBST(XORGCONFIG_DEP_LIBS)
36+fi
37
38 dnl xorgcfg GUI configuration utility
39 AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
new file mode 100644
index 0000000000..8ec3a37c78
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
@@ -0,0 +1,11 @@
1Index: xorg-server-1.2.0/hw/kdrive/Makefile.am
2===================================================================
3--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200
4+++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200
5@@ -1,5 +1,5 @@
6 if KDRIVEFBDEV
7-FBDEV_SUBDIRS = fbdev
8+FBDEV_SUBDIRS = fbdev epson
9 endif
10
11 if KDRIVEIMAGEON
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
new file mode 100644
index 0000000000..9a59530ed3
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
@@ -0,0 +1,12 @@
1Index: xorg-server-1.2.0/configure.ac
2===================================================================
3--- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200
4+++ xorg-server-1.2.0/configure.ac 2007-03-29 13:28:35.000000000 +0200
5@@ -1517,6 +1517,7 @@
6 AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
7 fi
8 AC_DEFINE(TSLIB, 1, [Have tslib support])
9+ AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support])
10 fi
11
12 # damage shadow extension glx (NOTYET) fb mi
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 @@
1Index: xorg-server-1.2.0/mi/miinitext.c
2===================================================================
3--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100
4+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-30 11:28:44.000000000 +0200
5@@ -372,6 +372,9 @@
6 #ifdef DMXEXT
7 extern void DMXExtensionInit(INITARGS);
8 #endif
9+#ifdef XCALIBRATE
10+extern void XCalibrateExtensionInit(INITARGS);
11+#endif
12 #ifdef XEVIE
13 extern void XevieExtensionInit(INITARGS);
14 #endif
15@@ -663,6 +666,9 @@
16 #ifdef DAMAGE
17 if (!noDamageExtension) DamageExtensionInit();
18 #endif
19+#ifdef XCALIBRATE
20+ XCalibrateExtensionInit ();
21+#endif
22 }
23
24 void
25Index: xorg-server-1.2.0/include/kdrive-config.h.in
26===================================================================
27--- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-03-30 11:31:07.000000000 +0200
28+++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-30 11:34:09.000000000 +0200
29@@ -22,6 +22,9 @@
30 /* Support tslib touchscreen abstraction library */
31 #undef TSLIB
32
33+/* Build XCalibrate extension */
34+#undef XCALIBRATE
35+
36 /* Verbose debugging output hilarity */
37 #undef DEBUG
38
39Index: xorg-server-1.2.0/configure.ac
40===================================================================
41--- xorg-server-1.2.0.orig/configure.ac 2007-03-30 12:47:25.000000000 +0200
42+++ xorg-server-1.2.0/configure.ac 2007-03-30 12:39:01.000000000 +0200
43@@ -1540,7 +1540,7 @@
44 ;;
45 esac
46 KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
47- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS"
48+ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS"
49
50 # check if we can build Xephyr
51 PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
new file mode 100644
index 0000000000..a580b500b7
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
@@ -0,0 +1,58 @@
1Index: xorg-server-1.2.0/Makefile.am
2===================================================================
3--- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100
4+++ xorg-server-1.2.0/Makefile.am 2007-03-28 20:26:19.000000000 +0200
5@@ -30,6 +30,10 @@
6 XINPUT_DIR=Xi
7 endif
8
9+if XKB
10+XKB_DIR=xkb
11+endif
12+
13 if DBE
14 DBE_DIR=dbe
15 endif
16@@ -46,7 +50,7 @@
17 randr \
18 render \
19 $(XINPUT_DIR) \
20- xkb \
21+ $(XKB_DIR) \
22 $(DBE_DIR) \
23 $(MFB_DIR) \
24 $(AFB_DIR) \
25Index: xorg-server-1.2.0/configure.ac
26===================================================================
27--- xorg-server-1.2.0.orig/configure.ac 2007-01-23 06:39:15.000000000 +0100
28+++ xorg-server-1.2.0/configure.ac 2007-03-28 20:27:13.000000000 +0200
29@@ -428,6 +428,7 @@
30 AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
31 AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
32 AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
33+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
34
35 dnl DDXes.
36 AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
37@@ -754,12 +755,15 @@
38
39 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
40
41-AC_DEFINE(XKB, 1, [Build XKB])
42-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
43-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
44-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
45-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
46-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
47+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
48+if test "x$XKB" = xyes; then
49+ AC_DEFINE(XKB, 1, [Build XKB])
50+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
51+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
52+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
53+ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
54+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
55+fi
56
57 AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
58 [Do not have `strcasecmp'.]))
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 02:00:11 +0000