[indiana-discuss] Updated diffs for adding Xorg client programs to FOX gate

[Martin Bochnig]

> # "legacy" SPARC links for GLU/GLw headers and
> libraries
> [...]
>     197 d none lib/amd64 0755 root bin
> 198 s none
> lib/amd64/libGL.so=../../X11/lib/amd64/libGL.so 0755

Alan, sorry for this one, too: You are right.
My memory back to the times of Solaris2.9, 2.8 and before begins to return: I believe SUNW's implementation of OpenGL had exclusively been available for SPARC. Back then I registered for that initiative and filled out a survey at sun.com or sunlabs's site. Yeah, well.
Your comment calling those links "legacy SPARC" stands!

So the changes that remain are:
* splitting prototype files incom/i386/sparc.

* adding the ISA-common drivers to prototype_com:
# X server-side components
# (currently *working* underlying kernel support exclusively exists for x64/x86 and
# only for some Intel chipsets, but hey: Let us show what we already have in place)
# * common drivers for both SPARC and x64/x86
# (only the 64bit version makes sense for SPARC-OpenSolaris, due to lack of 32bit kernel [no iommu32 code])
d none X11/lib/modules 0755 root bin
d none X11/lib/modules/dri 0755 root bin
!search $HOME/lib/modules/dri
f none X11/lib/modules/dri/mach64_dri.so 0755 root bin
f none X11/lib/modules/dri/r128_dri.so 0755 root bin
f none X11/lib/modules/dri/radeon_dri.so 0755 root bin
f none X11/lib/modules/dri/mga_dri.so 0755 root bin

* moving the ISA specific ones to corresponding files:
prototype_i386:
f none X11/lib/modules/dri/i915_dri.so 0755 root bin
f none X11/lib/modules/dri/i965_dri.so 0755 root bin
and
f none X11/lib/modules/dri/$plat_64/i915_dri.so 0755 root bin
f none X11/lib/modules/dri/$plat_64/i965_dri.so 0755 root bin

prototype_sparc:
f none X11/lib/modules/dri/ffb_dri.so 0755 root bin
and
f none X11/lib/modules/dri/$plat_64/ffb_dri.so 0755 root bin

* globally replacing "amd64" with "$plat_64" in prototype_com

* re-activating the previously commented-out libOSMesa files, upgrading them to version_6, plus adding symlinks for backward-compatibility to version_4:

f none X11/lib/mesa/libOSMesa.so.6 0755 root bin
s none X11/lib/mesa/libOSMesa.so=libOSMesa.so.6 0755 root bin
s none X11/lib/mesa/libOSMesa.so.4=libOSMesa.so.6 0755 root bin
s none X11/lib/mesa/libOSMesa.so.4.0=libOSMesa.so.6 0755 root bin
s none X11/lib/mesa/libOSMesa.so.6.0=libOSMesa.so.6 0755 root bin

and

f none X11/lib/mesa/$plat_64/libOSMesa.so.6 0755 root bin
s none X11/lib/mesa/$plat_64/libOSMesa.so=libOSMesa.so.6 0755 root bin
s none X11/lib/mesa/$plat_64/libOSMesa.so.4=libOSMesa.so.6 0755 root bin
s none X11/lib/mesa/$plat_64/libOSMesa.so.4.0=libOSMesa.so.6 0755 root bin
s none X11/lib/mesa/$plat_64/libOSMesa.so.6.0=libOSMesa.so.6 0755 root bin

plus adjusting corresponding "mesa" vs. "GL" symlinks:

s none X11/lib/GL/libOSMesa.so.6=../mesa/libOSMesa.so.6 0755 root bin
s none X11/lib/GL/libOSMesa.so=libOSMesa.so.6 0755 root bin
s none X11/lib/GL/libOSMesa.so.4=libOSMesa.so.6 0755 root bin
s none X11/lib/GL/libOSMesa.so.4.0=libOSMesa.so.6 0755 root bin
s none X11/lib/GL/libOSMesa.so.6.0=libOSMesa.so.6 0755 root bin

and

s none X11/lib/GL/$plat_64/libOSMesa.so.6=../../mesa/$plat_64/libOSMesa.so.6 0755 root bin
s none X11/lib/GL/$plat_64/libOSMesa.so=libOSMesa.so.6 0755 root bin
s none X11/lib/GL/$plat_64/libOSMesa.so.4=libOSMesa.so.6 0755 root bin
s none X11/lib/GL/$plat_64/libOSMesa.so.4.0=libOSMesa.so.6 0755 root bin
s none X11/lib/GL/$plat_64/libOSMesa.so.6.0=libOSMesa.so.6 0755 root bin

So the mesa pkgdefs are done.
What's now still required is adding a patch against mesalib's build dir's Makefile.am/.in, because the $plat_64 stuff gets installed into a wrong location by the lib/mesa "make install" target: X11/$plat_64/foo, rather than X11/lib/$plat_64 etc ...
I could have added a hack by simply adjusting the prototype_*'s !search paths, or by manually (or script) driven copying stuff around in the proto-area, but that's not my style. So it all takes more and more time, for which I say "sorry".


> --
> Regards,
> %martin
--

This message posted from opensolaris.org