Commit Graph

142 Commits

Author SHA1 Message Date
abs 9a317b44dd Add Xwsfb X server to pmax build
With the previous tweak to TURBOchannel framebuffers in sys/dev/tc this
should allows pmax to once again run X11.

TODO: Investigate pullup to -9
2021-12-06 17:51:59 +00:00
mrg d07aa01e08 xorg-server is now at 1.20.13. 2021-08-24 06:29:18 +00:00
mrg 6579c40d91 xorg-server is now 1.20.12. 2021-07-11 00:13:49 +00:00
rin 99f59e4c4b Switch amiga to Xorg server 1.20; wsfb(4) is only graphic driver both for
1.10 and 1.20 (Xamiga was gone a long ago...), and there is no reason to
stay with 1.10.

At least, 1.20 works fine on wsdisplay(4) at amidisplaycc(4).
2021-06-03 07:40:48 +00:00
mrg 842d17106a xorg-server 1.20.11 is now current. 2021-04-27 04:02:09 +00:00
mrg e9b9ccbba9 bump version for xorg-server 1.20.10. 2020-12-05 22:44:57 +00:00
mrg 65244620f1 fix various missing transforms for man page, ala PR#55422.
add method to transform both the "__foo__" and "@foo@"
version of various transforms, while upstream are converting
from the former to the latter it seems.  convert all the
common transforms to this method.

expand the grep for .pc files to look for missing @foo@
fixes to the man page genration, and ignore a few things
(thanks uwe@ - .IN lines, and stuff between tab(@) and .TE.)

xorg-server __default_font_path__ -> @default_font_path@,
and xfree86 transform xconfigdir, xkbdir, and modulepath
using new both method.
2020-08-10 09:23:37 +00:00
tsutsui 879355ad78 Fix typos in ${X11INCS.DIX} include paths. PR/55500 2020-07-20 13:55:08 +00:00
mrg 7d2bf6fde2 update for xorg-server 1.20.6. 2020-02-23 10:28:16 +00:00
maya 4bf438acf0 Allow overriding the default man substitutions with X11EXTRAMANTRANSFORMS 2019-09-13 10:23:07 +00:00
mrg f791ec1b3a break the build if a .pc generation leaves something matching "@.*@".
this is an error in the build that doesn't trigger issues until you
try to integrate with eg, pkgsrc.
2019-07-10 21:53:35 +00:00
mrg ac10ab4460 xorg-server 1.20.5 is now current. 2019-06-01 06:57:03 +00:00
mrg 45a98ae559 fix a bunch of man page transforms.
XXX X11MANCPP=yes has only one use left, maybe it can go away!
2019-03-11 06:25:55 +00:00
mrg 8fc8a45971 xorg-server 1.20.4 is now current. 2019-03-03 22:02:49 +00:00
christos 0a4f449bbb Most of the mv operations are to move temporary files to their final place.
Some use -f, others don't. This can lead to spurious build failures when
the user performing the build changes. Centralize, and always use -f.
2019-01-21 21:11:54 +00:00
mrg bf3711ce19 move some defines from xorg-server dix-config.h back into makefiles,
so that Xx68k can build.
2019-01-03 23:25:52 +00:00
mrg 66ee4e221d updates for xorg-server 1.20. don't define stuff here for it. 2018-12-31 11:19:58 +00:00
christos be5fb36d0b last I checked powerpc64 was 64 bits, so it needs _XSERVER64.. 2018-03-04 23:47:55 +00:00
scole 975ce79004 Make ia64 considered 64bit for the _XSERVER64 define so a release with x11 will at least build. 2016-12-14 16:03:19 +00:00
joerg b0fa2ba3de Consider aarch64 a 64bit architecture for the purpose of crappy long use
in X.
2016-10-14 20:34:29 +00:00
mrg 8e7f733949 move some flags from dix-config.h into X11FLAGS.DIX 2016-08-30 08:34:43 +00:00
mrg 34102114fc fix up X11FLAGS.LOADABLE for modern xorg. 2016-08-20 00:35:37 +00:00
mrg 9f5c81fc6e add a HAVE_XORG_SERVER_VER for use in sets. clean up the x11
defines a little for modern xorg, particularly the version.
2016-08-16 01:03:07 +00:00
nakayama d454cfbd16 Add missing transform for xpresent.pc. 2016-05-29 03:02:07 +00:00
christos 54d5052a6c Add NO{SSP,FORTIFY} 2016-03-13 17:56:56 +00:00
mrg cf4dd8937a remove the xfree86 reachover makefiles and the vast majority of
the support in the rest of the source tree.

X11 sets could use some cleaning up perhaps (just deletion, as
we've never really marked the old X11R6 as obsolete for native
xorg using platforms so far either.)
2015-07-23 08:03:24 +00:00
matt 589b128fbc Support building the xorg X11 libraries under MKCOMPAT.
Add XORG_MACHINE_ARCH to compat's bsd.*.mk
Turn xorg makekeys and makestrs into real host tools which are installed into
${TOOLSDIR}
2015-06-24 22:20:24 +00:00
jmcneill 889ad2c6eb Build and install Mesa GBM buffer management library (libgbm). 2015-02-23 00:09:30 +00:00
mrg fbfbb2ece8 move xorg-server.pc's SDK_REQUIRED_MODULES into the local Makefile. 2014-12-30 22:07:21 +00:00
nakayama 4a75cb34db Add new transform for gl.pc.
Now GLX_TLS is "no" since GLX_USE_TLS is not defined.
2014-07-16 14:10:26 +00:00
mrg 40f1a24e2d make pkg-config files be cleaned by "make clean" 2014-03-31 01:59:36 +00:00
mrg c4dae12d14 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.)
2014-03-23 20:40:18 +00:00
tron cb1db61165 Fix generation of pkg-config(1) files. Patch from Ryo ONODERA via
"current-users" mailing list.
2014-03-23 19:49:52 +00:00
mrg 375467851c substitute several more values for .pc files:
+ 		s,@LIBXML2_CFLAGS@,,; \
+ 		s,@ICONV_CFLAGS@,,; \
+ 		s,@PACKAGE@,${PKGDIST},; \
+ 		s,@PKGCONFIG_REQUIRES@,xx,; \
+ 		s,@PKGCONFIG_REQUIRES_PRIVATELY@,xx,; \
+ 		s,@ERRORDBDIR@,${X11LIBDIR},; \
+ 		s,@EXPAT_CFLAGS@,,; \
+ 		s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \
+ 		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," \
2014-03-20 22:24:32 +00:00
mrg b2836e59b2 make .pc files depend upon configure files if they exist. this
will force them to be rebuilt when the version has changed.
this fixes one of the most often broken parts of update builds
after a version update.
2013-06-05 23:14:13 +00:00
mrg 2419004b57 update to xorg-server 1.10.6. 2013-06-03 07:39:07 +00:00
joerg b757af438b Disable new -Wstring-plus-int warning where needed for now.
Adjust various places that add GCC-only options to check for the active
compiler first.
2012-04-04 10:59:44 +00:00
njoly 1d7281ae96 For xkb_base, do not use ${libdir} (xkeyboard-config.pc does not define
it) but its value ${prefix}/lib instead.
2012-01-17 19:40:08 +00:00
dholland 2a481dca6b Fix the setting of "xcbincludedir" in .pc files (where the xcb XML
files live) so that anything that needs to find them can. Fixes build
of pkgsrc libxcb, not that that in particular is terribly important.
2011-09-29 10:59:26 +00:00
apb 386a389aab Move all "clean" and "cleandir" processing to a new bsd.clean.mk
file, as proposed in tech-toolchain.
2011-09-10 16:57:35 +00:00
plunky fa3d1b9a20 pcc cpp(1) does not understand the '-undef' and '-traditional' long form
arguments, use $(CC) -E instead of $(CPP) for these
2011-09-01 16:41:48 +00:00
mrg e740c47eb7 updates for xorg-server 1.10.3 2011-08-02 07:44:39 +00:00
mrg d4bb67a86f update to xorg-server 1.9.5 2011-07-24 01:40:40 +00:00
mrg 4cdc33f137 updates for freetype 2.4.5 2011-07-24 00:33:38 +00:00
dholland 5d43254f4a Fix the value of "appdefaultdir" that ends up in native X .pc files.
(It should be "app-defaults" but was "app-default", probably because
of a typo; it's been wrong ever since this logic was put in two and a
half years ago, and as app-defaults files are a legacy mechanism it
took this long for anyone to notice.) Should be pulled up to -5.
2011-07-03 22:59:46 +00:00
joerg 5e3fd2e02b Adjust --sysroot related usage:
-Wl,-rpath does not expand =, so just drop it.

Drop -Wl,-rpath-link entries that duplicate the -Wl,-rpath entries, this
is done implicitly now that ld is built with sysroot support.

Use ${DESTDIR} explicitly for the remaining -Wl,-rpath-link entries.
2011-04-11 23:03:38 +00:00
joerg c033559e42 GCC 4.1 doesn't have the support code for -I =... yet, so don't use it
for now.
2011-04-11 21:04:11 +00:00
joerg c28ff146c9 For USETOOLS=yes, use the --sysroot support of the compiler to cut down
the number of hard-coded pathes and magic invocations.
2011-04-10 16:52:36 +00:00
plunky b34a9665c8 CLEANFILES is not processed by <bsd.files.mk> so don't assume that
anything assigned there will be cleaned up; handle clean up of the
PKGCONFIG files explicitly. (eg lib/dri/dri.pc was not cleaned)
2011-03-12 13:22:03 +00:00
joerg d9da1368fc Don't depend on ${CC} passing down -R to ld, use -Wl,-rpath explicitly. 2010-12-08 01:57:22 +00:00