The module directory has changed to a per ABI folder in the xlibre-xserver.
Now the default value of `xorg-module-dir` will be detected from the `moduledir` variable in xorg-server.pc.
Signed-off-by: b-aaz <b-aazbsd.proton.me>
Added upstream suggestion to error message in case xorg macros or
xserver macros are missing. No actual package manager references in
suggestion since these are 'user' and/or 'distribution' preferences.
(Cherry picked from xf86-video-intel 90538ecfff9c324d61419f451d41d26ab026f232)
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
Avoid use of two manners of setting automake configuration options,
and consolidate them into AM_INIT_AUTOMAKE macro.
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
The sdkdir variable is not used, so remove the statement.
(Copied from xf86-video-ati 36bd69affc996c92c40b7360a7fbaa1a3a46abfd)
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
These macros are called by the PKG_CHECK_MODULES macro, for all
versions of pkg-config >= 0.24.0 (released May 23, 2010).
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Was previously required to ensure the system has C header files conforming
to ANSI C89 (ISO C90). Specifically, this macro checks for stdlib.h,
stdarg.h, string.h, and float.h.
This autoconf option was used to provide conditional fallback support
via defined STDC_HEADERS.
xf86-video-nouveau does not do so, so this macro is obsolete and unused,
so let's drop it.
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
This macro expands into several macros and provide several build functions [0].
Refer to the module generated aclocal.m4 file as this is subject to change.
At present, this includes:
- XORG_CWARNFLAGS: platform adjusted compiler warning flags
- XORG_STRICT_OPTION: additional warning flags
- XORG_RELEASE_VERSION: defines variables for major, minor and patch level
- XORG_CHANGELOG: contains a makefile rule which creates the ChangeLog file from Git
- XORG_INSTALL: contains a makefile rule which provides the INSTALL file in the module root directory
- XORG_MANPAGE_SECTIONS: platform adjusted man page section number
The above macros invoke the following Autoconf macros:
- AC_PROG_INSTALL
- AC_PROG_CC_C99
- AC_PROG_SED
- AC_CANONICAL_HOST
[0] https://www.x.org/wiki/NewModuleGuidelines/
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
As suggested by one tool called by autoreconf. Necessitates change to:
- configure.ac: Call AC_CONFIG_MACRO_DIR()
- Makefile.am: Set ACLOCAL_AMFLAGS = -I m4
- Create placeholder m4 folders
- Update gitignore files
>From the autoconf documentation:
"Starting from version 2.58, autoconf provide the macro AC_CONFIG_MACRO_DIR
to declare where additional macro files are to be put and found. The
argument passed to this macro is commonly m4."
https://autotools.io/autoconf/macros.html
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
After a version-conditioned check for libdrm was added, no longer necessary
to check a second time, especially without a version number check.
Fixes: 779b8d4 ("Link against libdrm")
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
Use xorg-macros provided PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} rather
than rolling our own in xf86-video-nouveau.
Macro has been available since xorg-macros 1.1.5 (we rely on >= 1.8)
provided that XORG_DEFAULT_OPTIONS is called.
Fixes: b82aacd ("configure: require xorg-macros 1.8")
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
If it's available, xorg-server calls it on each mode configuration change. It
does what xf86_reload_cursors does (and more), so we don't need to call
the latter anymore.
Avoids gcc 8.2 warning:
drmmode_display.c: In function ‘drmmode_set_mode_major’:
drmmode_display.c:525:2: warning: ‘xf86_reload_cursors’ is deprecated [-Wdeprecated-declarations]
xf86_reload_cursors(crtc->scrn->pScreen);
^~~~~~~~~~~~~~~~~~~
In file included from nv_type.h:10,
from nv_include.h:69,
from drmmode_display.c:36:
/usr/include/xorg/xf86Crtc.h:1068:37: note: declared here
static _X_INLINE _X_DEPRECATED void xf86_reload_cursors(ScreenPtr screen) {}
^~~~~~~~~~~~~~~~~~~
(Ported from radeon commit d670c5c9851b4eff21c845d26c7d7e4eb5ee0fa9)
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
If you want glamor, just use modesetting instead. It's hooked up
incorrectly in nouveau, and there doesn't seem to be any point in fixing
it when the modesetting driver does it all properly.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Highlights:
- Support for server managed fd's.
- Glamor support.
- Maxwell support.
- DRI3 and initial Present support.
- vsync'ed kms pageflip performance fixes when running on Linux 3.13+
- Multi-display vsync, vblank, swap scheduling, timestamping fixes.
- Multi x-screen support fixes.
- ZaphodHead support on for multiple outputs per x-screen.
- EXA nv-10 fixes.
- Enable sync of swaps to vblank by default (Option GLXVblank "on").
- Disable pseudo-triplebuffering by default (Option SwapLimit "1").
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
...when building against pre 1.12 x.
The build will fail as earlier versions of X were missing the xorg_
prefix of the symbols - struct and util functions.
Reported-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
xorg-server can be built without glamor, which leads to:
CC nouveau_xv.lo
In file included from nouveau_xv.c:41:0:
nouveau_glamor.h:12:20: fatal error: glamor.h: No such file or directory
compilation terminated.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
The DDX uses symbols from libdrm but currently does not link against
it, but rather relies on indirect linkage from libdrm_nouveau. This
could lead to insufficient dependencies in distribution packages, seen
in http://bugs.debian.org/633786.
Signed-off-by: Sven Joachim <svenjoac@gmx.de>
