re: CVS commit: src/external/mit/xorg/server/xorg-server
"Christos Zoulas" writes: > Module Name: src > Committed By: christos > Date: Mon Jan 25 18:00:26 UTC 2016 > > Modified Files: > src/external/mit/xorg/server/xorg-server: Makefile.serverlib > Makefile.servermod > > Log Message: > Include before setting any MK variables, so that /etc/mk.conf > is processed first, and it's settings don't override ours. i suspect this should be using NOFOO= instead of overriding MKFOO. .mrg.
Re: CVS commit: src/external/mit/xorg/server/xorg-server
In article <6985.1453779...@splode.eterna.com.au>, matthew green wrote: >"Christos Zoulas" writes: >> Module Name: src >> Committed By:christos >> Date:Mon Jan 25 18:00:26 UTC 2016 >> >> Modified Files: >> src/external/mit/xorg/server/xorg-server: Makefile.serverlib >> Makefile.servermod >> >> Log Message: >> Include before setting any MK variables, so that /etc/mk.conf >> is processed first, and it's settings don't override ours. > >i suspect this should be using NOFOO= instead of overriding MKFOO. Yes, bsd.lib.mk is guilty of the same. But we are not consistent and this was the expedient fix. christos
Re: CVS commit: src/external/mit/xorg/server/xorg-server
> Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
> diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.9
> src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.10
> --- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.9
> Thu Aug 11 08:32:42 2016
> +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Aug
> 12 01:15:49 2016
> @@ -1,4 +1,4 @@
> -#$NetBSD: Makefile,v 1.9 2016/08/11 08:32:42 mrg Exp $
> +#$NetBSD: Makefile,v 1.10 2016/08/12 01:15:49 mrg Exp $
>
> .include
>
> @@ -46,7 +46,7 @@ LDADD+= ${LDADD.mi}
> LDADD+= ${LDADD.xfixes}
> LDADD+= ${LDADD.Xext/Xextbuiltin}
> LDADD+= ${LDADD.render}
> -LDADD+= ${LDADD.randr}
> +eDADD+= ${LDADD.randr}
> LDADD+= ${LDADD.damageext}
> LDADD+= ${LDADD.miext/damage}
> LDADD+= ${LDADD.miext/shadow}
> @@ -57,6 +57,10 @@ LDADD+=${LDADD.os}
> ...
typo?
--
Richard PALO
re: CVS commit: src/external/mit/xorg/server/xorg-server
> Log Message: > 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 i meant "dri3" here. .mrg.
re: CVS commit: src/external/mit/xorg/server/xorg-server
> > LDADD+=${LDADD.render}
> > -LDADD+=${LDADD.randr}
> > +eDADD+=${LDADD.randr}
> > LDADD+=${LDADD.damageext}
>
> typo?
well spotted! thanks.
.mrg.
re: CVS commit: src/external/mit/xorg/server/xorg-server/hw
> XXX: I wonder if each Xorg server extension can be enabled/disabled
> per ${MACHINE} basis rather than in MI include/dix-config.h header.
i had a look at this, and we could do it but it might require
generating a patched eg, xorg-config.h and maybe others, some
that are installed, some that are not installed.
not against the idea, just wasn't inspired for it yet :)
thanks for fixing the build.
.mrg.
Re: CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun
> Module Name: src
> Committed By: mrg
> Date: Thu Jul 23 09:59:36 UTC 2020
>
> Modified Files:
> src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
>
> Log Message:
> fix build:
> - add .../xorg subdir to the path
> - add dbe and present extensions, both wanted via linkage
This is caused by the following .if clause in bsd.x11.mk:
---
.if !(${MACHINE} == "acorn32" || \
${MACHINE} == "amiga" || \
${MACHINE} == "pmax"|| \
${MACHINE} == "sun3"|| \
${MACHINE} == "x68k"|| \
${MACHINE} == "vax")
# EXT_DEFINES
X11FLAGS.EXTENSION+=-DXF86VIDMODE
X11FLAGS.DIX+= -DDBE -DXRECORD -DPRESENT
---
Maybe disabling these DIX flags is enough to avoid errors.
I'm not sure what is the intention of the above MACHINE list,
but it should be ${MKXORG_SERVER} == "yes" instead?
> .. but maybe these shouldn't be built? they're not in sets.
I've already disabled them for sparc and sparc64.
They have been enabled in Makefile.common since initial import..
(to prepare future porting work?)
---
Izumi Tsutsui
Re: CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
> Module Name: src > Committed By: macallan > Date: Thu Feb 14 16:16:25 UTC 2013 > > Modified Files: > src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile > > Log Message: > set -DPCVT_SUPPORT on most hardware Isn't it VGA specific? --- Izumi Tsutsui
Re: CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Hello, On Fri, 15 Feb 2013 01:27:39 +0900 Izumi Tsutsui wrote: > > Module Name:src > > Committed By: macallan > > Date: Thu Feb 14 16:16:25 UTC 2013 > > > > Modified Files: > > src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile > > > > Log Message: > > set -DPCVT_SUPPORT on most hardware > > Isn't it VGA specific? Not really. For now Xorg uses PCVT-specific ioctl()s to switch virtual consoles, until someone changes that to use wsdisplay we need PCVT for that. ( and COMPAT_PCVT in the kernel, in order to emulate those ioctl()s ) have fun Michael
