605690 - DOS line endings on config_win32.h

Status: RESOLVED INVALID

(Core :: Audio/Video, defect)

Description

[Jeff Beckley]

Attachment: Convert DOS to Unix line endings

In changeset 32222:37f2a93fbe7e the file media/liboggz/include/oggz/config_win32.h was checked in with DOS line endings.

Attached is a patch to make it use Unix line endings.

Comment 1

[Chris Pearce [:cpearce (Not reading bugmail)]]

Comment on attachment 484583 [details]
Convert DOS to Unix line endings

The file which media/liboggz/include/oggz/config_win32.h is copied from upstream in liboggz (liboggz/win32/config.h) has DOS style line endings. So we just faithfully checked in the same DOS style line endings.

What benefit do we get by deviating from upstream and changing the line endings of this file?

If you want to make this change, you might be best to file a bug upstream in trac.xiph.org and submit your patch there, or email it to the ogg-dev mailing list, and we'll eventually get this change next time we update our copy of liboggz.

Comment 2

[cajbir (:cajbir)]

Comment on attachment 484583 [details]
Convert DOS to Unix line endings

I agree with cpearce that the best way of dealing with this would be to get the patch accepted upstream first. If we take a patch to convert DOS line endings and later need to merge some upstream changes it can cause merge issues.

Comment 3

[Jeff Beckley]

OK, I will submit a bug to liboggz.  When I browsed the liboggz source I didn't see a corresponding config_win32.h file so I assumed that it was something that Mozilla had added.

Comment 4

[Jeff Beckley]

Bug created against liboggz is https://trac.annodex.net/ticket/501