Update to xserver 1.16.1.

Tested by naddy@, jsg@ & kettenis@
This commit is contained in:
matthieu 2014-09-27 17:49:46 +00:00
parent e4c13334f7
commit cd0bdbef9f
4 changed files with 13074 additions and 170 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,6 @@
AUTOMAKE_OPTIONS=nostdinc
# Required for automake < 1.14
ACLOCAL_AMFLAGS = -I m4
if COMPOSITE
@ -25,6 +27,14 @@ if PRESENT
PRESENT_DIR=present
endif
if PSEUDORAMIX
PSEUDORAMIX_DIR=pseudoramiX
endif
if GLAMOR
GLAMOR_DIR=glamor
endif
SUBDIRS = \
doc \
man \
@ -35,11 +45,11 @@ SUBDIRS = \
Xext \
miext \
os \
pseudoramiX \
randr \
render \
Xi \
xkb \
$(PSEUDORAMIX_DIR) \
$(DBE_DIR) \
$(RECORD_DIR) \
xfixes \
@ -49,6 +59,7 @@ SUBDIRS = \
$(PRESENT_DIR) \
$(DRI3_DIR) \
exa \
$(GLAMOR_DIR) \
config \
hw \
test
@ -100,6 +111,7 @@ DIST_SUBDIRS = \
composite \
glx \
exa \
glamor \
config \
dri3 \
present \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.51 2014/03/18 22:37:29 miod Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.52 2014/09/27 17:49:47 matthieu Exp $
.include <bsd.xconf.mk>
@ -42,6 +42,7 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--enable-xcsecurity \
--without-fop --without-xmlto --without-xsltproc \
--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \
--disable-xtrans-send-fds \
--disable-unit-tests \
${DRI_OPTION}

View File

@ -54,8 +54,8 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/xorg-server.pc.in \
$(srcdir)/xserver.ent.in $(top_srcdir)/configure COPYING \
ChangeLog INSTALL config.guess config.sub depcomp install-sh \
ltmain.sh missing ylwrap
ChangeLog INSTALL compile config.guess config.sub depcomp \
install-sh ltmain.sh missing ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@ -221,6 +221,8 @@ DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
DEFAULT_LOGDIR = @DEFAULT_LOGDIR@
DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
DEFAULT_XDG_DATA_HOME = @DEFAULT_XDG_DATA_HOME@
DEFAULT_XDG_DATA_HOME_LOGDIR = @DEFAULT_XDG_DATA_HOME_LOGDIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DGA_CFLAGS = @DGA_CFLAGS@
@ -265,6 +267,10 @@ FONTROOTDIR = @FONTROOTDIR@
FONTTTFDIR = @FONTTTFDIR@
FONTTYPE1DIR = @FONTTYPE1DIR@
FOP = @FOP@
GBM_CFLAGS = @GBM_CFLAGS@
GBM_LIBS = @GBM_LIBS@
GLAMOR_CFLAGS = @GLAMOR_CFLAGS@
GLAMOR_LIBS = @GLAMOR_LIBS@
GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
GLX_DEFINES = @GLX_DEFINES@
GLX_SYS_LIBS = @GLX_SYS_LIBS@
@ -367,7 +373,10 @@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
SUID_WRAPPER_DIR = @SUID_WRAPPER_DIR@
SYSCONFDIR = @SYSCONFDIR@
SYSTEMD_DAEMON_CFLAGS = @SYSTEMD_DAEMON_CFLAGS@
SYSTEMD_DAEMON_LIBS = @SYSTEMD_DAEMON_LIBS@
TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
@ -376,6 +385,7 @@ UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
WAYLAND_SCANNER = @WAYLAND_SCANNER@
WINDOWSWM_CFLAGS = @WINDOWSWM_CFLAGS@
WINDOWSWM_LIBS = @WINDOWSWM_LIBS@
WINDRES = @WINDRES@
@ -442,6 +452,10 @@ XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@
XVFB_LIBS = @XVFB_LIBS@
XVFB_SYS_LIBS = @XVFB_SYS_LIBS@
XWAYLANDMODULES_CFLAGS = @XWAYLANDMODULES_CFLAGS@
XWAYLANDMODULES_LIBS = @XWAYLANDMODULES_LIBS@
XWAYLAND_LIBS = @XWAYLAND_LIBS@
XWAYLAND_SYS_LIBS = @XWAYLAND_SYS_LIBS@
XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@
XWINMODULES_LIBS = @XWINMODULES_LIBS@
XWIN_LIBS = @XWIN_LIBS@
@ -515,6 +529,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = nostdinc
# Required for automake < 1.14
ACLOCAL_AMFLAGS = -I m4
@COMPOSITE_TRUE@COMPOSITE_DIR = composite
@GLX_TRUE@GLX_DIR = glx
@ -522,6 +538,8 @@ ACLOCAL_AMFLAGS = -I m4
@RECORD_TRUE@RECORD_DIR = record
@DRI3_TRUE@DRI3_DIR = dri3
@PRESENT_TRUE@PRESENT_DIR = present
@PSEUDORAMIX_TRUE@PSEUDORAMIX_DIR = pseudoramiX
@GLAMOR_TRUE@GLAMOR_DIR = glamor
SUBDIRS = \
doc \
man \
@ -532,11 +550,11 @@ SUBDIRS = \
Xext \
miext \
os \
pseudoramiX \
randr \
render \
Xi \
xkb \
$(PSEUDORAMIX_DIR) \
$(DBE_DIR) \
$(RECORD_DIR) \
xfixes \
@ -546,6 +564,7 @@ SUBDIRS = \
$(PRESENT_DIR) \
$(DRI3_DIR) \
exa \
$(GLAMOR_DIR) \
config \
hw \
test
@ -582,6 +601,7 @@ DIST_SUBDIRS = \
composite \
glx \
exa \
glamor \
config \
dri3 \
present \