andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10cba7d546
xserver-multidpi/include
History
Lyude Paul 10cba7d546 meson: Add xkb_bin_dir option 
Now that we can actually configure all of the directories xkb uses for
finding things, we can (finally, but only with meson) finally make it so
that with the correct meson configuration the Xserver will "just work"
without any additional changes to the installation prefix after
building.

For the people like me who have since scripted this part out of their
build process and forgotten about it, building and installing the X
server into a non-standard prefix has always required the following (or
something else that makes sure that X has a valid xkbcomp configuration)
commands be run right after doing the installation:

	# start in root of prefix you installed X to
	mkdir -pv share/X11/xkb/rules
	ln -s /usr/share/X11/xkb/rules/evdev share/X11/xkb/rules/
	rm -f bin/xkbcomp
	ln -s /usr/bin/xkbcomp bin/

The one last piece of getting rid of this post-install junk is making
sure that we can control the directory that X uses for finding the
xkbcomp binary from meson so we can point it at the system provided
xkbcomp (/usr/bin/xkbcomp or similar). So, this patch adds a
configuration option for controlling this called xkb_bin_dir.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
2017-10-12 12:14:47 -04:00
..
.gitignore .gitignore: use common defaults with custom section #24239 2009-11-11 21:40:20 -08:00
busfault.h Trap SIGBUS to handle truncated shared memory segments 2013-11-11 15:16:07 -08:00
callback.h Avoid starting a comment with */* 2014-07-17 10:19:52 -07:00
client.h Introduce a consistent coding style 2012-03-21 13:54:42 -07:00
closestr.h Replace 'pointer' type with 'void *' 2014-01-12 10:24:11 -08:00
closure.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
colormap.h dix: Unexport various implementation details 2015-07-08 16:40:57 -04:00
colormapst.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
cursor.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
cursorstr.h cursor: drop ARGB_CURSOR 2015-06-30 12:17:51 +10:00
dbus-core.h xfree86: drop double-typedef of DBusConnection 2014-11-12 10:25:00 +10:00
displaymode.h vidmode: move display mode definitions 2016-02-29 16:28:57 -05:00
dix-config-apple-verbatim.h Move the apple fat binary hacks back to a header file, and make it apple-only. 2009-01-30 16:36:45 -08:00
dix-config.h.in glx: Use the same endian swapping as the rest of the server. 2017-04-21 11:39:10 -07:00
dix.h dix: Silence TSan warnings when checking for pending input 2016-09-22 14:55:01 -07:00
dixaccess.h Introduce a consistent coding style 2012-03-21 13:54:42 -07:00
dixevents.h dix: Remove redundant declarations. 2012-05-14 13:31:00 +01:00
dixfont.h dix: Switch to the libXfont2 API (v2) 2016-07-18 15:25:59 -04:00
dixfontstr.h dix: Switch to the libXfont2 API (v2) 2016-07-18 15:25:59 -04:00
dixgrabs.h Avoid starting a comment with */* 2014-07-17 10:19:52 -07:00
dixstruct.h Use #ifdef instead of #if for features to make Meson easier. 2017-04-26 17:30:12 -04:00
eventconvert.h input: drop FP1616 macro 2012-11-19 12:12:23 +10:00
events.h Add support for XI2.3: Pointer barrier events and releases. 2012-12-17 15:01:45 +10:00
eventstr.h Input: Add focus-in event source 2015-11-24 11:36:34 +10:00
exevents.h dix: Move DeviceFocusEvent from Xi into enterleave.c 2012-05-17 08:50:44 +10:00
extension.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
extinit.h Make PseudoramiXExtensionInit() prototype more generally available 2015-03-16 16:56:17 +00:00
extnsionst.h dix: Remove extension aliases 2017-06-20 16:37:24 -04:00
gc.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
gcstruct.h fb: Remove 24bpp support (v3) 2017-03-17 15:14:42 -04:00
globals.h dpms: Consolidate a bunch of stuff into Xext/dpms.c 2017-03-27 15:59:47 -04:00
glx_extinit.h glx: drop GLX_LIBS from X server and workaround sdksyms. 2012-07-25 23:30:53 -07:00
hotplug.h config: Replace OdevAttributes linked list with struct 2014-07-17 17:10:48 -07:00
input.h os: log a bug whenever WriteToClient is called from the input thread 2017-02-27 09:25:08 +10:00
inputstr.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
inpututils.h Input: Add DeviceEventSource enum 2015-11-24 11:36:32 +10:00
list.h Fix uninitialized variable warnings reported by clang 2016-01-06 09:42:59 -05:00
Makefile.am include: Add 'xserver_poll.h' to Makefile.am 2016-09-16 10:57:23 -07:00
meson.build meson: Add xkb_bin_dir option 2017-10-12 12:14:47 -04:00
misc.h sync: Convert from "CARD64" to int64_t. 2017-09-20 13:19:27 -04:00
miscstruct.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
nonsdk_extinit.h Make PseudoramiXExtensionInit() prototype more generally available 2015-03-16 16:56:17 +00:00
opaque.h configurable maximum number of clients 2015-08-24 00:00:18 -07:00
optionstr.h Introduce a consistent coding style 2012-03-21 13:54:42 -07:00
os.h meson: Detect strlcat/strlcpy/reallocarray in libbsd 2017-05-10 15:08:27 -04:00
pixmap.h Make PixmapDirtyUpdateRec::src a DrawablePtr 2017-08-15 17:01:39 +09:00
pixmapstr.h Make PixmapDirtyUpdateRec::src a DrawablePtr 2017-08-15 17:01:39 +09:00
privates.h dix: Remove PRIVATE_DAMAGE 2017-03-21 11:20:26 -04:00
probes.h Get rid of const warnings in XSERVER_INPUT_EVENT dtrace probe calls 2015-02-10 18:14:44 -08:00
property.h dix: Add a callback chain for window property state change 2017-02-23 13:30:11 -05:00
propertyst.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
protocol-versions.h Add Windows-DRI extension 2016-09-15 20:10:29 +01:00
ptrveloc.h dix: indentation fixes for pointer acceleration 2012-05-16 10:59:35 +10:00
region.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
regionstr.h dix: make RegionInit legal C++ 2015-01-23 10:35:49 -08:00
registry.h XSERVER_DTRACE needs request names from registry too 2014-09-22 12:00:46 -07:00
resource.h dix: export ResourceClientBits() 2015-09-01 20:11:26 -07:00
rgb.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
screenint.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
scrnintstr.h Make PixmapDirtyUpdateRec::src a DrawablePtr 2017-08-15 17:01:39 +09:00
selection.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
servermd.h dix: Fix image byte order on big endian hardware 2015-05-07 14:03:50 -04:00
site.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
swaprep.h dix: Unexport various implementation details 2015-07-08 16:40:57 -04:00
swapreq.h dix: Unexport various implementation details 2015-07-08 16:40:57 -04:00
systemd-logind.h systemd-logind: let the logind code decided whether to close an fd 2014-05-05 07:26:33 +10:00
validate.h Introduce a consistent coding style 2012-03-21 13:54:42 -07:00
version-config.h.in Move VENDOR_* defines from AC_SUBST to a header to avoid angering shave. 2009-04-14 10:35:44 -04:00
vidmodestr.h vidmode: build without xf86vidmodeproto 2016-03-01 11:25:59 -05:00
window.h dix: Add hybrid full-size/empty-clip mode to SetRootClip 2016-02-22 13:26:31 -05:00
windowstr.h dix: unifdef pWin->rootlessUnhittable 2015-07-08 16:41:28 -04:00
XIstubs.h Introduce a consistent coding style 2012-03-21 13:54:42 -07:00
xkb-config.h.in Move to autoconf standard function name checks & defines 2011-12-05 14:32:45 -08:00
xkbfile.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
xkbrules.h xkb: add a call to init an XkbRMLVOSet from const chars 2014-02-04 10:53:59 +10:00
xkbsrv.h xkb: Match key releases with an overlaid press 2017-01-04 13:23:31 +10:00
xkbstr.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
xorg-config.h.in xfree86: Silence a new glibc warning 2017-05-03 15:44:06 -04:00
xorg-config.h.meson.in Add a Meson build system alongside autotools. 2017-04-26 15:25:27 -07:00
xorg-server.h.in xorg: Change __XCONFIGFILE__ to XCONFIGFILE (and DIR) to fix scan.c. 2017-04-25 15:01:23 -07:00
Xprintf.h os/xprintf: add Xvscnprintf and Xscnprintf 2012-05-03 14:59:23 +10:00
xserver_poll.h Use #ifdef instead of #if for features to make Meson easier. 2017-04-26 17:30:12 -04:00
xserver-properties.h Add missing labels for multitouch valuators 2012-10-30 15:11:10 +10:00
xsha1.h Drop trailing whitespaces 2014-11-12 10:25:00 +10:00
xwin-config.h.in configure: Restore DEFAULT_LOGDIR to xwin-config.h, it is used 2014-06-02 13:07:46 +01:00
xwin-config.h.meson.in Add meson.build for XWin server (v2) 2017-06-02 09:32:35 -07:00