head	1.31;
access;
symbols
	netbsd-11-0-RC4:1.31
	netbsd-11-0-RC3:1.31
	netbsd-11-0-RC2:1.31
	netbsd-11-0-RC1:1.31
	perseant-exfatfs-base-20250801:1.31
	netbsd-11:1.31.0.6
	netbsd-11-base:1.31
	netbsd-10-1-RELEASE:1.31
	perseant-exfatfs-base-20240630:1.31
	perseant-exfatfs:1.31.0.4
	perseant-exfatfs-base:1.31
	netbsd-8-3-RELEASE:1.28
	netbsd-9-4-RELEASE:1.29
	netbsd-10-0-RELEASE:1.31
	netbsd-10-0-RC6:1.31
	netbsd-10-0-RC5:1.31
	netbsd-10-0-RC4:1.31
	netbsd-10-0-RC3:1.31
	netbsd-10-0-RC2:1.31
	netbsd-10-0-RC1:1.31
	netbsd-10:1.31.0.2
	netbsd-10-base:1.31
	netbsd-9-3-RELEASE:1.29
	cjep_sun2x-base1:1.29
	cjep_sun2x:1.29.0.12
	cjep_sun2x-base:1.29
	cjep_staticlib_x-base1:1.29
	netbsd-9-2-RELEASE:1.29
	cjep_staticlib_x:1.29.0.10
	cjep_staticlib_x-base:1.29
	netbsd-9-1-RELEASE:1.29
	phil-wifi-20200421:1.29
	phil-wifi-20200411:1.29
	is-mlppp:1.29.0.8
	is-mlppp-base:1.29
	phil-wifi-20200406:1.29
	netbsd-8-2-RELEASE:1.28
	netbsd-9-0-RELEASE:1.29
	netbsd-9-0-RC2:1.29
	netbsd-9-0-RC1:1.29
	phil-wifi-20191119:1.29
	netbsd-9:1.29.0.6
	netbsd-9-base:1.29
	phil-wifi-20190609:1.29
	netbsd-8-1-RELEASE:1.28
	netbsd-8-1-RC1:1.28
	pgoyette-compat-merge-20190127:1.29
	pgoyette-compat-20190127:1.29
	pgoyette-compat-20190118:1.29
	pgoyette-compat-1226:1.29
	pgoyette-compat-1126:1.29
	pgoyette-compat-1020:1.29
	pgoyette-compat-0930:1.29
	pgoyette-compat-0906:1.29
	netbsd-7-2-RELEASE:1.21
	pgoyette-compat-0728:1.29
	netbsd-8-0-RELEASE:1.28
	phil-wifi:1.29.0.4
	phil-wifi-base:1.29
	pgoyette-compat-0625:1.29
	netbsd-8-0-RC2:1.28
	pgoyette-compat-0521:1.29
	pgoyette-compat-0502:1.29
	pgoyette-compat-0422:1.29
	netbsd-8-0-RC1:1.28
	pgoyette-compat-0415:1.29
	pgoyette-compat-0407:1.29
	pgoyette-compat-0330:1.29
	pgoyette-compat-0322:1.29
	pgoyette-compat-0315:1.29
	netbsd-7-1-2-RELEASE:1.21
	pgoyette-compat:1.29.0.2
	pgoyette-compat-base:1.29
	netbsd-7-1-1-RELEASE:1.21
	matt-nb8-mediatek:1.28.0.8
	matt-nb8-mediatek-base:1.28
	perseant-stdc-iso10646:1.28.0.6
	perseant-stdc-iso10646-base:1.28
	netbsd-8:1.28.0.4
	netbsd-8-base:1.28
	prg-localcount2-base3:1.28
	prg-localcount2-base2:1.28
	prg-localcount2-base1:1.28
	prg-localcount2:1.28.0.2
	prg-localcount2-base:1.28
	pgoyette-localcount-20170426:1.28
	bouyer-socketcan-base1:1.28
	pgoyette-localcount-20170320:1.28
	netbsd-7-1:1.21.0.10
	netbsd-7-1-RELEASE:1.21
	netbsd-7-1-RC2:1.21
	netbsd-7-nhusb-base-20170116:1.21
	bouyer-socketcan:1.27.0.2
	bouyer-socketcan-base:1.27
	pgoyette-localcount-20170107:1.27
	netbsd-7-1-RC1:1.21
	pgoyette-localcount-20161104:1.27
	netbsd-7-0-2-RELEASE:1.21
	localcount-20160914:1.27
	netbsd-7-nhusb:1.21.0.8
	netbsd-7-nhusb-base:1.21
	pgoyette-localcount-20160806:1.22
	pgoyette-localcount-20160726:1.22
	pgoyette-localcount:1.22.0.2
	pgoyette-localcount-base:1.22
	netbsd-7-0-1-RELEASE:1.21
	netbsd-7-0:1.21.0.6
	netbsd-7-0-RELEASE:1.21
	netbsd-7-0-RC3:1.21
	netbsd-7-0-RC2:1.21
	netbsd-7-0-RC1:1.21
	netbsd-5-2-3-RELEASE:1.17.6.2
	netbsd-5-1-5-RELEASE:1.17.6.2
	netbsd-6-0-6-RELEASE:1.19
	netbsd-6-1-5-RELEASE:1.19
	netbsd-7:1.21.0.4
	netbsd-7-base:1.21
	yamt-pagecache-base9:1.21
	yamt-pagecache-tag8:1.19
	netbsd-6-1-4-RELEASE:1.19
	netbsd-6-0-5-RELEASE:1.19
	tls-earlyentropy:1.21.0.2
	tls-earlyentropy-base:1.21
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.21
	riastradh-drm2-base3:1.20
	netbsd-6-1-3-RELEASE:1.19
	netbsd-6-0-4-RELEASE:1.19
	netbsd-5-2-2-RELEASE:1.17.6.2
	netbsd-5-1-4-RELEASE:1.17.6.2
	netbsd-6-1-2-RELEASE:1.19
	netbsd-6-0-3-RELEASE:1.19
	netbsd-5-2-1-RELEASE:1.17.6.2
	netbsd-5-1-3-RELEASE:1.17.6.2
	netbsd-6-1-1-RELEASE:1.19
	riastradh-drm2-base2:1.20
	riastradh-drm2-base1:1.20
	riastradh-drm2:1.20.0.2
	riastradh-drm2-base:1.20
	netbsd-6-1:1.19.0.20
	netbsd-6-0-2-RELEASE:1.19
	netbsd-6-1-RELEASE:1.19
	netbsd-6-1-RC4:1.19
	netbsd-6-1-RC3:1.19
	agc-symver:1.19.0.18
	agc-symver-base:1.19
	netbsd-6-1-RC2:1.19
	netbsd-6-1-RC1:1.19
	yamt-pagecache-base8:1.19
	netbsd-5-2:1.17.6.2.0.6
	netbsd-6-0-1-RELEASE:1.19
	yamt-pagecache-base7:1.19
	netbsd-5-2-RELEASE:1.17.6.2
	netbsd-5-2-RC1:1.17.6.2
	matt-nb6-plus-nbase:1.19
	yamt-pagecache-base6:1.19
	netbsd-6-0:1.19.0.14
	netbsd-6-0-RELEASE:1.19
	netbsd-6-0-RC2:1.19
	tls-maxphys:1.19.0.12
	tls-maxphys-base:1.21
	matt-nb6-plus:1.19.0.10
	matt-nb6-plus-base:1.19
	netbsd-6-0-RC1:1.19
	yamt-pagecache-base5:1.19
	yamt-pagecache-base4:1.19
	netbsd-6:1.19.0.8
	netbsd-6-base:1.19
	netbsd-5-1-2-RELEASE:1.17.6.2
	netbsd-5-1-1-RELEASE:1.17.6.2
	yamt-pagecache-base3:1.19
	yamt-pagecache-base2:1.19
	yamt-pagecache:1.19.0.6
	yamt-pagecache-base:1.19
	cherry-xenmp:1.19.0.4
	cherry-xenmp-base:1.19
	bouyer-quota2-nbase:1.19
	bouyer-quota2:1.19.0.2
	bouyer-quota2-base:1.19
	matt-mips64-premerge-20101231:1.19
	matt-nb5-mips64-premerge-20101231:1.17.6.1.4.1
	matt-nb5-pq3:1.17.6.2.0.4
	matt-nb5-pq3-base:1.17.6.2
	pre-xorg-192:1.19
	netbsd-5-1:1.17.6.2.0.2
	netbsd-5-1-RELEASE:1.17.6.2
	netbsd-5-1-RC4:1.17.6.2
	matt-nb5-mips64-k15:1.17.6.1.4.1
	netbsd-5-1-RC3:1.17.6.2
	netbsd-5-1-RC2:1.17.6.2
	netbsd-5-1-RC1:1.17.6.2
	netbsd-5-0-2-RELEASE:1.17.6.1
	matt-nb5-mips64-premerge-20091211:1.17.6.1
	matt-premerge-20091211:1.19
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.17.6.1
	matt-nb4-mips64-k7-u2a-k9b:1.17.6.1
	matt-nb5-mips64-u1-k1-k5:1.17.6.1
	matt-nb5-mips64:1.17.6.1.0.4
	netbsd-5-0-1-RELEASE:1.17.6.1
	jym-xensuspend-nbase:1.18
	netbsd-5-0:1.17.6.1.0.2
	netbsd-5-0-RELEASE:1.17.6.1
	netbsd-5-0-RC4:1.17.6.1
	netbsd-5-0-RC3:1.17.6.1
	netbsd-5-0-RC2:1.17.6.1
	jym-xensuspend:1.18.0.2
	jym-xensuspend-base:1.18
	netbsd-5-0-RC1:1.17.6.1
	haad-dm-base:1.17
	haad-dm-base2:1.17
	haad-nbase2:1.17
	netbsd-5:1.17.0.6
	netbsd-5-base:1.17
	matt-mips64-base2:1.17
	haad-dm:1.17.0.4
	haad-dm-base1:1.17
	wrstuden-revivesa-base-3:1.16
	wrstuden-revivesa:1.16.0.2
	wrstuden-revivesa-base-2:1.15;
locks; strict;
comment	@# @;


1.31
date	2022.07.21.22.51.23;	author mrg;	state Exp;
branches;
next	1.30;
commitid	uLcaMQRq0yEjCOMD;

1.30
date	2021.08.19.11.03.04;	author mrg;	state Exp;
branches;
next	1.29;
commitid	qjeCdkK2f23fvz5D;

1.29
date	2017.08.29.18.19.49;	author ryoon;	state Exp;
branches;
next	1.28;
commitid	2tK0IDxH6RRPy85A;

1.28
date	2017.03.05.11.52.39;	author mrg;	state Exp;
branches;
next	1.27;
commitid	99ZeIOr4f6DC6mIz;

1.27
date	2016.08.21.20.51.04;	author mrg;	state Exp;
branches
	1.27.2.1;
next	1.26;
commitid	IgA8fcwIyiGZndjz;

1.26
date	2016.08.19.03.59.30;	author mrg;	state Exp;
branches;
next	1.25;
commitid	jBvUBpYuoiw1QRiz;

1.25
date	2016.08.18.18.42.09;	author mrg;	state Exp;
branches;
next	1.24;
commitid	ZEomJhHGeWNELOiz;

1.24
date	2016.08.14.00.03.57;	author mrg;	state Exp;
branches;
next	1.23;
commitid	GTnYSwjk1lG4Iciz;

1.23
date	2016.08.12.01.15.49;	author mrg;	state Exp;
branches;
next	1.22;
commitid	5GiziC5fk8bIaXhz;

1.22
date	2014.12.30.22.07.21;	author mrg;	state Exp;
branches
	1.22.2.1;
next	1.21;
commitid	8HNi1Btd8idU574y;

1.21
date	2014.03.23.20.40.18;	author mrg;	state Exp;
branches;
next	1.20;
commitid	P7LQ5bg0c980GRtx;

1.20
date	2013.06.12.21.35.29;	author mrg;	state Exp;
branches;
next	1.19;
commitid	oMyG6ccGSF4F6nTw;

1.19
date	2009.06.11.05.43.15;	author mrg;	state Exp;
branches
	1.19.6.1
	1.19.8.1
	1.19.12.1;
next	1.18;

1.18
date	2008.12.22.01.04.27;	author jmcneill;	state Exp;
branches;
next	1.17;

1.17
date	2008.09.25.14.15.06;	author rtr;	state Exp;
branches
	1.17.4.1
	1.17.6.1;
next	1.16;

1.16
date	2008.09.13.04.32.31;	author cube;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	2008.09.01.10.15.08;	author rtr;	state Exp;
branches;
next	1.14;

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

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

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

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

1.10
date	2008.08.03.01.13.44;	author rtr;	state Exp;
branches;
next	1.9;

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

1.8
date	2008.08.02.21.19.21;	author mrg;	state Exp;
branches;
next	1.7;

1.7
date	2008.08.02.20.41.29;	author mrg;	state Exp;
branches;
next	1.6;

1.6
date	2008.08.02.19.54.24;	author mrg;	state Exp;
branches;
next	1.5;

1.5
date	2008.08.02.19.27.28;	author mrg;	state Exp;
branches;
next	1.4;

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

1.3
date	2008.08.02.13.27.28;	author rtr;	state Exp;
branches;
next	1.2;

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

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

1.27.2.1
date	2017.04.21.16.53.00;	author bouyer;	state Exp;
branches;
next	;
commitid	dUG7nkTKALCadqOz;

1.22.2.1
date	2017.03.20.06.56.50;	author pgoyette;	state Exp;
branches;
next	;
commitid	jjw7cAwgyKq7RfKz;

1.19.6.1
date	2014.05.22.14.09.46;	author yamt;	state Exp;
branches;
next	;
commitid	FFQX08bYGKywAxBx;

1.19.8.1
date	2014.12.25.05.05.02;	author msaitoh;	state Exp;
branches;
next	1.19.8.2;
commitid	trYU17flUxocBn3y;

1.19.8.2
date	2014.12.26.07.29.34;	author msaitoh;	state Exp;
branches;
next	;
commitid	qKvdLzLIr2ocmw3y;

1.19.12.1
date	2013.06.23.06.28.48;	author tls;	state Exp;
branches;
next	1.19.12.2;
commitid	OnlO1cBgtQRcIHUw;

1.19.12.2
date	2014.08.20.00.00.14;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;

1.17.4.1
date	2008.09.25.14.15.06;	author haad;	state dead;
branches;
next	1.17.4.2;

1.17.4.2
date	2008.10.19.22.41.17;	author haad;	state Exp;
branches;
next	;

1.17.6.1
date	2008.12.24.16.48.25;	author snj;	state Exp;
branches
	1.17.6.1.4.1;
next	1.17.6.2;

1.17.6.2
date	2009.09.17.04.24.37;	author snj;	state Exp;
branches;
next	;

1.17.6.1.4.1
date	2010.04.21.05.24.42;	author matt;	state Exp;
branches;
next	;

1.16.2.1
date	2008.09.13.04.32.31;	author wrstuden;	state dead;
branches;
next	1.16.2.2;

1.16.2.2
date	2008.09.18.05.18.43;	author wrstuden;	state Exp;
branches;
next	1.16.2.3;

1.16.2.3
date	2008.09.24.16.35.06;	author wrstuden;	state Exp;
branches;
next	;


desc
@@


1.31
log
@build glamoregl module with all the glamor objects, not as part of
the base list of libraries.  noted by rjs.

should fix PR#56934.
@
text
@#	$NetBSD: Makefile,v 1.30 2021/08/19 11:03:04 mrg Exp $

.include <bsd.own.mk>

.include "Makefile.common"

SUBDIR=		doc include .WAIT
SUBDIR+=	glx
SUBDIR+=	dix fb mi Xext miext os randr render 
SUBDIR+=	present pseudoramiX
SUBDIR+=	Xi xkb xkbstubs dbe record xfixes
SUBDIR+=	damageext composite config dri3 .WAIT

# And finally, build the servers.
SUBDIR+=	.WAIT hw

.PATH:	${X11SRCDIR.xorg-server}

PKGCONFIG=	xorg-server
# Use -fvisibility=hidden for symbol_visibility?
PKGCONFIG_SED_FLAGS= \
	-e "s,@@sysconfigdir@@,${X11ETCDIR},; \
	    s,@@XORG_DRIVER_LIBS@@,,; \
	    s,@@SDK_REQUIRED_MODULES@@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 pixman-1 >= 0.27.2 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
	    s,@@symbol_visibility@@,,"

.include <bsd.x11.mk>
.include <bsd.man.mk>
.include <bsd.subdir.mk>
@


1.30
log
@fix dri3 extension building and build it.

needed for amdgpu.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.29 2017/08/29 18:19:49 ryoon Exp $
a13 4
.if ${HAVE_XORG_GLAMOR} != "no"
SUBDIR+=	glamor
.endif

@


1.29
log
@xorg-server.pc should include pixman-1 dependency because
include/xorg/miscstruct.h includes pixman.h
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.28 2017/03/05 11:52:39 mrg Exp $
d12 1
a12 6
SUBDIR+=	damageext composite config .WAIT

# XXX
.if ${HAVE_DRI3:Uno} != "no"
SUBDIR+=	dri3
.endif
@


1.28
log
@add some missing @@foo@@ cases for libepoxy, libxshmfence and xorg-server.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.27 2016/08/21 20:51:04 mrg Exp $
d33 1
a33 1
	    s,@@SDK_REQUIRED_MODULES@@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
@


1.27
log
@build 'hw' (the actual servers) after everything else.  should fix
a build issue reported by Dave Tyson.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.26 2016/08/19 03:59:30 mrg Exp $
d32 1
@


1.27.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.28 2017/03/05 11:52:39 mrg Exp $
a31 1
	    s,@@XORG_DRIVER_LIBS@@,,; \
@


1.26
log
@- introduce HAVE_XORG_GLAMOR which is set to yes on xorg-server 1.18
  and x86 ports only so far.
- build glamor extension.
- fix debug set lists for xorg-server 1.18
- install xf86-video-amdgpu driver on xorg-server 1.8 and x86
- clean up radeon-kms Makefile and enable glamor xorg-server 1.8
- clean up various obsolete makefile parts
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.25 2016/08/18 18:42:09 mrg Exp $
a12 1
SUBDIR+=	hw
d23 3
@


1.25
log
@teach the build about glamor and install glamor.h.
fix SDK_REQUIRED_MODULES for xorg-server 1.18.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.24 2016/08/14 00:03:57 mrg Exp $
a6 6
.if ${XSERVER_NEEDS_XFONT} != "no"
SUBDIR.xfont=Xfont fontbase
.else
SUBDIR.xfont=
.endif

d20 1
a20 1
.if ${XORG_XSERVER_GLAMOR} != "no"
@


1.24
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.23 2016/08/12 01:15:49 mrg Exp $
d26 4
d36 1
a36 1
	    s,@@SDK_REQUIRED_MODULES@@,xproto >= 7.0.17 randrproto >= 1.2.99.3 renderproto >= 0.11 xextproto >= 7.1.99 inputproto >= 1.9.99.902 kbproto >= 1.0.3 fontsproto,; \
@


1.23
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.22 2014/12/30 22:07:21 mrg Exp $
d16 1
a16 1
SUBDIR+=	present dri3 pseudoramiX
@


1.22
log
@move xorg-server.pc's SDK_REQUIRED_MODULES into the local Makefile.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.21 2014/03/23 20:40:18 mrg Exp $
d16 1
d21 5
@


1.22.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.28 2017/03/05 11:52:39 mrg Exp $
d26 1
a26 2
	    s,@@XORG_DRIVER_LIBS@@,,; \
	    s,@@SDK_REQUIRED_MODULES@@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
@


1.21
log
@allow for .pc substitutions to be listed per makefile
(could maybe do per-target, as well.)  fix the remaining
substitutions for xcb-proto, fontconfig and xorg-server.

(XXX: move many per-package-specific parts out of
bsd.x11.mk itself, into the relevant Makefile.)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.20 2013/06/12 21:35:29 mrg Exp $
d26 1
@


1.20
log
@rename (new) xorg_drivers to xorg_server -- platforms that build the
actual Xorg server (aka "xfree86 server").

move the list of these platforms from xorg-server/Makefile.common to
bsd.own.mk, so that we can access it easily in distrib.

this should fix most of the current build failures.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.19 2009/06/11 05:43:15 mrg Exp $
d23 4
@


1.19
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.18 2008/12/22 01:04:27 jmcneill Exp $
a12 12
.if ${XSERVER_NEEDS_MIEXT} != "no"
SUBDIR.miext=miext
.else
SUBDIR.miext=
.endif

.if ${XSERVER_HAS_IPLAN} != "no"
SUBDIR.iplan=iplan2p4 iplan2p8
.else
SUBDIR.iplan=
.endif

d15 1
a15 1
SUBDIR+=	dix fb mi Xext ${SUBDIR.miext} os randr render 
@


1.19.8.1
log
@Pullup additional patches requested by mrg in ticket #1178:

external/mit/xorg/include/xcb-proto/Makefile	patch
external/mit/xorg/lib/fontconfig/src/Makefile	patch
external/mit/xorg/server/xorg-server/Makefile	patch
xsrc/external/mit/fontconfig/include/config.h	patch

	- Fix compile error on non x86 archs.
	- Fix unexpanded @@@@ in .pc files.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.19 2009/06/11 05:43:15 mrg Exp $
a34 4
# Use -fvisibility=hidden for symbol_visibility?
PKGCONFIG_SED_FLAGS= \
	-e "s,@@sysconfigdir@@,${X11ETCDIR},; \
	    s,@@symbol_visibility@@,,"
@


1.19.8.2
log
@Pull up following revision(s) (requested by mrg in ticket #1222):
	external/mit/xorg/server/xorg-server/Makefile	patch

Fix conversion of SDK_REQUIRED_MODULES which was reported by John D. Baker
in PR#49500.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.19.8.1 2014/12/25 05:05:02 msaitoh Exp $
a37 1
	    s,@@SDK_REQUIRED_MODULES@@,xproto >= 7.0.17 randrproto >= 1.2.99.3 renderproto >= 0.11 xextproto >= 7.1.99 inputproto >= 1.9.99.902 kbproto >= 1.0.3 fontsproto,; \
@


1.19.6.1
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.19 2009/06/11 05:43:15 mrg Exp $
d13 12
d27 1
a27 1
SUBDIR+=	dix fb mi Xext miext os randr render 
a34 4
# Use -fvisibility=hidden for symbol_visibility?
PKGCONFIG_SED_FLAGS= \
	-e "s,@@sysconfigdir@@,${X11ETCDIR},; \
	    s,@@symbol_visibility@@,,"
@


1.19.12.1
log
@resync from head
@
text
@d1 1
a1 1
#	$NetBSD$
d13 12
d27 1
a27 1
SUBDIR+=	dix fb mi Xext miext os randr render 
@


1.19.12.2
log
@Rebase to HEAD as of a few days ago.
@
text
@a22 4
# Use -fvisibility=hidden for symbol_visibility?
PKGCONFIG_SED_FLAGS= \
	-e "s,@@sysconfigdir@@,${X11ETCDIR},; \
	    s,@@symbol_visibility@@,,"
@


1.18
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.17 2008/09/25 14:15:06 rtr Exp $
a18 18
.if ${XSERVER_HAS_CFB} != "no"
SUBDIR.cfb=cfb cfb32
.else
SUBDIR.cfb=
.endif

.if ${XSERVER_HAS_FB} != "no"
SUBDIR.fb=fb
.else
SUBDIR.fb=
.endif

.if ${XSERVER_HAS_AFB} != "no"
SUBDIR.afb=afb
.else
SUBDIR.afb=
.endif

d26 4
a29 4
SUBDIR+=	GL
SUBDIR+=	dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} os randr render 
SUBDIR+=	Xi xkb xkbstubs dbe mfb ${SUBDIR.afb} ${SUBDIR.cfb} record xfixes
SUBDIR+=	damageext XTrap composite config .WAIT
a31 9
# XXX stuff installed by modular-xorg-server we need to deal with:
#libpcidata
#libshadow

#bin/X
#bin/Xorg
#bin/xorgcfg
#bin/xorgconfig

@


1.17
log
@descend into GL/glx and build the libglx.a archive and the libglx.so
extension module.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.16 2008/09/13 04:32:31 cube Exp $
d46 1
a46 1
SUBDIR+=	Xi xkb dbe mfb ${SUBDIR.afb} ${SUBDIR.cfb} record xfixes
@


1.17.6.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.17 2008/09/25 14:15:06 rtr Exp $
d46 1
a46 1
SUBDIR+=	Xi xkb xkbstubs dbe mfb ${SUBDIR.afb} ${SUBDIR.cfb} record xfixes
@


1.17.6.1.4.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17.6.2 2009/09/17 04:24:37 snj Exp $
d19 18
d44 4
a47 4
SUBDIR+=	glx
SUBDIR+=	dix fb mi Xext ${SUBDIR.miext} os randr render 
SUBDIR+=	Xi xkb xkbstubs dbe record xfixes
SUBDIR+=	damageext composite config .WAIT
d50 9
@


1.17.6.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.19 2009/06/11 05:43:15 mrg Exp $
d19 18
d44 4
a47 4
SUBDIR+=	glx
SUBDIR+=	dix fb mi Xext ${SUBDIR.miext} os randr render 
SUBDIR+=	Xi xkb xkbstubs dbe record xfixes
SUBDIR+=	damageext composite config .WAIT
d50 9
@


1.17.4.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:17 +0000
@
text
@d1 65
@


1.17.4.2
log
@Sync with HEAD.
@
text
@a0 65
#	$NetBSD: Makefile,v 1.17 2008/09/25 14:15:06 rtr Exp $

.include <bsd.own.mk>

.include "Makefile.common"

.if ${XSERVER_NEEDS_XFONT} != "no"
SUBDIR.xfont=Xfont fontbase
.else
SUBDIR.xfont=
.endif

.if ${XSERVER_NEEDS_MIEXT} != "no"
SUBDIR.miext=miext
.else
SUBDIR.miext=
.endif

.if ${XSERVER_HAS_CFB} != "no"
SUBDIR.cfb=cfb cfb32
.else
SUBDIR.cfb=
.endif

.if ${XSERVER_HAS_FB} != "no"
SUBDIR.fb=fb
.else
SUBDIR.fb=
.endif

.if ${XSERVER_HAS_AFB} != "no"
SUBDIR.afb=afb
.else
SUBDIR.afb=
.endif

.if ${XSERVER_HAS_IPLAN} != "no"
SUBDIR.iplan=iplan2p4 iplan2p8
.else
SUBDIR.iplan=
.endif

SUBDIR=		doc include .WAIT
SUBDIR+=	GL
SUBDIR+=	dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} os randr render 
SUBDIR+=	Xi xkb dbe mfb ${SUBDIR.afb} ${SUBDIR.cfb} record xfixes
SUBDIR+=	damageext XTrap composite config .WAIT
SUBDIR+=	hw

# XXX stuff installed by modular-xorg-server we need to deal with:
#libpcidata
#libshadow

#bin/X
#bin/Xorg
#bin/xorgcfg
#bin/xorgconfig

.PATH:	${X11SRCDIR.xorg-server}

PKGCONFIG=	xorg-server

.include <bsd.x11.mk>
.include <bsd.man.mk>
.include <bsd.subdir.mk>
@


1.16
log
@Install pkgconfig files.  Where applicable, remove .if 0 code that tried to
do the same thing.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.15 2008/09/01 10:15:08 rtr Exp $
d44 1
@


1.16.2.1
log
@file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:43 +0000
@
text
@d1 64
@


1.16.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 62
#	$NetBSD: Makefile,v 1.15 2008/09/01 10:15:08 rtr Exp $

.include <bsd.own.mk>

.include "Makefile.common"

.if ${XSERVER_NEEDS_XFONT} != "no"
SUBDIR.xfont=Xfont fontbase
.else
SUBDIR.xfont=
.endif

.if ${XSERVER_NEEDS_MIEXT} != "no"
SUBDIR.miext=miext
.else
SUBDIR.miext=
.endif

.if ${XSERVER_HAS_CFB} != "no"
SUBDIR.cfb=cfb cfb32
.else
SUBDIR.cfb=
.endif

.if ${XSERVER_HAS_FB} != "no"
SUBDIR.fb=fb
.else
SUBDIR.fb=
.endif

.if ${XSERVER_HAS_AFB} != "no"
SUBDIR.afb=afb
.else
SUBDIR.afb=
.endif

.if ${XSERVER_HAS_IPLAN} != "no"
SUBDIR.iplan=iplan2p4 iplan2p8
.else
SUBDIR.iplan=
.endif

SUBDIR=		doc include .WAIT
SUBDIR+=	dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} os randr render 
SUBDIR+=	Xi xkb dbe mfb ${SUBDIR.afb} ${SUBDIR.cfb} record xfixes
SUBDIR+=	damageext XTrap composite config .WAIT
SUBDIR+=	hw

# XXX stuff installed by modular-xorg-server we need to deal with:
#libpcidata
#libshadow

#bin/X
#bin/Xorg
#bin/xorgcfg
#bin/xorgconfig

.PATH:	${X11SRCDIR.xorg-server}

.include <bsd.x11.mk>
.include <bsd.man.mk>
.include <bsd.subdir.mk>
@


1.16.2.3
log
@Merge in changes between wrstuden-revivesa-base-2 and
wrstuden-revivesa-base-3.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.16.2.2 2008/09/18 05:18:43 wrstuden Exp $
a59 2
PKGCONFIG=	xorg-server

@


1.15
log
@don't link libexa.a into the Xorg server. instead build the loadable
module with the correct set of sources and they shall provide what is
needed for the i830 driver at runtime.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.14 2008/08/09 04:39:49 mrg Exp $
d60 2
@


1.14
log
@add a .WAIT before hw
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2008/08/06 05:10:40 mrg Exp $
d46 1
a46 1
SUBDIR+=	damageext XTrap composite exa config .WAIT
@


1.13
log
@build the modes, shadowfb, vbe, vgahw and xaa subdirs from hw/xfree86.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2008/08/06 04:15:06 mrg Exp $
d46 2
a47 1
SUBDIR+=	damageext XTrap composite exa config hw
@


1.12
log
@remove libint10 and Xvfb.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2008/08/05 05:24:47 mrg Exp $
a50 4
#libshadowfb
#libvbe
#libvgahw
#libxaa
@


1.11
log
@enable hw, and note a few things we need to do
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2008/08/03 01:13:44 rtr Exp $
a48 1
#libint10
a57 1
#bin/Xvfb
@


1.10
log
@{SUBDIR.cfb} -> ${SUBDIR.cfb}
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2008/08/02 21:44:14 mrg Exp $
d46 16
a61 1
SUBDIR+=	damageext XTrap composite exa config # hw
@


1.9
log
@add xorg-server build support for composite, config and exa.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2008/08/02 21:19:21 mrg Exp $
d45 1
a45 1
SUBDIR+=	Xi xkb dbe mfb ${SUBDIR.afb} {SUBDIR.cfb} record xfixes
@


1.8
log
@add xorg-server build support for XTrap, cfb, cfb32, damageext,
record and xfixes.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2008/08/02 20:41:29 mrg Exp $
a42 2
.if 0
### this is the desired version ###
d46 1
a46 20
SUBDIR+=	damageext XTrap composite exa config hw
.else
### this is the current working set
SUBDIR=		doc include .WAIT
SUBDIR+=	dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} os randr render 
# XXX need to test afb yet
SUBDIR+=	Xi xkb dbe mfb ${SUBDIR.afb} {SUBDIR.cfb} record xfixes
SUBDIR+=	damageext XTrap
#SUBDIR+=	damageext XTrap composite exa config hw
.endif

.if 0
### this is the old version
SUBDIR=		include
SUBDIR+=	.WAIT dix os mi printer Xext xkb xinput GL lbx dbe record
SUBDIR+=	mfb randr render xtrap composite damage xfixes
SUBDIR+=	${SUBDIR.cfb} ${SUBDIR.fb} ${SUBDIR.iplan} hw
SUBDIR+=	${SUBDIR.xfont} ${SUBDIR.afb} ${SUBDIR.miext}
SUBDIR+=	.WAIT Xserver
.endif
@


1.7
log
@build xorg-server xkb, dbe and mfb dirs.  maybe be ready to build afb.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2008/08/02 19:54:24 mrg Exp $
d20 1
a20 1
SUBDIR.cfb=cfb cfb16 cfb24 cfb32
d53 3
a55 2
SUBDIR+=	Xi xkb dbe mfb 
#SUBDIR+=	${SUBDIR.afb} {SUBDIR.cfb} record xfixes
@


1.6
log
@add Xi and os subdirs
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2008/08/02 19:27:28 mrg Exp $
d53 2
a54 2
SUBDIR+=	Xi
#SUBDIR+=	xkb dbe mfb ${SUBDIR.afb} {SUBDIR.cfb} record xfixes
@


1.5
log
@add xorg-server Xext from rtr@@.  thanks!
add Xext to the list of working subdirs.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2008/08/02 15:25:50 rtr Exp $
d52 4
a55 1
SUBDIR+=	dix ${SUBDIR.fb} mi Xext ${SUBDIR.miext} randr render 
@


1.4
log
@don't install Xserver.1 from here. it has been moved to doc/Makefile
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/08/02 13:27:28 rtr Exp $
d52 1
a52 1
SUBDIR+=	dix ${SUBDIR.fb} mi ${SUBDIR.miext} randr render 
@


1.3
log
@remove use of MKX11LOADABLE since it isn't defined
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/08/02 04:46:57 mrg Exp $
a65 1
MAN=	Xserver.1
@


1.2
log
@list the actually working SUBDIRs, and also list the desired set.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/08/02 04:32:00 mrg Exp $
d8 1
a8 4
.if ${MKX11LOADABLE} != "no"
SUBDIR.xfont=Xfont
.endif
SUBDIR.xfont+=fontbase
@


1.1
log
@start of build-glue support for xorg-server bits.
building so far:
	doc include dix fb mi miext randr render


again based on the work rtr made for xorg support, and of course this
is very much based on the work lukem did originally for src/x11, as is
all the stuff in src/external/mit/xorg.

hi luke! :)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13.2.3 2004/12/07 11:00:32 rtr Exp $
d46 2
d52 5
d58 2
a59 6
SUBDIR+=	printer xinput GL lbx
SUBDIR+=	mfb xtrap composite damage
SUBDIR+=	${SUBDIR.iplan} hw
SUBDIR+=	${SUBDIR.xfont} 
SUBDIR+=	.WAIT Xserver

d66 1
@