| Summary: | xorg-x11-6.8.2 release (candidate) tracking on sparc. | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Ferris McCormick (RETIRED) <fmccor> |
| Component: | Current packages | Assignee: | Ferris McCormick (RETIRED) <fmccor> |
| Status: | RESOLVED FIXED | ||
| Severity: | minor | CC: | sparc, x11 |
| Priority: | Low | Keywords: | Tracker |
| Version: | 2004.3 | ||
| Hardware: | Sparc | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Attachments: |
Patch to activate 'xaa' support in sunffb driver for Creator/Elite graphics.
Apply xorg Bug 1891 xaa-for-sunffb patch to sunffb, activate with USE=xaa Apply xorg Bug xaa-for-sunffb and Bug 1259 convert-sunleo patches to .904 ebuild xaa, sunleo patch for xorg-x11-6.8.2-r1 xaa, sunleo patch for xorg-x11-6.8.2-r2 xaa, sunleo patch for 6.8.2-r3 |
||
|
Description
Ferris McCormick (RETIRED)
2005-01-25 07:11:04 UTC
Created attachment 49479 [details, diff] Patch to activate 'xaa' support in sunffb driver for Creator/Elite graphics. This patch corresponds to patch 48609 on Bug 63994, and see that bug for explanation and references. Notice that this version only applies the changes to sunffb, because the fixes to fb to take care of [r,g,b] <--> [b,g,r] problems are included in the master patch set for this version of xorg-x11. Now ~sparc for testing. It builds, installs, and runs for me without incident (hardened). Created attachment 49831 [details, diff] Apply xorg Bug 1891 xaa-for-sunffb patch to sunffb, activate with USE=xaa Do not add ~sparc keyword to the ebuild, as that is now in portage. Here are my notes for 6.8.1.903 (6.8.2_rc3) testing. This is copied verbatim from my email, same subject. I include it here for tracking and doculemtation purposes. ========================================================== >> Donnie Berkholz wrote: > >>>> I just committed it with KEYWORDS="-*" because I need some brave >>>> testers. I already tested every possibility of which I could think of >>>> version changes resulting in an upgrade to 6.8.1.903 and things seem to >>>> be working fine now. >>>> >>>> The most significant change is that it migrates all of /usr/X11R6 to >>>> /usr and symlinks /usr/X11R6 -> /usr. I have installed this release candidate on a couple sparc systems, and note the following: 1. (Previously noted) A couple font directories (cyrillic, ukr) were never made into symbolic links before, and right now they must be removed by hand; 2. (Previously noted) A couple orphan symbolic links: a. /usr/include/X11/X11 --> ../X11R6/include/X11 b. /usr/include/GL/GL --> ../X11R6/include/GL (I think; I removed it before writing this note.) 3. For some reason, /usr/include/GL/glu.h does not get installed (it is not in /var/tmp/portage/xorg-x11-6.8.1.903/image). With version 6.8.1.902, it is in the image directory and is installed. The problem seems to be that with ...903, nothing which started in /usr/X11R6/include/GL is installed, but only files from opengl/xorg-x11. So, for example, GL/glext.h is present (it is in both GL/include and in opengl/xorg-x11/include originally), but GL/glu.h is not installed because it is only in include/GL to begin with. This might be sparc only; I cannot verify. I note that for one install, this file (glu.h) was automatically moved to /usr/include/GL/glu.h, but apparently from /usr/X11R6/include/GL, because it is definitely not in the image for .903. 4. (Sparc only) For this test, I forced the sunffb/xaa patch to be installed unconditionally because at some point it will be part of the mainstream patch set. This is just a one-line change to the ebuild: This, for anyone interested: --- xorg-x11-6.8.1.903.ebuild- 2005-02-02 17:54:13.000000000 +0000 +++ xorg-x11-6.8.1.903.ebuild 2005-02-02 17:55:08.000000000 +0000 @@ -487,6 +487,7 @@ cd ${WORKDIR} EPATCH_SUFFIX="patch" \ epatch ${PATCHDIR} + epatch $(FILESDIR)/092_Xserver_sunffb_xaa_extension.diff cd ${S} } Otherwise, everything seems fine. Except for poine -3.-, nothing really troubling. I haven't figured out what is going on with the GL include files yet, but the libraries seem to be OK. Bookkeeping notes: ================= a. On both systems, I use x11-base/opengl-update-2.1_pre4 b. Use flags for the build/install: [binary R ] x11-base/xorg-x11-6.8.1.903 (-3dfx) (-3dnow) +bitmap-fonts -cjk -debug +dlloader -dmx -doc -font-server +hardened -insecure-drivers -ipv6 -minimal (-mmx) +nls +opengl +pam -sdk (-sse) -static +truetype-fonts +type1-fonts (-uclibc) -xprint +xv [1] Total size of downloads: 0 kB Portage overlays: [1] /usr/local/portage c. This is two installs from one build: First install was from emerge -buv xorg-x11; Second from 'emerge -kuv xorg-x11' d. Both systems use sunffb graphics driver; one for Elite3d-m3, one for Creator3D, series 2 (ffb2+). e. This note was written on U2-SMP (ffb2+) running xorg-x11-6.8.1.903 (modified by hand as suggested above). Created attachment 50269 [details, diff] Apply xorg Bug xaa-for-sunffb and Bug 1259 convert-sunleo patches to .904 ebuild This patch applies freedesktop's patches for these bugs: https://bugs.freedesktop.org/show_bug.cgi?id=1259 (convert sunleo to use fb) https://bugs.freedesktop.org/show_bug.cgi?id=1891 (xaa for sunffb) It applies them to xorg-x11-6.8.1.904.ebuild, and activates xaa for sunffb only if USE=xaa .904 (RC4) is supposed to be the last candidate release before 6.8.2. Please note that with this release, all that is left of /usr/X11R6 is X11R6 -> ../usr/. If you wish to test this version, please read the ChangeLog first. To apply the patch: Download it to your favorite directory, then in .../portage/x11-base/xorg-x11, execute patch -z- -b -p0 < {path-to-xorg-x11-6.8.1.904.patch} and verify that in ...xorg/x11/files you have 092_Xserver_sunffb_xaa_extension.diff and sunleo-conversion-2.patch For reference, .904 is running fine for me on U60-SMP(afb), U2-SMP(cfb2+). Use flags for build are: x11-base/xorg-x11-6.8.1.904 (-3dfx) (-3dnow) +bitmap-fonts -cjk -debug +dlloader -dmx -doc -font-server +hardened -insecure-drivers -ipv6 -minimal (-mmx) +nls +opengl +pam -sdk (-sse) -static +truetype-fonts +type1-fonts (-uclibc) +xaa -xprint +xv Um, the patch name is "xorg-x11-6.8.1.904-sparc.patch" of course, so the instructions should read:
patch -b -z- -p0 < {path-to-xorg-x11-6.8.1.904-sparc.patch}
Sorry for my rotten proofreading.
The official release xorg-x11-6.8.2 builds and runs (dlloader+hardened) on sparc (ffb2+) systems,
both kernel 2.4.xx and kernel 2.6.6.
Neither the sunleo patch nor the patch to convert sunffb to use xaa is included yet, so
if you need either of these, you must apply it yourself. See the patch in attachment 50269 [details, diff] above.
If you could open up a bug for me on those patches, it would be helpful. One bug per patch, with Keywords: Inclusion and tell me exactly what you want done with it. I keep seeing them brought up here but I don't know exactly what you want. Sorry for the delay. Background (see also Comment 5): The patch corresponds to two Resolved xorg bugs at freedesktop: https://bugs.freedesktop.org/show_bug.cgi?id=1891 https://bugs.freedesktop.org/show_bug.cgi?id=1259 The second (1259) is required for sunleo users, but there are very few of them. If they need this, they almost certainly have applied it already themselves. The first (1891) adds xaa support to sunffb (Creator/Elite) driver. Right now, it is completely optional. It is available for testing, evaluation, and playing libSDL-based games. It should not become standard yet, because a side effect of it is to remove DRM support from sunffb. (If kernel-2.6.xx ever becomes stable for sparc, this will not be an issue because no kernel beyond 2.6.6 supports DRM for ffb anyway.) Both of these are scheduled for release by freedesktop; ajax should able to provide a schedule. Because of this anticipated xorg incorporation of the patches and because of their non-critical nature (rarely used or in evaluation), I do not see a compelling need for Gentoo to incorporate them. If you like, I can open bugs for them to track them or so you can add them to your patch set. The sunffb-xaa patch now should remain optional, though (controlled by your proposed xaa-sparc local USE flag) for example. (I have never said exactly what I want because what at this point is nothing. :-) Since I have been living with them for a while, I tend to fall into the lawyer trap of assuming the judge cares as much about my case as I do.) OK, I'm going to ignore them until/unless you open bugs for them. Created attachment 53024 [details, diff]
xaa, sunleo patch for xorg-x11-6.8.2-r1
Updated xorg-x11-6.8.2-r1.ebuild patch to apply sunleo, xaa patch for 6.8.2-r1.
6.8.2-r1 will be moving to stable about the 11th of March in order to address the security bug 83598. The actual change from 6.8.2 is very small (in xpm, change two 'unsigned int i; --> int i;' so that 'i > 0' test actually means something.). xorg-x11-6.8.2-r1 is now stable for sparc (Bug 83598). Please track here. Created attachment 61119 [details, diff]
xaa, sunleo patch for xorg-x11-6.8.2-r2
Corresponding patch for sunleo, sunffb drivers for xorg-x11-6.8.2-r2. Same
instructions for installation:
patch -p0 -b -z- < {path-to}/xorg-x11-6.8.2-r2-sparc.patch
Note that if this patch is installed, the sunffb-xaa change is built
unconditionally; there is no local 'xaa' use flag to control this.
Comment on attachment 61119 [details, diff]
xaa, sunleo patch for xorg-x11-6.8.2-r2
Fix description.
Created attachment 68572 [details, diff]
xaa, sunleo patch for 6.8.2-r3
Same patch, updated to apply to xorg-x11-6.8.2-r3.ebuild (instructions as
before, there will be a note from the 'patch -b -z- -p0 < ...' to the effect
that the changes to the ebuild are offset by a couple lines, but it applies
correctly).
Committed to 6.8.2-r5. Is there any reason this is still open? I think not, closing. |