fixes for xorg-server 1.20:

- XFree86LOADER is obsolete.
- some deprecated functions are used, we should fix them.
This commit is contained in:
mrg 2018-12-31 11:58:43 +00:00
parent 66ee4e221d
commit fe441dc30e
3 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.xf86-driver,v 1.24 2016/10/08 20:08:57 mrg Exp $
# $NetBSD: Makefile.xf86-driver,v 1.25 2018/12/31 11:58:43 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@ -37,8 +37,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
-DHAVE_XEXTPROTO_71 \
-DXFree86LOADER
-DHAVE_XEXTPROTO_71
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DHAVE_XAA_H

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2013/01/12 18:32:12 macallan Exp $
# $NetBSD: Makefile,v 1.16 2018/12/31 11:58:43 mrg Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@ -26,6 +26,7 @@ CPPFLAGS.kbd.c= -D__XKBDEFRULES__=${__XKBDEFRULES__}
X11EXTRAMANDEFS+= -e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
COPTS.kbd.c= -Wno-error # XXX deprecated
COPTS.kbd.c= -Wno-error # XXX deprecated
COPTS.bsd_kbd.c= -Wno-error # XXX deprecated
.include "../Makefile.xf86-driver"

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2012/03/22 23:46:27 joerg Exp $
# $NetBSD: Makefile,v 1.4 2018/12/31 11:58:43 mrg Exp $
WARNS?= 2
@ -14,4 +14,6 @@ CPPFLAGS+= -DHAVE_CONFIG_H \
CWARNFLAGS.clang+= -Wno-parentheses-equality
COPTS.emumb.c= -Wno-error # XXX deprecated
.include "../Makefile.xf86-driver"