Bug 1057

Created attachment 618 [details] [review]
Imakefile fix

amd64, ppc64, s390x are all the same for libdir beign "lib64".  Both the current
CVS glx code is broken with ProjectRoot, as well as the attached patch.  Imake
defines BUILDMODULESDIR as a base for the modules to get installed into.

A patch that does something like this might work better, and fix ProjectRoot
at the same time:

-   GLX_DEFS = GlxDefines VidModeExtensionDefines
+   GLX_DEFS = GlxDefines VidModeExtensionDefines \
+              -DDEFAULT_DRIVER_DIR=\"$(BUILDMODULEDIR)\"

Untested yet however.  If someone else hasn't tested this yet when I get
to testing AMD64, I'll test it.

(on a side note, s390 architectures do not build the core X server, and
 ppc64 doesn't have a working X server either, however if either arch did,
 they would also use lib64 dirs for the modules)

(In reply to comment #2)
> amd64, ppc64, s390x are all the same for libdir beign "lib64".  Both the current
> CVS glx code is broken with ProjectRoot, as well as the attached patch.  Imake
> defines BUILDMODULESDIR as a base for the modules to get installed into.
> 
> A patch that does something like this might work better, and fix ProjectRoot
> at the same time:
> 
> -   GLX_DEFS = GlxDefines VidModeExtensionDefines
> +   GLX_DEFS = GlxDefines VidModeExtensionDefines \
> +              -DDEFAULT_DRIVER_DIR=\"$(BUILDMODULEDIR)\"
> 
> Untested yet however.  If someone else hasn't tested this yet when I get
> to testing AMD64, I'll test it.
> 

I don't fully understand what you think ProjectRoot should be..

How about this:

-     GLX_DEFS = GlxDefines VidModeExtensionDefines
+     GLX_DEFS = GlxDefines VidModeExtensionDefines \
+               -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\"

Tested on AMD64.

(In reply to comment #4)
> (In reply to comment #2)
> > amd64, ppc64, s390x are all the same for libdir beign "lib64".  Both the current
> > CVS glx code is broken with ProjectRoot, as well as the attached patch.  Imake
> > defines BUILDMODULESDIR as a base for the modules to get installed into.
> > 
> > A patch that does something like this might work better, and fix ProjectRoot
> > at the same time:
> > 
> > -   GLX_DEFS = GlxDefines VidModeExtensionDefines
> > +   GLX_DEFS = GlxDefines VidModeExtensionDefines \
> > +              -DDEFAULT_DRIVER_DIR=\"$(BUILDMODULEDIR)\"
> > 
> > Untested yet however.  If someone else hasn't tested this yet when I get
> > to testing AMD64, I'll test it.
> > 
> 
> I don't fully understand what you think ProjectRoot should be..

ProjectRoot defaults to /usr/X11R6, however it is redefineable to anywhere
else.  All files that normally install in /usr/X11R6, aren't hard coded
to be there, but rather they are relative to ProjectRoot, so if you move
ProjectRoot to say /opt/X11, all files will install there instead.  When this
happens, and NothingOutsideProjectRoot is set, all stuff should get installed
in ProjectRoot/... at make install time, and everything looking for files
at runtime should be relative to ProjectRoot as well (such as looking for
server modules).

> How about this:
> 
> -     GLX_DEFS = GlxDefines VidModeExtensionDefines
> +     GLX_DEFS = GlxDefines VidModeExtensionDefines \
> +               -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\"
> 
> Tested on AMD64.
 
Yes, this looks correct, I picked the wrong directive in my sleepiness.

Keith and I used that last diff while we were working on the r200 issues.  It
should get committed.

Created attachment 653 [details] [review]
xorg-x11-6.8.0-glx-install-dri-modules-in-correct-place.patch

Ok, the fix in comment #4 has been confirmed by 3 people now, and is in my
6.7.99.2-5 rpms.  Please apply the patch above in comment #7

Patch applied and tested.  Closing.

Applied patch is broken - it has "/dri" missing.  See #1093 for 'fix'.

*** Bug 1093 has been marked as a duplicate of this bug. ***

Apply the incremental fix in #1093 (and give Mike Harris more coffee ;) )

(In reply to comment #12)
> Apply the incremental fix in #1093 (and give Mike Harris more coffee ;) )

Incremental fix applied.  Will work on Mike's coffee intake, but that's not a
release blocker, so closing this one. ;)