From 81123216f8eba2c90f8f0fb65a4d2003a7853503 Mon Sep 17 00:00:00 2001 From: Jason Gerecke Date: Mon, 9 Dec 2013 13:02:01 -0800 Subject: HACK: Define 'input_option_new' for Ubuntu 12.04 'frankenserver' The 'frankenserver' X server that ships with Ubuntu 12.04 doesn't actually implement the input_option_new function, despite what its version number would imply. With the symbol missing, the server crashes once a tablet is plugged in. This hack forces the input_option_new function to be compiled, allowing it to be resolved on the frakenserver. This patch DOES NOT belong in the upstream xf86-input-wacom tree. --- src/wcmValidateDevice.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c index 1a5e722..11b5c35 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -341,7 +341,6 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) return ret; } -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 static InputOption* input_option_new(InputOption *list, char *key, char *value) { @@ -367,7 +366,6 @@ input_option_free_list(InputOption **opts) *opts = tmp; } } -#endif /** * Duplicate xf86 options, replace the "type" option with the given type -- cgit v1.2.1