[oe-commits] org.oe.dev kdrive 1.2: rediff optional-xkb.patch

[koen commit]

kdrive 1.2: rediff optional-xkb.patch

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3747999334cad4bb22159396976a802d18c50703
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3747999334cad4bb22159396976a802d18c50703
Files:
1
packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch
Diffs:

#
# mt diff -rb9879412c955e1d524d7c0f26b6a42a43ccd563c -r3747999334cad4bb22159396976a802d18c50703
#
# 
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch"
#  content [2764c989f5f70d77c86a8316c71aa2a13d2da6c5]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch	2764c989f5f70d77c86a8316c71aa2a13d2da6c5
+++ packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch	2764c989f5f70d77c86a8316c71aa2a13d2da6c5
@@ -0,0 +1,54 @@
+--- /tmp/bar/Makefile.am	2007-03-29 20:12:38.000000000 +0200
++++ xorg-server-1.2.0/Makefile.am	2007-03-29 20:12:49.325251000 +0200
+@@ -30,6 +30,10 @@
+ XINPUT_DIR=Xi
+ endif
+ 
++if XKB
++XKB_DIR=xkb
++endif
++
+ if DBE
+ DBE_DIR=dbe
+ endif
+@@ -46,7 +50,7 @@
+ 	randr \
+ 	render  \
+ 	$(XINPUT_DIR) \
+-	xkb \
++	$(XKB_DIR) \
+ 	$(DBE_DIR) \
+ 	$(MFB_DIR) \
+ 	$(AFB_DIR) \
+--- /tmp/bar/configure.ac	2007-03-29 20:12:38.000000000 +0200
++++ xorg-server-1.2.0/configure.ac	2007-03-29 20:12:49.325251000 +0200
+@@ -428,6 +428,7 @@
+ AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
+ AC_ARG_ENABLE(xinput,         AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
+ AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
++AC_ARG_ENABLE(xkb,            AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
+ 
+ dnl DDXes.
+ AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+@@ -754,12 +755,15 @@
+ 
+ AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+ 
+-AC_DEFINE(XKB, 1, [Build XKB])
+-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
+-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
++if test "x$XKB" = xyes; then
++       AC_DEFINE(XKB, 1, [Build XKB])
++       AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
++       AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
++       REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
++       XKB_LIB='$(top_builddir)/xkb/libxkb.la'
++       XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++fi
+ 
+ AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
+                                         [Do not have `strcasecmp'.]))