On Mon, Aug 28, 2006 at 04:03:50PM +0200, Petr Salinger wrote: > Well, I have been confused by mandatory subdir linux, > so 2nd attempt. That's pretty close, thanks. I'll try to clean it up a little bit tonight and commit those two to upstream git; I'll bounce -x the patches when I do. > - kfreebsd-kdrive.diff - presence of <sys/vm86.h> is not sufficient for > VESA drivers, > let hw/kdrive/linux/agp.c compile also on kfreebsd > should be submitted upstream ? > - kfreebsd-man_suffix.diff - again sync man pages suffixes with linux > (aclocal.m4), changed in 1:1.1.1-2 only for linux We fixed that better upstream by removing the x suffix madness in util-macros 1.1.1. > - kfreebsd-debian.diff - debian packaging, > files in usr/lib/xorg/modules/freebsd/*.so are needed for us That's fine. > diff -ur x/xorg-server-1.1.1/hw/kdrive/linux/agp.c xorg-server-1.1.1/hw/kdrive/linux/agp.c > --- x/xorg-server-1.1.1/hw/kdrive/linux/agp.c 2006-07-05 20:31:39.000000000 +0200 > +++ xorg-server-1.1.1/hw/kdrive/linux/agp.c 2006-08-28 13:38:45.000000000 +0200 > @@ -65,7 +65,7 @@ > > #include <linux/agpgart.h> > > -#elif defined(__FreeBSD__) > +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) > #include <sys/ioctl.h> > #include <sys/agpio.h> > #endif Oh my god, why is this in linux/? > diff -ur x/xorg-server-1.1.1/configure.ac xorg-server-1.1.1/configure.ac > --- x/xorg-server-1.1.1/configure.ac 2006-08-28 17:01:11.000000000 +0200 > +++ xorg-server-1.1.1/configure.ac 2006-08-28 16:43:11.000000000 +0200 > @@ -1433,7 +1436,11 @@ > > AC_CHECK_HEADERS([sys/vm86.h sys/io.h]) > if test "$ac_cv_header_sys_vm86_h" = yes; then > - AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers]) > + case $host_os in > + kfreebsd*-gnu) kdrivevesa=no ;; > + *) AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers]) > + kdrivevesa=yes;; > + esac > fi > > AC_CHECK_HEADERS([linux/fb.h]) > @@ -1473,7 +1480,7 @@ > AC_SUBST(KDRIVE_LIBS) > AM_CONDITIONAL(TSLIB, false) > AM_CONDITIONAL(H3600_TS, false) > -AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) > +AM_CONDITIONAL(KDRIVEVESA, [test x"$kdrivevesa" = xyes]) > AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes]) Surely KDRIVEFBDEV also needs to be Linux-only? Cheers, Daniel
Attachment:
signature.asc
Description: Digital signature