~thopiekar/xorg-server/+git/xorg-server-salsa.debian:ubuntu+1

Last commit made on 2018-05-21
Get this branch:
git clone -b ubuntu+1 https://git.launchpad.net/~thopiekar/xorg-server/+git/xorg-server-salsa.debian

Branch merges

Branch information

Recent commits

01b6795... by Timo Aaltonen

Drop Xmir.

388668e... by Timo Aaltonen

refresh patches, drop obsolete ones

3765858... by Timo Aaltonen

update the changelog

d924dce... by Timo Aaltonen

Merge branch 'debian-experimental' into ubuntu+1

ca2c91d... by Emilio Pozuelo Monfort <email address hidden>

Release to experimental

2015932... by Emilio Pozuelo Monfort <email address hidden>

Update Vcs-* for salsa

f4e9f86... by Emilio Pozuelo Monfort <email address hidden>

New upstream stable release

4cd77b2... by Emilio Pozuelo Monfort <email address hidden>

Merge branch 'upstream-experimental' into debian-experimental

82f8fc5... by Adam Jackson <email address hidden>

xserver 1.20

Signed-off-by: Adam Jackson <email address hidden>

b6bf68b... by Aaron Plattner

meson: Fix module_dir configuration (v2)

meson.build has code to set the module_dir variable to
${libdir}/xorg/modules if the module_dir option string is empty.
However, this has several problems:

1. The variable is only used for an unused @moduledir@ substitution in
   the man page. The rule for xorg-server.pc uses option('module_dir')
   directly instead.
2. The 'module_dir' option has a default value of 'xorg/modules' so the
   above rule doesn't do anything by default.
3. The xorg-server.pc rule uses ${exec_prefix}/option('module_dir'), so
   the effect of #2 is that the default moduledir is different between
   autoconf and meson. E.g. if ${prefix} is /X, then you get

     autoconf: moduledir=/X/lib/xorg/modules
     meson: moduledir=/X/xorg/modules

Fix this by using the module_dir variable when generating xorg-server.pc, and by
using join_paths() to assign module_dir unconditionally.

v2: Keep the 'xorg/modules' default path, but use join_paths() unconditionally (Thierry Reding)

Signed-off-by: Aaron Plattner <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>