qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge the build of Xephyr in the main xserver build.

Browse Source 
Recent X server doesn't require to build the DIX with different
options for xfree86 and kdrive.

Tested for beeing a no-op on m88k by Kenji Aoyama. Thanks
This commit is contained in:
matthieu 2016-07-30 12:18:35 +00:00
parent 4159a76ad9
commit 7d876864d7
3 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.70 2016/04/01 03:15:15 jsg Exp $
# $OpenBSD: Makefile,v 1.71 2016/07/30 12:18:35 matthieu Exp $
.include <bsd.own.mk>
.include <bsd.xconf.mk>
@ -10,12 +10,6 @@ RM?=rm
XSERVER= xserver
.if defined(XENOCARA_BUILD_GL)
.if ${XENOCARA_BUILD_GL:L} == "yes"
XSERVER+= kdrive
.endif
.endif
SUBDIR= proto font/util data/bitmaps lib app data \
${XSERVER} driver util doc
.ifndef NOFONTS

32
kdrive/Makefile.bsd-wrapper
View File

@ -1,32 +0,0 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.18 2015/06/27 21:50:55 miod Exp $
.include <bsd.xconf.mk>
_SRCDIR= ${.CURDIR}/../xserver
NO_REORDER=yes
XKB_PATH= ${X11BASE}/share/X11/xkb
XKB_RULES= base
CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-xkb-path=${XKB_PATH} \
--with-xkb-output=/var/db/xkb \
--with-default-xkb-rules=${XKB_RULES} \
--disable-xorg \
--enable-xcsecurity \
--enable-kdrive \
--disable-dmx \
--disable-xnest \
--disable-xvfb \
--without-fop --without-xmlto --without-xsltproc
realinstall:
(cd hw/kdrive/ephyr ; make install)
.if ${MACHINE_CPU} == "mips64"
# disable cache file, because the compiler flags will not match
CONFIGURE_ARGS+= --cache-file=/dev/null
CFLAGS+= -Wa,-xgot
.endif
.include <bsd.xorg.mk>

4
xserver/Makefile.bsd-wrapper
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.62 2016/05/12 07:19:50 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.63 2016/07/30 12:18:35 matthieu Exp $
.include <bsd.xconf.mk>
@ -16,6 +16,7 @@ NO_XORG_OPTION=${NO_XORG_${MACHINE}}
GLX_OPTION= --disable-glx
.else
GLX_OPTION= --enable-glamor
KDRIVE_OPTION= --enable-kdrive
.endif
.if ${XENOCARA_BUILD_DRI:L} == "yes"
@ -33,6 +34,7 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-default-xkb-rules=${XKB_RULES} \
--with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \
--enable-install-setuid --enable-privsep \
${KDRIVE_OPTION} \
--enable-xcsecurity \
--without-fop --without-xmlto --without-xsltproc \
--disable-dmx ${NO_XORG_OPTION} \