------=_Part_24281_1139339.1154253891914
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On 7/16/06, Greg A. Woods <woods@weird.com> wrote:
> (Gack!  Why can't I see the original message headers on mail-index.NetBSD.org?)
>
> Seems the following change is the culprit since it was incomplete.
>
> ----------------------------
> revision 1.7
> date: 2005/12/27 20:19:07;  author: jmmv;  state: Exp;  lines: +56 -24
> Sync the Nvidia drivers with XFree86's sources as of December 24th, 2005.
> These changes fix lots of problems (i.e. freezes) with the latest cards
> (such as a GeForce 6600GT).
>
> Approved by tron@.
> ----------------------------
>
> Indeed the original diffs posted to tech-x11 include the calls to this
> macro but no new definition for it.
>
>         http://mail-index.netbsd.org/tech-x11/2005/12/24/0000.html
>
> I see it has been pulled up to 3.1 and 3.0 too, but I don't see any
> corresponding definition of xf86LoadVBEModule() in any file checked out
> from the netbsd-3 branch of xsrc and so I'm not sure how anyone is
> successfully building x11 on NetBSD at the moment.  Is everyone ignoring
> the build errors because the make doesn't stop!?!?!?!?  WTF!?!?!?

You are right in that there is a problem, but there is no build error
(hence why it went unnoticed for so long).  The problem only appears
at run time with a warning message that I had not noticed until now:

Symbol xf86LoadVBEModule from module
/usr/X11R6/lib/modules/drivers/nv_drv.o is unresolved!

The fix is trivial: just revert the offending line to what it was (a
call to xf86LoadSubModule).  I'm now testing the fix locally
(attached).

Matthias: OK to commit and request a pullup?

Thanks.

-- 
Julio M. Merino Vidal <jmmv84@gmail.com>
The Julipedia - http://julipedia.blogspot.com/

------=_Part_24281_1139339.1154253891914
Content-Type: text/x-patch; name=patch.diff; charset=ANSI_X3.4-1968
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="patch.diff"

SW5kZXg6IG52X2RyaXZlci5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L3hzcmMveGZy
ZWUveGMvcHJvZ3JhbXMvWHNlcnZlci9ody94ZnJlZTg2L2RyaXZlcnMvbnYvbnZfZHJpdmVyLmMs
dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNwpkaWZmIC11IC1wIC1yMS43IG52X2RyaXZlci5jCi0t
LSBudl9kcml2ZXIuYwkyNyBEZWMgMjAwNSAyMDoxOTowNyAtMDAwMAkxLjcKKysrIG52X2RyaXZl
ci5jCTMwIEp1bCAyMDA2IDA5OjUyOjM1IC0wMDAwCkBAIC05MzYsNyArOTM2LDcgQEAgbnZQcm9i
ZUREQyhTY3JuSW5mb1B0ciBwU2NybiwgaW50IGluZGV4KQogewogICAgIHZiZUluZm9QdHIgcFZi
ZTsKIAotICAgIGlmICh4Zjg2TG9hZFZCRU1vZHVsZShwU2NybikpIHsKKyAgICBpZiAoeGY4Nkxv
YWRTdWJNb2R1bGUocFNjcm4sICJ2YmUiKSkgewogICAgICAgICBwVmJlID0gVkJFSW5pdChOVUxM
LGluZGV4KTsKICAgICAgICAgQ29uZmlndXJlZE1vbml0b3IgPSB2YmVEb0VESUQocFZiZSwgTlVM
TCk7CiAJdmJlRnJlZShwVmJlKTsKSW5kZXg6IHJpdmFfZHJpdmVyLmMKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg
ZmlsZTogL2N2c3Jvb3QveHNyYy94ZnJlZS94Yy9wcm9ncmFtcy9Yc2VydmVyL2h3L3hmcmVlODYv
ZHJpdmVycy9udi9yaXZhX2RyaXZlci5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIKZGlmZiAt
dSAtcCAtcjEuMiByaXZhX2RyaXZlci5jCi0tLSByaXZhX2RyaXZlci5jCTI3IERlYyAyMDA1IDIw
OjE5OjA3IC0wMDAwCTEuMgorKysgcml2YV9kcml2ZXIuYwkzMCBKdWwgMjAwNiAwOTo1MjozNSAt
MDAwMApAQCAtNDM5LDcgKzQzOSw3IEBAIHJpdmFQcm9iZUREQyhTY3JuSW5mb1B0ciBwU2Nybiwg
aW50IGluZGUKIHsKICAgICB2YmVJbmZvUHRyIHBWYmU7CiAKLSAgICBpZiAoeGY4NkxvYWRWQkVN
b2R1bGUocFNjcm4pKSB7CisgICAgaWYgKHhmODZMb2FkU3ViTW9kdWxlKHBTY3JuLCAidmJlIikp
IHsKICAgICAgICAgcFZiZSA9IFZCRUluaXQoTlVMTCxpbmRleCk7CiAgICAgICAgIENvbmZpZ3Vy
ZWRNb25pdG9yID0gdmJlRG9FRElEKHBWYmUsIE5VTEwpOwogCXZiZUZyZWUocFZiZSk7Cg==
------=_Part_24281_1139339.1154253891914--