Subject: Re: Experience with modular-x11
To: None <tech-pkg@netbsd.org>
From: Blair Sadewitz <blair.sadewitz@gmail.com>
List: tech-pkg
Date: 12/13/2006 09:21:14
The main problem I've had is that individual builtin.mk files, such as
xproto, xextproto, etc. define IS_BUILTIN.pkg because there's no
reason not to. A workaround is to add ``&& if ${X11BASE} ==
${LOCALBASE} to the line that defines IS_BUILTIN.pkg in each
builtin.mk file.
As of now, I got the server to build (without xorgcfg, dri, or xprint,
no major losses).
Also, something like this has to be added for amd64 for
modular-xorg-server in hw/xfree86/os-support/bsd/i386_video.c:
--- hw/xfree86/os-support/bsd/i386_video.c.orig 2006-12-13 01:33:54.000000000 -0
500
+++ hw/xfree86/os-support/bsd/i386_video.c
@@ -50,6 +50,11 @@
#include <machine/mtrr.h>
#include <machine/sysarch.h>
#include <sys/queue.h>
+#if defined(__NetBSD__) && defined(__amd64__)__
+#define i386_set_mtrr x86_64_set_mtrr
+#define i386_get_mtrr x86_64_get_mtrr
+#define i386_iopl x86_64_iopl
+#endif
#endif
#if defined(__OpenBSD__) && defined(__amd64__)
In addition, the xorgos (sp?) library needs to be linked with -lx86_64
instead of -li386. I built xf86-video-intel from HEAD without a
problem, but I'm having issues trying to install the fonts. :(
It seems that make wants to execvp the font directory, which needless
to say doesn't work out well. This I have not been able to figure out
yet. I stopped hacking on this way too late last night ...
Joerg: are you just going to add individual dependencies to every
package? Would it at least be possible to automagically depend on the
buildlink3.mk files of packages pkg-config wants to cut down on the
effort?
I will help if I can && my skills are up to the task.
Regards,
--Blair
P.S. It might also be a good idea to add the changes from bsd_mouse.c
from our local Xorg to this, if they are not included already (haven't
looked). Thanks for all of the hard work, Joerg.
--
Support WFMU-FM: free-form radio for the masses!
<http://www.wfmu.org/>
91.1 FM Jersey City, NJ
90.1 FM Mt. Hope, NY
"The Reggae Schoolroom":
<http://www.wfmu.org/playlists/RS/>