[asterisk-commits] russell: branch russell/events r95722 - in /team/russell/events: ./ codecs/ m...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Jan 1 19:37:53 CST 2008 

Author: russell
Date: Tue Jan  1 19:37:53 2008
New Revision: 95722

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95722
Log:
resolve conflict

Added:
    team/russell/events/res/libresample/   (props changed)
      - copied from r95697, trunk/res/libresample/
    team/russell/events/res/libresample/LICENSE.txt
      - copied unchanged from r95697, trunk/res/libresample/LICENSE.txt
    team/russell/events/res/libresample/Makefile.asterisk
      - copied unchanged from r95697, trunk/res/libresample/Makefile.asterisk
    team/russell/events/res/libresample/Makefile.in
      - copied unchanged from r95697, trunk/res/libresample/Makefile.in
    team/russell/events/res/libresample/README.txt
      - copied unchanged from r95697, trunk/res/libresample/README.txt
    team/russell/events/res/libresample/config.guess
      - copied unchanged from r95697, trunk/res/libresample/config.guess
    team/russell/events/res/libresample/config.sub
      - copied unchanged from r95697, trunk/res/libresample/config.sub
    team/russell/events/res/libresample/configure
      - copied unchanged from r95697, trunk/res/libresample/configure
    team/russell/events/res/libresample/configure.in
      - copied unchanged from r95697, trunk/res/libresample/configure.in
    team/russell/events/res/libresample/include/
      - copied from r95697, trunk/res/libresample/include/
    team/russell/events/res/libresample/include/libresample.h
      - copied unchanged from r95697, trunk/res/libresample/include/libresample.h
    team/russell/events/res/libresample/install-sh
      - copied unchanged from r95697, trunk/res/libresample/install-sh
    team/russell/events/res/libresample/src/
      - copied from r95697, trunk/res/libresample/src/
    team/russell/events/res/libresample/src/configtemplate.h
      - copied unchanged from r95697, trunk/res/libresample/src/configtemplate.h
    team/russell/events/res/libresample/src/filterkit.c
      - copied unchanged from r95697, trunk/res/libresample/src/filterkit.c
    team/russell/events/res/libresample/src/filterkit.h
      - copied unchanged from r95697, trunk/res/libresample/src/filterkit.h
    team/russell/events/res/libresample/src/resample.c
      - copied unchanged from r95697, trunk/res/libresample/src/resample.c
    team/russell/events/res/libresample/src/resample_defs.h
      - copied unchanged from r95697, trunk/res/libresample/src/resample_defs.h
    team/russell/events/res/libresample/src/resamplesubs.c
      - copied unchanged from r95697, trunk/res/libresample/src/resamplesubs.c
    team/russell/events/res/libresample/tests/
      - copied from r95697, trunk/res/libresample/tests/
    team/russell/events/res/libresample/tests/compareresample.c
      - copied unchanged from r95697, trunk/res/libresample/tests/compareresample.c
    team/russell/events/res/libresample/tests/resample-sndfile.c
      - copied unchanged from r95697, trunk/res/libresample/tests/resample-sndfile.c
    team/russell/events/res/libresample/tests/testresample.c
      - copied unchanged from r95697, trunk/res/libresample/tests/testresample.c
    team/russell/events/res/libresample/win/
      - copied from r95697, trunk/res/libresample/win/
    team/russell/events/res/libresample/win/libresample.dsp
      - copied unchanged from r95697, trunk/res/libresample/win/libresample.dsp
    team/russell/events/res/libresample/win/libresample.vcproj
      - copied unchanged from r95697, trunk/res/libresample/win/libresample.vcproj
    team/russell/events/res/res_resample.c
      - copied unchanged from r95697, trunk/res/res_resample.c
Removed:
    team/russell/events/main/libresample/
Modified:
    team/russell/events/   (props changed)
    team/russell/events/codecs/Makefile
    team/russell/events/codecs/codec_resample.c
    team/russell/events/main/Makefile
    team/russell/events/res/Makefile

Propchange: team/russell/events/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan  1 19:37:53 2008
@@ -1,1 +1,1 @@
-/trunk:1-95693
+/trunk:1-95721

Modified: team/russell/events/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/events/codecs/Makefile?view=diff&rev=95722&r1=95721&r2=95722
==============================================================================
--- team/russell/events/codecs/Makefile (original)
+++ team/russell/events/codecs/Makefile Tue Jan  1 19:37:53 2008
@@ -55,7 +55,4 @@
 
 $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
 
-codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include
-ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  codec_resample.so: LIBS += $(ASTTOPDIR)/main/libresample/libresample.a
-endif
+codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/libresample/include

Modified: team/russell/events/codecs/codec_resample.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/codecs/codec_resample.c?view=diff&rev=95722&r1=95721&r2=95722
==============================================================================
--- team/russell/events/codecs/codec_resample.c (original)
+++ team/russell/events/codecs/codec_resample.c Tue Jan  1 19:37:53 2008
@@ -23,6 +23,10 @@
  *
  * \ingroup codecs
  */
+
+/*** MODULEINFO
+	<depend>res_resample</depend>
+ ***/
 
 #include "asterisk.h"
 

Modified: team/russell/events/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/events/main/Makefile?view=diff&rev=95722&r1=95721&r2=95722
==============================================================================
--- team/russell/events/main/Makefile (original)
+++ team/russell/events/main/Makefile Tue Jan  1 19:37:53 2008
@@ -111,9 +111,6 @@
 db1-ast/libdb1.a: CHECK_SUBDIR
 	CFLAGS="$(ASTCFLAGS)" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
 
-libresample/libresample.a: CHECK_SUBDIR
-	$(MAKE) -f Makefile.asterisk -C libresample libresample.a
-
 ast_expr2.c ast_expr2.h:
 	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
 
@@ -155,7 +152,7 @@
 MAIN_TGT:=asterisk
 endif
 
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) libresample/libresample.a
+$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
@@ -172,4 +169,3 @@
 	@$(MAKE) -C db1-ast clean
 	@$(MAKE) -C stdtime clean
 	@$(MAKE) -C minimime clean
-	@$(MAKE) -f Makefile.asterisk -C libresample clean

Modified: team/russell/events/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/events/res/Makefile?view=diff&rev=95722&r1=95721&r2=95722
==============================================================================
--- team/russell/events/res/Makefile (original)
+++ team/russell/events/res/Makefile Tue Jan  1 19:37:53 2008
@@ -49,5 +49,8 @@
 
 ael/pval.o: ael/pval.c
 
+res_resample.so: libresample/src/resample.o libresample/src/resamplesubs.o libresample/src/filterkit.o
+
 clean::
 	rm -f snmp/*.o ael/*.o ais/*.o
+	rm -f libresample/src/*.o

Propchange: team/russell/events/res/libresample/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan  1 19:37:53 2008
@@ -1,0 +1,2 @@
+*.d
+libresample.a

More information about the asterisk-commits mailing list