<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"> <HTML> <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"> <META NAME="GENERATOR" CONTENT="GtkHTML/3.26.0"> </HEAD> <BODY LINK="#0000ff"> On Wed, 2010-01-27 at 15:55 +0800, Jong Lin wrote: <BLOCKQUOTE TYPE=CITE> Could you please try on the attachment? </BLOCKQUOTE> It applies without error. On Linux it shows a ^M character at the end of each line, which was there before. The XGI team may want to investigate further more and adopt common development practises. Some files are in one format and other files are in another. <BLOCKQUOTE TYPE=CITE> </BLOCKQUOTE> <BLOCKQUOTE TYPE=CITE> <DIV ALIGN=center> <HR> </DIV> </BLOCKQUOTE> <BLOCKQUOTE TYPE=CITE> From:Jong Lin Sent: Wednesday, January 27, 2010 11:26 AM To: 'memsize@videotron.ca' Cc: xorg-devel@lists.x.org Subject: RE: [PATCH video-xgi] Add Support-ARM, EXA acceleration, EDID,Custom Modes, Bugs fixed, ... </BLOCKQUOTE> <BLOCKQUOTE TYPE=CITE>   Hi Gaetan, It might be caused by our editing source code on Windows platform. It might be fixed by convert files by dos2unix. How about your comment?   </BLOCKQUOTE> <BLOCKQUOTE TYPE=CITE> <DIV ALIGN=center> <HR> </DIV> </BLOCKQUOTE> <BLOCKQUOTE TYPE=CITE> From:xorg-devel-bounces@lists.x.org [mailto:xorg-devel-bounces@lists.x.org] On Behalf Of Gaetan Nadon Sent: Monday, January 25, 2010 9:43 PM To: Jong Lin Cc: xorg-devel@lists.x.org Subject: Re: [PATCH video-xgi] Add Support-ARM, EXA acceleration, EDID,Custom Modes, Bugs fixed, ... </BLOCKQUOTE> <BLOCKQUOTE TYPE=CITE>   On Mon, 2010-01-25 at 16:29 +0800, Jong Lin wrote: This patch includes the following enhancements and some bug fixings. (1). Support ARM (2). Support EXA acceleration (3). Support EDID with I2C function (4). Support Custom Modes of modeline (5). Unify code for x86, PowerPC, ARM I used 'git apply --check' to verify the patch would apply but it doesn't I get errors like: error: patch failed: src/init.c:1 <PRE>   error: src/init.c: patch does not apply </PRE> The patch shows that the whole content of the init.c file has changed, but I can't see any real code difference. Then I remembered about code page issues when translators worked from different platforms (Unix, Windows...). I checked the file with the 'file' command: <PRE>   init.c:        ASCII C program text, with CRLF line terminators vb_ext.c:      ASCII C program text vb_init.c:     ASCII C program text, with CRLF line terminators vb_setmode.c:  ASCII C program text, with CRLF line terminators xgi_accel.c:   ASCII C program text, with CRLF line terminators xgi_cursor.c:  ASCII C program text xgi_dac.c:     ASCII C program text xgi_dga.c:     ASCII C program text xgi_dri.c:     ASCII C program text xgi_driver.c:  ASCII C program text, with CRLF, LF line terminators xgi_opt.c:     ASCII C program text xgi_setup.c:   ASCII C program text, with CRLF, LF line terminators xgi_vb.c:      ASCII C program text xgi_vga.c:     ASCII C program text, with CRLF line terminators xgi_video.c:   ASCII C program text xgi_videohw.c: ASCII C program text   </PRE> It just so happens that the files giving errors are the one with CRLF terminators. Most likely, xgi developers edit code on platforms having different file formats. I did a quick scan on other drivers and I have not seen files with CRLF terminators. It's just a theory for now, most likely others have seen this before and know of to fix it. </BLOCKQUOTE> </BODY> </HTML>