[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53391] trunk/blender: set line endings to native & mime type to text/plain for .app/Contents/ MacOS/xxx files.

[Campbell Barton]

Revision: 53391
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53391
Author:   campbellbarton
Date:     2012-12-29 03:19:30 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
set line endings to native & mime type to text/plain for .app/Contents/MacOS/xxx files.

Modified Paths:
--------------
    trunk/blender/extern/carve/patches/mingw_w64.patch
    trunk/blender/extern/libopenjpeg/patches/osx.patch
    trunk/blender/release/darwin/blender.app/Contents/MacOS/blender
    trunk/blender/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer

Property Changed:
----------------
    trunk/blender/extern/carve/patches/mingw_w64.patch
    trunk/blender/extern/libopenjpeg/patches/osx.patch
    trunk/blender/release/darwin/blender.app/Contents/MacOS/blender
    trunk/blender/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer

Modified: trunk/blender/extern/carve/patches/mingw_w64.patch
===================================================================
--- trunk/blender/extern/carve/patches/mingw_w64.patch	2012-12-29 02:57:52 UTC (rev 53390)
+++ trunk/blender/extern/carve/patches/mingw_w64.patch	2012-12-29 03:19:30 UTC (rev 53391)
@@ -1,8 +1,8 @@
-Index: bundle.sh
-===================================================================
---- bundle.sh	(revision 45912)
-+++ bundle.sh	(working copy)
-@@ -114,7 +114,7 @@
+Index: bundle.sh
+===================================================================
+--- bundle.sh	(revision 45912)
++++ bundle.sh	(working copy)
+@@ -114,7 +114,7 @@
  if env['WITH_BF_BOOST']:
      if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
          # Boost is setting as preferred collections library in the Carve code when using MSVC compiler


Property changes on: trunk/blender/extern/carve/patches/mingw_w64.patch
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/blender/extern/libopenjpeg/patches/osx.patch
===================================================================
--- trunk/blender/extern/libopenjpeg/patches/osx.patch	2012-12-29 02:57:52 UTC (rev 53390)
+++ trunk/blender/extern/libopenjpeg/patches/osx.patch	2012-12-29 03:19:30 UTC (rev 53391)
@@ -3,15 +3,15 @@
 --- opj_malloc.h	(revision 15089)
 +++ opj_malloc.h	(working copy)
 @@ -76,8 +76,10 @@
- 	#if defined(__sun)
- 			#define HAVE_MEMALIGN
- 		#elif defined(__GNUC__)
--			#define HAVE_MEMALIGN
--			#include <malloc.h>		
-+                        #ifndef __APPLE__
-+			    #define HAVE_MEMALIGN
-+			    #include <malloc.h>
-+                        #endif
- 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
- 		#elif !defined(__amd64__) && !defined(__APPLE__)	
- 			/* FIXME: Yes, this is a big assumption */
+ 	#if defined(__sun)
+ 			#define HAVE_MEMALIGN
+ 		#elif defined(__GNUC__)
+-			#define HAVE_MEMALIGN
+-			#include <malloc.h>		
++                        #ifndef __APPLE__
++			    #define HAVE_MEMALIGN
++			    #include <malloc.h>
++                        #endif
+ 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
+ 		#elif !defined(__amd64__) && !defined(__APPLE__)	
+ 			/* FIXME: Yes, this is a big assumption */


Property changes on: trunk/blender/extern/libopenjpeg/patches/osx.patch
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/blender/release/darwin/blender.app/Contents/MacOS/blender
===================================================================
(Binary files differ)


Property changes on: trunk/blender/release/darwin/blender.app/Contents/MacOS/blender
___________________________________________________________________
Modified: svn:mime-type
   - application/octet-stream
   + text/html
Added: svn:eol-style
   + native

Modified: trunk/blender/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer
===================================================================
(Binary files differ)


Property changes on: trunk/blender/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer
___________________________________________________________________
Modified: svn:mime-type
   - application/octet-stream
   + text/html
Added: svn:eol-style
   + native