There's not really a good reason to keep these separate, the vbe code
requires int10 and is not very large. This change eliminates the
build-time options for vbe; if you build int10, you get vbe.
Gitlab: https://gitlab.freedesktop.org/xorg/xserver/issues/692
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Promote the generated file containing the date & time build was
configured to top-level.
Rename it from xf86Build.h to buildDateTIme.h.
Use it as well in XQuartz, stringize BUILD_DATE when needed.
Automake would skip a few meson files that would prevent to build with
meson a dist file previously generated by automake.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Add some missing meson.builds to the distball, and update the meson
build test to work when the distcheck srcdir != builddir. The test build
directory will be $(srcdir)/_distcheck_build so srcdir will need to be
writable; this shouldn't be too much to ask I hope.
Signed-off-by: Adam Jackson <ajax@redhat.com>
While we're shipping both build systems, we'll likely have 'make dist'
generated tarballs - those tarballs should be buildable with meson to
have more exposure. List them all explicitly since the list isn't likely
to change much.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
PseudoramiXExtensionInit() is not defined in extinit.h if it won't be
used and we get a compiler warning when compiling the pseudoramiX code.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
For now we're just building an uninstalled library. The extra EGL
stubs are required so that we can get the DIX building and usable
without pulling in the xf86 DDX code in glamor_egl.c.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
LT_PREREQ([2.2])
LT_INIT
AC_CONFIG_MACRO_DIR([m4]) is recommended to locate local macros,
which is fully used starting automake 1.14.
ACLOCAL_AMFLAGS in Makefile.am is deprecated since automake 1.14.
The comment is to prevent developers from removing the statement
as suggested in 1.14 which would break earlier versions.
Automake 1.14 is already in use by many.
This patch works on versions prior and post 1.14
References:
Building the X Window System from Source:
http://www.x.org/wiki/Building_the_X_Window_System/#index2h3
Discussion on xorg minimum autotools requirements:
http://lists.x.org/archives/xorg-devel/2013-October/038325.html
Tested with autoconf 2.60, automake 1.10.3 and libtool 2.2
The same upgrade will be applied to libraries and drivers.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
Provides both a software implementation using timers and driver hooks
to base everything on vblank intervals.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Adds DRM compatible fences using futexes.
Uses FD passing to get pixmaps from DRM applications.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Move pseudoramiX code to a separate top-level directory. Link Xwin and Xquartz
with libPseudoramiX
I'm not sure moving this to a top-level directory is appropriate, but I'm not
sure where else it fits.
Future work: pseudoramiX can probably be consolidated with the rrxinerama code
(which I think provides fake xinerama data when real XINERAMA is disabled and we
only have one screen)
v2: fix distcheck
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
This target recursively locates directories with sdk headers and
installs them all. Useful when you want to build a complete new X
server and drivers without having to install the X server before the
drivers are actually working.
Signed-off-by: Keith Packard <keithp@keithp.com>
The convention is to have the manual pages in a man subdir
which is not under a doc dir. The doc dir contains users docs.
This will move man pages out of the way for upcoming DocBook patches.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
With libtool 2.2.10 the difference in build time is so small
(< 5% with -j8 builds) that it isn't worth having this hack.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Add $(AM_V_at) to all relink make targets to silence them when automake
silent rules are in use.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
'make distcheck' needs to read xkb files and write out compiled
versions as a part of the 'make check' phase. This patch passes
suitable options to the configure stage of the distcheck process to
read xkb files from the system location and write them to the
distcheck _inst directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
* Makefile.am: Include the test/ subdirectory in the dist tarball.
* include/Makefile.am: Move events.h to sdk_HEADERS and eventconvert.h to
EXTRA_DIST so they're included in the tarball. events.h shouldn't be
included in the SDK either, but for now it's needed by input.h.
If unittests are enabled, make will build those as well - spotting potential
build errors in the tests faster. Furthermore, this allows for the tests to
be run from the top-level directory.
This patch removes the "run make check to build the test suite" message
since that'd pop up after every build now.
If unittests are disabled, this change has no effect.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
dependencies. It was nearly abstract enough already to be used by
multiple DDXes. This will be useful for EXA development through
providing a fake acceleration implementation within Xephyr, so that
testing can be done on new EXA code without worrying about buggy
drivers.
Adam Jackson
Jon Turney
Alan Coopersmith
Olivier Fourdan
Peter Hutterer
Keith Packard
Eric Anholt
Gaetan Nadon
Adrian Bunk
Yaakov Selkowitz
Aaron Plattner
Paulo Cesar Pereira de Andrade
Kristian Høgsberg
Keith Packard
Daniel Stone
Daniel Stone
Adam Jackson
Donnie Berkholz
Adam Jackson
Eric Anholt