Re: Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT

2005-04-07 Thread Xin LI
Hi, Michal,

 2005-04-05 22:07 +0200Michal Mertl
 Didier Wiroth wrote:
  Hello,
  Thank you very much for replying.
  
   cd /usr/src/usr.sbin/vidcontrol
   patch /path/vidcontrol.diff.20050215
  
  I'm using the RELENG_5 sources from today.
 
  The syscons.diff.20050215 works but the vidcontrol.diff.20050215 gives
  some errors.
 
 The diff is against the sources from -CURRENT where it applies and
 compiles cleanly. You should be ok using the current vidcontrol sources
 on -STABLE. The only difference is just some code purity fixes by Xin Li
 - probably in preparation for integrating the changes we speak about.

I went into some problem when using the patch on my own laptop, which
indicates that USB based mouse can play something nasty with the
patchset :-(  It does not affect the functionality seriously, but is
really annoying.  I would appreciate if someone can fix the issue.

Cheers,
-- 
Xin LI delphij delphij net  http://www.delphij.net/


signature.asc
Description: This is a digitally signed message part


Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT

2005-04-05 Thread Didier Wiroth
Hello,
Thank you very much for replying.

 cd /usr/src/usr.sbin/vidcontrol
 patch /path/vidcontrol.diff.20050215

I'm using the RELENG_5 sources from today.
The syscons.diff.20050215 works but the vidcontrol.diff.20050215 gives some 
errors.

|Index: vidcontrol.c

|===

|RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.c,v

|retrieving revision 1.48

|diff -u -r1.48 vidcontrol.c

|--- vidcontrol.c   13 Jan 2005 03:59:44 -  1.48

|+++ vidcontrol.c   17 Jan 2005 05:27:25 -

--

Patching file vidcontrol.c using Plan A...

Hunk #1 succeeded at 24.

Hunk #2 succeeded at 48.

Hunk #3 succeeded at 66 with fuzz 1.

Hunk #4 failed at 187.

Hunk #5 succeeded at 223.

Hunk #6 failed at 239.

Hunk #7 failed at 257.

Hunk #8 failed at 297.

Hunk #9 failed at 332.

Hunk #10 succeeded at 348 with fuzz 2.

Hunk #11 failed at 377.

Hunk #12 failed at 419.

Hunk #13 failed at 507.

Hunk #14 failed at 572.

Hunk #15 failed at 669.

Hunk #16 failed at 722.

Hunk #17 failed at 743.

Hunk #18 failed at 806.

Hunk #19 succeeded at 891.

Hunk #20 failed at 900.

Hunk #21 failed at 933.

Hunk #22 succeeded at 950 with fuzz 2.

Hunk #23 failed at 962.

Hunk #24 failed at 985.

Hunk #25 failed at 1035.

Hunk #26 failed at 1050.

Hunk #27 succeeded at 1148.

Hunk #28 succeeded at 1173.

Hunk #29 succeeded at 1217.

Hunk #30 succeeded at 1234.

19 out of 30 hunks failed--saving rejects to vidcontrol.c.rej

done


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re: Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT

2005-04-05 Thread Michal Mertl
Didier Wiroth wrote:
 Hello,
 Thank you very much for replying.
 
  cd /usr/src/usr.sbin/vidcontrol
  patch /path/vidcontrol.diff.20050215
 
 I'm using the RELENG_5 sources from today.

 The syscons.diff.20050215 works but the vidcontrol.diff.20050215 gives
 some errors.

The diff is against the sources from -CURRENT where it applies and
compiles cleanly. You should be ok using the current vidcontrol sources
on -STABLE. The only difference is just some code purity fixes by Xin Li
- probably in preparation for integrating the changes we speak about.

Michal

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re : Re: Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT

2005-04-05 Thread Didier Wiroth
Unfortunately with patch applied it does not compile on stable:

Warning: Object directory not changed from original /usr/src/usr.sbin/vidcontrol
cc -O -pipe   -c vidcontrol.c
vidcontrol.c: In function `video_mode':
vidcontrol.c:500: error: `_VESA_800x600_DFL_COLS' undeclared (first use in this 
function)
vidcontrol.c:500: error: (Each undeclared identifier is reported only once
vidcontrol.c:500: error: for each function it appears in.)
vidcontrol.c:505: error: `_VESA_800x600_DFL_FNSZ' undeclared (first use in this 
function)
vidcontrol.c:509: error: `_VESA_800x600_DFL_ROWS' undeclared (first use in this 
function)
*** Error code 1


- Message d'origine -
De: Michal Mertl [EMAIL PROTECTED]
Date: Mardi, Avril 5, 2005 10:07 pm
Objet: Re: Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for 
FreeBSD-CURRENT

 Didier Wiroth wrote:
  Hello,
  Thank you very much for replying.
  
   cd /usr/src/usr.sbin/vidcontrol
   patch /path/vidcontrol.diff.20050215
  
  I'm using the RELENG_5 sources from today.
 
  The syscons.diff.20050215 works but the vidcontrol.diff.20050215 
 gives some errors.
 
 The diff is against the sources from -CURRENT where it applies and
 compiles cleanly. You should be ok using the current vidcontrol 
 sourceson -STABLE. The only difference is just some code purity 
 fixes by Xin Li
 - probably in preparation for integrating the changes we speak about.
 
 Michal
 
 

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]