xserver: Branch 'master' - 6 commits
Adam Jackson
ajax at kemper.freedesktop.org
Thu Mar 23 17:33:22 UTC 2017
configure.ac | 10 ++--------
glamor/glamor_priv.h | 2 +-
hw/kdrive/ephyr/Makefile.am | 1 +
hw/kdrive/ephyr/ephyr.c | 4 ++--
hw/kdrive/ephyr/ephyr_draw.c | 4 ++--
hw/kdrive/ephyr/ephyr_glamor_xv.c | 4 ++--
hw/kdrive/ephyr/ephyrcursor.c | 4 ++--
hw/kdrive/ephyr/ephyrinit.c | 14 ++------------
hw/kdrive/ephyr/ephyrvideo.c | 4 ++--
hw/kdrive/ephyr/hostx.c | 4 ++--
hw/kdrive/ephyr/os.c | 4 ++--
hw/kdrive/src/kcmap.c | 4 ++--
hw/kdrive/src/kdrive.c | 4 ++--
hw/kdrive/src/kinfo.c | 4 ++--
hw/kdrive/src/kinput.c | 30 +++---------------------------
hw/kdrive/src/kmode.c | 4 ++--
hw/kdrive/src/kshadow.c | 4 ++--
hw/kdrive/src/kxv.c | 4 ++--
hw/xfree86/exa/examodule.c | 2 +-
hw/xfree86/modes/xf86Crtc.c | 4 ----
hw/xfree86/modes/xf86Cursors.c | 4 ----
hw/xfree86/modes/xf86DiDGA.c | 4 ----
hw/xfree86/modes/xf86EdidModes.c | 4 ----
hw/xfree86/modes/xf86Modes.c | 4 ----
hw/xfree86/modes/xf86RandR12.c | 4 ----
hw/xfree86/modes/xf86Rotate.c | 4 ----
hw/xfree86/modes/xf86cvt.c | 4 ----
hw/xfree86/modes/xf86gtf.c | 4 ----
hw/xwayland/xwayland-shm.c | 2 +-
include/dix-config.h.in | 6 ------
include/kdrive-config.h.in | 31 -------------------------------
include/xorg-server.h.in | 3 ---
mi/miinitext.c | 4 ----
xkb/XKBMAlloc.c | 2 --
xkb/XKBMisc.c | 2 --
35 files changed, 37 insertions(+), 160 deletions(-)
New commits:
commit e2e50c509718ea8c7f4684dc18f5ce66e526792b
Author: Eric Anholt <eric at anholt.net>
Date: Wed Mar 22 15:11:35 2017 -0700
xserver: Unifdef HAVE_CONFIG_H
The X Server never generates a global config.h, and instead all these
paths are including dix-config.h or xorg-config.h.
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 966a16891..3f9857b4a 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -23,10 +23,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#include <stddef.h>
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 9543eedb3..26969efb2 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -23,10 +23,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#include <stddef.h>
diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c
index 645727441..368649852 100644
--- a/hw/xfree86/modes/xf86DiDGA.c
+++ b/hw/xfree86/modes/xf86DiDGA.c
@@ -22,10 +22,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#include "xf86.h"
diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index b4ab14fc5..a2e960d42 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -29,10 +29,6 @@
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#define _PARSE_EDID_
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index 43b223307..5651f1ef8 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -27,10 +27,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#include "xf86Modes.h"
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index d83461997..900048df9 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -22,10 +22,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#include "xf86.h"
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index 13e5a5059..85ab9b8c7 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -23,10 +23,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#include <stddef.h>
diff --git a/hw/xfree86/modes/xf86cvt.c b/hw/xfree86/modes/xf86cvt.c
index b6c1bc81c..c0a342040 100644
--- a/hw/xfree86/modes/xf86cvt.c
+++ b/hw/xfree86/modes/xf86cvt.c
@@ -28,10 +28,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#include "xf86.h"
diff --git a/hw/xfree86/modes/xf86gtf.c b/hw/xfree86/modes/xf86gtf.c
index 17c2f3255..c6a738422 100644
--- a/hw/xfree86/modes/xf86gtf.c
+++ b/hw/xfree86/modes/xf86gtf.c
@@ -62,10 +62,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#endif
#include "xf86.h"
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index dbc1389e6..3e380a8ea 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
-#include <config.h>
#endif
#include <stdio.h>
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index df268b583..f17194528 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
-#include <config.h>
#endif
#include <stdio.h>
commit 266af991c8e41e62f054ac9870468a9ba2aaa9f2
Author: Eric Anholt <eric at anholt.net>
Date: Wed Mar 22 15:11:34 2017 -0700
glamor: Fix some formatting that confused the unifdef command.
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 27f95521d..7b92f3570 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -910,7 +910,7 @@ int glamor_xv_put_image(glamor_port_private *port_priv,
void glamor_xv_core_init(ScreenPtr screen);
void glamor_xv_render(glamor_port_private *port_priv);
-#include"glamor_utils.h"
+#include "glamor_utils.h"
/* Dynamic pixmap upload to texture if needed.
* Sometimes, the target is a gl texture pixmap/picture,
commit 2da405759fbabd4b918838a0de728c1911b4a2fa
Author: Eric Anholt <eric at anholt.net>
Date: Wed Mar 22 15:11:33 2017 -0700
xserver: Check the right HAVE_*_CONFIG_H.
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index 76f780ab6..0bbd93e34 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -25,7 +25,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
+#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index 452d1f509..29732eaca 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -24,7 +24,7 @@
* SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
+#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
commit 190c2adf4a237a4c0dc13d7566ca91662271d3e4
Author: Eric Anholt <eric at anholt.net>
Date: Wed Mar 22 15:11:32 2017 -0700
kdrive: Drop kdrive-config.h.
It had nothing left in it that was used but wasn't in dix-config.h.
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
diff --git a/configure.ac b/configure.ac
index 2a066e2da..3bc15a81a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,6 @@ dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
AC_CONFIG_HEADERS(include/xkb-config.h)
dnl xwin-config.h covers the XWin DDX.
AC_CONFIG_HEADERS(include/xwin-config.h)
-dnl kdrive-config.h covers the kdrive DDX
-AC_CONFIG_HEADERS(include/kdrive-config.h)
dnl version-config.h covers the version numbers so they can be bumped without
dnl forcing an entire recompile.x
AC_CONFIG_HEADERS(include/version-config.h)
@@ -2369,9 +2367,6 @@ XEPHYR_INCS=
AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
if test "$KDRIVE" = yes; then
- AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
- AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
-
XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm xcb-keysyms xcb-randr xcb-xkb"
if test "x$XV" = xyes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
@@ -2399,7 +2394,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
- KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H"
+ KDRIVE_CFLAGS="$XSERVER_CFLAGS"
KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index 6ce0d6fa0..f4bd060f8 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -26,6 +26,7 @@ AM_CPPFLAGS = \
@KDRIVE_CFLAGS@ \
@XEPHYR_INCS@ \
@XEPHYR_CFLAGS@ \
+ -DHAVE_DIX_CONFIG_H \
-I$(top_srcdir) \
-I$(top_srcdir)/glamor \
-I$(top_srcdir)/exa
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index ef5350e18..546a76c24 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include <xcb/xcb_keysyms.h>
diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c
index 66371334a..64e07a7d1 100644
--- a/hw/kdrive/ephyr/ephyr_draw.c
+++ b/hw/kdrive/ephyr/ephyr_draw.c
@@ -25,8 +25,8 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "ephyr.h"
diff --git a/hw/kdrive/ephyr/ephyr_glamor_xv.c b/hw/kdrive/ephyr/ephyr_glamor_xv.c
index b9c3464d8..4dd15cf41 100644
--- a/hw/kdrive/ephyr/ephyr_glamor_xv.c
+++ b/hw/kdrive/ephyr/ephyr_glamor_xv.c
@@ -21,8 +21,8 @@
* IN THE SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "kdrive.h"
diff --git a/hw/kdrive/ephyr/ephyrcursor.c b/hw/kdrive/ephyr/ephyrcursor.c
index 808b3c72c..f991899c5 100644
--- a/hw/kdrive/ephyr/ephyrcursor.c
+++ b/hw/kdrive/ephyr/ephyrcursor.c
@@ -24,8 +24,8 @@
* Adam Jackson <ajax at redhat.com>
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "ephyr.h"
#include "ephyrlog.h"
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 9794cecc9..383fa9f7c 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "ephyr.h"
#include "ephyrlog.h"
diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c
index 31b1eee31..9c9c78d11 100644
--- a/hw/kdrive/ephyr/ephyrvideo.c
+++ b/hw/kdrive/ephyr/ephyrvideo.c
@@ -26,8 +26,8 @@
* Dodji Seketeli <dodji at openedhand.com>
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include <string.h>
#include <X11/extensions/Xv.h>
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index d5578deaa..ef8541673 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "hostx.h"
diff --git a/hw/kdrive/ephyr/os.c b/hw/kdrive/ephyr/os.c
index b481d0a11..12bbc5497 100644
--- a/hw/kdrive/ephyr/os.c
+++ b/hw/kdrive/ephyr/os.c
@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "ephyr.h"
diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c
index 0970064f6..4fe454551 100644
--- a/hw/kdrive/src/kcmap.c
+++ b/hw/kdrive/src/kcmap.c
@@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "kdrive.h"
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index f02d8262b..b2b499669 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "kdrive.h"
#include <mivalidate.h>
diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c
index f91d57504..4abb082b0 100644
--- a/hw/kdrive/src/kinfo.c
+++ b/hw/kdrive/src/kinfo.c
@@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "kdrive.h"
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index b15375137..39d8af742 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -21,8 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#include <xkb-config.h>
#endif
#include "kdrive.h"
#include "inputstr.h"
diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c
index ef1b6b4fa..fed4ac5a4 100644
--- a/hw/kdrive/src/kmode.c
+++ b/hw/kdrive/src/kmode.c
@@ -21,8 +21,8 @@
* Author: Keith Packard, SuSE, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "kdrive.h"
diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c
index 7f1e2ee19..0cc8a1309 100644
--- a/hw/kdrive/src/kshadow.c
+++ b/hw/kdrive/src/kshadow.c
@@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "kdrive.h"
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index 844deca0d..035c5e991 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -35,8 +35,8 @@ of the copyright holder.
*/
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "kdrive.h"
diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in
deleted file mode 100644
index 59c754be5..000000000
--- a/include/kdrive-config.h.in
+++ /dev/null
@@ -1,25 +0,0 @@
-/* kdrive-config.h.in: not at all generated. -*- c -*-
- */
-
-#ifndef _KDRIVE_CONFIG_H_
-#define _KDRIVE_CONFIG_H_
-
-#include <dix-config.h>
-#include <xkb-config.h>
-
-/* Building kdrive server. */
-#undef KDRIVESERVER
-
-/* Include framebuffer support in X servers */
-#undef KDRIVEFBDEV
-
-/* Verbose debugging output hilarity */
-#undef DEBUG
-
-/* Have the backtrace() function. */
-#undef HAVE_BACKTRACE
-
-/* Have execinfo.h for backtrace(). */
-#undef HAVE_EXECINFO_H
-
-#endif /* _KDRIVE_CONFIG_H_ */
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 5fc44e3f4..9e6578d4a 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -97,10 +97,6 @@ SOFTWARE.
#undef DPMSExtension
#endif
-#ifdef HAVE_KDRIVE_CONFIG_H
-#include <kdrive-config.h>
-#endif
-
#ifdef HAVE_XGL_CONFIG_H
#include <xgl-config.h>
#endif
commit 5c7ed785e3bdb9f0fbf8fbfdc93b5fdd2b2c7dbf
Author: Eric Anholt <eric at anholt.net>
Date: Wed Mar 22 15:11:31 2017 -0700
kdrive: Remove vestiges of TSLIB support.
The actual code was gone in 27819950e4158326e0f83a30f2e8968b932625ef,
but some checks remained.
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
diff --git a/configure.ac b/configure.ac
index da08a2a4e..2a066e2da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -624,7 +624,6 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF8
AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
AC_ARG_ENABLE(xselinux, AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])
AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])
-AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])
AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
@@ -2400,7 +2399,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
- KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
+ KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H"
KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
@@ -2408,7 +2407,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"
- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
AC_SUBST([XEPHYR_LIBS])
AC_SUBST([XEPHYR_INCS])
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index c3f956d67..a59d441bb 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -247,9 +247,6 @@
/* Define to 1 if you have the `timingsafe_memcmp' function. */
#undef HAVE_TIMINGSAFE_MEMCMP
-/* Define to 1 if you have the <tslib.h> header file. */
-#undef HAVE_TSLIB_H
-
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@@ -322,9 +319,6 @@
/* Support TCP socket connections */
#undef TCPCONN
-/* Support tslib touchscreen abstraction library */
-#undef TSLIB
-
/* Support UNIX socket connections */
#undef UNIXCONN
diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in
index 2d3aedf85..59c754be5 100644
--- a/include/kdrive-config.h.in
+++ b/include/kdrive-config.h.in
@@ -13,9 +13,6 @@
/* Include framebuffer support in X servers */
#undef KDRIVEFBDEV
-/* Support tslib touchscreen abstraction library */
-#undef TSLIB
-
/* Verbose debugging output hilarity */
#undef DEBUG
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index e46ccecf7..dafc27f4a 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -101,9 +101,6 @@
/* Support TCP socket connections */
#undef TCPCONN
-/* Support tslib touchscreen abstraction library */
-#undef TSLIB
-
/* Support UNIX socket connections */
#undef UNIXCONN
commit 1b1a8c481773e15142202a7b761d614b33f12577
Author: Eric Anholt <eric at anholt.net>
Date: Wed Mar 22 15:11:30 2017 -0700
kdrive: Unifdef KDRIVE_EVDEV.
ajax deleted the evdev driver in the removal of fbdev and the linux
backend.
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 7632c2643..9794cecc9 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -40,11 +40,6 @@ extern Bool ephyr_glamor, ephyr_glamor_gles2, ephyr_glamor_skip_present;
extern Bool ephyrNoXV;
-#ifdef KDRIVE_EVDEV
-extern KdPointerDriver LinuxEvdevMouseDriver;
-extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
-#endif
-
void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id);
void processOutputArg(const char *output, char *parent_id);
void processScreenArg(const char *screen_size, char *parent_id);
@@ -91,11 +86,6 @@ InitInput(int argc, char **argv)
KdKeyboardInfo *ki;
KdPointerInfo *pi;
-#ifdef KDRIVE_EVDEV
- KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
- KdAddPointerDriver(&LinuxEvdevMouseDriver);
-#endif
-
if (!SeatId) {
KdAddKeyboardDriver(&EphyrKeyboardDriver);
KdAddPointerDriver(&EphyrMouseDriver);
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 8b08747a6..b15375137 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -54,11 +54,6 @@
#include <hotplug.h>
#endif
-#ifdef KDRIVE_EVDEV
-#define DEV_INPUT_EVENT_PREFIX "/dev/input/event"
-#define DEV_INPUT_EVENT_PREFIX_LEN (sizeof(DEV_INPUT_EVENT_PREFIX) - 1)
-#endif
-
#define AtomFromName(x) MakeAtom(x, strlen(x), 1)
struct KdConfigDevice {
@@ -1091,16 +1086,6 @@ KdParseKbdOptions(KdKeyboardInfo * ki)
ErrorF("Kbd option key (%s) of value (%s) not assigned!\n",
key, value);
}
-
-#ifdef KDRIVE_EVDEV
- if (!ki->driver && ki->path != NULL &&
- strncasecmp(ki->path,
- DEV_INPUT_EVENT_PREFIX,
- DEV_INPUT_EVENT_PREFIX_LEN) == 0) {
- ki->driver = KdFindKeyboardDriver("evdev");
- ki->options = input_option_new(ki->options, "driver", "evdev");
- }
-#endif
}
KdKeyboardInfo *
@@ -1209,16 +1194,6 @@ KdParsePointerOptions(KdPointerInfo * pi)
ErrorF("Pointer option key (%s) of value (%s) not assigned!\n",
key, value);
}
-
-#ifdef KDRIVE_EVDEV
- if (!pi->driver && pi->path != NULL &&
- strncasecmp(pi->path,
- DEV_INPUT_EVENT_PREFIX,
- DEV_INPUT_EVENT_PREFIX_LEN) == 0) {
- pi->driver = KdFindPointerDriver("evdev");
- pi->options = input_option_new(pi->options, "driver", "evdev");
- }
-#endif
}
KdPointerInfo *
diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in
index f59262c41..2d3aedf85 100644
--- a/include/kdrive-config.h.in
+++ b/include/kdrive-config.h.in
@@ -16,9 +16,6 @@
/* Support tslib touchscreen abstraction library */
#undef TSLIB
-/* Support KDrive evdev driver */
-#undef KDRIVE_EVDEV
-
/* Verbose debugging output hilarity */
#undef DEBUG
More information about the xorg-commit
mailing list