summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-xserver
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/xorg-xserver')
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch92
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-common.inc2
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb11
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 11931f83d6..717e72f93f 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 @@
1Index: xorg-server-1.2.0/mi/miinitext.c 1---
2 Xext/Makefile.am | 6 ++++++
3 configure.ac | 9 ++++++++-
4 include/kdrive-config.h.in | 3 +++
5 mi/miinitext.c | 6 ++++++
6 4 files changed, 23 insertions(+), 1 deletion(-)
7
8Index: xorg-server-1.3.0.0/mi/miinitext.c
2=================================================================== 9===================================================================
3--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100 10--- xorg-server-1.3.0.0.orig/mi/miinitext.c 2007-05-15 16:05:34.000000000 +0100
4+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-30 11:28:44.000000000 +0200 11+++ xorg-server-1.3.0.0/mi/miinitext.c 2007-05-15 16:05:39.000000000 +0100
5@@ -372,6 +372,9 @@ 12@@ -372,6 +372,9 @@ extern void ResExtensionInit(INITARGS);
6 #ifdef DMXEXT 13 #ifdef DMXEXT
7 extern void DMXExtensionInit(INITARGS); 14 extern void DMXExtensionInit(INITARGS);
8 #endif 15 #endif
@@ -12,7 +19,7 @@ Index: xorg-server-1.2.0/mi/miinitext.c
12 #ifdef XEVIE 19 #ifdef XEVIE
13 extern void XevieExtensionInit(INITARGS); 20 extern void XevieExtensionInit(INITARGS);
14 #endif 21 #endif
15@@ -663,6 +666,9 @@ 22@@ -663,6 +666,9 @@ InitExtensions(argc, argv)
16 #ifdef DAMAGE 23 #ifdef DAMAGE
17 if (!noDamageExtension) DamageExtensionInit(); 24 if (!noDamageExtension) DamageExtensionInit();
18 #endif 25 #endif
@@ -22,25 +29,32 @@ Index: xorg-server-1.2.0/mi/miinitext.c
22 } 29 }
23 30
24 void 31 void
25Index: xorg-server-1.2.0/include/kdrive-config.h.in 32Index: xorg-server-1.3.0.0/configure.ac
26=================================================================== 33===================================================================
27--- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-03-30 11:31:07.000000000 +0200 34--- xorg-server-1.3.0.0.orig/configure.ac 2007-05-15 16:05:34.000000000 +0100
28+++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-30 11:34:09.000000000 +0200 35+++ xorg-server-1.3.0.0/configure.ac 2007-05-15 16:17:54.000000000 +0100
29@@ -22,6 +22,9 @@ 36@@ -421,6 +421,7 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_ST
30 /* Support tslib touchscreen abstraction library */ 37 AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
31 #undef TSLIB 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
32 47
33+/* Build XCalibrate extension */ 48+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
34+#undef XCALIBRATE 49+if test "x$XCALIBRATE" = xyes; then
50+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
51+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
52+fi
35+ 53+
36 /* Verbose debugging output hilarity */ 54 AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
37 #undef DEBUG 55 if test "x$XEVIE" = xyes; then
38 56 AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
39Index: xorg-server-1.2.0/configure.ac 57@@ -1547,7 +1554,7 @@ if test "$KDRIVE" = yes; then
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 ;; 58 ;;
45 esac 59 esac
46 KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' 60 KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
@@ -49,3 +63,39 @@ Index: xorg-server-1.2.0/configure.ac
49 63
50 # check if we can build Xephyr 64 # check if we can build Xephyr
51 PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) 65 PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
66Index: xorg-server-1.3.0.0/include/kdrive-config.h.in
67===================================================================
68--- xorg-server-1.3.0.0.orig/include/kdrive-config.h.in 2007-05-15 16:05:34.000000000 +0100
69+++ xorg-server-1.3.0.0/include/kdrive-config.h.in 2007-05-15 16:05:39.000000000 +0100
70@@ -25,4 +25,7 @@
71 /* Verbose debugging output hilarity */
72 #undef DEBUG
73
74+/* Enable XCalibrate extension */
75+#undef XCALIBRATE
76+
77 #endif /* _KDRIVE_CONFIG_H_ */
78Index: xorg-server-1.3.0.0/Xext/Makefile.am
79===================================================================
80--- xorg-server-1.3.0.0.orig/Xext/Makefile.am 2007-05-15 16:05:34.000000000 +0100
81+++ xorg-server-1.3.0.0/Xext/Makefile.am 2007-05-15 16:05:39.000000000 +0100
82@@ -91,6 +91,11 @@ BUILTIN_SRCS += $(XCALIBRATE_SRCS)
83 # XCalibrare needs tslib
84 endif
85
86+XCALIBRATE_SRCS = xcalibrate.c
87+if XCALIBRATE
88+BUILTIN_SRCS += $(XCALIBRATE_SRCS)
89+endif
90+
91 # X EVent Interception Extension: allows accessibility helpers & composite
92 # managers to intercept events from input devices and transform as needed
93 # before the clients see them.
94@@ -169,6 +174,7 @@ EXTRA_DIST = \
95 $(XCSECURITY_SRCS) \
96 $(XCALIBRATE_SRCS) \
97 $(XINERAMA_SRCS) \
98+ $(XCALIBRATE_SRCS) \
99 $(XEVIE_SRCS) \
100 $(XPRINT_SRCS) \
101 $(APPGROUP_SRCS) \
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-common.inc b/meta/packages/xorg-xserver/xserver-kdrive-common.inc
index f3db2ef0ed..ff894586ad 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 \
117 --disable-xorg --disable-xorgcfg \ 117 --disable-xorg --disable-xorgcfg \
118 --disable-xkb --disable-xnest --disable-xvfb \ 118 --disable-xkb --disable-xnest --disable-xvfb \
119 --disable-xevie --disable-xprint --disable-xtrap \ 119 --disable-xevie --disable-xprint --disable-xtrap \
120 --disable-dmx ${W100_OECONF} ${IMAGEON_OECONF} \ 120 --disable-dmx \
121 --with-default-font-path=built-ins \ 121 --with-default-font-path=built-ins \
122 --enable-tslib --enable-xcalibrate \ 122 --enable-tslib --enable-xcalibrate \
123 ac_cv_file__usr_share_X11_sgml_defs_ent=no" 123 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 831ccec083..59ee2a7c20 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
3DEPENDS += "libxkbfile libxcalibrate" 3DEPENDS += "libxkbfile libxcalibrate"
4 4
5PE = "1" 5PE = "1"
6PR = "r7" 6PR = "r9"
7 7
8SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 8SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
9 ${KDRIVE_COMMON_PATCHES} \ 9 ${KDRIVE_COMMON_PATCHES} \
10 file://enable-xcalibrate.patch;patch=1 \ 10 file://enable-xcalibrate.patch;patch=1 "
11 file://w100.patch;patch=1 \
12 file://w100-fix-offscreen-bmp.patch;patch=1 \
13 "
14 11
15S = "${WORKDIR}/xorg-server-${PV}" 12S = "${WORKDIR}/xorg-server-${PV}"
16
17W100_OECONF = "--disable-w100"
18W100_OECONF_arm = "--enable-w100"
19
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 00:35:07 +0000