[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14488] trunk/blender/extern: == FFMPEG / mp3lame ==
Peter Schlaile
peter at schlaile.de
Sun Apr 20 18:28:22 CEST 2008
Revision: 14488
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14488
Author: schlaile
Date: 2008-04-20 18:28:21 +0200 (Sun, 20 Apr 2008)
Log Message:
-----------
== FFMPEG / mp3lame ==
Added libmp3lame to extern. (Ton that was the last one for this release,
promised :) )
Modified Paths:
--------------
trunk/blender/extern/SConscript
trunk/blender/extern/ffmpeg/SConscript
trunk/blender/extern/ffmpeg/configure
trunk/blender/extern/ffmpeg/patches/README
Added Paths:
-----------
trunk/blender/extern/libmp3lame/
trunk/blender/extern/libmp3lame/Makefile.am
trunk/blender/extern/libmp3lame/Makefile.in
trunk/blender/extern/libmp3lame/SConscript
trunk/blender/extern/libmp3lame/VbrTag.c
trunk/blender/extern/libmp3lame/VbrTag.h
trunk/blender/extern/libmp3lame/bitstream.c
trunk/blender/extern/libmp3lame/bitstream.h
trunk/blender/extern/libmp3lame/depcomp
trunk/blender/extern/libmp3lame/encoder.c
trunk/blender/extern/libmp3lame/encoder.h
trunk/blender/extern/libmp3lame/fft.c
trunk/blender/extern/libmp3lame/fft.h
trunk/blender/extern/libmp3lame/gain_analysis.c
trunk/blender/extern/libmp3lame/gain_analysis.h
trunk/blender/extern/libmp3lame/i386/
trunk/blender/extern/libmp3lame/i386/Makefile.am
trunk/blender/extern/libmp3lame/i386/Makefile.in
trunk/blender/extern/libmp3lame/i386/choose_table.nas
trunk/blender/extern/libmp3lame/i386/cpu_feat.nas
trunk/blender/extern/libmp3lame/i386/fft.nas
trunk/blender/extern/libmp3lame/i386/fft3dn.nas
trunk/blender/extern/libmp3lame/i386/fftfpu.nas
trunk/blender/extern/libmp3lame/i386/fftsse.nas
trunk/blender/extern/libmp3lame/i386/ffttbl.nas
trunk/blender/extern/libmp3lame/i386/nasm.h
trunk/blender/extern/libmp3lame/id3tag.c
trunk/blender/extern/libmp3lame/id3tag.h
trunk/blender/extern/libmp3lame/l3side.h
trunk/blender/extern/libmp3lame/lame/
trunk/blender/extern/libmp3lame/lame/lame.h
trunk/blender/extern/libmp3lame/lame-analysis.h
trunk/blender/extern/libmp3lame/lame.c
trunk/blender/extern/libmp3lame/lame.h
trunk/blender/extern/libmp3lame/lame_global_flags.h
trunk/blender/extern/libmp3lame/libmp3lame_vc6.dsp
trunk/blender/extern/libmp3lame/libmp3lame_vc7.vcproj
trunk/blender/extern/libmp3lame/machine.h
trunk/blender/extern/libmp3lame/mpglib_interface.c
trunk/blender/extern/libmp3lame/newmdct.c
trunk/blender/extern/libmp3lame/newmdct.h
trunk/blender/extern/libmp3lame/presets.c
trunk/blender/extern/libmp3lame/psymodel.c
trunk/blender/extern/libmp3lame/psymodel.h
trunk/blender/extern/libmp3lame/quantize.c
trunk/blender/extern/libmp3lame/quantize.h
trunk/blender/extern/libmp3lame/quantize_pvt.c
trunk/blender/extern/libmp3lame/quantize_pvt.h
trunk/blender/extern/libmp3lame/reservoir.c
trunk/blender/extern/libmp3lame/reservoir.h
trunk/blender/extern/libmp3lame/set_get.c
trunk/blender/extern/libmp3lame/set_get.h
trunk/blender/extern/libmp3lame/tables.c
trunk/blender/extern/libmp3lame/tables.h
trunk/blender/extern/libmp3lame/takehiro.c
trunk/blender/extern/libmp3lame/util.c
trunk/blender/extern/libmp3lame/util.h
trunk/blender/extern/libmp3lame/vbrquantize.c
trunk/blender/extern/libmp3lame/vbrquantize.h
trunk/blender/extern/libmp3lame/version.c
trunk/blender/extern/libmp3lame/version.h
Modified: trunk/blender/extern/SConscript
===================================================================
--- trunk/blender/extern/SConscript 2008-04-20 16:18:43 UTC (rev 14487)
+++ trunk/blender/extern/SConscript 2008-04-20 16:28:21 UTC (rev 14488)
@@ -17,6 +17,7 @@
if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
SConscript(['x264/SConscript'])
+ SConscript(['libmp3lame/SConscript'])
SConscript(['xvidcore/SConscript'])
SConscript(['ffmpeg/SConscript'])
Modified: trunk/blender/extern/ffmpeg/SConscript
===================================================================
--- trunk/blender/extern/ffmpeg/SConscript 2008-04-20 16:18:43 UTC (rev 14487)
+++ trunk/blender/extern/ffmpeg/SConscript 2008-04-20 16:28:21 UTC (rev 14488)
@@ -6,12 +6,12 @@
root = "extern/ffmpeg"
if env['OURPLATFORM'] == 'win32-mingw':
- ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads --enable-libx264 --enable-libxvid"
+ ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame"
else:
- ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid"
+ ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame"
extra_variables = { }
-extra_includes = [ "../x264", "../xvidcore/src" ]
+extra_includes = [ "../x264", "../xvidcore/src", "../libmp3lame" ]
import sys
import os
Modified: trunk/blender/extern/ffmpeg/configure
===================================================================
--- trunk/blender/extern/ffmpeg/configure 2008-04-20 16:18:43 UTC (rev 14487)
+++ trunk/blender/extern/ffmpeg/configure 2008-04-20 16:28:21 UTC (rev 14488)
@@ -1567,7 +1567,7 @@
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad
enabled libgsm && require libgsm gsm.h gsm_create -lgsm
-enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
+# enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg
enabled libtheora && require libtheora theora/theora.h theora_info_init -ltheora -logg
Modified: trunk/blender/extern/ffmpeg/patches/README
===================================================================
--- trunk/blender/extern/ffmpeg/patches/README 2008-04-20 16:18:43 UTC (rev 14487)
+++ trunk/blender/extern/ffmpeg/patches/README 2008-04-20 16:28:21 UTC (rev 14488)
@@ -8,17 +8,19 @@
Additionally:
- To make ffmpeg work with scons, you have to disable the libx264 library
test! (or you have to install libx264 seperately, your choice)
- same goes for XVid
+ same goes for XVid and libmp3lame
change
enabled libx264 && require x264 x264.h x264_encoder_open -lx264
enabled libxvid && require Xvid xvid.h xvid_global -lxvidcore
+ enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
into
# enabled libx264 && require x264 x264.h x264_encoder_open -lx264
# enabled libxvid && require Xvid xvid.h xvid_global -lxvidcore
+ # enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
within configure
Added: trunk/blender/extern/libmp3lame/Makefile.am
===================================================================
--- trunk/blender/extern/libmp3lame/Makefile.am (rev 0)
+++ trunk/blender/extern/libmp3lame/Makefile.am 2008-04-20 16:28:21 UTC (rev 14488)
@@ -0,0 +1,98 @@
+## $Id: Makefile.am,v 1.33 2005/08/21 17:32:09 bouvigne Exp $
+
+include $(top_srcdir)/Makefile.am.global
+
+SUBDIRS = i386
+
+lib_LTLIBRARIES = libmp3lame.la
+
+if HAVE_NASM
+nasm_ldadd = $(top_builddir)/libmp3lame/@CPUTYPE@/liblameasmroutines.la
+else
+nasm_ldadd =
+endif
+
+if LIB_WITH_DECODER
+decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
+else
+decoder_ldadd =
+endif
+
+libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
+libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
+ -no-undefined
+
+INCLUDES = @INCLUDES@ -I$(top_srcdir)/mpglib -I$(top_builddir)
+
+DEFS = @DEFS@ @CONFIG_DEFS@
+
+EXTRA_DIST = \
+ libmp3lame_vc6.dsp \
+ libmp3lame_vc7.vcproj \
+ vbrquantize.h
+
+libmp3lame_la_SOURCES = \
+ VbrTag.c \
+ bitstream.c \
+ encoder.c \
+ fft.c \
+ gain_analysis.c \
+ id3tag.c \
+ lame.c \
+ newmdct.c \
+ presets.c \
+ psymodel.c \
+ quantize.c \
+ quantize_pvt.c \
+ reservoir.c \
+ set_get.c \
+ tables.c \
+ takehiro.c \
+ util.c \
+ vbrquantize.c \
+ version.c \
+ mpglib_interface.c
+
+noinst_HEADERS= \
+ VbrTag.h \
+ bitstream.h \
+ encoder.h \
+ fft.h \
+ gain_analysis.h \
+ id3tag.h \
+ l3side.h \
+ lame-analysis.h \
+ lame_global_flags.h \
+ machine.h \
+ newmdct.h \
+ psymodel.h \
+ quantize.h \
+ quantize_pvt.h \
+ reservoir.h \
+ set_get.h \
+ tables.h \
+ util.h \
+ vbrquantize.h \
+ version.h
+
+CLEANFILES = lclint.txt
+
+LCLINTFLAGS= \
+ +posixlib \
+ +showsummary \
+ +showalluses \
+ +whichlib \
+ +forcehints \
+ -fixedformalarray \
+ +matchanyintegral \
+ -Dlint
+
+lclint.txt: ${libmp3lame_la_SOURCES} ${noinst_HEADERS}
+ @lclint ${LCLINTFLAGS} ${INCLUDES} ${DEFS} ${libmp3lame_la_SOURCES} 2>&1 >lclint.txt || true
+
+lclint: lclint.txt
+ more lclint.txt
+
+#$(OBJECTS): libtool
+#libtool: $(LIBTOOL_DEPS)
+# $(SHELL) $(top_builddir)/config.status --recheck
Added: trunk/blender/extern/libmp3lame/Makefile.in
===================================================================
--- trunk/blender/extern/libmp3lame/Makefile.in (rev 0)
+++ trunk/blender/extern/libmp3lame/Makefile.in 2008-04-20 16:28:21 UTC (rev 14488)
@@ -0,0 +1,763 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# global section for every Makefile.am
+
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+ANSI2KNR = $(top_srcdir)/ansi2knr
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.global depcomp
+subdir = libmp3lame
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+ at HAVE_NASM_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/libmp3lame/@CPUTYPE@/liblameasmroutines.la
+ at LIB_WITH_DECODER_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/mpglib/libmpgdecoder.la
+libmp3lame_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+am_libmp3lame_la_OBJECTS = VbrTag$U.lo bitstream$U.lo encoder$U.lo \
+ fft$U.lo gain_analysis$U.lo id3tag$U.lo lame$U.lo newmdct$U.lo \
+ presets$U.lo psymodel$U.lo quantize$U.lo quantize_pvt$U.lo \
+ reservoir$U.lo set_get$U.lo tables$U.lo takehiro$U.lo \
+ util$U.lo vbrquantize$U.lo version$U.lo mpglib_interface$U.lo
+libmp3lame_la_OBJECTS = $(am_libmp3lame_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libmp3lame_la_SOURCES)
+DIST_SOURCES = $(libmp3lame_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONFIG_DEFS = @CONFIG_DEFS@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list