[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27970] trunk/lib/darwin-9.x.universal: OSX/10.5 libs : add Ogg/Vorbis/FLAC support to lib SNDFILE
Damien Plisson
damien.plisson at yahoo.fr
Sat Apr 3 11:50:02 CEST 2010
Revision: 27970
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27970
Author: damien78
Date: 2010-04-03 11:50:02 +0200 (Sat, 03 Apr 2010)
Log Message:
-----------
OSX/10.5 libs : add Ogg/Vorbis/FLAC support to lib SNDFILE
In addition, lib SNDFILE updated to rev. 1.0.21
Note: build scripts update comes in next commit
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/README
trunk/lib/darwin-9.x.universal/sndfile/include/sndfile.h
trunk/lib/darwin-9.x.universal/sndfile/lib/libsndfile.a
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/sndfile/lib/libFLAC.a
Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README 2010-04-03 09:09:48 UTC (rev 27969)
+++ trunk/lib/darwin-9.x.universal/README 2010-04-03 09:50:02 UTC (rev 27970)
@@ -17,11 +17,12 @@
openexr (version 1.4.0a)
samplerate (version 0.1.7)
fftw3 (version 3.2.2)
-sndfile (version 1.0.20)
ffmpeg (version 0.5)
ogg (version 1.1.4)
vorbis (version 1.2.3)
theora (version 1.1.1)
+flac (1.2.1)
+sndfile (version 1.0.21)
lame (version 3.97)
xvidcore (version 1.2.2)
x264 (version 20090331)
@@ -42,10 +43,6 @@
./configure --enable-universalsdk=/Developer/SDKs/MacOSX10.5.sdk --with-universal-archs="64-bit"
-SND:
-
-./configure --prefix=/Volumes/Daten250GB/bf-blender/LIB_Sources/libsndfile-1.0.20/build CC=gcc-4.2 CXX=g++-4.2 CFLAGS="-arch x86_64" CXXFLAGS="-arch x86_64" OBJCFLAGS="-arch x86_64" OBJCXXFLAGS="-arch x86_64" LDFLAGS="-arch x86_64"
-
Libsamplerate:
/Volumes/Daten250GB/bf-blender/LIB_Sources/libsamplerate-0.1.7/build
@@ -117,5 +114,21 @@
./configure --arch=ppc --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags="-O3 -arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20090331-2245 -I/Users/damien/Documents/Dev/blender2.5/sources/lame-3.97/include -I/Users/damien/Documents/Dev/blender2.5/sources/xvidcore/src -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include" --extra-ldflags="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib"
+FLAC:
+./configure --disable-shared --enable-sse --disable-doxygen-docs --disable-xmms-plugin --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include --build=x86_64-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
+
+./configure --disable-shared --enable-sse --disable-doxygen-docs --disable-xmms-plugin --disable-asm-optimizations --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include --build=i386-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
+
+./configure --disable-shared --enable-altivec --disable-doxygen-docs --disable-xmms-plugin --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include --build=powerpc-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
+
+SNDFILE:
+Note: Ogg/Vorbis/FLAC forced to Yes in configure script
+
+./configure --disable-shared --disable-sqlite --build=x86_64-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" CXXFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" LDFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/sndfile/lib" LIBS="-logg -lvorbis -lvorbisenc -lFLAC"
+
+./configure --disable-shared --disable-sqlite --build=i386-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/sndfile/lib" LIBS="-logg -lvorbis -lvorbisenc -lFLAC"
+
+./configure --disable-shared --disable-sqlite --build=powerpc-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" LDFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/sndfile/lib" LIBS="-logg -lvorbis -lvorbisenc -lFLAC"
+
Collada:
python scons.py -j 2 RELEASE=1 PCRENATIVE=0 XMLPARSER=libxmlnative NOVALIDATION=1
Modified: trunk/lib/darwin-9.x.universal/sndfile/include/sndfile.h
===================================================================
--- trunk/lib/darwin-9.x.universal/sndfile/include/sndfile.h 2010-04-03 09:09:48 UTC (rev 27969)
+++ trunk/lib/darwin-9.x.universal/sndfile/include/sndfile.h 2010-04-03 09:50:02 UTC (rev 27970)
@@ -267,27 +267,34 @@
enum
{ SF_CHANNEL_MAP_INVALID = 0,
SF_CHANNEL_MAP_MONO = 1,
- SF_CHANNEL_MAP_LEFT,
- SF_CHANNEL_MAP_RIGHT,
- SF_CHANNEL_MAP_CENTER,
+ SF_CHANNEL_MAP_LEFT, /* Apple calls this 'Left' */
+ SF_CHANNEL_MAP_RIGHT, /* Apple calls this 'Right' */
+ SF_CHANNEL_MAP_CENTER, /* Apple calls this 'Center' */
SF_CHANNEL_MAP_FRONT_LEFT,
SF_CHANNEL_MAP_FRONT_RIGHT,
SF_CHANNEL_MAP_FRONT_CENTER,
- SF_CHANNEL_MAP_REAR_CENTER,
- SF_CHANNEL_MAP_REAR_LEFT,
- SF_CHANNEL_MAP_REAR_RIGHT,
- SF_CHANNEL_MAP_LFE,
- SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,
- SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,
- SF_CHANNEL_MAP_SIDE_LEFT,
- SF_CHANNEL_MAP_SIDE_RIGHT,
- SF_CHANNEL_MAP_TOP_CENTER,
- SF_CHANNEL_MAP_TOP_FRONT_LEFT,
- SF_CHANNEL_MAP_TOP_FRONT_RIGHT,
- SF_CHANNEL_MAP_TOP_FRONT_CENTER,
- SF_CHANNEL_MAP_TOP_REAR_LEFT,
- SF_CHANNEL_MAP_TOP_REAR_RIGHT,
- SF_CHANNEL_MAP_TOP_REAR_CENTER
+ SF_CHANNEL_MAP_REAR_CENTER, /* Apple calls this 'Center Surround', Msft calls this 'Back Center' */
+ SF_CHANNEL_MAP_REAR_LEFT, /* Apple calls this 'Left Surround', Msft calls this 'Back Left' */
+ SF_CHANNEL_MAP_REAR_RIGHT, /* Apple calls this 'Right Surround', Msft calls this 'Back Right' */
+ SF_CHANNEL_MAP_LFE, /* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency' */
+ SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER, /* Apple calls this 'Left Center' */
+ SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER, /* Apple calls this 'Right Center */
+ SF_CHANNEL_MAP_SIDE_LEFT, /* Apple calls this 'Left Surround Direct' */
+ SF_CHANNEL_MAP_SIDE_RIGHT, /* Apple calls this 'Right Surround Direct' */
+ SF_CHANNEL_MAP_TOP_CENTER, /* Apple calls this 'Top Center Surround' */
+ SF_CHANNEL_MAP_TOP_FRONT_LEFT, /* Apple calls this 'Vertical Height Left' */
+ SF_CHANNEL_MAP_TOP_FRONT_RIGHT, /* Apple calls this 'Vertical Height Right' */
+ SF_CHANNEL_MAP_TOP_FRONT_CENTER, /* Apple calls this 'Vertical Height Center' */
+ SF_CHANNEL_MAP_TOP_REAR_LEFT, /* Apple and MS call this 'Top Back Left' */
+ SF_CHANNEL_MAP_TOP_REAR_RIGHT, /* Apple and MS call this 'Top Back Right' */
+ SF_CHANNEL_MAP_TOP_REAR_CENTER, /* Apple and MS call this 'Top Back Center' */
+
+ SF_CHANNEL_MAP_AMBISONIC_B_W,
+ SF_CHANNEL_MAP_AMBISONIC_B_X,
+ SF_CHANNEL_MAP_AMBISONIC_B_Y,
+ SF_CHANNEL_MAP_AMBISONIC_B_Z,
+
+ SF_CHANNEL_MAP_MAX,
} ;
@@ -297,12 +304,12 @@
/* The following typedef is system specific and is defined when libsndfile is
** compiled. sf_count_t can be one of loff_t (Linux), off_t (*BSD), off64_t
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list