[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14865] branches/apricot/extern: Merging libmp3lamp from trunk (slipped between the cracks)
Martin Poirier
theeth at yahoo.com
Fri May 16 12:43:50 CEST 2008
Revision: 14865
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14865
Author: theeth
Date: 2008-05-16 12:43:49 +0200 (Fri, 16 May 2008)
Log Message:
-----------
Merging libmp3lamp from trunk (slipped between the cracks)
Modified Paths:
--------------
branches/apricot/extern/SConscript
Added Paths:
-----------
branches/apricot/extern/libmp3lame/
branches/apricot/extern/libmp3lame/Makefile.am
branches/apricot/extern/libmp3lame/Makefile.in
branches/apricot/extern/libmp3lame/SConscript
branches/apricot/extern/libmp3lame/VbrTag.c
branches/apricot/extern/libmp3lame/VbrTag.h
branches/apricot/extern/libmp3lame/bitstream.c
branches/apricot/extern/libmp3lame/bitstream.h
branches/apricot/extern/libmp3lame/depcomp
branches/apricot/extern/libmp3lame/encoder.c
branches/apricot/extern/libmp3lame/encoder.h
branches/apricot/extern/libmp3lame/fft.c
branches/apricot/extern/libmp3lame/fft.h
branches/apricot/extern/libmp3lame/gain_analysis.c
branches/apricot/extern/libmp3lame/gain_analysis.h
branches/apricot/extern/libmp3lame/i386/
branches/apricot/extern/libmp3lame/i386/Makefile.am
branches/apricot/extern/libmp3lame/i386/Makefile.in
branches/apricot/extern/libmp3lame/i386/choose_table.nas
branches/apricot/extern/libmp3lame/i386/cpu_feat.nas
branches/apricot/extern/libmp3lame/i386/fft.nas
branches/apricot/extern/libmp3lame/i386/fft3dn.nas
branches/apricot/extern/libmp3lame/i386/fftfpu.nas
branches/apricot/extern/libmp3lame/i386/fftsse.nas
branches/apricot/extern/libmp3lame/i386/ffttbl.nas
branches/apricot/extern/libmp3lame/i386/nasm.h
branches/apricot/extern/libmp3lame/id3tag.c
branches/apricot/extern/libmp3lame/id3tag.h
branches/apricot/extern/libmp3lame/l3side.h
branches/apricot/extern/libmp3lame/lame/
branches/apricot/extern/libmp3lame/lame/lame.h
branches/apricot/extern/libmp3lame/lame-analysis.h
branches/apricot/extern/libmp3lame/lame.c
branches/apricot/extern/libmp3lame/lame.h
branches/apricot/extern/libmp3lame/lame_global_flags.h
branches/apricot/extern/libmp3lame/libmp3lame_vc6.dsp
branches/apricot/extern/libmp3lame/libmp3lame_vc7.vcproj
branches/apricot/extern/libmp3lame/machine.h
branches/apricot/extern/libmp3lame/mpglib_interface.c
branches/apricot/extern/libmp3lame/newmdct.c
branches/apricot/extern/libmp3lame/newmdct.h
branches/apricot/extern/libmp3lame/presets.c
branches/apricot/extern/libmp3lame/psymodel.c
branches/apricot/extern/libmp3lame/psymodel.h
branches/apricot/extern/libmp3lame/quantize.c
branches/apricot/extern/libmp3lame/quantize.h
branches/apricot/extern/libmp3lame/quantize_pvt.c
branches/apricot/extern/libmp3lame/quantize_pvt.h
branches/apricot/extern/libmp3lame/reservoir.c
branches/apricot/extern/libmp3lame/reservoir.h
branches/apricot/extern/libmp3lame/set_get.c
branches/apricot/extern/libmp3lame/set_get.h
branches/apricot/extern/libmp3lame/tables.c
branches/apricot/extern/libmp3lame/tables.h
branches/apricot/extern/libmp3lame/takehiro.c
branches/apricot/extern/libmp3lame/util.c
branches/apricot/extern/libmp3lame/util.h
branches/apricot/extern/libmp3lame/vbrquantize.c
branches/apricot/extern/libmp3lame/vbrquantize.h
branches/apricot/extern/libmp3lame/version.c
branches/apricot/extern/libmp3lame/version.h
Removed Paths:
-------------
branches/apricot/extern/libmp3lame/Makefile.am
branches/apricot/extern/libmp3lame/Makefile.in
branches/apricot/extern/libmp3lame/SConscript
branches/apricot/extern/libmp3lame/VbrTag.c
branches/apricot/extern/libmp3lame/VbrTag.h
branches/apricot/extern/libmp3lame/bitstream.c
branches/apricot/extern/libmp3lame/bitstream.h
branches/apricot/extern/libmp3lame/depcomp
branches/apricot/extern/libmp3lame/encoder.c
branches/apricot/extern/libmp3lame/encoder.h
branches/apricot/extern/libmp3lame/fft.c
branches/apricot/extern/libmp3lame/fft.h
branches/apricot/extern/libmp3lame/gain_analysis.c
branches/apricot/extern/libmp3lame/gain_analysis.h
branches/apricot/extern/libmp3lame/i386/
branches/apricot/extern/libmp3lame/i386/Makefile.am
branches/apricot/extern/libmp3lame/i386/Makefile.in
branches/apricot/extern/libmp3lame/i386/choose_table.nas
branches/apricot/extern/libmp3lame/i386/cpu_feat.nas
branches/apricot/extern/libmp3lame/i386/fft.nas
branches/apricot/extern/libmp3lame/i386/fft3dn.nas
branches/apricot/extern/libmp3lame/i386/fftfpu.nas
branches/apricot/extern/libmp3lame/i386/fftsse.nas
branches/apricot/extern/libmp3lame/i386/ffttbl.nas
branches/apricot/extern/libmp3lame/i386/nasm.h
branches/apricot/extern/libmp3lame/id3tag.c
branches/apricot/extern/libmp3lame/id3tag.h
branches/apricot/extern/libmp3lame/l3side.h
branches/apricot/extern/libmp3lame/lame/
branches/apricot/extern/libmp3lame/lame/lame.h
branches/apricot/extern/libmp3lame/lame-analysis.h
branches/apricot/extern/libmp3lame/lame.c
branches/apricot/extern/libmp3lame/lame.h
branches/apricot/extern/libmp3lame/lame_global_flags.h
branches/apricot/extern/libmp3lame/libmp3lame_vc6.dsp
branches/apricot/extern/libmp3lame/libmp3lame_vc7.vcproj
branches/apricot/extern/libmp3lame/machine.h
branches/apricot/extern/libmp3lame/mpglib_interface.c
branches/apricot/extern/libmp3lame/newmdct.c
branches/apricot/extern/libmp3lame/newmdct.h
branches/apricot/extern/libmp3lame/presets.c
branches/apricot/extern/libmp3lame/psymodel.c
branches/apricot/extern/libmp3lame/psymodel.h
branches/apricot/extern/libmp3lame/quantize.c
branches/apricot/extern/libmp3lame/quantize.h
branches/apricot/extern/libmp3lame/quantize_pvt.c
branches/apricot/extern/libmp3lame/quantize_pvt.h
branches/apricot/extern/libmp3lame/reservoir.c
branches/apricot/extern/libmp3lame/reservoir.h
branches/apricot/extern/libmp3lame/set_get.c
branches/apricot/extern/libmp3lame/set_get.h
branches/apricot/extern/libmp3lame/tables.c
branches/apricot/extern/libmp3lame/tables.h
branches/apricot/extern/libmp3lame/takehiro.c
branches/apricot/extern/libmp3lame/util.c
branches/apricot/extern/libmp3lame/util.h
branches/apricot/extern/libmp3lame/vbrquantize.c
branches/apricot/extern/libmp3lame/vbrquantize.h
branches/apricot/extern/libmp3lame/version.c
branches/apricot/extern/libmp3lame/version.h
Modified: branches/apricot/extern/SConscript
===================================================================
--- branches/apricot/extern/SConscript 2008-05-16 10:23:18 UTC (rev 14864)
+++ branches/apricot/extern/SConscript 2008-05-16 10:43:49 UTC (rev 14865)
@@ -19,6 +19,7 @@
if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
SConscript(['x264/SConscript'])
+ SConscript(['libmp3lame/SConscript'])
SConscript(['xvidcore/SConscript'])
SConscript(['ffmpeg/SConscript'])
Copied: branches/apricot/extern/libmp3lame (from rev 14488, trunk/blender/extern/libmp3lame)
Deleted: branches/apricot/extern/libmp3lame/Makefile.am
===================================================================
--- trunk/blender/extern/libmp3lame/Makefile.am 2008-04-20 16:28:21 UTC (rev 14488)
+++ branches/apricot/extern/libmp3lame/Makefile.am 2008-05-16 10:43:49 UTC (rev 14865)
@@ -1,98 +0,0 @@
-## $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
Copied: branches/apricot/extern/libmp3lame/Makefile.am (from rev 14488, trunk/blender/extern/libmp3lame/Makefile.am)
===================================================================
--- branches/apricot/extern/libmp3lame/Makefile.am (rev 0)
+++ branches/apricot/extern/libmp3lame/Makefile.am 2008-05-16 10:43:49 UTC (rev 14865)
@@ -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
Deleted: branches/apricot/extern/libmp3lame/Makefile.in
===================================================================
--- trunk/blender/extern/libmp3lame/Makefile.in 2008-04-20 16:28:21 UTC (rev 14488)
+++ branches/apricot/extern/libmp3lame/Makefile.in 2008-05-16 10:43:49 UTC (rev 14865)
@@ -1,763 +0,0 @@
-# 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@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CPUTYPE = @CPUTYPE@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@ @CONFIG_DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRONTEND_CFLAGS = @FRONTEND_CFLAGS@
-FRONTEND_LDADD = @FRONTEND_LDADD@
-FRONTEND_LDFLAGS = @FRONTEND_LDFLAGS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
-HAVE_NASM_FALSE = @HAVE_NASM_FALSE@
-HAVE_NASM_TRUE = @HAVE_NASM_TRUE@
-INCLUDES = @INCLUDES@ -I$(top_srcdir)/mpglib -I$(top_builddir)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDADD = @LDADD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
-LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
-LIB_WITH_DECODER_FALSE = @LIB_WITH_DECODER_FALSE@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list