head	1.24;
access;
symbols
	netbsd-9-5-RELEASE:1.21.2.1
	netbsd-11-0-RELEASE:1.24
	netbsd-11-0-RC7:1.24
	netbsd-11-0-RC6:1.24
	netbsd-11-0-RC5:1.24
	netbsd-11-0-RC4:1.24
	netbsd-11-0-RC3:1.24
	netbsd-11-0-RC2:1.24
	netbsd-11-0-RC1:1.24
	perseant-exfatfs-base-20250801:1.24
	netbsd-11:1.24.0.6
	netbsd-11-base:1.24
	netbsd-10-1-RELEASE:1.24
	perseant-exfatfs-base-20240630:1.24
	perseant-exfatfs:1.24.0.4
	perseant-exfatfs-base:1.24
	netbsd-8-3-RELEASE:1.20
	netbsd-9-4-RELEASE:1.21.2.1
	netbsd-10-0-RELEASE:1.24
	netbsd-10-0-RC6:1.24
	netbsd-10-0-RC5:1.24
	netbsd-10-0-RC4:1.24
	netbsd-10-0-RC3:1.24
	netbsd-10-0-RC2:1.24
	netbsd-10-0-RC1:1.24
	netbsd-10:1.24.0.2
	netbsd-10-base:1.24
	netbsd-9-3-RELEASE:1.21.2.1
	cjep_sun2x-base1:1.23
	cjep_sun2x:1.23.0.4
	cjep_sun2x-base:1.23
	cjep_staticlib_x-base1:1.23
	netbsd-9-2-RELEASE:1.21.2.1
	cjep_staticlib_x:1.23.0.2
	cjep_staticlib_x-base:1.23
	netbsd-9-1-RELEASE:1.21.2.1
	phil-wifi-20200421:1.21
	phil-wifi-20200411:1.21
	is-mlppp:1.21.0.4
	is-mlppp-base:1.21
	phil-wifi-20200406:1.21
	netbsd-8-2-RELEASE:1.20
	netbsd-9-0-RELEASE:1.21
	netbsd-9-0-RC2:1.21
	netbsd-9-0-RC1:1.21
	phil-wifi-20191119:1.21
	netbsd-9:1.21.0.2
	netbsd-9-base:1.21
	phil-wifi-20190609:1.21
	netbsd-8-1-RELEASE:1.20
	netbsd-8-1-RC1:1.20
	pgoyette-compat-merge-20190127:1.20.8.1
	pgoyette-compat-20190127:1.21
	pgoyette-compat-20190118:1.21
	pgoyette-compat-1226:1.20
	pgoyette-compat-1126:1.20
	pgoyette-compat-1020:1.20
	pgoyette-compat-0930:1.20
	pgoyette-compat-0906:1.20
	netbsd-7-2-RELEASE:1.14
	pgoyette-compat-0728:1.20
	netbsd-8-0-RELEASE:1.20
	phil-wifi:1.20.0.10
	phil-wifi-base:1.20
	pgoyette-compat-0625:1.20
	netbsd-8-0-RC2:1.20
	pgoyette-compat-0521:1.20
	pgoyette-compat-0502:1.20
	pgoyette-compat-0422:1.20
	netbsd-8-0-RC1:1.20
	pgoyette-compat-0415:1.20
	pgoyette-compat-0407:1.20
	pgoyette-compat-0330:1.20
	pgoyette-compat-0322:1.20
	pgoyette-compat-0315:1.20
	netbsd-7-1-2-RELEASE:1.14
	pgoyette-compat:1.20.0.8
	pgoyette-compat-base:1.20
	netbsd-7-1-1-RELEASE:1.14
	matt-nb8-mediatek:1.20.0.6
	matt-nb8-mediatek-base:1.20
	perseant-stdc-iso10646:1.20.0.4
	perseant-stdc-iso10646-base:1.20
	netbsd-8:1.20.0.2
	netbsd-8-base:1.20
	prg-localcount2-base3:1.19
	prg-localcount2-base2:1.19
	prg-localcount2-base1:1.19
	prg-localcount2:1.19.0.4
	prg-localcount2-base:1.19
	pgoyette-localcount-20170426:1.19
	bouyer-socketcan-base1:1.19
	pgoyette-localcount-20170320:1.19
	netbsd-7-1:1.14.0.26
	netbsd-7-1-RELEASE:1.14
	netbsd-7-1-RC2:1.14
	netbsd-7-nhusb-base-20170116:1.14
	bouyer-socketcan:1.19.0.2
	bouyer-socketcan-base:1.19
	pgoyette-localcount-20170107:1.19
	netbsd-7-1-RC1:1.14
	pgoyette-localcount-20161104:1.19
	netbsd-7-0-2-RELEASE:1.14
	localcount-20160914:1.19
	netbsd-7-nhusb:1.14.0.24
	netbsd-7-nhusb-base:1.14
	pgoyette-localcount-20160806:1.15
	pgoyette-localcount-20160726:1.15
	pgoyette-localcount:1.15.0.2
	pgoyette-localcount-base:1.15
	netbsd-7-0-1-RELEASE:1.14
	netbsd-7-0:1.14.0.22
	netbsd-7-0-RELEASE:1.14
	netbsd-7-0-RC3:1.14
	netbsd-7-0-RC2:1.14
	netbsd-7-0-RC1:1.14
	netbsd-5-2-3-RELEASE:1.6.4.2
	netbsd-5-1-5-RELEASE:1.6.4.2
	netbsd-6-0-6-RELEASE:1.14
	netbsd-6-1-5-RELEASE:1.14
	netbsd-7:1.14.0.20
	netbsd-7-base:1.14
	yamt-pagecache-base9:1.14
	yamt-pagecache-tag8:1.14
	netbsd-6-1-4-RELEASE:1.14
	netbsd-6-0-5-RELEASE:1.14
	tls-earlyentropy:1.14.0.18
	tls-earlyentropy-base:1.14
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.14
	riastradh-drm2-base3:1.14
	netbsd-6-1-3-RELEASE:1.14
	netbsd-6-0-4-RELEASE:1.14
	netbsd-5-2-2-RELEASE:1.6.4.2
	netbsd-5-1-4-RELEASE:1.6.4.2
	netbsd-6-1-2-RELEASE:1.14
	netbsd-6-0-3-RELEASE:1.14
	netbsd-5-2-1-RELEASE:1.6.4.2
	netbsd-5-1-3-RELEASE:1.6.4.2
	netbsd-6-1-1-RELEASE:1.14
	riastradh-drm2-base2:1.14
	riastradh-drm2-base1:1.14
	riastradh-drm2:1.14.0.12
	riastradh-drm2-base:1.14
	netbsd-6-1:1.14.0.16
	netbsd-6-0-2-RELEASE:1.14
	netbsd-6-1-RELEASE:1.14
	netbsd-6-1-RC4:1.14
	netbsd-6-1-RC3:1.14
	agc-symver:1.14.0.14
	agc-symver-base:1.14
	netbsd-6-1-RC2:1.14
	netbsd-6-1-RC1:1.14
	yamt-pagecache-base8:1.14
	netbsd-5-2:1.6.4.2.0.6
	netbsd-6-0-1-RELEASE:1.14
	yamt-pagecache-base7:1.14
	netbsd-5-2-RELEASE:1.6.4.2
	netbsd-5-2-RC1:1.6.4.2
	matt-nb6-plus-nbase:1.14
	yamt-pagecache-base6:1.14
	netbsd-6-0:1.14.0.10
	netbsd-6-0-RELEASE:1.14
	netbsd-6-0-RC2:1.14
	tls-maxphys:1.14.0.8
	tls-maxphys-base:1.14
	matt-nb6-plus:1.14.0.6
	matt-nb6-plus-base:1.14
	netbsd-6-0-RC1:1.14
	yamt-pagecache-base5:1.14
	yamt-pagecache-base4:1.14
	netbsd-6:1.14.0.4
	netbsd-6-base:1.14
	netbsd-5-1-2-RELEASE:1.6.4.2
	netbsd-5-1-1-RELEASE:1.6.4.2
	yamt-pagecache-base3:1.14
	yamt-pagecache-base2:1.14
	yamt-pagecache:1.14.0.2
	yamt-pagecache-base:1.14
	cherry-xenmp:1.12.0.4
	cherry-xenmp-base:1.12
	bouyer-quota2-nbase:1.12
	bouyer-quota2:1.12.0.2
	bouyer-quota2-base:1.12
	matt-mips64-premerge-20101231:1.12
	matt-nb5-mips64-premerge-20101231:1.6.4.1.4.1
	matt-nb5-pq3:1.6.4.2.0.4
	matt-nb5-pq3-base:1.6.4.2
	pre-xorg-192:1.12
	netbsd-5-1:1.6.4.2.0.2
	netbsd-5-1-RELEASE:1.6.4.2
	netbsd-5-1-RC4:1.6.4.2
	matt-nb5-mips64-k15:1.6.4.1.4.1
	netbsd-5-1-RC3:1.6.4.2
	netbsd-5-1-RC2:1.6.4.2
	netbsd-5-1-RC1:1.6.4.2
	netbsd-5-0-2-RELEASE:1.6.4.1
	matt-nb5-mips64-premerge-20091211:1.6.4.1
	matt-premerge-20091211:1.11
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.6.4.1
	matt-nb4-mips64-k7-u2a-k9b:1.6.4.1
	matt-nb5-mips64-u1-k1-k5:1.6.4.1
	matt-nb5-mips64:1.6.4.1.0.4
	netbsd-5-0-1-RELEASE:1.6.4.1
	jym-xensuspend-nbase:1.8
	netbsd-5-0:1.6.4.1.0.2
	netbsd-5-0-RELEASE:1.6.4.1
	netbsd-5-0-RC4:1.6.4.1
	netbsd-5-0-RC3:1.6.4.1
	netbsd-5-0-RC2:1.6.4.1
	jym-xensuspend:1.8.0.2
	jym-xensuspend-base:1.8
	netbsd-5-0-RC1:1.6.4.1
	haad-dm-base:1.6
	haad-dm-base2:1.6
	haad-nbase2:1.6
	netbsd-5:1.6.0.4
	netbsd-5-base:1.6
	matt-mips64-base2:1.6
	haad-dm:1.6.0.2
	haad-dm-base1:1.6
	wrstuden-revivesa-base-3:1.5
	wrstuden-revivesa:1.5.0.2
	wrstuden-revivesa-base-2:1.5;
locks; strict;
comment	@# @;


1.24
date	2021.08.19.11.03.04;	author mrg;	state Exp;
branches;
next	1.23;
commitid	qjeCdkK2f23fvz5D;

1.23
date	2020.08.05.15.48.09;	author tsutsui;	state Exp;
branches;
next	1.22;
commitid	B4wyPZt6HZ9IfTiC;

1.22
date	2020.07.20.13.59.57;	author tsutsui;	state Exp;
branches;
next	1.21;
commitid	NOJZTRfws5efbPgC;

1.21
date	2018.12.31.11.14.06;	author mrg;	state Exp;
branches
	1.21.2.1;
next	1.20;
commitid	TUVjjF1MdjrmtW5B;

1.20
date	2017.05.21.15.28.40;	author riastradh;	state Exp;
branches
	1.20.8.1
	1.20.10.1;
next	1.19;
commitid	qFvwLLy2KgFGNgSz;

1.19
date	2016.08.14.03.43.05;	author mrg;	state Exp;
branches;
next	1.18;
commitid	J271e7p9sa4wUdiz;

1.18
date	2016.08.14.00.03.58;	author mrg;	state Exp;
branches;
next	1.17;
commitid	GTnYSwjk1lG4Iciz;

1.17
date	2016.08.12.01.15.51;	author mrg;	state Exp;
branches;
next	1.16;
commitid	5GiziC5fk8bIaXhz;

1.16
date	2016.08.11.08.32.44;	author mrg;	state Exp;
branches;
next	1.15;
commitid	8krHm1L1UVyjzRhz;

1.15
date	2016.06.29.19.36.56;	author christos;	state Exp;
branches;
next	1.14;
commitid	s2upAomcNCxhGocz;

1.14
date	2011.08.02.09.11.38;	author mrg;	state Exp;
branches;
next	1.13;

1.13
date	2011.08.02.07.41.01;	author mrg;	state Exp;
branches;
next	1.12;

1.12
date	2010.05.22.05.45.02;	author mrg;	state Exp;
branches;
next	1.11;

1.11
date	2009.08.22.02.40.27;	author mrg;	state Exp;
branches;
next	1.10;

1.10
date	2009.06.12.01.59.07;	author mrg;	state Exp;
branches;
next	1.9;

1.9
date	2009.06.11.05.43.18;	author mrg;	state Exp;
branches;
next	1.8;

1.8
date	2009.01.24.17.24.53;	author bouyer;	state Exp;
branches;
next	1.7;

1.7
date	2008.12.22.01.04.27;	author jmcneill;	state Exp;
branches;
next	1.6;

1.6
date	2008.10.14.23.37.19;	author cube;	state Exp;
branches
	1.6.2.1
	1.6.4.1;
next	1.5;

1.5
date	2008.08.15.15.55.06;	author rtr;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2008.08.09.06.50.17;	author rtr;	state Exp;
branches;
next	1.3;

1.3
date	2008.08.04.04.32.17;	author mrg;	state Exp;
branches;
next	1.2;

1.2
date	2008.08.03.22.07.08;	author mrg;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.03.03.37.05;	author mrg;	state Exp;
branches;
next	;

1.21.2.1
date	2020.07.26.10.59.47;	author martin;	state Exp;
branches;
next	;
commitid	TJFzJhB0NPGtZzhC;

1.20.8.1
date	2019.01.18.08.49.08;	author pgoyette;	state Exp;
branches;
next	;
commitid	Lmlzg3OVT2cd6f8B;

1.20.10.1
date	2019.06.10.22.02.49;	author christos;	state Exp;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;

1.6.2.1
date	2008.10.14.23.37.19;	author haad;	state dead;
branches;
next	1.6.2.2;

1.6.2.2
date	2008.10.19.22.41.21;	author haad;	state Exp;
branches;
next	;

1.6.4.1
date	2008.12.24.16.48.25;	author snj;	state Exp;
branches
	1.6.4.1.4.1;
next	1.6.4.2;

1.6.4.2
date	2009.09.17.04.24.41;	author snj;	state Exp;
branches;
next	;

1.6.4.1.4.1
date	2010.04.21.05.24.47;	author matt;	state Exp;
branches;
next	;

1.5.2.1
date	2008.08.15.15.55.06;	author wrstuden;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2008.09.18.05.18.47;	author wrstuden;	state Exp;
branches;
next	;


desc
@@


1.24
log
@fix dri3 extension building and build it.

needed for amdgpu.
@
text
@#	$NetBSD: Makefile,v 1.23 2020/08/05 15:48:09 tsutsui Exp $

.include <bsd.own.mk>

PROG=	Xnest

.include "../../Makefile.serverlib"
.include "../../Makefile.servermod"

.PATH:		${X11SRCDIR.xorg-server}/hw/xnest
.PATH:		${X11SRCDIR.xorg-server}/hw/xnest/man
.PATH:		${X11SRCDIR.xorg-server}/Xext
.PATH:		${X11SRCDIR.xorg-server}/Xi
.PATH:		${X11SRCDIR.xorg-server}/mi
.PATH:		${X11SRCDIR.xorg-server}/fb
SRCS=		Args.c Color.c Cursor.c Display.c Events.c Font.c \
		GC.c GCOps.c Handlers.c Init.c Keyboard.c \
		Pixmap.c Pointer.c Screen.c Visual.c Window.c \
		stubs.c miinitext.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${X11SRCDIR.xorg-server}/include \
		-I${X11SRCDIR.xorg-server}/os \
		-I${X11SRCDIR.xorg-server}/present \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${X11SRCDIR.xorg-server}/../include \
		${X11INCS.DIX}

CPPFLAGS+=	${X11FLAGS.OS_DEFINES} \
		${X11FLAGS.EXTENSION} \
		${X11FLAGS.DIX} \
		-UXFree86LOADER -UMITSHM \
		-D__XKBDEFRULES__='"xorg"'

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
		-DHAVE_XNEST_CONFIG_H \
		-UGLXEXT

CPPFLAGS.Events.c=	-Wno-error
CPPFLAGS.Screen.c=	-Wno-error
CPPFLAGS.Color.c=	-Wno-error
CPPFLAGS.Window.c=	-Wno-error
CPPFLAGS.miinitext.c=	-UDPMSExtension

.include "../../Makefile.Xserver"

LDADD+=	${LDADD.dix} \
	${LDADD.fb} \
	${LDADD.mi} \
	${LDADD.config} \
	${LDADD.xfixes} \
	${LDADD.Xext} \
	${LDADD.dbe} \
	${LDADD.record} \
	${LDADD.randr} \
	${LDADD.damageext} \
	${LDADD.miext/damage} \
	${LDADD.miext/shadow} \
	${LDADD.miext/sync} \
	${LDADD.render} \
	${LDADD.Xi} \
	${LDADD.xkb} \
	${LDADD.xkbstubs} \
	${LDADD.composite} \
	${LDADD.os} \
	${LDADD.glx} \
	${LDADD.present} \
	${LDADD.dri3} \
	-lXfont2 -lXext -lfontenc \
	-lpixman-1 -lX11 -lXau \
	-lXdmcp -lfreetype -lm

DPADD+=	${LDADD.dix} \
	${DPADD.fb} \
	${DPADD.mi} \
	${DPADD.config} \
	${DPADD.xfixes} \
	${DPADD.Xext} \
	${DPADD.dbe} \
	${DPADD.record} \
	${DPADD.render} \
	${DPADD.randr} \
	${DPADD.damageext} \
	${DPADD.miext/damage} \
	${DPADD.miext/shadow} \
	${DPADD.miext/sync} \
	${DPADD.Xi} \
	${DPADD.xkb} \
	${DPADD.composite} \
	${DPADD.os} \
	${DPADD.glx} \
	${DPADD.present} \
	${DPADD.dri3} \
	${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
	${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
	${LIBXDMCP} ${LIBFREETYPE} ${LIBM}

LDADD+=	-lcrypto
DPADD+=	${LIBCRYPTO}

.if ${MACHINE_ARCH} == "i386"
LDADD+=	-li386
DPADD+=	${LIBI386}
.endif

.if ${MACHINE_ARCH} == "x86_64"
LDADD+=	-lx86_64
DPADD+=	${LIBX86_64}
.endif

.if ${MACHINE_ARCH} == "alpha"
LDADD+=	-lalpha
DPADD+=	${LIBALPHA}
.endif

COPTS.miinitext.c+=	-Wno-error	# XXX xf86bigfstr.h

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.23
log
@No need to build fbcmap_mi.c in each DDX server.

Per upstream commit:
 https://cgit.freedesktop.org/xorg/xserver/commit/?id=432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7
> Build fbcmap_mi.c once, rather than once for each DDX, and make it part of libfb
> or libwfb convenience library.

Tested on sun3 and x68k.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.22 2020/07/20 13:59:57 tsutsui Exp $
d73 1
d98 1
@


1.22
log
@Remove extra "-I" for ${X11INCS.DIX} macro.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.21 2018/12/31 11:14:06 mrg Exp $
d19 1
a19 2
		stubs.c miinitext.c \
		fbcmap_mi.c
@


1.21
log
@build updates for xorg-server 1.20.3:
- moved/removed/new files
- don't define HAVE_XORG_CONFIG_H or HAVE_DIX_CONFIG_H if using
  ${X11FLAGS.DIX} -- already included.

put glxvnd into glx itself for now.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.20 2017/05/21 15:28:40 riastradh Exp $
d33 1
a33 1
		-I${X11INCS.DIX}
@


1.21.2.1
log
@Pull up following revision(s) (requested by tsutsui in ticket #1028):

	share/mk/bsd.x11.mk: revision 1.135
	external/mit/xorg/server/xorg-server/hw/xnest/Makefile: revision 1.22
	external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile: revision 1.4

Fix typos in ${X11INCS.DIX} include paths. PR/55500
Remove extra "-I" for ${X11INCS.DIX} macro.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.21 2018/12/31 11:14:06 mrg Exp $
d33 1
a33 1
		${X11INCS.DIX}
@


1.20
log
@Remove MKCRYPTO option.

Originally, MKCRYPTO was introduced because the United States
classified cryptography as a munition and restricted its export.  The
export controls were substantially relaxed fifteen years ago, and are
essentially irrelevant for software with published source code.

In the intervening time, nobody bothered to remove the option after
its motivation -- the US export restriction -- was eliminated.  I'm
not aware of any other operating system that has a similar option; I
expect it is mainly out of apathy for churn that we still have it.
Today, cryptography is an essential part of modern computing -- you
can't use the internet responsibly without cryptography.

The position of the TNF board of directors is that TNF makes no
representation that MKCRYPTO=no satisfies any country's cryptography
regulations.

My personal position is that the availability of cryptography is a
basic human right; that any local laws restricting it to a privileged
few are fundamentally immoral; and that it is wrong for developers to
spend effort crippling cryptography to work around such laws.

As proposed on tech-crypto, tech-security, and tech-userlevel to no
objections:

https://mail-index.netbsd.org/tech-crypto/2017/05/06/msg000719.html
https://mail-index.netbsd.org/tech-security/2017/05/06/msg000928.html
https://mail-index.netbsd.org/tech-userlevel/2017/05/06/msg010547.html

P.S.  Reviewing all the uses of MKCRYPTO in src revealed a lot of
*bad* crypto that was conditional on it, e.g. DES in telnet...  That
should probably be removed too, but on the grounds that it is bad,
not on the grounds that it is (nominally) crypto.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.19 2016/08/14 03:43:05 mrg Exp $
d19 1
a19 1
		dpmsstubs.c stubs.c miinitext.c \
a61 1
	${LDADD.render} \
d66 1
d74 1
a74 1
	-lXfont -lXext -lfontenc \
@


1.20.10.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.21 2018/12/31 11:14:06 mrg Exp $
d19 1
a19 1
		stubs.c miinitext.c \
d62 1
a66 1
	${LDADD.render} \
d74 1
a74 1
	-lXfont2 -lXext -lfontenc \
@


1.20.8.1
log
@Synch with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.20 2017/05/21 15:28:40 riastradh Exp $
d19 1
a19 1
		stubs.c miinitext.c \
d62 1
a66 1
	${LDADD.render} \
d74 1
a74 1
	-lXfont2 -lXext -lfontenc \
@


1.19
log
@various updates:
- port pkgsrc libxshmfence patches
- Xextbuiltin/module is no longer a thing, make it normal
- always need xorg-config.h/xorg-server.h for server components now
- add present, damage, render, Xi, dri, pixman,  extension where needed
- fix various CPPFLAGS issues
- deal with moved sdksyms.sh
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.18 2016/08/14 00:03:58 mrg Exp $
a101 1
.if ${MKCRYPTO:Uno} != "no"
a103 1
.endif
@


1.18
log
@various build updates for xorg-server 1.18.  with this and some other
uncommited work, Xvfb and Xnest both link.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17 2016/08/12 01:15:51 mrg Exp $
d28 1
d73 1
d97 1
@


1.17
log
@round do of reach over updates for xorg-server 1.18.  again, untested,
but this should be much closer to complete for the necessary changes.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.16 2016/08/11 08:32:44 mrg Exp $
d28 1
@


1.16
log
@first merge of xorg-server 1.18.4 reach over.  not tested, and
missing at these new subdirs, some which may not be needed:

	dri2
	glamor
	hw/xfree86/drivers/modesetting
	hw/xfree86/parser
	present
	pseudoramiX
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.15 2016/06/29 19:36:56 christos Exp $
d36 1
a36 1
		-DNO_HW_ONLY_EXTS -UXFree86LOADER -UMITSHM \
@


1.15
log
@Fix MKCRYPTO=no build.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.14 2011/08/02 09:11:38 mrg Exp $
a62 1
	${LDADD.cw/cw} \
a86 1
	${DPADD.cw/cw} \
@


1.14
log
@various updates for xorg-server 1.10.3.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2011/08/02 07:41:01 mrg Exp $
d74 1
a74 1
	-lXdmcp -lfreetype -lm -lcrypto
d98 6
a103 1
	${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
@


1.13
log
@build updates and fixes for xorg-server 1.10.3.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2010/05/22 05:45:02 mrg Exp $
d65 1
d90 1
@


1.12
log
@XXX: use -Wno-error for files that use old foostr.h includes that now have
XXX: #warning's in them.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2009/08/22 02:40:27 mrg Exp $
d11 1
@


1.11
log
@add -Wno-error for a bunch of files that use (xorg) deprecated symbols.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2009/06/12 01:59:07 mrg Exp $
d112 2
@


1.10
log
@build updates for xorg-server 1.6.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2009/06/11 05:43:18 mrg Exp $
d44 2
@


1.9
log
@upgrade the build framework for xorg-server 1.6.

this doesn't quite work yet.  Xvfb and Xnest attempt to link but
have missing symbols.  Xorg doesn't build all its components yet.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2009/01/24 17:24:53 bouyer Exp $
d67 1
d90 1
@


1.8
log
@Add support for X11FLAVOUR=xorg to NetBSD/alpha. Tested on PWS500
(ev56, handled as non-BWX by Xorg) and XP1000 (ev6, BWX). Also
tested by Rafael Ruiz on a AlphaStation 255 (thanks !).
non-PCI adapters are not supported; someone should make these work
as a wsfb device.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2008/12/22 01:04:27 jmcneill Exp $
a54 1
	${LDADD.XTrap} \
d56 1
a57 1
	${LDADD.randr} \
a65 1
	${LDADD.dix/xpstubs} \
d69 1
a69 1
	-lXdmcp -lfreetype -lm
a77 1
	${DPADD.XTrap} \
a87 1
	${DPADD.dix/xpstubs} \
d91 1
a91 1
	${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
@


1.7
log
@PR# xsrc/40150: unable to use Ctr-Alt-Fx to switch out of X server

Break libxkb into two separate libraries (libxkb and libxbkstubs). Pull
in libxkbstubs for Xvfb and Xnest, and for Xorg use dixmods/libxorgxkb.
Now Xorg no longer uses the stub XkbDDXSwitchScreen from xkb/ddxVT.c so
display switching works again.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2008/10/14 23:37:19 cube Exp $
d107 5
@


1.6
log
@- Adapt to changes on bsd.x11.mk
- Remove unnecessary targets that handled .man.pre files
- Add transformations for package-specific patterns in man page templates.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2008/08/15 15:55:06 rtr Exp $
d65 1
@


1.6.4.1
log
@Pull up following revision(s) (requested by jmcneill in ticket #200):
	external/mit/xorg/server/xorg-server/Makefile: revision 1.18
	external/mit/xorg/server/xorg-server/Makefile.Xserver: revision 1.8
	external/mit/xorg/server/xorg-server/hw/vfb/Makefile: revision 1.5
	external/mit/xorg/server/xorg-server/hw/xfree86/Makefile: revision 1.23
	external/mit/xorg/server/xorg-server/hw/xnest/Makefile: revision 1.7
	external/mit/xorg/server/xorg-server/xkb/Makefile: revision 1.4
	external/mit/xorg/server/xorg-server/xkbstubs/Makefile: revision 1.1
PR# xsrc/40150: unable to use Ctr-Alt-Fx to switch out of X server
Break libxkb into two separate libraries (libxkb and libxbkstubs). Pull
in libxkbstubs for Xvfb and Xnest, and for Xorg use dixmods/libxorgxkb.
Now Xorg no longer uses the stub XkbDDXSwitchScreen from xkb/ddxVT.c so
display switching works again.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2008/10/14 23:37:19 cube Exp $
a64 1
	${LDADD.xkbstubs} \
@


1.6.4.1.4.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6.4.2 2009/09/17 04:24:41 snj Exp $
a43 2
CPPFLAGS.Color.c=	-Wno-error
CPPFLAGS.Window.c=	-Wno-error
d55 1
d57 1
a58 1
	${LDADD.render} \
d67 1
a68 1
	${LDADD.glx} \
d71 1
a71 1
	-lXdmcp -lfreetype -lm -lcrypto
d80 1
d91 1
a92 1
	${DPADD.glx} \
d95 1
a95 1
	${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
a106 5
.if ${MACHINE_ARCH} == "alpha"
LDADD+=	-lalpha
DPADD+=	${LIBALPHA}
.endif

@


1.6.4.2
log
@Apply patch (requested by mrg in ticket #958):
Sync X.Org reachover build framework and setlists with the new X.Org.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2009/06/12 01:59:07 mrg Exp $
a43 2
CPPFLAGS.Color.c=	-Wno-error
CPPFLAGS.Window.c=	-Wno-error
d55 1
d57 1
a58 1
	${LDADD.render} \
d67 1
a68 1
	${LDADD.glx} \
d71 1
a71 1
	-lXdmcp -lfreetype -lm -lcrypto
d80 1
d91 1
a92 1
	${DPADD.glx} \
d95 1
a95 1
	${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
a106 5
.if ${MACHINE_ARCH} == "alpha"
LDADD+=	-lalpha
DPADD+=	${LIBALPHA}
.endif

@


1.6.2.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:21 +0000
@
text
@d1 107
@


1.6.2.2
log
@Sync with HEAD.
@
text
@a0 107
#	$NetBSD: Makefile,v 1.6 2008/10/14 23:37:19 cube Exp $

.include <bsd.own.mk>

PROG=	Xnest

.include "../../Makefile.serverlib"
.include "../../Makefile.servermod"

.PATH:		${X11SRCDIR.xorg-server}/hw/xnest
.PATH:		${X11SRCDIR.xorg-server}/Xext
.PATH:		${X11SRCDIR.xorg-server}/Xi
.PATH:		${X11SRCDIR.xorg-server}/mi
.PATH:		${X11SRCDIR.xorg-server}/fb
SRCS=		Args.c Color.c Cursor.c Display.c Events.c Font.c \
		GC.c GCOps.c Handlers.c Init.c Keyboard.c \
		Pixmap.c Pointer.c Screen.c Visual.c Window.c \
		dpmsstubs.c stubs.c miinitext.c \
		fbcmap_mi.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${X11SRCDIR.xorg-server}/include \
		-I${X11SRCDIR.xorg-server}/os \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${X11SRCDIR.xorg-server}/../include \
		-I${X11INCS.DIX}

CPPFLAGS+=	${X11FLAGS.OS_DEFINES} \
		${X11FLAGS.EXTENSION} \
		${X11FLAGS.DIX} \
		-DNO_HW_ONLY_EXTS -UXFree86LOADER -UMITSHM \
		-D__XKBDEFRULES__='"xorg"'

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
		-DHAVE_XNEST_CONFIG_H \
		-UGLXEXT

CPPFLAGS.Events.c=	-Wno-error
CPPFLAGS.Screen.c=	-Wno-error
CPPFLAGS.miinitext.c=	-UDPMSExtension

.include "../../Makefile.Xserver"

LDADD+=	${LDADD.dix} \
	${LDADD.fb} \
	${LDADD.mi} \
	${LDADD.config} \
	${LDADD.xfixes} \
	${LDADD.Xext} \
	${LDADD.dbe} \
	${LDADD.XTrap} \
	${LDADD.record} \
	${LDADD.render} \
	${LDADD.randr} \
	${LDADD.damageext} \
	${LDADD.miext/damage} \
	${LDADD.cw/cw} \
	${LDADD.miext/shadow} \
	${LDADD.Xi} \
	${LDADD.xkb} \
	${LDADD.composite} \
	${LDADD.dix/xpstubs} \
	${LDADD.os} \
	-lXfont -lXext -lfontenc \
	-lpixman-1 -lX11 -lXau \
	-lXdmcp -lfreetype -lm

DPADD+=	${LDADD.dix} \
	${DPADD.fb} \
	${DPADD.mi} \
	${DPADD.config} \
	${DPADD.xfixes} \
	${DPADD.Xext} \
	${DPADD.dbe} \
	${DPADD.XTrap} \
	${DPADD.record} \
	${DPADD.render} \
	${DPADD.randr} \
	${DPADD.damageext} \
	${DPADD.miext/damage} \
	${DPADD.cw/cw} \
	${DPADD.miext/shadow} \
	${DPADD.Xi} \
	${DPADD.xkb} \
	${DPADD.composite} \
	${DPADD.dix/xpstubs} \
	${DPADD.os} \
	${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
	${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
	${LIBXDMCP} ${LIBFREETYPE} ${LIBM}

.if ${MACHINE_ARCH} == "i386"
LDADD+=	-li386
DPADD+=	${LIBI386}
.endif

.if ${MACHINE_ARCH} == "x86_64"
LDADD+=	-lx86_64
DPADD+=	${LIBX86_64}
.endif

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.5
log
@stop using XSERVERINCDIR since it was referencing src/x11 reachover
this is not correct for xorg reachover
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2008/08/09 06:50:17 rtr Exp $
a105 4
# XXX
Xnest.1: Xnest.man.pre
	cp ${.ALLSRC} ${.TARGET}

@


1.5.2.1
log
@file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:47 +0000
@
text
@d1 111
@


1.5.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 111
#	$NetBSD: Makefile,v 1.5 2008/08/15 15:55:06 rtr Exp $

.include <bsd.own.mk>

PROG=	Xnest

.include "../../Makefile.serverlib"
.include "../../Makefile.servermod"

.PATH:		${X11SRCDIR.xorg-server}/hw/xnest
.PATH:		${X11SRCDIR.xorg-server}/Xext
.PATH:		${X11SRCDIR.xorg-server}/Xi
.PATH:		${X11SRCDIR.xorg-server}/mi
.PATH:		${X11SRCDIR.xorg-server}/fb
SRCS=		Args.c Color.c Cursor.c Display.c Events.c Font.c \
		GC.c GCOps.c Handlers.c Init.c Keyboard.c \
		Pixmap.c Pointer.c Screen.c Visual.c Window.c \
		dpmsstubs.c stubs.c miinitext.c \
		fbcmap_mi.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${X11SRCDIR.xorg-server}/include \
		-I${X11SRCDIR.xorg-server}/os \
		-I${DESTDIR}${X11INCDIR}/X11/extensions \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${X11SRCDIR.xorg-server}/../include \
		-I${X11INCS.DIX}

CPPFLAGS+=	${X11FLAGS.OS_DEFINES} \
		${X11FLAGS.EXTENSION} \
		${X11FLAGS.DIX} \
		-DNO_HW_ONLY_EXTS -UXFree86LOADER -UMITSHM \
		-D__XKBDEFRULES__='"xorg"'

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
		-DHAVE_XNEST_CONFIG_H \
		-UGLXEXT

CPPFLAGS.Events.c=	-Wno-error
CPPFLAGS.Screen.c=	-Wno-error
CPPFLAGS.miinitext.c=	-UDPMSExtension

.include "../../Makefile.Xserver"

LDADD+=	${LDADD.dix} \
	${LDADD.fb} \
	${LDADD.mi} \
	${LDADD.config} \
	${LDADD.xfixes} \
	${LDADD.Xext} \
	${LDADD.dbe} \
	${LDADD.XTrap} \
	${LDADD.record} \
	${LDADD.render} \
	${LDADD.randr} \
	${LDADD.damageext} \
	${LDADD.miext/damage} \
	${LDADD.cw/cw} \
	${LDADD.miext/shadow} \
	${LDADD.Xi} \
	${LDADD.xkb} \
	${LDADD.composite} \
	${LDADD.dix/xpstubs} \
	${LDADD.os} \
	-lXfont -lXext -lfontenc \
	-lpixman-1 -lX11 -lXau \
	-lXdmcp -lfreetype -lm

DPADD+=	${LDADD.dix} \
	${DPADD.fb} \
	${DPADD.mi} \
	${DPADD.config} \
	${DPADD.xfixes} \
	${DPADD.Xext} \
	${DPADD.dbe} \
	${DPADD.XTrap} \
	${DPADD.record} \
	${DPADD.render} \
	${DPADD.randr} \
	${DPADD.damageext} \
	${DPADD.miext/damage} \
	${DPADD.cw/cw} \
	${DPADD.miext/shadow} \
	${DPADD.Xi} \
	${DPADD.xkb} \
	${DPADD.composite} \
	${DPADD.dix/xpstubs} \
	${DPADD.os} \
	${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
	${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
	${LIBXDMCP} ${LIBFREETYPE} ${LIBM}

.if ${MACHINE_ARCH} == "i386"
LDADD+=	-li386
DPADD+=	${LIBI386}
.endif

.if ${MACHINE_ARCH} == "x86_64"
LDADD+=	-lx86_64
DPADD+=	${LIBX86_64}
.endif

# XXX
Xnest.1: Xnest.man.pre
	cp ${.ALLSRC} ${.TARGET}

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.4
log
@make this build more like the xorg build and cleanup DPADD while i'm here
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/08/04 04:32:17 mrg Exp $
a25 1
		-I${XSERVERINCDIR} \
@


1.3
log
@add a hack to build Xnest.1.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/08/03 22:07:08 mrg Exp $
d49 2
a50 2
LDADD+= \
	${LDADD.XORG_CORE} \
a52 6
	-lXfont \
	-lXau \
	-lfontenc \
	-lpixman-1 \
	-lXdmcp \
	${LDADD.fb} \
d62 1
d69 3
a71 4
	-lXext \
	-lX11 \
	-lXau \
	-lfreetype
d73 2
a74 2
DPADD+= \
	${DPADD.XORG_CORE} \
a76 6
	${LIBXFONT} \
	${LIBXAU} \
	${LIBFONTENC} \
	${LIBPIXMAN-1} \
	${LIBXDMCP} \
	${DPADD.fb} \
d86 1
d93 3
a95 4
	${LIBXEXT} \
	${LIBX11} \
	${LIBXAU} \
	${LIBFREETYPE}
@


1.2
log
@build Xnest itself from here, like xorg-server does.

also, now Xnest links.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/08/03 03:37:05 mrg Exp $
d119 4
@


1.1
log
@initial build glue for hw/xnest / Xnest.  doesn't yet link but
does attempt to try.
@
text
@d1 5
a5 1
#	$NetBSD: Makefile,v 1.6.4.2 2004/11/21 10:01:27 rtr Exp $
a9 2
LIB=		xnest

d39 4
d47 72
d120 1
a120 1
.include <bsd.lib.mk>
@