summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch110
1 files changed, 110 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
new file mode 100644
index 0000000000..5a971002cd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
@@ -0,0 +1,110 @@
1---
2 Xext/Makefile.am | 6 ++++++
3 configure.ac | 11 +++++++++--
4 include/kdrive-config.h.in | 3 +++
5 mi/miinitext.c | 6 ++++++
6 4 files changed, 24 insertions(+), 2 deletions(-)
7
8Index: xorg-server-1.3.0.0/mi/miinitext.c
9===================================================================
10--- xorg-server-1.3.0.0.orig/mi/miinitext.c 2006-11-16 18:01:26.000000000 +0000
11+++ xorg-server-1.3.0.0/mi/miinitext.c 2008-01-11 13:45:57.000000000 +0000
12@@ -372,6 +372,9 @@ extern void ResExtensionInit(INITARGS);
13 #ifdef DMXEXT
14 extern void DMXExtensionInit(INITARGS);
15 #endif
16+#ifdef XCALIBRATE
17+extern void XCalibrateExtensionInit(INITARGS);
18+#endif
19 #ifdef XEVIE
20 extern void XevieExtensionInit(INITARGS);
21 #endif
22@@ -663,6 +666,9 @@ InitExtensions(argc, argv)
23 #ifdef DAMAGE
24 if (!noDamageExtension) DamageExtensionInit();
25 #endif
26+#ifdef XCALIBRATE
27+ XCalibrateExtensionInit ();
28+#endif
29 }
30
31 void
32Index: xorg-server-1.3.0.0/configure.ac
33===================================================================
34--- xorg-server-1.3.0.0.orig/configure.ac 2008-01-11 13:45:57.000000000 +0000
35+++ xorg-server-1.3.0.0/configure.ac 2008-01-11 13:45:58.000000000 +0000
36@@ -421,6 +421,7 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_ST
37 AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
38 AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
39 AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=$XACE])
40+AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
41 AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
42 AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
43 AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
44@@ -653,6 +654,12 @@ if test "x$XCSECURITY" = xyes; then
45 AC_DEFINE(XCSECURITY, 1, [Build Security extension])
46 fi
47
48+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
49+if test "x$XCALIBRATE" = xyes; then
50+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
51+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
52+fi
53+
54 AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
55 if test "x$XEVIE" = xyes; then
56 AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
57@@ -1519,7 +1526,7 @@ if test "$KDRIVE" = yes; then
58
59 # tslib...
60 if test "x$TSLIB" = xyes; then
61- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
62+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
63 if test "x$HAVE_TSLIB" = xno; then
64 AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
65 fi
66@@ -1547,7 +1554,7 @@ if test "$KDRIVE" = yes; then
67 ;;
68 esac
69 KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
70- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS"
71+ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS"
72
73 # check if we can build Xephyr
74 PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
75Index: xorg-server-1.3.0.0/include/kdrive-config.h.in
76===================================================================
77--- xorg-server-1.3.0.0.orig/include/kdrive-config.h.in 2006-11-16 18:01:26.000000000 +0000
78+++ xorg-server-1.3.0.0/include/kdrive-config.h.in 2008-01-11 13:45:57.000000000 +0000
79@@ -25,4 +25,7 @@
80 /* Verbose debugging output hilarity */
81 #undef DEBUG
82
83+/* Enable XCalibrate extension */
84+#undef XCALIBRATE
85+
86 #endif /* _KDRIVE_CONFIG_H_ */
87Index: xorg-server-1.3.0.0/Xext/Makefile.am
88===================================================================
89--- xorg-server-1.3.0.0.orig/Xext/Makefile.am 2006-10-25 01:25:19.000000000 +0100
90+++ xorg-server-1.3.0.0/Xext/Makefile.am 2008-01-11 13:45:57.000000000 +0000
91@@ -91,6 +91,11 @@ BUILTIN_SRCS += $(XCALIBRATE_SRCS)
92 # XCalibrare needs tslib
93 endif
94
95+XCALIBRATE_SRCS = xcalibrate.c
96+if XCALIBRATE
97+BUILTIN_SRCS += $(XCALIBRATE_SRCS)
98+endif
99+
100 # X EVent Interception Extension: allows accessibility helpers & composite
101 # managers to intercept events from input devices and transform as needed
102 # before the clients see them.
103@@ -169,6 +174,7 @@ EXTRA_DIST = \
104 $(XCSECURITY_SRCS) \
105 $(XCALIBRATE_SRCS) \
106 $(XINERAMA_SRCS) \
107+ $(XCALIBRATE_SRCS) \
108 $(XEVIE_SRCS) \
109 $(XPRINT_SRCS) \
110 $(APPGROUP_SRCS) \