Re: [FFmpeg-devel] [PATCH] Force text files to be downloaded in UNIX line ending (LF)

2015-01-16 Thread Timotius Margo
I verified that GNU Make 4.1 in MSYS2 environment builds FFmpeg without any 
issue regardless of the line ending. This is good and I recommend MSYS2 usage 
for building FFmpeg for WinRT in the wiki below:
https://trac.ffmpeg.org/wiki/CompilationGuide/WinRT

However, the official documentation and the wiki still suggest that MinGW/MSYS 
as the default environment to build FFmpeg on Windows. For example MSYS web 
link points directly to the MinGW/MSYS web page. If MSYS2 is in fact the 
recommended shell to build FFmpeg in Windows, is there any upcoming effort to 
update these docs?

Best Regards,


Timotius Margo

-Original Message-
From: ffmpeg-devel-boun...@ffmpeg.org [mailto:ffmpeg-devel-boun...@ffmpeg.org] 
On Behalf Of Matt Oliver
Sent: Saturday, January 10, 2015 2:28 AM
To: FFmpeg development discussions and patches
Subject: Re: [FFmpeg-devel] [PATCH] Force text files to be downloaded in UNIX 
line ending (LF)

On 10 January 2015 at 21:18, Derek Buitenhuis derek.buitenh...@gmail.com
wrote:

 On 1/10/2015 8:40 AM, Timotius Margo wrote:
  This causes a problem with autoconf and prevents user from building 
  FFmpeg successfully without applying a workaround.

 I forgot to mention this is fixed in newer make.exe's, and I think 
 it's included in MSYS2.


It is included in MSYS2 as current versions dont seem to have this problem at 
all. Which is just another reason why *IF* anything is going to be 
mentioned/recommended then it should be MSYS2 and not MSYS/MinGW setups.
Although this may be a good example of why it could be useful to make it clear 
somewhere that MSYS2 is the recommended setup to help avoid these issues that 
way.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] Force text files to be downloaded in UNIX line ending (LF)

2015-01-11 Thread Reimar Döffinger
On 10.01.2015, at 11:18, Derek Buitenhuis derek.buitenh...@gmail.com wrote:
 On 1/10/2015 8:40 AM, Timotius Margo wrote:
 This causes a problem with autoconf and prevents
 user from building FFmpeg successfully without applying a workaround.
 
 I forgot to mention this is fixed in newer make.exe's, and I think
 it's included in MSYS2.

I think this is in part irrelevant.
We may have or possibly already have data files that look like text.
We don't want git to mess with files, or at the very least only for a subset 
that we explicitly reviewed and considered it desirable.
So if there is a way to do that I think that would be good.
Assuming it doesn't open up a risk of people by accident committing files 
containing CRLF at least.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] Force text files to be downloaded in UNIX line ending (LF)

2015-01-10 Thread Derek Buitenhuis
On 1/10/2015 8:40 AM, Timotius Margo wrote:
 +* text eol=lf

I think this is wrong. git should be set up to pull and push verbatim,
not a specific line ending.

- Derek
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] Force text files to be downloaded in UNIX line ending (LF)

2015-01-10 Thread Derek Buitenhuis
On 1/10/2015 8:40 AM, Timotius Margo wrote:
 This causes a problem with autoconf and prevents
 user from building FFmpeg successfully without applying a workaround.

I forgot to mention this is fixed in newer make.exe's, and I think
it's included in MSYS2.

- Derek
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH] Force text files to be downloaded in UNIX line ending (LF)

2015-01-10 Thread Timotius Margo
From 7723f4ed203671c410109cbaf6dc3caca130b27b Mon Sep 17 00:00:00 2001
From: Timotius Margo tima...@microsoft.com
Date: Fri, 9 Jan 2015 17:03:56 -0800
Subject: [PATCH] Force text files to be downloaded in UNIX line ending (LF)

In a default MinGW environment, FFmpeg is always downloaded with CRLF
(Windows) line ending. This causes a problem with autoconf and prevents
user from building FFmpeg successfully without applying a workaround.
Current suggested workaround is to set core.autocrlf to false in git
global config. This workaround is not ideal since it affects other git
project in the same machine.

This change eliminates the need for the workaround by ensuring that
the text files are downloaded in UNIX line ending regardless of the
core.autocrlf setting.

Signed-off-by: Timotius Margo tima...@microsoft.com
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index a900528..2e15a9e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
+* text eol=lf
 *.pnm -diff -text
-- 
1.9.4.msysgit.0



0001-Force-text-files-to-be-downloaded-in-UNIX-line-endin.patch
Description: 0001-Force-text-files-to-be-downloaded-in-UNIX-line-endin.patch
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] Force text files to be downloaded in UNIX line ending (LF)

2015-01-10 Thread Derek Buitenhuis
On 1/10/2015 10:28 AM, Matt Oliver wrote:
 Although this may be a good example of why it could be useful to make it
 clear somewhere that MSYS2 is the recommended setup to help avoid these
 issues that way.

Agreed.

- Derek
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] Force text files to be downloaded in UNIX line ending (LF)

2015-01-10 Thread Matt Oliver
On 10 January 2015 at 21:18, Derek Buitenhuis derek.buitenh...@gmail.com
wrote:

 On 1/10/2015 8:40 AM, Timotius Margo wrote:
  This causes a problem with autoconf and prevents
  user from building FFmpeg successfully without applying a workaround.

 I forgot to mention this is fixed in newer make.exe's, and I think
 it's included in MSYS2.


It is included in MSYS2 as current versions dont seem to have this problem
at all. Which is just another reason why *IF* anything is going to be
mentioned/recommended then it should be MSYS2 and not MSYS/MinGW setups.
Although this may be a good example of why it could be useful to make it
clear somewhere that MSYS2 is the recommended setup to help avoid these
issues that way.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel