diff -Nru gst-plugins-farsight-0.12.5/aclocal.m4 gst-plugins-farsight-0.12.8/aclocal.m4 --- gst-plugins-farsight-0.12.5/aclocal.m4 2007-09-17 16:24:59.000000000 -0500 +++ gst-plugins-farsight-0.12.8/aclocal.m4 2008-05-09 14:56:37.000000000 -0500 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file 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. @@ -11,14 +11,17 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL +# serial 52 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -106,7 +109,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -208,6 +210,8 @@ ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -251,7 +255,7 @@ *** \$ltmain is not defined, please check the patch for consistency! *** ]) fi -gentoo_lt_version="1.5.24" +gentoo_lt_version="1.5.26" gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"` if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then AC_MSG_RESULT(no) @@ -330,9 +334,80 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* ])# _LT_LINKER_BOILERPLATE +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) # _LT_AC_SYS_LIBPATH_AIX # ---------------------- @@ -657,7 +732,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -750,7 +829,7 @@ $2=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -1021,7 +1100,7 @@ AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], @@ -1029,7 +1108,7 @@ [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -1346,7 +1425,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[[4-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1880,6 +1959,13 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -2379,7 +2465,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[[4-9]]*) lt_cv_deplibs_check_method=pass_all ;; @@ -2815,7 +2901,7 @@ fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -2872,6 +2958,7 @@ _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= # Source file extension for C++ test sources. ac_ext=cpp @@ -2981,7 +3068,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -2994,7 +3081,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -3140,51 +3227,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -3435,7 +3494,7 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -3870,7 +3929,8 @@ # compiler output when linking a shared library. # Parse the compiler output and extract the necessary # objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +[AC_REQUIRE([LT_AC_PROG_SED])dnl dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each @@ -3995,6 +4055,11 @@ $rm -f confest.$objext +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in @@ -4051,7 +4116,6 @@ ;; esac ]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac @@ -4136,7 +4200,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -4313,6 +4377,7 @@ _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ @@ -4375,7 +4440,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4612,6 +4677,10 @@ # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) @@ -4961,7 +5030,7 @@ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -5018,7 +5087,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -5055,7 +5125,7 @@ esac else case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -5151,7 +5221,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' @@ -5302,7 +5372,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -5372,7 +5443,8 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) @@ -5509,7 +5581,7 @@ # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -5533,7 +5605,7 @@ # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) @@ -5549,7 +5621,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -5568,6 +5640,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -5598,12 +5671,14 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. _LT_CC_BASENAME([$compiler]) @@ -5653,7 +5728,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -5872,7 +5947,7 @@ fi ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -5892,7 +5967,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -6052,11 +6127,10 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -6785,7 +6859,7 @@ _PKG_TEXT -To get pkg-config, see .])], +To get pkg-config, see .])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -6795,7 +6869,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6810,7 +6884,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -6826,8 +6900,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # Figure out how to run the assembler. -*- Autoconf -*- @@ -7121,7 +7197,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -7181,13 +7257,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file 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. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7292,16 +7368,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7607,7 +7684,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -Nru gst-plugins-farsight-0.12.5/ChangeLog gst-plugins-farsight-0.12.8/ChangeLog --- gst-plugins-farsight-0.12.5/ChangeLog 2007-09-17 16:25:17.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ChangeLog 2008-05-09 14:57:05.000000000 -0500 @@ -1,3 +1,399 @@ +Fri May 9 15:40:47 EDT 2008 Youness Alaoui + tagged gst-plugins-farsight 0.12.8 + +Fri May 9 15:38:31 EDT 2008 Youness Alaoui + * Version 0.12.8 + +Thu May 8 16:48:51 EDT 2008 Youness Alaoui + * Avoid the pause_task to block because we didn't unlock the jitter_queue yet + +Fri May 2 15:10:04 EDT 2008 Olivier Crete + * Print debug message if we return non-ok from chain + +Fri May 2 15:09:54 EDT 2008 Olivier Crete + * Don't return EOS if we have no pads + +Wed Apr 30 15:04:33 EDT 2008 Youness Alaoui + * Fix async queue lock/unlock issue when doing a hold/unhold + +Thu May 1 16:31:54 EDT 2008 Olivier Crete + * Check that the format is NOT time + +Mon Apr 28 18:17:37 EDT 2008 Olivier Crete + * Don't use g_queue_clear() + +Thu May 1 16:09:40 EDT 2008 Olivier Crete + * Pad push event after the lock has been unlocked + +Thu May 1 14:25:54 EDT 2008 Olivier Crete + * Create generic segment is none received and refuse non-time segments + +Tue Apr 29 10:08:02 EDT 2008 Simon McVittie + * Add missing semicolon (did anyone test this?!) + +Mon Apr 28 18:22:37 EDT 2008 Olivier Crete + * Link modules with libm where required + +Mon Apr 28 20:36:00 EDT 2008 Youness Alaoui + * Robustness check, make sure the queue is not empty before using the head element + +Mon Apr 28 20:34:12 EDT 2008 Youness Alaoui + * Remove useless condition + +Mon Apr 28 20:03:39 EDT 2008 Youness Alaoui + * check against audio_buffer_clip which can return NULL if the buffer is outside the clipping segment + +Mon Apr 28 19:49:48 EDT 2008 Youness Alaoui + * Fix object locking in setcaps + +Mon Apr 28 19:49:35 EDT 2008 Youness Alaoui + * Use g_cond_broadcast instead of g_cond_signal + +Mon Apr 28 19:28:51 EDT 2008 Youness Alaoui + * Max latency should also be increased by our own latency + +Mon Apr 28 18:36:06 EDT 2008 Olivier Crete + * Fix deadlock on invalid timestamp error + +Mon Apr 28 12:19:58 EDT 2008 Youness Alaoui + * Added comment for clarity + +Mon Apr 28 12:12:35 EDT 2008 Youness Alaoui + * added TODO comments + +Mon Apr 28 11:59:27 EDT 2008 Youness Alaoui + * check_eos will always return FALSE here.. + +Mon Apr 28 11:49:56 EDT 2008 Youness Alaoui + * added comment on the no clock error + +Mon Apr 28 11:48:50 EDT 2008 Youness Alaoui + * error if no clock is available + +Fri Apr 25 17:04:56 EDT 2008 Youness Alaoui + * renaming unused arg + +Fri Apr 25 16:39:38 EDT 2008 Youness Alaoui + * removed unused user_data and commented line + +Fri Apr 25 16:37:35 EDT 2008 Youness Alaoui + * remove unused cases and empty switch + +Mon Apr 28 14:34:09 EDT 2008 Olivier Crete + * Explicit the discont flag mangling + +Mon Apr 28 14:07:11 EDT 2008 Olivier Crete + * Unref events when they are dropped + +Thu Apr 24 18:46:27 EDT 2008 Olivier Crete + * Use Glib G_{MAX,MIN}{U,}INT{8,16,32} macros + +Sun Apr 20 23:26:14 EDT 2008 Olivier Crete + * Unlock liveadder empty buffer gcond on flush + +Fri Apr 18 15:29:41 EDT 2008 Olivier Crete + * Unref event instead of leaking it + +Thu Apr 3 13:09:56 EDT 2008 Olivier Crete + * non-perfect stream isnt an error, lets just log it + +Thu Apr 3 12:54:31 EDT 2008 Olivier Crete + * We retimestamp to the running time, starting the segments from 0 should therefore work + +Thu Apr 3 12:54:15 EDT 2008 Olivier Crete + * Do the min/max of the latencies correctly + +Wed Apr 2 22:14:25 EDT 2008 Olivier Crete + * Fix indentation + +Wed Apr 2 22:03:18 EDT 2008 Olivier Crete + * Activate pads before adding them in case we're already playing + +Wed Apr 2 22:02:53 EDT 2008 Olivier Crete + * For latencies, use the min of the max and the max of the min (and the min wins if they cross) + +Wed Apr 2 20:57:28 EDT 2008 Olivier Crete + * Rename next_ts into expected_ts, make sure all buffers have a duration + +Wed Apr 2 20:40:12 EDT 2008 Olivier Crete + * Don't try to set the discont flag if the duration of the previous incoming buffer was not valid + +Wed Apr 2 18:46:27 EDT 2008 Olivier Crete + * Reset buffers offsets to none + +Wed Apr 2 18:46:12 EDT 2008 Olivier Crete + * Import adder src event handling + +Mon Mar 31 14:44:21 EDT 2008 Olivier Crete + * Push out a simple newsegment event + +Mon Mar 31 14:44:04 EDT 2008 Olivier Crete + * Don't return EOS if there is no sink pad + +Mon Mar 31 13:11:16 EDT 2008 Olivier Crete + * Reduce locking a bit and cleanup code a bit + +Fri Mar 28 20:45:18 EDT 2008 Olivier Crete + * Add liveadder element + +Thu Apr 24 16:25:54 EDT 2008 Youness Alaoui + * Added dtmfdepay test + +Mon Apr 28 10:42:32 EDT 2008 Simon McVittie + * In libjingle <-> C glue, don't assume that the P2PSocket will always have a ->best_connection(), but warn if it does not + +Sat Apr 12 19:43:25 EDT 2008 Youness Alaoui + * Removed debug output + +Thu Apr 10 19:43:28 EDT 2008 Youness Alaoui + * Oups, typo + +Thu Apr 10 03:01:16 EDT 2008 Youness Alaoui + * Added Siren encoder/decoder/payloader/depayloader + +Wed Apr 9 12:32:21 EDT 2008 Olivier Crete + * Remove unused dispose method in valve + +Tue Mar 25 16:46:25 EDT 2008 Olivier Crete + * Remove unused/clashing gstrtpssrcdemux plugin + +Sun Mar 23 13:33:10 EDT 2008 Olivier Crete + * Dont try to built unused j2k plugin + +Sat Apr 12 19:44:18 EDT 2008 Youness Alaoui + * Fix byte ordering issues with dtmfsrc and rtpdtmfdepay.. use of G_STRINGIFY to avoid error on MSVC + +Mon Apr 7 09:55:32 EDT 2008 Simon McVittie + * Actually, we should use string.h not cstring, since our code expects memset to be in the global namespace rather than in std:: + +Mon Apr 7 09:46:58 EDT 2008 Simon McVittie + * We use memset(), so should #include (fd.o #13577, Debian #455287) + +Fri Apr 4 14:37:28 EDT 2008 Olivier Crete + tagged 0.12.7 + +Fri Apr 4 14:37:16 EDT 2008 Olivier Crete + * Version 0.12.7 + +Tue Apr 1 18:16:49 EDT 2008 Youness Alaoui + * Fix wrong-state error when holding/unholding jitterbuffer + +Tue Apr 1 16:19:53 EDT 2008 Youness Alaoui + * Fix hold in jitterbuffer by flushing the queue + +Thu Mar 20 15:14:38 EDT 2008 Youness Alaoui + * Fix copyrights again, per smcv's advice.. + +Wed Mar 19 17:17:31 EDT 2008 Olivier Crete + * Make it clear that dtmfsrc also takes named events as input + +Thu Mar 20 14:48:41 EDT 2008 Youness Alaoui + * debug message made into errors because that's what they are... + +Thu Mar 20 14:39:37 EDT 2008 Youness Alaoui + * Clean unused stuff... + +Thu Mar 20 14:39:12 EDT 2008 Youness Alaoui + * Fix copyrights + +Wed Mar 19 21:13:01 EDT 2008 Youness Alaoui + * Adding support for rtpdtmfdepay + +Thu Mar 6 12:47:08 EST 2008 Olivier Crete + * Load the right include for atoi() + +Wed Mar 19 15:32:51 EDT 2008 Olivier Crete + * encoding name has to be upper-case + +Wed Mar 19 20:51:47 EDT 2008 Youness Alaoui + * Adding necessary files for rtpdtmfdepay + +Wed Mar 19 20:50:41 EDT 2008 Youness Alaoui + * Fix typos + +Tue Mar 4 14:10:31 EST 2008 Olivier Crete + * "Push version to 0.12.6.1" + +Tue Mar 4 14:04:09 EST 2008 Olivier Crete + tagged 0.12.6 + +Tue Mar 4 14:03:23 EST 2008 Olivier Crete + * version 0.12.6 + +Wed Feb 20 17:04:48 EST 2008 Olivier Crete + * If over 100 seqnums are skipped, its a jump + +Wed Feb 20 16:39:59 EST 2008 Olivier Crete + * Explain algorithm + +Wed Feb 20 16:35:04 EST 2008 Olivier Crete + * Add accolades to make it clearer + +Wed Feb 20 16:27:47 EST 2008 Olivier Crete + * Fix roll-over detection in jump detection + +Tue Feb 19 15:11:29 EST 2008 Olivier Crete + * Fix indentation + +Tue Feb 19 14:45:00 EST 2008 Olivier Crete + * Improve variable naming and commenting + +Tue Feb 19 14:32:31 EST 2008 Olivier Crete + * Verify if a free_func was passed on flush_unlocked + +Mon Feb 18 17:54:02 EST 2008 Olivier Crete + * Reset the JB if there are 5 consecutive packets with new sequence numbers + +Mon Feb 18 17:53:37 EST 2008 Olivier Crete + * Add function to empty the AsyncJitterQueue + +Tue Feb 19 13:36:24 EST 2008 Olivier Crete + * Also unref the selected_pad when there is an iterator error + +Mon Feb 11 17:24:31 EST 2008 Youness Alaoui + * Limit timestamp diff in case of a jump in the timestamps + +Tue Feb 5 22:16:54 EST 2008 Youness Alaoui + * Make it back to 30 fps in caps + +Tue Feb 5 22:09:47 EST 2008 Youness Alaoui + * Fix timestamps in gst buffers sent by gstmimic + +Tue Feb 5 21:03:35 EST 2008 Youness Alaoui + * Fix framerate type in caps for gstmimic element + +Mon Jan 28 23:55:50 EST 2008 Olivier Crete + * Find pads properly + +Mon Jan 28 23:52:31 EST 2008 Olivier Crete + * Unref pad on resync + +Mon Jan 28 05:02:35 EST 2008 Olivier Crete + * Remove second copy of rtppayloads + +Mon Jan 28 04:36:03 EST 2008 Olivier Crete + * Add proper marshaller for rtp pt muxer signal + +Sat Feb 16 08:41:40 EST 2008 Sjoerd Simons + * dtmfsrc: Correctly set the endianess in the caps to the machines endianess + +Thu Jan 17 17:13:36 EST 2008 Olivier Crete + * Only call the GstVideoOrientation interface function if the interface is implemented + +Wed Dec 19 15:32:30 EST 2007 Olivier Crete + * Dont hold the object lock while calling base alloc function + +Wed Dec 19 15:32:18 EST 2007 Olivier Crete + * Set the DISCONT flag after dropping buffers + +Tue Dec 18 19:57:39 EST 2007 Olivier Crete + * Use do the alloc_buffer function in the valve + +Thu Jan 17 13:06:51 EST 2008 philippe.kalaf@collabora.co.uk + * Cleanups + +Wed Jan 16 17:54:30 EST 2008 Olivier Crete + * Add some comments/documentation to the various functions + +Wed Jan 16 17:53:36 EST 2008 Olivier Crete + * More completely check that factories have the right pads + +Wed Jan 16 15:44:28 EST 2008 Olivier Crete + * Refuse element templates with more than one pad template per direction + +Wed Jan 16 15:44:14 EST 2008 Olivier Crete + * Refuse elements with more than one pad per direction + +Fri Jan 11 16:12:46 EST 2008 Olivier Crete + * Rename all Fg* to Fs* + +Fri Jan 11 16:05:58 EST 2008 Olivier Crete + * Rename fgselector file to fsselector + +Fri Jan 11 16:03:53 EST 2008 Olivier Crete + * There were two _get_internal_sinkpad function prototpye, one should be srcpad + +Wed Oct 31 13:59:18 EDT 2007 Olivier Crete + * Fix warning call + +Wed Oct 31 13:58:49 EDT 2007 Olivier Crete + * Prevent calling gst functions with NULL pointers + +Wed Oct 31 13:55:21 EDT 2007 Olivier Crete + * Rename fgselector to fsselector + +Fri Oct 26 14:05:36 EDT 2007 Olivier Crete + * Merged selector and valve branches + +Fri Oct 5 13:49:44 EDT 2007 Olivier Crete + * Warn if one tries to set factories when they are already set + +Fri Oct 5 13:40:05 EDT 2007 Olivier Crete + * rename property to PROP_ + +Fri Oct 5 13:21:27 EDT 2007 Olivier Crete + * Add proper locking to selector + +Fri Oct 5 10:27:52 EDT 2007 Olivier Crete + * Make it dispose properly + +Fri Oct 5 10:27:11 EDT 2007 Olivier Crete + * Dont negotiate on buffer_alloc + +Thu Oct 4 16:23:11 EDT 2007 Olivier Crete + * Add selector element + +Thu Jan 3 20:17:30 EST 2008 Youness Alaoui + * Name the jitterbuffer in rtpbin to allow a child_proxy_set call on it + +Thu Jan 3 20:17:14 EST 2008 Youness Alaoui + * Adding a 'hold' property on the jitterbuffer + +Wed Nov 21 15:08:58 EST 2007 Olivier Crete + * Only set passthrough to TRUE on newer versions of gst + +Wed Nov 21 13:17:29 EST 2007 Olivier Crete + * Compare minor, not major + +Fri Oct 26 18:16:34 EDT 2007 Olivier Crete + * Valve plugin requires 0.10.13 too + +Fri Oct 26 18:37:49 EDT 2007 Olivier Crete + * Make the valve element work with gst < 0.10.13 + +Wed Oct 24 18:42:46 EDT 2007 Olivier Crete + * Rename valve to fsvalve + +Wed Oct 24 18:41:47 EDT 2007 Olivier Crete + * Add valve element + +Fri Oct 12 12:15:58 EDT 2007 Olivier Crete + * Don't push EOS events onto the queue if its disabled, ie latency==0 + +Tue Oct 9 18:44:04 EDT 2007 Olivier Crete + * Fixup configure.ac test for gst 0.10.13 + +Tue Oct 9 15:33:34 EDT 2007 Olivier Crete + * Only enable G729 and DTMF plugins if gstreamer >= 0.10.13 is installed + +Wed Sep 26 08:05:37 EDT 2007 Olivier Crete + * Also do src query on the src pad on the jitterbuffer + +Tue Sep 25 11:36:58 EDT 2007 Olivier Crete + * Remove r263 from Makefile.am too + +Wed Sep 19 08:22:59 EDT 2007 Olivier Crete + * Remove rtpr263depay, use rtph263depay from gst-plugins-good + +Wed Sep 19 03:57:10 EDT 2007 Olivier Crete + * Move forgotten variable declaration to the beginning of the block + +Tue Sep 18 11:14:53 EDT 2007 Olivier Crete + * Comments out g_debugs + +Mon Sep 17 17:46:49 EDT 2007 Olivier Crete + * Bump nano version to 1 + Mon Sep 17 17:24:38 EDT 2007 Olivier Crete tagged 0.12.5 diff -Nru gst-plugins-farsight-0.12.5/config.guess gst-plugins-farsight-0.12.8/config.guess --- gst-plugins-farsight-0.12.5/config.guess 2007-05-31 03:13:19.000000000 -0500 +++ gst-plugins-farsight-0.12.8/config.guess 2007-12-30 22:52:47.000000000 -0600 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-15' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -347,7 +347,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -808,12 +808,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; diff -Nru gst-plugins-farsight-0.12.5/config.h.in gst-plugins-farsight-0.12.8/config.h.in --- gst-plugins-farsight-0.12.5/config.h.in 2007-09-17 16:25:16.000000000 -0500 +++ gst-plugins-farsight-0.12.8/config.h.in 2008-05-09 14:57:03.000000000 -0500 @@ -1,6 +1,7 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Compile the G729 payloader and depayloader */ +/* Compile the G729 payloader and depayloader (which requires gstreamer + 0.10.13) */ #undef ENABLE_G729 /* Define if libgsm has suport for WAV49. */ diff -Nru gst-plugins-farsight-0.12.5/config.sub gst-plugins-farsight-0.12.8/config.sub --- gst-plugins-farsight-0.12.5/config.sub 2007-05-31 03:13:19.000000000 -0500 +++ gst-plugins-farsight-0.12.8/config.sub 2007-12-30 22:52:47.000000000 -0600 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -475,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; diff -Nru gst-plugins-farsight-0.12.5/configure gst-plugins-farsight-0.12.8/configure --- gst-plugins-farsight-0.12.5/configure 2007-09-17 16:25:06.000000000 -0500 +++ gst-plugins-farsight-0.12.8/configure 2008-05-09 14:56:44.000000000 -0500 @@ -866,6 +866,8 @@ ECHO AR RANLIB +DSYMUTIL +NMEDIT CPP CXX CXXFLAGS @@ -890,6 +892,8 @@ PKG_CONFIG GST_CFLAGS GST_LIBS +GST_13_CFLAGS +GST_13_LIBS GST_MAJORMINOR GST_BASE_CFLAGS GST_BASE_LIBS @@ -958,6 +962,8 @@ PKG_CONFIG GST_CFLAGS GST_LIBS +GST_13_CFLAGS +GST_13_LIBS GST_BASE_CFLAGS GST_BASE_LIBS GST_PLUGINS_BASE_CFLAGS @@ -1565,8 +1571,6 @@ --disable-gsm disable GSM library: gsmenc gsmdec --disable-jasper disable JASPER library: jasperenc --disable-jingle-p2p compile without jingle-p2p support - --enable-g729 Compile the G729 payloader and depayloader (requires - gstreamer 0.10.13) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1598,6 +1602,9 @@ PKG_CONFIG path to pkg-config utility GST_CFLAGS C compiler flags for GST, overriding pkg-config GST_LIBS linker flags for GST, overriding pkg-config + GST_13_CFLAGS + C compiler flags for GST_13, overriding pkg-config + GST_13_LIBS linker flags for GST_13, overriding pkg-config GST_BASE_CFLAGS C compiler flags for GST_BASE, overriding pkg-config GST_BASE_LIBS @@ -2238,20 +2245,20 @@ PACKAGE=gst-plugins-farsight GST_PLUGINS_VERSION_MAJOR=0 GST_PLUGINS_VERSION_MINOR=12 - GST_PLUGINS_VERSION_MICRO=5 + GST_PLUGINS_VERSION_MICRO=8 NANO=0 GST_PLUGINS_VERSION_NANO=$NANO if test "x$NANO" = "x" || test "x$NANO" = "x0"; then { echo "$as_me:$LINENO: configuring gst-plugins-farsight for release" >&5 echo "$as_me: configuring gst-plugins-farsight for release" >&6;} - VERSION=0.12.5 + VERSION=0.12.8 GST_PLUGINS_VERSION_RELEASE=1 GST_CVS="no" else { echo "$as_me:$LINENO: configuring gst-plugins-farsight for development with nano $NANO" >&5 echo "$as_me: configuring gst-plugins-farsight for development with nano $NANO" >&6;} - VERSION=0.12.5.$NANO + VERSION=0.12.8.$NANO GST_PLUGINS_VERSION_RELEASE=0.`date +%Y%m%d.%H%M%S` GST_CVS="yes" fi @@ -4315,7 +4322,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[4-9]*) lt_cv_deplibs_check_method=pass_all ;; @@ -4531,7 +4538,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4534 "configure"' > conftest.$ac_ext + echo '#line 4541 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4703,7 +4710,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -6300,7 +6311,6 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } @@ -6615,7 +6625,7 @@ echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -7175,6 +7185,318 @@ ;; esac + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +echo "${ECHO_T}$DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +echo "${ECHO_T}$NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi +fi +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + lt_cv_ld_exported_symbols_list=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_ld_exported_symbols_list=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[0123]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac + + enable_dlopen=no enable_win32_dll=no @@ -7218,7 +7540,7 @@ " >&2;} { (exit 1); exit 1; }; } fi -gentoo_lt_version="1.5.24" +gentoo_lt_version="1.5.26" gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"` if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then { echo "$as_me:$LINENO: result: no" >&5 @@ -7301,7 +7623,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* @@ -7329,11 +7651,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7332: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7654: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7336: \$? = $ac_status" >&5 + echo "$as_me:7658: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7603,10 +7925,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works=no + lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" @@ -7619,27 +7941,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7622: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7944: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7626: \$? = $ac_status" >&5 + echo "$as_me:7948: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works=yes + lt_cv_prog_compiler_pic_works=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_prog_compiler_pic_works" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -7666,10 +7988,10 @@ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works+set}" = set; then +if test "${lt_cv_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works=no + lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -7682,20 +8004,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi else - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_prog_compiler_static_works" = xyes; then +if test x"$lt_cv_prog_compiler_static_works" = xyes; then : else lt_prog_compiler_static= @@ -7723,11 +8045,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7726: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8048: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7730: \$? = $ac_status" >&5 + echo "$as_me:8052: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7807,12 +8129,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -7871,7 +8194,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -8090,7 +8413,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -8110,7 +8433,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -8382,11 +8705,10 @@ link_all_deplibs=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -8906,7 +9228,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -9441,6 +9763,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -9760,7 +10097,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else { echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } @@ -10036,7 +10373,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10085,7 +10422,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -11156,7 +11499,7 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -11169,7 +11512,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -11427,51 +11770,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='' link_all_deplibs_CXX=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -11722,7 +12037,7 @@ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -12129,7 +12444,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" - cat > conftest.$ac_ext <&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_CXX=no + lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" @@ -12605,27 +12923,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12608: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12926: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12612: \$? = $ac_status" >&5 + echo "$as_me:12930: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_CXX=yes + lt_cv_prog_compiler_pic_works_CXX=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -12652,10 +12970,10 @@ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_CXX=no + lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -12668,20 +12986,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi else - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : else lt_prog_compiler_static_CXX= @@ -12709,11 +13027,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12712: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13030: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12716: \$? = $ac_status" >&5 + echo "$as_me:13034: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12766,7 +13084,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -12785,6 +13103,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 echo "${ECHO_T}$ld_shlibs_CXX" >&6; } @@ -12886,7 +13205,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -13420,6 +13739,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -13503,6 +13837,7 @@ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX \ + compiler_lib_search_dirs_CXX \ archive_cmds_CXX \ archive_expsym_cmds_CXX \ postinstall_cmds_CXX \ @@ -13751,6 +14086,10 @@ # shared library. postdeps=$lt_postdeps_CXX +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_CXX @@ -13965,7 +14304,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -14003,7 +14342,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -14268,10 +14607,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_F77=no + lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" @@ -14284,27 +14623,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14287: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14626: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14291: \$? = $ac_status" >&5 + echo "$as_me:14630: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_F77=yes + lt_cv_prog_compiler_pic_works_F77=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in "" | " "*) ;; *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; @@ -14331,10 +14670,10 @@ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_F77=no + lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -14347,20 +14686,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi else - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } -if test x"$lt_prog_compiler_static_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : else lt_prog_compiler_static_F77= @@ -14388,11 +14727,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14391: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14730: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14395: \$? = $ac_status" >&5 + echo "$as_me:14734: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14472,12 +14811,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -14536,7 +14876,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_F77=no @@ -14755,7 +15095,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -14775,7 +15115,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -15027,11 +15367,10 @@ link_all_deplibs_F77=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -15500,7 +15839,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -16034,6 +16373,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -16117,6 +16471,7 @@ predeps_F77 \ postdeps_F77 \ compiler_lib_search_path_F77 \ + compiler_lib_search_dirs_F77 \ archive_cmds_F77 \ archive_expsym_cmds_F77 \ postinstall_cmds_F77 \ @@ -16365,6 +16720,10 @@ # shared library. postdeps=$lt_postdeps_F77 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_F77 @@ -16539,7 +16898,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -16588,11 +16947,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16591: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16950: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16595: \$? = $ac_status" >&5 + echo "$as_me:16954: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16652,7 +17011,7 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; darwin* | rhapsody*) @@ -16722,7 +17081,7 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; hpux9* | hpux10* | hpux11*) @@ -16862,10 +17221,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_GCJ=no + lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" @@ -16878,27 +17237,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16881: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17240: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16885: \$? = $ac_status" >&5 + echo "$as_me:17244: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_GCJ=yes + lt_cv_prog_compiler_pic_works_GCJ=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in "" | " "*) ;; *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; @@ -16925,10 +17284,10 @@ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_GCJ=no + lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -16941,20 +17300,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi else - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : else lt_prog_compiler_static_GCJ= @@ -16982,11 +17341,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16985: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17344: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16989: \$? = $ac_status" >&5 + echo "$as_me:17348: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17066,12 +17425,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -17130,7 +17490,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_GCJ=no @@ -17349,7 +17709,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -17369,7 +17729,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -17641,11 +18001,10 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -18114,7 +18473,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -18648,6 +19007,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -18731,6 +19105,7 @@ predeps_GCJ \ postdeps_GCJ \ compiler_lib_search_path_GCJ \ + compiler_lib_search_dirs_GCJ \ archive_cmds_GCJ \ archive_expsym_cmds_GCJ \ postinstall_cmds_GCJ \ @@ -18979,6 +19354,10 @@ # shared library. postdeps=$lt_postdeps_GCJ +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ @@ -19152,7 +19531,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -19212,6 +19591,7 @@ predeps_RC \ postdeps_RC \ compiler_lib_search_path_RC \ + compiler_lib_search_dirs_RC \ archive_cmds_RC \ archive_expsym_cmds_RC \ postinstall_cmds_RC \ @@ -19460,6 +19840,10 @@ # shared library. postdeps=$lt_postdeps_RC +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_RC @@ -22468,12 +22852,12 @@ pkg_failed=no -{ echo "$as_me:$LINENO: checking for GST" >&5 -echo $ECHO_N "checking for GST... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for GST_13" >&5 +echo $ECHO_N "checking for GST_13... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then - if test -n "$GST_CFLAGS"; then - pkg_cv_GST_CFLAGS="$GST_CFLAGS" + if test -n "$GST_13_CFLAGS"; then + pkg_cv_GST_13_CFLAGS="$GST_13_CFLAGS" else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ @@ -22483,7 +22867,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "\ + pkg_cv_GST_13_CFLAGS=`$PKG_CONFIG --cflags "\ gstreamer-$GST_MAJORMINOR >= 0.10.13" 2>/dev/null` else pkg_failed=yes @@ -22493,8 +22877,8 @@ pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$GST_LIBS"; then - pkg_cv_GST_LIBS="$GST_LIBS" + if test -n "$GST_13_LIBS"; then + pkg_cv_GST_13_LIBS="$GST_13_LIBS" else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ @@ -22504,7 +22888,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "\ + pkg_cv_GST_13_LIBS=`$PKG_CONFIG --libs "\ gstreamer-$GST_MAJORMINOR >= 0.10.13" 2>/dev/null` else pkg_failed=yes @@ -22524,14 +22908,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ + GST_13_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ gstreamer-$GST_MAJORMINOR >= 0.10.13"` else - GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ + GST_13_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ gstreamer-$GST_MAJORMINOR >= 0.10.13"` fi # Put the nasty error message in config.log where it belongs - echo "$GST_PKG_ERRORS" >&5 + echo "$GST_13_PKG_ERRORS" >&5 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -22539,8 +22923,8 @@ elif test $pkg_failed = untried; then HAVE_GST_13=no else - GST_CFLAGS=$pkg_cv_GST_CFLAGS - GST_LIBS=$pkg_cv_GST_LIBS + GST_13_CFLAGS=$pkg_cv_GST_13_CFLAGS + GST_13_LIBS=$pkg_cv_GST_13_LIBS { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } HAVE_GST_13=yes @@ -22732,11 +23116,14 @@ GST_PLUGINS_ALL="\ rtpmux \ rtpdemux \ -rtpssrcdemux \ rtpjitterbuffer \ network-simulator \ dtmf \ -rtppayloads" +siren \ +rtppayloads \ +valve \ +selector \ +liveadder" @@ -24427,17 +24814,7 @@ fi -# Check whether --enable-g729 was given. -if test "${enable_g729+set}" = set; then - enableval=$enable_g729; g729="$enableval" -else - g729="no" -fi - - -{ echo "$as_me:$LINENO: result: Checking for --enable-g729... $g729" >&5 -echo "${ECHO_T}Checking for --enable-g729... $g729" >&6; } -if test "x$g729" != "xno" && test "x$HAVE_GST_13" == "xyes" ; then +if test "x$HAVE_GST_13" == "xyes" ; then if true; then ENABLE_G729_TRUE= ENABLE_G729_FALSE='#' @@ -24460,9 +24837,15 @@ ENABLE_G729_FALSE= fi + GST_PLUGINS_SELECTED="${GST_PLUGINS_SELECTED/dtmf/}" + GST_PLUGINS_SELECTED="${GST_PLUGINS_SELECTED/valve/}" + { echo "$as_me:$LINENO: DTMF and Valve plugins not compiled because you dont have gstreamer >= 0.10.13" >&5 +echo "$as_me: DTMF and Valve plugins not compiled because you dont have gstreamer >= 0.10.13" >&6;} + { echo "$as_me:$LINENO: Will not build G729 depayloader because you do not have gstreamer >= 0.10.13" >&5 +echo "$as_me: Will not build G729 depayloader because you do not have gstreamer >= 0.10.13" >&6;} fi -ac_config_files="$ac_config_files Makefile ext/Makefile ext/jrtp/Makefile ext/mimic/Makefile ext/gsm/Makefile ext/jpeg2000/Makefile ext/jasper/Makefile ext/ice/Makefile ext/gconf/Makefile gst/Makefile gst/dtmf/Makefile gst/rtppayloads/Makefile gst/rtpmux/Makefile gst/rtpdemux/Makefile gst/rtpssrcdemux/Makefile gst/rtpjitterbuffer/Makefile gst/network-simulator/Makefile tests/Makefile m4/Makefile" +ac_config_files="$ac_config_files Makefile ext/Makefile ext/jrtp/Makefile ext/mimic/Makefile ext/gsm/Makefile ext/jpeg2000/Makefile ext/jasper/Makefile ext/ice/Makefile ext/gconf/Makefile gst/Makefile gst/dtmf/Makefile gst/siren/Makefile gst/rtppayloads/Makefile gst/rtpmux/Makefile gst/rtpdemux/Makefile gst/rtpjitterbuffer/Makefile gst/network-simulator/Makefile gst/valve/Makefile gst/selector/Makefile gst/liveadder/Makefile tests/Makefile m4/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -25173,12 +25556,15 @@ "ext/gconf/Makefile") CONFIG_FILES="$CONFIG_FILES ext/gconf/Makefile" ;; "gst/Makefile") CONFIG_FILES="$CONFIG_FILES gst/Makefile" ;; "gst/dtmf/Makefile") CONFIG_FILES="$CONFIG_FILES gst/dtmf/Makefile" ;; + "gst/siren/Makefile") CONFIG_FILES="$CONFIG_FILES gst/siren/Makefile" ;; "gst/rtppayloads/Makefile") CONFIG_FILES="$CONFIG_FILES gst/rtppayloads/Makefile" ;; "gst/rtpmux/Makefile") CONFIG_FILES="$CONFIG_FILES gst/rtpmux/Makefile" ;; "gst/rtpdemux/Makefile") CONFIG_FILES="$CONFIG_FILES gst/rtpdemux/Makefile" ;; - "gst/rtpssrcdemux/Makefile") CONFIG_FILES="$CONFIG_FILES gst/rtpssrcdemux/Makefile" ;; "gst/rtpjitterbuffer/Makefile") CONFIG_FILES="$CONFIG_FILES gst/rtpjitterbuffer/Makefile" ;; "gst/network-simulator/Makefile") CONFIG_FILES="$CONFIG_FILES gst/network-simulator/Makefile" ;; + "gst/valve/Makefile") CONFIG_FILES="$CONFIG_FILES gst/valve/Makefile" ;; + "gst/selector/Makefile") CONFIG_FILES="$CONFIG_FILES gst/selector/Makefile" ;; + "gst/liveadder/Makefile") CONFIG_FILES="$CONFIG_FILES gst/liveadder/Makefile" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; @@ -25384,6 +25770,8 @@ ECHO!$ECHO$ac_delim AR!$AR$ac_delim RANLIB!$RANLIB$ac_delim +DSYMUTIL!$DSYMUTIL$ac_delim +NMEDIT!$NMEDIT$ac_delim CPP!$CPP$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim @@ -25408,6 +25796,8 @@ PKG_CONFIG!$PKG_CONFIG$ac_delim GST_CFLAGS!$GST_CFLAGS$ac_delim GST_LIBS!$GST_LIBS$ac_delim +GST_13_CFLAGS!$GST_13_CFLAGS$ac_delim +GST_13_LIBS!$GST_13_LIBS$ac_delim GST_MAJORMINOR!$GST_MAJORMINOR$ac_delim GST_BASE_CFLAGS!$GST_BASE_CFLAGS$ac_delim GST_BASE_LIBS!$GST_BASE_LIBS$ac_delim @@ -25457,7 +25847,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -25858,21 +26248,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -25909,7 +26300,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ diff -Nru gst-plugins-farsight-0.12.5/configure.ac gst-plugins-farsight-0.12.8/configure.ac --- gst-plugins-farsight-0.12.5/configure.ac 2007-09-17 16:24:21.000000000 -0500 +++ gst-plugins-farsight-0.12.8/configure.ac 2008-05-09 14:56:27.000000000 -0500 @@ -12,7 +12,7 @@ dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gst-plugins-farsight, GST_PLUGINS_VERSION, 0, 12, 5, 0, GST_CVS="no", GST_CVS="yes") +AS_VERSION(gst-plugins-farsight, GST_PLUGINS_VERSION, 0, 12, 8, 0, GST_CVS="no", GST_CVS="yes") AM_INIT_AUTOMAKE($PACKAGE, $VERSION) @@ -72,7 +72,7 @@ HAVE_GST=yes,HAVE_GST=no) dnl check to disable G729 if we don't have 10.13 at least -PKG_CHECK_MODULES(GST, \ +PKG_CHECK_MODULES(GST_13, \ gstreamer-$GST_MAJORMINOR >= 0.10.13, HAVE_GST_13=yes,HAVE_GST_13=no) @@ -126,11 +126,14 @@ GST_PLUGINS_ALL="\ rtpmux \ rtpdemux \ -rtpssrcdemux \ rtpjitterbuffer \ network-simulator \ dtmf \ -rtppayloads" +siren \ +rtppayloads \ +valve \ +selector \ +liveadder" AC_SUBST(GST_PLUGINS_ALL) @@ -332,19 +335,15 @@ AC_SUBST(HAVE_JINGLEP2P) AM_CONDITIONAL(USE_JINGLEP2P, test x$USE_JINGLEP2P = xyes) -dnl g729 -AC_ARG_ENABLE([g729], - AC_HELP_STRING([--enable-g729], - [Compile the G729 payloader and depayloader (requires gstreamer 0.10.13)]), - [g729="$enableval"], - [g729="no"]) - -AC_MSG_RESULT(Checking for --enable-g729... $g729) -if test "x$g729" != "xno" && test "x$HAVE_GST_13" == "xyes" ; then +if test "x$HAVE_GST_13" == "xyes" ; then AM_CONDITIONAL(ENABLE_G729, true) - AC_DEFINE(ENABLE_G729, , [Compile the G729 payloader and depayloader]) + AC_DEFINE(ENABLE_G729, , [Compile the G729 payloader and depayloader (which requires gstreamer 0.10.13)]) else AM_CONDITIONAL(ENABLE_G729, false) + GST_PLUGINS_SELECTED="${GST_PLUGINS_SELECTED/dtmf/}" + GST_PLUGINS_SELECTED="${GST_PLUGINS_SELECTED/valve/}" + AC_MSG_NOTICE([DTMF and Valve plugins not compiled because you dont have gstreamer >= 0.10.13]) + AC_MSG_NOTICE([Will not build G729 depayloader because you do not have gstreamer >= 0.10.13]) fi AC_OUTPUT(Makefile \ @@ -358,12 +357,15 @@ ext/gconf/Makefile \ gst/Makefile \ gst/dtmf/Makefile \ +gst/siren/Makefile \ gst/rtppayloads/Makefile \ gst/rtpmux/Makefile \ gst/rtpdemux/Makefile \ -gst/rtpssrcdemux/Makefile \ gst/rtpjitterbuffer/Makefile \ gst/network-simulator/Makefile \ +gst/valve/Makefile \ +gst/selector/Makefile \ +gst/liveadder/Makefile \ tests/Makefile \ m4/Makefile ) diff -Nru gst-plugins-farsight-0.12.5/debian/changelog gst-plugins-farsight-0.12.8/debian/changelog --- gst-plugins-farsight-0.12.5/debian/changelog 2008-06-08 16:55:33.000000000 -0500 +++ gst-plugins-farsight-0.12.8/debian/changelog 2008-06-08 16:55:34.000000000 -0500 @@ -1,3 +1,55 @@ +gst-plugins-farsight (0.12.8-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #238414): + - Build-dep on gstreamer-tools + - Call dh_gstscancodecs, for automatic codec install + - Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Nathan Handler Sun, 08 Jun 2008 16:51:23 -0500 + +gst-plugins-farsight (0.12.8-1) unstable; urgency=low + + [ Simon McVittie ] + * Use my debian.org address in Uploaders + * Wrap Uploaders, Build-Depends + + [ Sjoerd Simons ] + * New upstream release + + -- Sjoerd Simons Thu, 05 Jun 2008 16:39:48 +0100 + +gst-plugins-farsight (0.12.7-1) unstable; urgency=low + + [ Simon McVittie ] + * New upstream release + * Add Sjoerd to Uploaders + * Correct capitalization of "GStreamer" + + [ Sjoerd Simons ] + * debian/control: Remove build-depends on libjasper, the jasper plugin has + been disabled upstream for several releases. + * debian/control: Bump gstreamer build-depends to the minimal versions + required to build all plugins + + -- Sjoerd Simons Sat, 12 Apr 2008 09:38:19 +0200 + +gst-plugins-farsight (0.12.6-1) unstable; urgency=low + + [ Laurent Bigonville ] + * Bump Standards-Version to 3.7.3 + + [ Sjoerd Simons ] + * New upstream release + * debian/patches/01quite-debug.patch: + - Removed. Merged upstream + * debian/patches/02_correct_marshaller.patch + - Removed. Merged upstream + * debian/patches/99_autoreconf.patch + - Removed. Not necessary anymore + + -- Sjoerd Simons Sat, 08 Mar 2008 18:14:49 +0100 + gst-plugins-farsight (0.12.5-2ubuntu1) hardy; urgency=low * Merge from debian unstable, remaining changes: diff -Nru gst-plugins-farsight-0.12.5/debian/control gst-plugins-farsight-0.12.8/debian/control --- gst-plugins-farsight-0.12.5/debian/control 2008-06-08 16:55:33.000000000 -0500 +++ gst-plugins-farsight-0.12.8/debian/control 2008-06-08 16:55:34.000000000 -0500 @@ -3,8 +3,18 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Debian Telepathy maintainers -Uploaders: Dafydd Harries , Riccardo Setti , Simon McVittie , Laurent Bigonville -Build-Depends: cdbs, debhelper (>= 5), libgstreamer-plugins-base0.10-dev (>= 0.10.3), libgstreamer0.10-dev (>= 0.10.3), gstreamer-tools (>= 0.10.11cvs20070110), libgsm1-dev, libjasper-dev | libjasper-1.701-dev, libjinglep2p0.3-dev +Uploaders: Dafydd Harries , + Riccardo Setti , + Simon McVittie , + Laurent Bigonville , + Sjoerd Simons +Build-Depends: cdbs, + debhelper (>= 5), + libgstreamer-plugins-base0.10-dev (>= 0.10.11), + libgstreamer0.10-dev (>= 0.10.13), + gstreamer-tools (>= 0.10.11cvs20070110), + libgsm1-dev, + libjinglep2p0.3-dev Standards-Version: 3.7.3 Vcs-Bzr: http://bzr.debian.org/pkg-telepathy/packages/unstable/gst-plugins-farsight/ @@ -13,12 +23,12 @@ Section: sound Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: gstreamer0.10-ffmpeg -Description: plugins for Gstreamer for Audio/Video conferencing - The aim of this project is to provide a D-Bus-based framework that unifies - all forms of real time conversations, including, but not limited to, instant - messaging, IRC and voice and video over IP. It aims to provide a simple - interface to client applications allowing them to quickly implement code to +Description: plugins for GStreamer for Audio/Video conferencing + The aim of this project is to provide a D-Bus-based framework that unifies + all forms of real time conversations, including, but not limited to, instant + messaging, IRC and voice and video over IP. It aims to provide a simple + interface to client applications allowing them to quickly implement code to make use of real time communication over any supported protocol. . - This is a set of plugins for Gstreamer that will be used by Farsight for + This is a set of plugins for GStreamer that will be used by Farsight for Audio/Video conferencing. diff -Nru gst-plugins-farsight-0.12.5/debian/patches/01quite-debug.patch gst-plugins-farsight-0.12.8/debian/patches/01quite-debug.patch --- gst-plugins-farsight-0.12.5/debian/patches/01quite-debug.patch 2008-06-08 16:55:33.000000000 -0500 +++ gst-plugins-farsight-0.12.8/debian/patches/01quite-debug.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,21 +0,0 @@ -diff -Nur gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/async_jitter_queue.c gst-plugins-farsight-0.12.5.new/gst/rtpjitterbuffer/async_jitter_queue.c ---- gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/async_jitter_queue.c 2007-09-17 23:05:02.000000000 +0200 -+++ gst-plugins-farsight-0.12.5.new/gst/rtpjitterbuffer/async_jitter_queue.c 2007-09-18 16:42:14.000000000 +0200 -@@ -530,7 +530,7 @@ - { - /* Let's wait until the high threshold is reached */ - while (!g_queue_peek_tail (queue->queue) || queue->pop_blocking) { -- g_debug ("Sink needs buffer, must wait for buffering to stop"); -+ //g_debug ("Sink needs buffer, must wait for buffering to stop"); - queue->underruns++; - queue->waiting_threads++; - g_cond_wait(queue->cond, queue->mutex); -@@ -545,7 +545,7 @@ - else - { - while (queue->pop_blocking && !g_queue_peek_tail (queue->queue)) { -- g_debug ("No packets available for sink! waiting"); -+ //g_debug ("No packets available for sink! waiting"); - queue->waiting_threads++; - queue->underruns++; - g_cond_wait(queue->cond, queue->mutex); diff -Nru gst-plugins-farsight-0.12.5/debian/patches/02_correct_marshaller.patch gst-plugins-farsight-0.12.8/debian/patches/02_correct_marshaller.patch --- gst-plugins-farsight-0.12.5/debian/patches/02_correct_marshaller.patch 2008-06-08 16:55:33.000000000 -0500 +++ gst-plugins-farsight-0.12.8/debian/patches/02_correct_marshaller.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,56 +0,0 @@ -Mon Jan 28 10:36:03 CET 2008 Olivier Crete - * Add proper marshaller for rtp pt muxer signal -diff -rN -u old-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/Makefile.am new-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/Makefile.am ---- old-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/Makefile.am 2008-02-15 17:37:55.000000000 +0100 -+++ new-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/Makefile.am 2008-02-15 17:37:55.000000000 +0100 -@@ -6,10 +6,22 @@ - test_rtpdemux_CFLAGS = $(GST_CFLAGS) - test_rtpdemux_LDADD = $(GST_LIBS) - --libgstrtpdemux_la_SOURCES = gstrtpdemux.c -+libgstrtpdemux_la_SOURCES = gstrtpdemux.c gstrtpdemux-marshal.c - - libgstrtpdemux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT - libgstrtpdemux_la_LIBADD = $(GST_LIBS_LIBS) - libgstrtpdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ - - #noinst_HEADERS = gstrrtpdemux.h -+ -+glib_enum_define = GST_RTP_DEMUX -+glib_enum_prefix = gst_rtp_demux -+ -+include $(top_srcdir)/common/glib-gen.mak -+ -+BUILT_SOURCES = gstrtpdemux-marshal.c \ -+ gstrtpdemux-marshal.h -+ -+CLEANFILES = $(BUILT_SOURCES) -+ -+EXTRA_DIST = gstrtpdemux-marshal.list -diff -rN -u old-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/gstrtpdemux-marshal.list new-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/gstrtpdemux-marshal.list ---- old-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/gstrtpdemux-marshal.list 1970-01-01 01:00:00.000000000 +0100 -+++ new-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/gstrtpdemux-marshal.list 2008-02-15 17:37:55.000000000 +0100 -@@ -0,0 +1 @@ -+VOID:UINT,OBJECT -diff -rN -u old-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/gstrtpdemux.c new-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/gstrtpdemux.c ---- old-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/gstrtpdemux.c 2008-02-15 17:37:55.000000000 +0100 -+++ new-gst-plugins-farsight-misc-fixes-tester/gst/rtpdemux/gstrtpdemux.c 2008-02-15 17:37:55.000000000 +0100 -@@ -50,6 +50,8 @@ - #include - #include - -+#include "gstrtpdemux-marshal.h" -+ - /* generic templates */ - static GstStaticPadTemplate rtp_demux_sink_template = - GST_STATIC_PAD_TEMPLATE ("sink", -@@ -179,7 +181,7 @@ - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRtpDemuxClass, new_payload_type), - NULL, NULL, -- g_cclosure_marshal_VOID__UINT_POINTER, -+ gst_rtp_demux_marshal_VOID__UINT_OBJECT, - G_TYPE_NONE, - 2, - G_TYPE_INT, - diff -Nru gst-plugins-farsight-0.12.5/debian/patches/99_autoreconf.patch gst-plugins-farsight-0.12.8/debian/patches/99_autoreconf.patch --- gst-plugins-farsight-0.12.5/debian/patches/99_autoreconf.patch 2008-06-08 16:55:33.000000000 -0500 +++ gst-plugins-farsight-0.12.8/debian/patches/99_autoreconf.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,5662 +0,0 @@ -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/Makefile.in gst-plugins-farsight-0.12.5/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -96,6 +96,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -155,6 +156,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -367,8 +369,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -393,8 +395,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -404,13 +406,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -484,6 +485,10 @@ - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) -@@ -510,6 +515,8 @@ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -@@ -661,18 +668,18 @@ - .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ -- dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ -- distclean distclean-generic distclean-hdr distclean-libtool \ -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am -+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ -+ distcheck distclean distclean-generic distclean-hdr \ -+ distclean-libtool distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-recursive uninstall uninstall-am - - - dist-hook: -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/aclocal.m4 gst-plugins-farsight-0.12.5/aclocal.m4 ---- gst-plugins-farsight-0.12.5.vanilla/aclocal.m4 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/aclocal.m4 2008-02-15 17:42:33.000000000 +0100 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.10 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.1 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This file 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. -@@ -11,14 +11,17 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --m4_if(m4_PACKAGE_VERSION, [2.61],, --[m4_fatal([this file was generated for autoconf 2.61. --You have another version of autoconf. If you want to use that, --you should regenerate the build system entirely.], [63])]) -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(AC_AUTOCONF_VERSION, [2.61],, -+[m4_warning([this file was generated for autoconf 2.61. -+You have another version of autoconf. It may work, but is not guaranteed to. -+If you have problems, you may need to regenerate the build system entirely. -+To do so, use the procedure documented by the package, typically `autoreconf'.])]) - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# serial 51 AC_PROG_LIBTOOL -+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -106,7 +109,6 @@ - AC_REQUIRE([AC_OBJEXT])dnl - AC_REQUIRE([AC_EXEEXT])dnl - dnl -- - AC_LIBTOOL_SYS_MAX_CMD_LEN - AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - AC_LIBTOOL_OBJDIR -@@ -208,6 +210,8 @@ - ;; - esac - -+_LT_REQUIRED_DARWIN_CHECKS -+ - AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], - enable_win32_dll=yes, enable_win32_dll=no) -@@ -224,14 +228,6 @@ - [pic_mode=default]) - test -z "$pic_mode" && pic_mode=default - --# Check if we have a version mismatch between libtool.m4 and ltmain.sh. --# --# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. --# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually --# calls AC_LIBTOOL_CONFIG and creates libtool. --# --_LT_VERSION_CHECK -- - # Use C for the default configuration in the libtool script - tagname= - AC_LIBTOOL_LANG_C_CONFIG -@@ -239,41 +235,6 @@ - ])# AC_LIBTOOL_SETUP - - --# _LT_VERSION_CHECK --# ----------------- --AC_DEFUN([_LT_VERSION_CHECK], --[AC_MSG_CHECKING([for correct ltmain.sh version]) --if test "x$ltmain" = "x" ; then -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([ -- --*** @<:@Gentoo@:>@ sanity check failed! *** --*** \$ltmain is not defined, please check the patch for consistency! *** --]) --fi --gentoo_lt_version="1.5.24" --gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"` --if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([ -- --*** @<:@Gentoo@:>@ sanity check failed! *** --*** libtool.m4 and ltmain.sh have a version mismatch! *** --*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** -- --Please run: -- -- libtoolize --copy --force -- --if appropriate, please contact the maintainer of this --package (or your distribution) for help. --]) --else -- AC_MSG_RESULT(yes) --fi --])# _LT_VERSION_CHECK -- -- - # _LT_AC_SYS_COMPILER - # ------------------- - AC_DEFUN([_LT_AC_SYS_COMPILER], -@@ -330,9 +291,80 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - ])# _LT_LINKER_BOILERPLATE - -+# _LT_REQUIRED_DARWIN_CHECKS -+# -------------------------- -+# Check for some things on darwin -+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[0123]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+]) - - # _LT_AC_SYS_LIBPATH_AIX - # ---------------------- -@@ -657,7 +689,11 @@ - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; - esac - ;; - esac -@@ -750,7 +786,7 @@ - $2=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - ]) - -@@ -1021,7 +1057,7 @@ - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], -@@ -1029,7 +1065,7 @@ - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) -@@ -1346,7 +1382,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1514,14 +1550,7 @@ - *) objformat=elf ;; - esac - fi -- # Handle Gentoo/FreeBSD as it was Linux -- case $host_vendor in -- gentoo) -- version_type=linux ;; -- *) -- version_type=freebsd-$objformat ;; -- esac -- -+ version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -@@ -1532,12 +1561,6 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; -- linux) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- need_lib_prefix=no -- need_version=no -- ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -@@ -1700,6 +1723,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -1880,6 +1915,13 @@ - AC_MSG_RESULT([$dynamic_linker]) - test "$dynamic_linker" = no && can_build_shared=no - -+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -2379,7 +2421,7 @@ - # whether `pass_all' will *always* work, you probably want this one. - - case $host_os in --aix4* | aix5*) -+aix[[4-9]]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2474,7 +2516,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -2815,7 +2857,7 @@ - fi - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -2872,6 +2914,7 @@ - _LT_AC_TAGVAR(predeps, $1)= - _LT_AC_TAGVAR(postdeps, $1)= - _LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= - - # Source file extension for C++ test sources. - ac_ext=cpp -@@ -2981,7 +3024,7 @@ - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aix4* | aix5*) -+ aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -2994,7 +3037,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -3140,51 +3183,23 @@ - fi - ;; - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) -@@ -3435,7 +3450,7 @@ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -3508,7 +3523,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -3870,7 +3885,8 @@ - # compiler output when linking a shared library. - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. --AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl - dnl we can't use the lt_simple_compile_test_code here, - dnl because it contains code intended for an executable, - dnl not a library. It's possible we should let each -@@ -3995,6 +4011,11 @@ - - $rm -f confest.$objext - -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ - # PORTME: override above test on systems where it is broken - ifelse([$1],[CXX], - [case $host_os in -@@ -4051,7 +4072,6 @@ - ;; - esac - ]) -- - case " $_LT_AC_TAGVAR(postdeps, $1) " in - *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - esac -@@ -4136,7 +4156,7 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4* | aix5*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -4313,6 +4333,7 @@ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ -@@ -4375,7 +4396,7 @@ - # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -4612,6 +4633,10 @@ - # shared library. - postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -@@ -4961,7 +4986,7 @@ - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -5018,7 +5043,8 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform -@@ -5055,7 +5081,7 @@ - esac - else - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -@@ -5151,7 +5177,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -@@ -5189,7 +5215,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -5302,7 +5328,8 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) -@@ -5372,7 +5399,8 @@ - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) -@@ -5509,7 +5537,7 @@ - # - if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; -@@ -5533,7 +5561,7 @@ - # - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" - AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -@@ -5549,7 +5577,7 @@ - ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -5564,10 +5592,14 @@ - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; -+ linux* | k*bsd*-gnu) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -5598,12 +5630,14 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) -@@ -5653,7 +5687,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -5769,12 +5803,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -5872,7 +5907,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -5892,7 +5927,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -6052,11 +6087,10 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -6206,7 +6240,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -6785,7 +6819,7 @@ - - _PKG_TEXT - --To get pkg-config, see .])], -+To get pkg-config, see .])], - [$4]) - else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -@@ -6795,7 +6829,7 @@ - fi[]dnl - ])# PKG_CHECK_MODULES - --# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -6810,7 +6844,7 @@ - [am__api_version='1.10' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.10], [], -+m4_if([$1], [1.10.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -6826,8 +6860,10 @@ - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.10])dnl --_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -+[AM_AUTOMAKE_VERSION([1.10.1])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) - - # Figure out how to run the assembler. -*- Autoconf -*- - -@@ -7121,7 +7157,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue -@@ -7181,13 +7217,13 @@ - # Do all the work for Automake. -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2008 Free Software Foundation, Inc. - # - # This file 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. - --# serial 12 -+# serial 13 - - # This macro actually does too much. Some checks are only needed if - # your package does certain things. But this isn't really a big deal. -@@ -7292,16 +7328,17 @@ - # our stamp files there. - AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], - [# Compute $1's index in $config_headers. -+_am_arg=$1 - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $1 | $1:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - - # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # -@@ -7607,7 +7644,7 @@ - - # _AM_SUBST_NOTMAKE(VARIABLE) - # --------------------------- --# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. - # This macro is traced by Automake. - AC_DEFUN([_AM_SUBST_NOTMAKE]) - -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/config.guess gst-plugins-farsight-0.12.5/config.guess ---- gst-plugins-farsight-0.12.5.vanilla/config.guess 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/config.guess 2008-02-15 17:42:38.000000000 +0100 -@@ -4,7 +4,7 @@ - # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, - # Inc. - --timestamp='2007-01-15' -+timestamp='2007-07-22' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -139,23 +139,6 @@ - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - --if [ "${UNAME_SYSTEM}" = "Linux" ] ; then -- eval $set_cc_for_build -- cat << EOF > $dummy.c -- #include -- #ifdef __UCLIBC__ -- # ifdef __UCLIBC_CONFIG_VERSION__ -- LIBC=uclibc __UCLIBC_CONFIG_VERSION__ -- # else -- LIBC=uclibc -- # endif -- #else -- LIBC=gnu -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` --fi -- - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -347,7 +330,7 @@ - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -- i86pc:SunOS:5.*:*) -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) -@@ -808,12 +791,15 @@ - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- x86:Interix*:[3456]*) -- echo i586-pc-interix${UNAME_RELEASE} -- exit ;; -- EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) -- echo x86_64-unknown-interix${UNAME_RELEASE} -- exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -@@ -847,28 +833,28 @@ - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-${LIBC} -+ echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-${LIBC} -+ echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-${LIBC} -+ echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build -@@ -891,7 +877,7 @@ - s: ::g - p - }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build -@@ -914,16 +900,16 @@ - s: ::g - p - }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-${LIBC} -+ echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) -- echo powerpc-unknown-linux-${LIBC} -+ echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-${LIBC} -+ echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -936,40 +922,40 @@ - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -- *) echo hppa-unknown-linux-${LIBC} ;; -+ PA7*) echo hppa1.1-unknown-linux-gnu ;; -+ PA8*) echo hppa2.0-unknown-linux-gnu ;; -+ *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-${LIBC} -+ echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) -- echo ${UNAME_MACHINE}-dec-linux-${LIBC} -+ echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-${LIBC} -+ echo x86_64-unknown-linux-gnu - exit ;; - xtensa:Linux:*:*) -- echo xtensa-unknown-linux-${LIBC} -+ echo xtensa-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so -@@ -984,22 +970,20 @@ - p'` - case "$ld_supported_targets" in - elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" -+ echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" -+ echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" -+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac -- # This should get integrated into the C code below, but now we hack -- if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/config.sub gst-plugins-farsight-0.12.5/config.sub ---- gst-plugins-farsight-0.12.5.vanilla/config.sub 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/config.sub 2008-02-15 17:42:38.000000000 +0100 -@@ -4,7 +4,7 @@ - # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, - # Inc. - --timestamp='2007-01-18' -+timestamp='2007-06-28' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -244,7 +244,7 @@ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ -- | d10v | d30v | dlx | dsp16xx | dvp \ -+ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ -@@ -277,7 +277,7 @@ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ -- | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -@@ -358,7 +358,7 @@ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -@@ -475,8 +475,8 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16c) -- basic_machine=cr16c-unknown -+ cr16) -+ basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) -@@ -683,6 +683,10 @@ - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -690,24 +694,6 @@ - basic_machine=m68k-atari - os=-mint - ;; -- mipsEE* | ee | ps2) -- basic_machine=mips64r5900el-scei -- case $os in -- -linux*) -- ;; -- *) -- os=-elf -- ;; -- esac -- ;; -- iop) -- basic_machine=mipsel-scei -- os=-irx -- ;; -- dvp) -- basic_machine=dvp-scei -- os=-elf -- ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; -@@ -1240,7 +1226,7 @@ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/configure gst-plugins-farsight-0.12.5/configure ---- gst-plugins-farsight-0.12.5.vanilla/configure 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/configure 2008-02-15 17:42:35.000000000 +0100 -@@ -866,6 +866,8 @@ - ECHO - AR - RANLIB -+DSYMUTIL -+NMEDIT - CPP - CXX - CXXFLAGS -@@ -4315,7 +4317,7 @@ - # whether `pass_all' will *always* work, you probably want this one. - - case $host_os in --aix4* | aix5*) -+aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -4410,7 +4412,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -4531,7 +4533,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 4534 "configure"' > conftest.$ac_ext -+ echo '#line 4536 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -4703,7 +4705,11 @@ - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; - esac - ;; - esac -@@ -6300,7 +6306,6 @@ - - - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -- - # find the maximum length of command line arguments - { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 - echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -@@ -6615,7 +6620,7 @@ - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -7175,86 +7180,337 @@ - ;; - esac - --enable_dlopen=no --enable_win32_dll=no - --# Check whether --enable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -- enableval=$enable_libtool_lock; -+ case $host_os in -+ rhapsody* | darwin*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+echo "${ECHO_T}$DSYMUTIL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -+fi -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --# Check whether --with-pic was given. --if test "${with_pic+set}" = set; then -- withval=$with_pic; pic_mode="$withval" -+fi -+fi -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } - else -- pic_mode=default -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --test -z "$pic_mode" && pic_mode=default -+ if test "x$ac_ct_DSYMUTIL" = x; then -+ DSYMUTIL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ DSYMUTIL=$ac_ct_DSYMUTIL -+ fi -+else -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" -+fi - --# Check if we have a version mismatch between libtool.m4 and ltmain.sh. --# --# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. --# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually --# calls AC_LIBTOOL_CONFIG and creates libtool. --# --{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5 --echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; } --if test "x$ltmain" = "x" ; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+echo "${ECHO_T}$NMEDIT" >&6; } -+else - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } -- { { echo "$as_me:$LINENO: error: -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_NMEDIT"; then -+ ac_ct_NMEDIT=$NMEDIT -+ # Extract the first word of "nmedit", so it can be a program name with args. -+set dummy nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_NMEDIT"; then -+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_NMEDIT="nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --*** [Gentoo] sanity check failed! *** --*** \$ltmain is not defined, please check the patch for consistency! *** --" >&5 --echo "$as_me: error: -- --*** [Gentoo] sanity check failed! *** --*** \$ltmain is not defined, please check the patch for consistency! *** --" >&2;} -- { (exit 1); exit 1; }; } - fi --gentoo_lt_version="1.5.24" --gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"` --if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then -+fi -+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -+if test -n "$ac_ct_NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } -+else - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } -- { { echo "$as_me:$LINENO: error: -+fi -+ -+ if test "x$ac_ct_NMEDIT" = x; then -+ NMEDIT=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ NMEDIT=$ac_ct_NMEDIT -+ fi -+else -+ NMEDIT="$ac_cv_prog_NMEDIT" -+fi -+ -+ -+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } -+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ lt_cv_ld_exported_symbols_list=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --*** [Gentoo] sanity check failed! *** --*** libtool.m4 and ltmain.sh have a version mismatch! *** --*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** -+ lt_cv_ld_exported_symbols_list=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" - --Please run: -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } -+ case $host_os in -+ rhapsody* | darwin1.[0123]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[012]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac - -- libtoolize --copy --force - --if appropriate, please contact the maintainer of this --package (or your distribution) for help. --" >&5 --echo "$as_me: error: -+enable_dlopen=no -+enable_win32_dll=no - --*** [Gentoo] sanity check failed! *** --*** libtool.m4 and ltmain.sh have a version mismatch! *** --*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; -+fi - --Please run: -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -- libtoolize --copy --force - --if appropriate, please contact the maintainer of this --package (or your distribution) for help. --" >&2;} -- { (exit 1); exit 1; }; } -+# Check whether --with-pic was given. -+if test "${with_pic+set}" = set; then -+ withval=$with_pic; pic_mode="$withval" - else -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ pic_mode=default - fi - -+test -z "$pic_mode" && pic_mode=default - - # Use C for the default configuration in the libtool script - tagname= -@@ -7301,7 +7557,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - -@@ -7329,11 +7585,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7332: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7588: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7336: \$? = $ac_status" >&5 -+ echo "$as_me:7592: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -7603,10 +7859,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works=no -+ lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" -@@ -7619,27 +7875,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7622: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7878: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7626: \$? = $ac_status" >&5 -+ echo "$as_me:7882: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works=yes -+ lt_cv_prog_compiler_pic_works=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - --if test x"$lt_prog_compiler_pic_works" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -@@ -7666,10 +7922,10 @@ - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works=no -+ lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -7682,20 +7938,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works=yes -+ lt_cv_prog_compiler_static_works=yes - fi - else -- lt_prog_compiler_static_works=yes -+ lt_cv_prog_compiler_static_works=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - --if test x"$lt_prog_compiler_static_works" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : - else - lt_prog_compiler_static= -@@ -7723,11 +7979,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7726: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7982: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:7730: \$? = $ac_status" >&5 -+ echo "$as_me:7986: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -7807,12 +8063,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -7871,7 +8128,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no -@@ -7987,12 +8244,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -8090,7 +8348,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -8110,7 +8368,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -8382,11 +8640,10 @@ - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -8536,7 +8793,7 @@ - link_all_deplibs=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -8906,7 +9163,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -9074,14 +9331,7 @@ - *) objformat=elf ;; - esac - fi -- # Handle Gentoo/FreeBSD as it was Linux -- case $host_vendor in -- gentoo) -- version_type=linux ;; -- *) -- version_type=freebsd-$objformat ;; -- esac -- -+ version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -@@ -9092,12 +9342,6 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; -- linux) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- need_lib_prefix=no -- need_version=no -- ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -@@ -9260,6 +9504,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -9441,6 +9697,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -9760,7 +10031,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 - echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } - if test $ac_cv_lib_dld_shl_load = yes; then -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else - { echo "$as_me:$LINENO: checking for dlopen" >&5 - echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -@@ -10036,7 +10307,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 - echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } - if test $ac_cv_lib_dld_dld_link = yes; then -- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" - fi - - -@@ -10085,7 +10356,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -11156,7 +11433,7 @@ - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -11169,7 +11446,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -11427,51 +11704,23 @@ - fi - ;; - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes -- -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) -@@ -11722,7 +11971,7 @@ - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -11795,7 +12044,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -12129,7 +12378,6 @@ - GCC_CXX="$GXX" - LD_CXX="$LD" - -- - cat > conftest.$ac_ext <&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_CXX=no -+ lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" -@@ -12605,27 +12857,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:12608: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12860: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:12612: \$? = $ac_status" >&5 -+ echo "$as_me:12864: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_CXX=yes -+ lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - --if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -@@ -12652,10 +12904,10 @@ - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_CXX=no -+ lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -12668,20 +12920,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_CXX=yes -+ lt_cv_prog_compiler_static_works_CXX=yes - fi - else -- lt_prog_compiler_static_works_CXX=yes -+ lt_cv_prog_compiler_static_works_CXX=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - --if test x"$lt_prog_compiler_static_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : - else - lt_prog_compiler_static_CXX= -@@ -12709,11 +12961,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:12712: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12964: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:12716: \$? = $ac_status" >&5 -+ echo "$as_me:12968: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -12766,7 +13018,7 @@ - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -12781,10 +13033,14 @@ - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; -+ linux* | k*bsd*-gnu) -+ link_all_deplibs_CXX=no -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 - echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -@@ -12886,7 +13142,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13053,14 +13309,7 @@ - *) objformat=elf ;; - esac - fi -- # Handle Gentoo/FreeBSD as it was Linux -- case $host_vendor in -- gentoo) -- version_type=linux ;; -- *) -- version_type=freebsd-$objformat ;; -- esac -- -+ version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -@@ -13071,12 +13320,6 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; -- linux) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- need_lib_prefix=no -- need_version=no -- ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -@@ -13239,6 +13482,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -13420,6 +13675,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -13503,6 +13773,7 @@ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ -+ compiler_lib_search_dirs_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ -@@ -13751,6 +14022,10 @@ - # shared library. - postdeps=$lt_postdeps_CXX - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -@@ -13965,7 +14240,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -14003,7 +14278,7 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4* | aix5*) -+aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -14268,10 +14543,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_F77=no -+ lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" -@@ -14284,27 +14559,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14287: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14562: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14291: \$? = $ac_status" >&5 -+ echo "$as_me:14566: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_F77=yes -+ lt_cv_prog_compiler_pic_works_F77=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } - --if test x"$lt_prog_compiler_pic_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -@@ -14331,10 +14606,10 @@ - wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_F77=no -+ lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -14347,20 +14622,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_F77=yes -+ lt_cv_prog_compiler_static_works_F77=yes - fi - else -- lt_prog_compiler_static_works_F77=yes -+ lt_cv_prog_compiler_static_works_F77=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } - --if test x"$lt_prog_compiler_static_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : - else - lt_prog_compiler_static_F77= -@@ -14388,11 +14663,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14391: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14666: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14395: \$? = $ac_status" >&5 -+ echo "$as_me:14670: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -14472,12 +14747,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -14536,7 +14812,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no -@@ -14652,12 +14928,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -14755,7 +15032,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -14775,7 +15052,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -15027,11 +15304,10 @@ - link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -15181,7 +15457,7 @@ - link_all_deplibs_F77=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -15500,7 +15776,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -15667,14 +15943,7 @@ - *) objformat=elf ;; - esac - fi -- # Handle Gentoo/FreeBSD as it was Linux -- case $host_vendor in -- gentoo) -- version_type=linux ;; -- *) -- version_type=freebsd-$objformat ;; -- esac -- -+ version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -@@ -15685,12 +15954,6 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; -- linux) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- need_lib_prefix=no -- need_version=no -- ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -@@ -15853,6 +16116,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -16034,6 +16309,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -16117,6 +16407,7 @@ - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ -+ compiler_lib_search_dirs_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ -@@ -16365,6 +16656,10 @@ - # shared library. - postdeps=$lt_postdeps_F77 - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -@@ -16539,7 +16834,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -16588,11 +16883,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16591: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16886: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16595: \$? = $ac_status" >&5 -+ echo "$as_me:16890: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -16652,7 +16947,7 @@ - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries -- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ - ;; - - darwin* | rhapsody*) -@@ -16722,7 +17017,7 @@ - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ - ;; - - hpux9* | hpux10* | hpux11*) -@@ -16862,10 +17157,10 @@ - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_GCJ=no -+ lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" -@@ -16878,27 +17173,27 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16881: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17176: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16885: \$? = $ac_status" >&5 -+ echo "$as_me:17180: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_GCJ=yes -+ lt_cv_prog_compiler_pic_works_GCJ=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - --if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -@@ -16925,10 +17220,10 @@ - wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_GCJ=no -+ lt_cv_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -16941,20 +17236,20 @@ - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_GCJ=yes -+ lt_cv_prog_compiler_static_works_GCJ=yes - fi - else -- lt_prog_compiler_static_works_GCJ=yes -+ lt_cv_prog_compiler_static_works_GCJ=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } - --if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then - : - else - lt_prog_compiler_static_GCJ= -@@ -16982,11 +17277,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16985: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17280: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16989: \$? = $ac_status" >&5 -+ echo "$as_me:17284: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -17066,12 +17361,13 @@ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -17130,7 +17426,7 @@ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no -@@ -17246,12 +17542,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -17349,7 +17646,7 @@ - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -17369,7 +17666,7 @@ - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -17641,11 +17938,10 @@ - link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) -@@ -17795,7 +18091,7 @@ - link_all_deplibs_GCJ=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -18114,7 +18410,7 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -18281,14 +18577,7 @@ - *) objformat=elf ;; - esac - fi -- # Handle Gentoo/FreeBSD as it was Linux -- case $host_vendor in -- gentoo) -- version_type=linux ;; -- *) -- version_type=freebsd-$objformat ;; -- esac -- -+ version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -@@ -18299,12 +18588,6 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; -- linux) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- need_lib_prefix=no -- need_version=no -- ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -@@ -18467,6 +18750,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -18648,6 +18943,21 @@ - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -18731,6 +19041,7 @@ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ -+ compiler_lib_search_dirs_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ -@@ -18979,6 +19290,10 @@ - # shared library. - postdeps=$lt_postdeps_GCJ - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -@@ -19152,7 +19467,7 @@ - echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -19212,6 +19527,7 @@ - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ -+ compiler_lib_search_dirs_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ -@@ -19460,6 +19776,10 @@ - # shared library. - postdeps=$lt_postdeps_RC - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_RC -@@ -25384,6 +25704,8 @@ - ECHO!$ECHO$ac_delim - AR!$AR$ac_delim - RANLIB!$RANLIB$ac_delim -+DSYMUTIL!$DSYMUTIL$ac_delim -+NMEDIT!$NMEDIT$ac_delim - CPP!$CPP$ac_delim - CXX!$CXX$ac_delim - CXXFLAGS!$CXXFLAGS$ac_delim -@@ -25457,7 +25779,7 @@ - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -25858,21 +26180,22 @@ - fi - rm -f "$tmp/out12" - # Compute $ac_file's index in $config_headers. -+_am_arg=$ac_file - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $ac_file | $ac_file:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || --$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X$ac_file : 'X\(//\)[^/]' \| \ -- X$ac_file : 'X\(//\)$' \| \ -- X$ac_file : 'X\(/\)' \| . 2>/dev/null || --echo X$ac_file | -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -25909,7 +26232,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/depcomp gst-plugins-farsight-0.12.5/depcomp ---- gst-plugins-farsight-0.12.5.vanilla/depcomp 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/depcomp 2008-02-15 17:42:38.000000000 +0100 -@@ -1,9 +1,9 @@ - #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects - --scriptversion=2006-10-15.18 -+scriptversion=2007-03-29.01 - --# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software -+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software - # Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify -@@ -215,34 +215,39 @@ - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. -- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` -- tmpdepfile="$stripped.u" -+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` -+ test "x$dir" = "x$object" && dir= -+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then -+ tmpdepfile1=$dir$base.u -+ tmpdepfile2=$base.u -+ tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else -+ tmpdepfile1=$dir$base.u -+ tmpdepfile2=$dir$base.u -+ tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - -- if test -f "$tmpdepfile"; then : -- else -- stripped=`echo "$stripped" | sed 's,^.*/,,'` -- tmpdepfile="$stripped.u" -- fi -- - if test $stat -eq 0; then : - else -- rm -f "$tmpdepfile" -+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - -+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" -+ do -+ test -f "$tmpdepfile" && break -+ done - if test -f "$tmpdepfile"; then -- outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. -- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" -- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" -+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" -+ # That's a tab and a space in the []. -+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ext/Makefile.in gst-plugins-farsight-0.12.5/ext/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/ext/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ext/Makefile.in 2008-02-15 17:42:37.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -80,6 +80,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -139,6 +140,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -351,8 +353,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -377,8 +379,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -388,13 +390,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ext/gconf/Makefile.in gst-plugins-farsight-0.12.5/ext/gconf/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/ext/gconf/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ext/gconf/Makefile.in 2008-02-15 17:42:37.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -67,7 +67,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libgstgconfelements2_la_CFLAGS) $(CFLAGS) \ - $(libgstgconfelements2_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -108,6 +108,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -167,6 +168,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -285,8 +287,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -294,8 +296,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -364,8 +366,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -377,8 +379,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -388,13 +390,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ext/gsm/Makefile.in gst-plugins-farsight-0.12.5/ext/gsm/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/ext/gsm/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ext/gsm/Makefile.in 2008-02-15 17:42:37.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -68,7 +68,7 @@ - libgstmsgsm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstmsgsm_la_CFLAGS) \ - $(CFLAGS) $(libgstmsgsm_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -109,6 +109,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -168,6 +169,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -285,8 +287,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -294,8 +296,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -372,8 +374,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -385,8 +387,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -396,13 +398,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ext/ice/Makefile.in gst-plugins-farsight-0.12.5/ext/ice/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/ext/ice/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ext/ice/Makefile.in 2008-02-15 17:42:37.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -66,7 +66,7 @@ - libgstice_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libgstice_la_CXXFLAGS) \ - $(CXXFLAGS) $(libgstice_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -116,6 +116,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -175,6 +176,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -292,8 +294,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -301,8 +303,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -408,8 +410,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -421,8 +423,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -432,13 +434,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ext/jasper/Makefile.in gst-plugins-farsight-0.12.5/ext/jasper/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/ext/jasper/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ext/jasper/Makefile.in 2008-02-15 17:42:37.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -64,7 +64,7 @@ - libgstjasper_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstjasper_la_CFLAGS) \ - $(CFLAGS) $(libgstjasper_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -105,6 +105,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -164,6 +165,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -280,8 +282,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -289,8 +291,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -359,8 +361,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -372,8 +374,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -383,13 +385,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ext/jpeg2000/Makefile.in gst-plugins-farsight-0.12.5/ext/jpeg2000/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/ext/jpeg2000/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ext/jpeg2000/Makefile.in 2008-02-15 17:42:37.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -65,7 +65,7 @@ - libgstjpeg2k_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstjpeg2k_la_CFLAGS) \ - $(CFLAGS) $(libgstjpeg2k_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -106,6 +106,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -165,6 +166,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -281,8 +283,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -290,8 +292,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -384,8 +386,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -397,8 +399,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -408,13 +410,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ext/jrtp/Makefile.in gst-plugins-farsight-0.12.5/ext/jrtp/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/ext/jrtp/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ext/jrtp/Makefile.in 2008-02-15 17:42:37.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -74,7 +74,7 @@ - libgstjrtp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libgstjrtp_la_CXXFLAGS) \ - $(CXXFLAGS) $(libgstjrtp_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -124,6 +124,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -183,6 +184,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -304,8 +306,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -313,8 +315,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -428,8 +430,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -441,8 +443,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -452,13 +454,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ext/mimic/Makefile.in gst-plugins-farsight-0.12.5/ext/mimic/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/ext/mimic/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ext/mimic/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -64,7 +64,7 @@ - libgstmimic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstmimic_la_CFLAGS) \ - $(CFLAGS) $(libgstmimic_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -105,6 +105,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -164,6 +165,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -280,8 +282,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -289,8 +291,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -367,8 +369,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -380,8 +382,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -391,13 +393,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/gst/Makefile.in gst-plugins-farsight-0.12.5/gst/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/gst/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/gst/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -80,6 +80,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -139,6 +140,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -326,8 +328,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -352,8 +354,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -363,13 +365,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/gst/dtmf/Makefile.in gst-plugins-farsight-0.12.5/gst/dtmf/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/gst/dtmf/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/gst/dtmf/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -62,7 +62,7 @@ - libgstdtmf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstdtmf_la_CFLAGS) \ - $(CFLAGS) $(libgstdtmf_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -103,6 +103,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -162,6 +163,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -283,8 +285,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -292,8 +294,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -370,8 +372,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -383,8 +385,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -394,13 +396,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/gst/network-simulator/Makefile.in gst-plugins-farsight-0.12.5/gst/network-simulator/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/gst/network-simulator/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/gst/network-simulator/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -61,7 +61,7 @@ - libgstnetsim_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstnetsim_la_CFLAGS) \ - $(CFLAGS) $(libgstnetsim_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -102,6 +102,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -161,6 +162,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -277,8 +279,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -286,8 +288,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -348,8 +350,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -361,8 +363,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -372,13 +374,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/gst/rtpdemux/Makefile.in gst-plugins-farsight-0.12.5/gst/rtpdemux/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/gst/rtpdemux/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/gst/rtpdemux/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -14,6 +14,13 @@ - - @SET_MAKE@ - -+# these are the variables your Makefile.am should set -+# the example is based on the colorbalance interface -+ -+#glib_enum_headers=$(colorbalance_headers) -+#glib_enum_define=GST_COLOR_BALANCE -+#glib_enum_prefix=gst_color_balance -+ - - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ -@@ -35,8 +42,9 @@ - host_triplet = @host@ - target_triplet = @target@ - noinst_PROGRAMS = test_rtpdemux$(EXEEXT) -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/common/glib-gen.mak - subdir = gst/rtpdemux --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gst-feature.m4 \ -@@ -56,7 +64,8 @@ - pluginLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(plugin_LTLIBRARIES) - libgstrtpdemux_la_DEPENDENCIES = --am_libgstrtpdemux_la_OBJECTS = libgstrtpdemux_la-gstrtpdemux.lo -+am_libgstrtpdemux_la_OBJECTS = libgstrtpdemux_la-gstrtpdemux.lo \ -+ libgstrtpdemux_la-gstrtpdemux-marshal.lo - libgstrtpdemux_la_OBJECTS = $(am_libgstrtpdemux_la_OBJECTS) - libgstrtpdemux_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -@@ -70,7 +79,7 @@ - test_rtpdemux_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_rtpdemux_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -110,6 +119,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -169,6 +179,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -244,15 +255,25 @@ - test_rtpdemux_SOURCES = test_rtpdemux.c - test_rtpdemux_CFLAGS = $(GST_CFLAGS) - test_rtpdemux_LDADD = $(GST_LIBS) --libgstrtpdemux_la_SOURCES = gstrtpdemux.c -+libgstrtpdemux_la_SOURCES = gstrtpdemux.c gstrtpdemux-marshal.c - libgstrtpdemux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT - libgstrtpdemux_la_LIBADD = $(GST_LIBS_LIBS) - libgstrtpdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ --all: all-am -+ -+#noinst_HEADERS = gstrrtpdemux.h -+glib_enum_define = GST_RTP_DEMUX -+glib_enum_prefix = gst_rtp_demux -+BUILT_SOURCES = gstrtpdemux-marshal.c \ -+ gstrtpdemux-marshal.h -+ -+CLEANFILES = $(BUILT_SOURCES) -+EXTRA_DIST = gstrtpdemux-marshal.list -+all: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/common/glib-gen.mak $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ -@@ -287,8 +308,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -296,8 +317,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -327,6 +348,7 @@ - distclean-compile: - -rm -f *.tab.c - -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtpdemux_la-gstrtpdemux-marshal.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtpdemux_la-gstrtpdemux.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rtpdemux-test_rtpdemux.Po@am__quote@ - -@@ -358,6 +380,13 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtpdemux_la_CFLAGS) $(CFLAGS) -c -o libgstrtpdemux_la-gstrtpdemux.lo `test -f 'gstrtpdemux.c' || echo '$(srcdir)/'`gstrtpdemux.c - -+libgstrtpdemux_la-gstrtpdemux-marshal.lo: gstrtpdemux-marshal.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtpdemux_la_CFLAGS) $(CFLAGS) -MT libgstrtpdemux_la-gstrtpdemux-marshal.lo -MD -MP -MF $(DEPDIR)/libgstrtpdemux_la-gstrtpdemux-marshal.Tpo -c -o libgstrtpdemux_la-gstrtpdemux-marshal.lo `test -f 'gstrtpdemux-marshal.c' || echo '$(srcdir)/'`gstrtpdemux-marshal.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstrtpdemux_la-gstrtpdemux-marshal.Tpo $(DEPDIR)/libgstrtpdemux_la-gstrtpdemux-marshal.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstrtpdemux-marshal.c' object='libgstrtpdemux_la-gstrtpdemux-marshal.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtpdemux_la_CFLAGS) $(CFLAGS) -c -o libgstrtpdemux_la-gstrtpdemux-marshal.lo `test -f 'gstrtpdemux-marshal.c' || echo '$(srcdir)/'`gstrtpdemux-marshal.c -+ - test_rtpdemux-test_rtpdemux.o: test_rtpdemux.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_rtpdemux_CFLAGS) $(CFLAGS) -MT test_rtpdemux-test_rtpdemux.o -MD -MP -MF $(DEPDIR)/test_rtpdemux-test_rtpdemux.Tpo -c -o test_rtpdemux-test_rtpdemux.o `test -f 'test_rtpdemux.c' || echo '$(srcdir)/'`test_rtpdemux.c - @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_rtpdemux-test_rtpdemux.Tpo $(DEPDIR)/test_rtpdemux-test_rtpdemux.Po -@@ -383,8 +412,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -396,8 +425,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -407,13 +436,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -453,13 +481,15 @@ - fi; \ - done - check-am: all-am --check: check-am -+check: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) - installdirs: - for dir in "$(DESTDIR)$(plugindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done --install: install-am -+install: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am - install-data: install-data-am - uninstall: uninstall-am -@@ -476,6 +506,7 @@ - mostlyclean-generic: - - clean-generic: -+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -@@ -483,6 +514,7 @@ - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - clean: clean-am - - clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -@@ -560,7 +592,41 @@ - uninstall-pluginLTLIBRARIES - - --#noinst_HEADERS = gstrrtpdemux.h -+# these are all the rules generating the relevant files -+%-marshal.h: %-marshal.list -+ glib-genmarshal --header --prefix=$(glib_enum_prefix)_marshal $^ > $*-marshal.h.tmp -+ mv $*-marshal.h.tmp $*-marshal.h -+ -+%-marshal.c: %-marshal.list -+ echo "#include \"$*-marshal.h\"" >> $*-marshal.c.tmp -+ glib-genmarshal --body --prefix=$(glib_enum_prefix)_marshal $^ >> $*-marshal.c.tmp -+ mv $*-marshal.c.tmp $*-marshal.c -+ -+%-enumtypes.h: $(glib_enum_headers) -+ glib-mkenums \ -+ --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ -+ --fprod "\n/* enumerations from \"@filename@\" */\n" \ -+ --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ -+ --ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \ -+ $^ > $@ -+ -+%-enumtypes.c: $(glib_enum_headers) -+ @if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi -+ glib-mkenums \ -+ --fhead "#include <$*.h>" \ -+ --fprod "\n/* enumerations from \"@filename@\" */" \ -+ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ -+ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ -+ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ -+ $^ > $@ -+ -+# a hack rule to make sure .Plo files exist because they get include'd -+# from Makefile's -+.deps/%-marshal.Plo: -+ touch $@ -+ -+.deps/%-enumtypes.Plo: -+ touch $@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/gst/rtpjitterbuffer/Makefile.in gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/gst/rtpjitterbuffer/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -75,7 +75,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libgstrtpjitterbuffer_la_CFLAGS) $(CFLAGS) \ - $(libgstrtpjitterbuffer_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -117,6 +117,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -176,6 +177,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -302,8 +304,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -311,8 +313,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -389,8 +391,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -402,8 +404,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -413,13 +415,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/gst/rtpmux/Makefile.in gst-plugins-farsight-0.12.5/gst/rtpmux/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/gst/rtpmux/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/gst/rtpmux/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -64,7 +64,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libgstrtpmuxer_la_CFLAGS) $(CFLAGS) \ - $(libgstrtpmuxer_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -105,6 +105,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -164,6 +165,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -280,8 +282,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -289,8 +291,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -367,8 +369,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -380,8 +382,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -391,13 +393,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/gst/rtppayloads/Makefile.in gst-plugins-farsight-0.12.5/gst/rtppayloads/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/gst/rtppayloads/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/gst/rtppayloads/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -84,7 +84,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libgstrtppayloads_la_CFLAGS) $(CFLAGS) \ - $(libgstrtppayloads_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -124,6 +124,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -183,6 +184,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -303,8 +305,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -312,8 +314,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -446,8 +448,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -459,8 +461,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -470,13 +472,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/gst/rtpssrcdemux/Makefile.in gst-plugins-farsight-0.12.5/gst/rtpssrcdemux/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/gst/rtpssrcdemux/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/gst/rtpssrcdemux/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -61,7 +61,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libgstrtpssrcdemux_la_CFLAGS) $(CFLAGS) \ - $(libgstrtpssrcdemux_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -101,6 +101,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -160,6 +161,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -280,8 +282,8 @@ - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -@@ -289,8 +291,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - - clean-pluginLTLIBRARIES: -@@ -351,8 +353,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -364,8 +366,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -375,13 +377,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/install-sh gst-plugins-farsight-0.12.5/install-sh ---- gst-plugins-farsight-0.12.5.vanilla/install-sh 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/install-sh 2008-02-15 17:42:37.000000000 +0100 -@@ -1,7 +1,7 @@ - #!/bin/sh - # install - install a program, script, or datafile - --scriptversion=2006-10-14.15 -+scriptversion=2006-12-25.00 - - # This originates from X11R5 (mit/util/scripts/install.sh), which was - # later released in X11R6 (xc/config/util/install.sh) with the -@@ -48,7 +48,7 @@ - # set DOITPROG to echo to test this script - - # Don't use :- since 4.3BSD and earlier shells don't like it. --doit="${DOITPROG-}" -+doit=${DOITPROG-} - if test -z "$doit"; then - doit_exec=exec - else -@@ -58,34 +58,49 @@ - # Put in absolute file names if you don't have them in your path; - # or use environment vars. - --mvprog="${MVPROG-mv}" --cpprog="${CPPROG-cp}" --chmodprog="${CHMODPROG-chmod}" --chownprog="${CHOWNPROG-chown}" --chgrpprog="${CHGRPPROG-chgrp}" --stripprog="${STRIPPROG-strip}" --rmprog="${RMPROG-rm}" --mkdirprog="${MKDIRPROG-mkdir}" -+chgrpprog=${CHGRPPROG-chgrp} -+chmodprog=${CHMODPROG-chmod} -+chownprog=${CHOWNPROG-chown} -+cmpprog=${CMPPROG-cmp} -+cpprog=${CPPROG-cp} -+mkdirprog=${MKDIRPROG-mkdir} -+mvprog=${MVPROG-mv} -+rmprog=${RMPROG-rm} -+stripprog=${STRIPPROG-strip} -+ -+posix_glob='?' -+initialize_posix_glob=' -+ test "$posix_glob" != "?" || { -+ if (set -f) 2>/dev/null; then -+ posix_glob= -+ else -+ posix_glob=: -+ fi -+ } -+' - --posix_glob= - posix_mkdir= - - # Desired mode of installed file. - mode=0755 - -+chgrpcmd= - chmodcmd=$chmodprog - chowncmd= --chgrpcmd= --stripcmd= -+mvcmd=$mvprog - rmcmd="$rmprog -f" --mvcmd="$mvprog" -+stripcmd= -+ - src= - dst= - dir_arg= --dstarg= -+dst_arg= -+ -+copy_on_change=false - no_target_directory= - --usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE -+usage="\ -+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... -@@ -95,65 +110,55 @@ - In the 4th, create DIRECTORIES. - - Options: ---c (ignored) ---d create directories instead of installing files. ---g GROUP $chgrpprog installed files to GROUP. ---m MODE $chmodprog installed files to MODE. ---o USER $chownprog installed files to USER. ---s $stripprog installed files. ---t DIRECTORY install into DIRECTORY. ---T report an error if DSTFILE is a directory. ----help display this help and exit. ----version display version info and exit. -+ --help display this help and exit. -+ --version display version info and exit. -+ -+ -c (ignored) -+ -C install only if different (preserve the last data modification time) -+ -d create directories instead of installing files. -+ -g GROUP $chgrpprog installed files to GROUP. -+ -m MODE $chmodprog installed files to MODE. -+ -o USER $chownprog installed files to USER. -+ -s $stripprog installed files. -+ -t DIRECTORY install into DIRECTORY. -+ -T report an error if DSTFILE is a directory. - - Environment variables override the default commands: -- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG -+ RMPROG STRIPPROG - " - - while test $# -ne 0; do - case $1 in -- -c) shift -- continue;; -+ -c) ;; -+ -+ -C) copy_on_change=true;; - -- -d) dir_arg=true -- shift -- continue;; -+ -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" -- shift -- shift -- continue;; -+ shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 -- shift -- shift - case $mode in - *' '* | *' '* | *' - '* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac -- continue;; -+ shift;; - - -o) chowncmd="$chownprog $2" -- shift -- shift -- continue;; -- -- -s) stripcmd=$stripprog -- shift -- continue;; -- -- -t) dstarg=$2 -- shift -- shift -- continue;; -- -- -T) no_target_directory=true -- shift -- continue;; -+ shift;; -+ -+ -s) stripcmd=$stripprog;; -+ -+ -t) dst_arg=$2 -+ shift;; -+ -+ -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - -@@ -165,21 +170,22 @@ - - *) break;; - esac -+ shift - done - --if test $# -ne 0 && test -z "$dir_arg$dstarg"; then -+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do -- if test -n "$dstarg"; then -+ if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. -- set fnord "$@" "$dstarg" -+ set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg -- dstarg=$arg -+ dst_arg=$arg - done - fi - -@@ -224,7 +230,7 @@ - do - # Protect names starting with `-'. - case $src in -- -*) src=./$src ;; -+ -*) src=./$src;; - esac - - if test -n "$dir_arg"; then -@@ -242,22 +248,22 @@ - exit 1 - fi - -- if test -z "$dstarg"; then -+ if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - -- dst=$dstarg -+ dst=$dst_arg - # Protect names starting with `-'. - case $dst in -- -*) dst=./$dst ;; -+ -*) dst=./$dst;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then -- echo "$0: $dstarg: Is a directory" >&2 -+ echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst -@@ -378,26 +384,19 @@ - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in -- /*) prefix=/ ;; -- -*) prefix=./ ;; -- *) prefix= ;; -+ /*) prefix='/';; -+ -*) prefix='./';; -+ *) prefix='';; - esac - -- case $posix_glob in -- '') -- if (set -f) 2>/dev/null; then -- posix_glob=true -- else -- posix_glob=false -- fi ;; -- esac -+ eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ -- $posix_glob && set -f -+ $posix_glob set -f - set fnord $dstdir - shift -- $posix_glob && set +f -+ $posix_glob set +f - IFS=$oIFS - - prefixes= -@@ -459,41 +458,54 @@ - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # -- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ -- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ -- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ -- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && -- -- # Now rename the file to the real destination. -- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ -- || { -- # The rename failed, perhaps because mv can't rename something else -- # to itself, or perhaps because mv is so ancient that it does not -- # support -f. -- -- # Now remove or move aside any old file at destination location. -- # We try this two ways since rm can't unlink itself on some -- # systems and the destination file might be busy for other -- # reasons. In this case, the final cleanup might fail but the new -- # file should still install successfully. -- { -- if test -f "$dst"; then -- $doit $rmcmd -f "$dst" 2>/dev/null \ -- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ -- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ -- || { -- echo "$0: cannot unlink or rename $dst" >&2 -- (exit 1); exit 1 -- } -- else -- : -- fi -- } && -- -- # Now rename the file to the real destination. -- $doit $mvcmd "$dsttmp" "$dst" -- } -- } || exit 1 -+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && -+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && -+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && -+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && -+ -+ # If -C, don't bother to copy if it wouldn't change the file. -+ if $copy_on_change && -+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && -+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && -+ -+ eval "$initialize_posix_glob" && -+ $posix_glob set -f && -+ set X $old && old=:$2:$4:$5:$6 && -+ set X $new && new=:$2:$4:$5:$6 && -+ $posix_glob set +f && -+ -+ test "$old" = "$new" && -+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 -+ then -+ rm -f "$dsttmp" -+ else -+ # Rename the file to the real destination. -+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || -+ -+ # The rename failed, perhaps because mv can't rename something else -+ # to itself, or perhaps because mv is so ancient that it does not -+ # support -f. -+ { -+ # Now remove or move aside any old file at destination location. -+ # We try this two ways since rm can't unlink itself on some -+ # systems and the destination file might be busy for other -+ # reasons. In this case, the final cleanup might fail but the new -+ # file should still install successfully. -+ { -+ test ! -f "$dst" || -+ $doit $rmcmd -f "$dst" 2>/dev/null || -+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && -+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } -+ } || -+ { echo "$0: cannot unlink or rename $dst" >&2 -+ (exit 1); exit 1 -+ } -+ } && -+ -+ # Now rename the file to the real destination. -+ $doit $mvcmd "$dsttmp" "$dst" -+ } -+ fi || exit 1 - - trap '' 0 - fi -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/ltmain.sh gst-plugins-farsight-0.12.5/ltmain.sh ---- gst-plugins-farsight-0.12.5.vanilla/ltmain.sh 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/ltmain.sh 2008-02-02 14:06:18.000000000 +0100 -@@ -2,7 +2,7 @@ - # NOTE: Changing this file will not affect anything until you rerun configure. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007 Free Software Foundation, Inc. -+# 2007, 2008 Free Software Foundation, Inc. - # Originally by Gordon Matzigkeit , 1996 - # - # This program is free software; you can redistribute it and/or modify -@@ -43,8 +43,8 @@ - - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=1.5.24 --TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" -+VERSION="1.5.26 Debian 1.5.26-1" -+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" - - # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -113,15 +113,21 @@ - # These must not be set unconditionally because not all systems understand - # e.g. LANG=C (notably SCO). - # We save the old values to restore during execute mode. --for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -+lt_env= -+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var -+ lt_env=\"$lt_var=\$$lt_var \$lt_env\" - $lt_var=C - export $lt_var - fi" - done - -+if test -n "$lt_env"; then -+ lt_env="env $lt_env" -+fi -+ - # Make sure IFS has a sensible default - lt_nl=' - ' -@@ -275,21 +281,7 @@ - esac - CC_quoted="$CC_quoted $arg" - done -- # user sometimes does CC=-gcc so we need to match that to 'gcc' -- trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"` -- # and sometimes libtool has CC=-gcc but user does CC=gcc -- extendcc=${host}-${CC} -- # and sometimes libtool has CC=-gcc but user has CC=-gcc -- # (Gentoo-specific hack because we always export $CHOST) -- mungedcc=${CHOST-${host}}-${trimedcc} - case "$@ " in -- "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\ -- "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) -- tagname=CC -- break ;; -- "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\ -- "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\ -- "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\ - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. -@@ -499,7 +491,7 @@ - echo "\ - $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP - --Copyright (C) 2007 Free Software Foundation, Inc. -+Copyright (C) 2008 Free Software Foundation, Inc. - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? -@@ -802,6 +794,7 @@ - *.for) xform=for ;; - *.java) xform=java ;; - *.obj) xform=obj ;; -+ *.sx) xform=sx ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -@@ -895,7 +888,7 @@ - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then -- until $run ln "$srcfile" "$lockfile" 2>/dev/null; do -+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done -@@ -970,7 +963,7 @@ - $run $rm "$lobj" "$output_obj" - - $show "$command" -- if $run eval "$command"; then : -+ if $run eval $lt_env "$command"; then : - else - test -n "$output_obj" && $run $rm $removelist - exit $EXIT_FAILURE -@@ -1042,7 +1035,7 @@ - command="$command$suppress_output" - $run $rm "$obj" "$output_obj" - $show "$command" -- if $run eval "$command"; then : -+ if $run eval $lt_env "$command"; then : - else - $run $rm $removelist - exit $EXIT_FAILURE -@@ -1175,6 +1168,7 @@ - thread_safe=no - vinfo= - vinfo_number=no -+ single_module="${wl}-single_module" - - func_infer_tag $base_compile - -@@ -1660,6 +1654,11 @@ - continue - ;; - -+ -multi_module) -+ single_module="${wl}-multi_module" -+ continue -+ ;; -+ - -module) - module=yes - continue -@@ -2136,7 +2135,10 @@ - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -+ ;; - esac - fi - if test "$pass" = dlopen; then -@@ -2163,7 +2165,12 @@ - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` -- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ if test "$linkmode" = lib; then -+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" -+ else -+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -+ fi -+ for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" -@@ -2959,12 +2966,18 @@ - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done -- if test -f "$path/$depdepl" ; then -+ if test -f "$deplibdir/$depdepl" ; then -+ depdepl="$deplibdir/$depdepl" -+ elif test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" -+ else -+ # Can't find it, oh well... -+ depdepl= - fi - # do not add paths which are already there - case " $newlib_search_path " in -@@ -3112,9 +3125,10 @@ - - case $linkmode in - oldlib) -- if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 -- fi -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; -+ esac - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 -@@ -3258,6 +3272,11 @@ - revision="$number_minor" - lt_irix_increment=no - ;; -+ *) -+ $echo "$modename: unknown library version type \`$version_type'" 1>&2 -+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit $EXIT_FAILURE -+ ;; - esac - ;; - no) -@@ -4251,9 +4270,10 @@ - ;; - - obj) -- if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 -- fi -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; -+ esac - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 -@@ -5456,11 +5476,6 @@ - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -- -- # Make sure env LD_LIBRARY_PATH does not mess us up -- if test -n \"\${LD_LIBRARY_PATH+set}\"; then -- export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH -- fi - " - case $host in - # Backslashes separate directories on plain windows -@@ -5688,53 +5703,9 @@ - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi -- if test "X$EGREP" = X ; then -- EGREP=egrep -- fi -- # We do not want portage's install root ($D) present. Check only for -- # this if the .la is being installed. -- if test "$installed" = yes && test "$D"; then -- eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` -- else -- mynewdependency_lib="$libdir/$name" -- fi -- # Do not add duplicates -- if test "$mynewdependency_lib"; then -- my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` -- if test -z "$my_little_ninja_foo_1"; then -- newdependency_libs="$newdependency_libs $mynewdependency_lib" -- fi -- fi -- ;; -- *) -- if test "$installed" = yes; then -- # Rather use S=WORKDIR if our version of portage supports it. -- # This is because some ebuild (gcc) do not use $S as buildroot. -- if test "$PWORKDIR"; then -- S="$PWORKDIR" -- fi -- # We do not want portage's build root ($S) present. -- my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` -- # We do not want portage's install root ($D) present. -- my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` -- if test -n "$my_little_ninja_foo_2" && test "$S"; then -- mynewdependency_lib="" -- elif test -n "$my_little_ninja_foo_3" && test "$D"; then -- eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` -- else -- mynewdependency_lib="$deplib" -- fi -- else -- mynewdependency_lib="$deplib" -- fi -- # Do not add duplicates -- if test "$mynewdependency_lib"; then -- my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` -- if test -z "$my_little_ninja_foo_4"; then -- newdependency_libs="$newdependency_libs $mynewdependency_lib" -- fi -- fi -+ newdependency_libs="$newdependency_libs $libdir/$name" - ;; -+ *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -5786,10 +5757,6 @@ - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac -- # Do not add duplicates -- if test "$installed" = yes && test "$D"; then -- install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` -- fi - $echo > $output "\ - # $outputname - a libtool library file - # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -@@ -6545,7 +6512,7 @@ - fi - - # Restore saved environment variables -- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/m4/Makefile.in gst-plugins-farsight-0.12.5/m4/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/m4/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/m4/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -69,6 +69,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -128,6 +129,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -diff -Nuar gst-plugins-farsight-0.12.5.vanilla/tests/Makefile.in gst-plugins-farsight-0.12.5/tests/Makefile.in ---- gst-plugins-farsight-0.12.5.vanilla/tests/Makefile.in 2008-02-15 17:42:06.000000000 +0100 -+++ gst-plugins-farsight-0.12.5/tests/Makefile.in 2008-02-15 17:42:38.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -110,7 +110,7 @@ - msgsmsend_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(msgsmsend_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -156,6 +156,7 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -215,6 +216,7 @@ - MIMIC_CFLAGS = @MIMIC_CFLAGS@ - MIMIC_LIBS = @MIMIC_LIBS@ - MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -576,8 +578,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -589,8 +591,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -600,13 +602,12 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/ext/gconf/gstgconfv4l2src.c gst-plugins-farsight-0.12.8/ext/gconf/gstgconfv4l2src.c --- gst-plugins-farsight-0.12.5/ext/gconf/gstgconfv4l2src.c 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/gconf/gstgconfv4l2src.c 2008-01-22 18:49:02.000000000 -0600 @@ -206,12 +206,19 @@ static void flip_it (GstGConfV4L2Src *self, gboolean flipped) { - /* at this point we simply set the horizontal flip */ - GST_DEBUG_OBJECT (self, "Setting h/v flip to %d", !flipped); - gst_video_orientation_set_hflip (GST_VIDEO_ORIENTATION - (self->priv->v4l2src_element), flipped); - gst_video_orientation_set_vflip (GST_VIDEO_ORIENTATION - (self->priv->v4l2src_element), flipped); + /* The interface is implemented if the device is opened (and it will + * abort() if its not implemented + */ + if (gst_element_implements_interface (self->priv->v4l2src_element, + GST_TYPE_VIDEO_ORIENTATION)) + { + /* at this point we simply set the horizontal flip */ + GST_DEBUG_OBJECT (self, "Setting h/v flip to %d", !flipped); + gst_video_orientation_set_hflip (GST_VIDEO_ORIENTATION + (self->priv->v4l2src_element), flipped); + gst_video_orientation_set_vflip (GST_VIDEO_ORIENTATION + (self->priv->v4l2src_element), flipped); + } } static GstStateChangeReturn diff -Nru gst-plugins-farsight-0.12.5/ext/gconf/Makefile.in gst-plugins-farsight-0.12.8/ext/gconf/Makefile.in --- gst-plugins-farsight-0.12.5/ext/gconf/Makefile.in 2007-09-17 16:25:03.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/gconf/Makefile.in 2008-05-09 14:56:40.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -67,7 +67,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libgstgconfelements2_la_CFLAGS) $(CFLAGS) \ $(libgstgconfelements2_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -121,6 +122,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -167,6 +170,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -285,8 +289,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -294,8 +298,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -364,8 +368,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -377,8 +381,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -388,13 +392,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/ext/gsm/gstmsgsmdec.c gst-plugins-farsight-0.12.8/ext/gsm/gstmsgsmdec.c --- gst-plugins-farsight-0.12.5/ext/gsm/gstmsgsmdec.c 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/gsm/gstmsgsmdec.c 2007-09-25 10:35:27.000000000 -0500 @@ -130,6 +130,9 @@ static void gst_msgsmdec_init (GstMSGSMDec * msgsmdec) { + // turn on WAN49 handling + gint use_wav49 = 1; + /* create the sink and src pads */ msgsmdec->sinkpad = gst_pad_new_from_template (gst_static_pad_template_get @@ -143,9 +146,8 @@ gst_element_add_pad (GST_ELEMENT (msgsmdec), msgsmdec->srcpad); msgsmdec->state = gsm_create (); - // turn on WAN49 handling - gint use_wav49 = 1; - gsm_option (msgsmdec->state, GSM_OPT_WAV49, &use_wav49); + + gsm_option (msgsmdec->state, GSM_OPT_WAV49, &use_wav49); msgsmdec->adapter = gst_adapter_new (); diff -Nru gst-plugins-farsight-0.12.5/ext/gsm/gstmsgsmenc.c gst-plugins-farsight-0.12.8/ext/gsm/gstmsgsmenc.c --- gst-plugins-farsight-0.12.5/ext/gsm/gstmsgsmenc.c 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/gsm/gstmsgsmenc.c 2007-09-25 10:35:27.000000000 -0500 @@ -130,6 +130,9 @@ static void gst_msgsmenc_init (GstMSGSMEnc * msgsmenc) { + // turn on WAN49 handling + gint use_wav49 = 1; + /* create the sink and src pads */ msgsmenc->sinkpad = gst_pad_new_from_template (gst_static_pad_template_get @@ -143,9 +146,8 @@ gst_element_add_pad (GST_ELEMENT (msgsmenc), msgsmenc->srcpad); msgsmenc->state = gsm_create (); - // turn on WAN49 handling - gint use_wav49 = 1; - gsm_option (msgsmenc->state, GSM_OPT_WAV49, &use_wav49); + + gsm_option (msgsmenc->state, GSM_OPT_WAV49, &use_wav49); msgsmenc->adapter = gst_adapter_new (); diff -Nru gst-plugins-farsight-0.12.5/ext/gsm/Makefile.in gst-plugins-farsight-0.12.8/ext/gsm/Makefile.in --- gst-plugins-farsight-0.12.5/ext/gsm/Makefile.in 2007-09-17 16:25:03.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/gsm/Makefile.in 2008-05-09 14:56:40.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -68,7 +68,7 @@ libgstmsgsm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstmsgsm_la_CFLAGS) \ $(CFLAGS) $(libgstmsgsm_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -109,6 +109,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -122,6 +123,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -168,6 +171,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -285,8 +289,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -294,8 +298,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -372,8 +376,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -385,8 +389,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -396,13 +400,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/ext/ice/jingle_c.cpp gst-plugins-farsight-0.12.8/ext/ice/jingle_c.cpp --- gst-plugins-farsight-0.12.5/ext/ice/jingle_c.cpp 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/ice/jingle_c.cpp 2008-04-28 13:10:34.000000000 -0500 @@ -21,6 +21,8 @@ #include "jingle_c.h" +#include + #include #include @@ -57,10 +59,20 @@ cb_info, i); socket_read_cb_type cb_ptr = (socket_read_cb_type)cb->callback; //g_message("called socketread cb"); + + if (!socket->best_connection()) + { + g_warning ("received %" G_GSIZE_FORMAT " bytes " + "but no best_connection, ignoring", len); + goto finally; + } + cb_ptr (cb->data, (gpointer)data, len, socket->best_connection()->remote_candidate().address().ip(), socket->best_connection()->remote_candidate().address().port()); } + +finally: g_mutex_unlock (socketclient->sigl2->getCbList()->mutex); } diff -Nru gst-plugins-farsight-0.12.5/ext/ice/Makefile.in gst-plugins-farsight-0.12.8/ext/ice/Makefile.in --- gst-plugins-farsight-0.12.5/ext/ice/Makefile.in 2007-09-17 16:25:03.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/ice/Makefile.in 2008-05-09 14:56:40.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -66,7 +66,7 @@ libgstice_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libgstice_la_CXXFLAGS) \ $(CXXFLAGS) $(libgstice_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -116,6 +116,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -129,6 +130,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -175,6 +178,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -292,8 +296,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -301,8 +305,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -408,8 +412,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -421,8 +425,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -432,13 +436,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/ext/jasper/Makefile.in gst-plugins-farsight-0.12.8/ext/jasper/Makefile.in --- gst-plugins-farsight-0.12.5/ext/jasper/Makefile.in 2007-09-17 16:25:03.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/jasper/Makefile.in 2008-05-09 14:56:40.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -64,7 +64,7 @@ libgstjasper_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstjasper_la_CFLAGS) \ $(CFLAGS) $(libgstjasper_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -105,6 +105,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -118,6 +119,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -164,6 +167,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -280,8 +284,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -289,8 +293,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -359,8 +363,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -372,8 +376,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -383,13 +387,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/ext/jpeg2000/Makefile.in gst-plugins-farsight-0.12.8/ext/jpeg2000/Makefile.in --- gst-plugins-farsight-0.12.5/ext/jpeg2000/Makefile.in 2007-09-17 16:25:03.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/jpeg2000/Makefile.in 2008-05-09 14:56:41.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -65,7 +65,7 @@ libgstjpeg2k_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstjpeg2k_la_CFLAGS) \ $(CFLAGS) $(libgstjpeg2k_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -106,6 +106,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -119,6 +120,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -165,6 +168,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -281,8 +285,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -290,8 +294,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -384,8 +388,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -397,8 +401,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -408,13 +412,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/ext/jrtp/gstrtpbin.c gst-plugins-farsight-0.12.8/ext/jrtp/gstrtpbin.c --- gst-plugins-farsight-0.12.5/ext/jrtp/gstrtpbin.c 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/jrtp/gstrtpbin.c 2008-03-20 15:00:25.000000000 -0500 @@ -21,9 +21,11 @@ * Thanks to the following contributors : * * Martin Cizek - * + * */ +#include + #include #include @@ -846,7 +848,7 @@ jb_name = "rtpjitterbuffer"; rtpjitterbuffer = gst_element_factory_make (jb_name, - NULL); + "jitterbuffer"); if (rtpjitterbuffer == NULL) { GST_WARNING("Could not create %s element", jb_name); return NULL; diff -Nru gst-plugins-farsight-0.12.5/ext/jrtp/Makefile.in gst-plugins-farsight-0.12.8/ext/jrtp/Makefile.in --- gst-plugins-farsight-0.12.5/ext/jrtp/Makefile.in 2007-09-17 16:25:03.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/jrtp/Makefile.in 2008-05-09 14:56:41.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -74,7 +74,7 @@ libgstjrtp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libgstjrtp_la_CXXFLAGS) \ $(CXXFLAGS) $(libgstjrtp_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -124,6 +124,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -137,6 +138,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -183,6 +186,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -304,8 +308,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -313,8 +317,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -428,8 +432,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -441,8 +445,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -452,13 +456,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/ext/Makefile.am gst-plugins-farsight-0.12.8/ext/Makefile.am --- gst-plugins-farsight-0.12.5/ext/Makefile.am 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/Makefile.am 2008-04-28 13:10:34.000000000 -0500 @@ -12,11 +12,11 @@ GSM_DIR= endif -if USE_LIBJ2K -J2K_DIR=jpeg2000 -else +#if USE_LIBJ2K +#J2K_DIR=jpeg2000 +#else J2K_DIR= -endif +#endif #if USE_LIBJASPER #JASPER_DIR=jasper diff -Nru gst-plugins-farsight-0.12.5/ext/Makefile.in gst-plugins-farsight-0.12.8/ext/Makefile.in --- gst-plugins-farsight-0.12.5/ext/Makefile.in 2007-09-17 16:25:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/Makefile.in 2008-05-09 14:56:40.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -80,6 +80,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -93,6 +94,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -139,6 +142,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -215,8 +219,12 @@ @USE_MIMIC_TRUE@MIMIC_DIR = mimic @USE_GSM_FALSE@GSM_DIR = @USE_GSM_TRUE@GSM_DIR = gsm -@USE_LIBJ2K_FALSE@J2K_DIR = -@USE_LIBJ2K_TRUE@J2K_DIR = jpeg2000 + +#if USE_LIBJ2K +#J2K_DIR=jpeg2000 +#else +J2K_DIR = +#endif #if USE_LIBJASPER #JASPER_DIR=jasper @@ -351,8 +359,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -377,8 +385,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -388,13 +396,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/ext/mimic/gstmimdec.c gst-plugins-farsight-0.12.8/ext/mimic/gstmimdec.c --- gst-plugins-farsight-0.12.5/ext/mimic/gstmimdec.c 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/mimic/gstmimdec.c 2008-02-19 12:05:41.000000000 -0600 @@ -49,7 +49,7 @@ "bpp = (int) 24, " "depth = (int) 24, " "endianness = (int) 4321, " - "framerate = (double) [1.0, 30.0], " + "framerate = (fraction) [1/1, 30/1], " "red_mask = (int) 16711680, " "green_mask = (int) 65280, " "blue_mask = (int) 255, " @@ -149,7 +149,7 @@ mimdec->srcpad = gst_pad_new_from_template ( gst_static_pad_template_get (&src_factory), "src"); - gst_pad_set_getcaps_function (mimdec->srcpad, gst_mimdec_src_getcaps); + gst_pad_set_getcaps_function (mimdec->srcpad, gst_mimdec_src_getcaps); gst_element_add_pad (GST_ELEMENT (mimdec), mimdec->srcpad); mimdec->adapter = gst_adapter_new (); @@ -158,6 +158,9 @@ mimdec->buffer_size = -1; mimdec->have_header = FALSE; mimdec->payload_size = -1; + mimdec->last_ts = -1; + mimdec->current_ts = -1; + mimdec->gst_timestamp = -1; } static void @@ -190,6 +193,21 @@ buf = GST_BUFFER (in); gst_adapter_push (mimdec->adapter, buf); + + if (mimdec->gst_timestamp == -1) { + GstClock *clock; + GstClockTime base_time; + + base_time = gst_element_get_base_time (GST_ELEMENT (mimdec)); + + clock = gst_element_get_clock (GST_ELEMENT (mimdec)); + if (clock != NULL) { + mimdec->gst_timestamp = gst_clock_get_time (clock) - base_time; + gst_object_unref (clock); + } + } + + // do we have enough bytes to read a header while (gst_adapter_available (mimdec->adapter) >= (mimdec->have_header ? mimdec->payload_size : 24)) { if (!mimdec->have_header) { @@ -209,6 +227,9 @@ } mimdec->payload_size = GUINT32_FROM_LE (*((guint32 *) (header + 8))); + + mimdec->current_ts = GUINT32_FROM_LE (*((guint32 *) (header + 20))); + GST_DEBUG ("Got packet, payload size %d", mimdec->payload_size); gst_adapter_flush (mimdec->adapter, 24); @@ -255,7 +276,7 @@ } out_buf = gst_buffer_new_and_alloc (mimdec->buffer_size); - GST_BUFFER_TIMESTAMP(out_buf) = GST_BUFFER_TIMESTAMP(buf); + if (!mimic_decode_frame (mimdec->dec, frame_body, GST_BUFFER_DATA (out_buf))) { GST_WARNING ("mimic_decode_frame error\n"); @@ -265,7 +286,18 @@ gst_buffer_unref (out_buf); return GST_FLOW_ERROR; } - + + if (mimdec->last_ts != -1) { + int diff = mimdec->current_ts - mimdec->last_ts; + if (diff < 0 || diff > 5000) { + diff = 1000; + } + mimdec->gst_timestamp += diff * GST_MSECOND; + } + GST_BUFFER_TIMESTAMP(out_buf) = mimdec->gst_timestamp; + mimdec->last_ts = mimdec->current_ts; + + mimic_get_property(mimdec->dec, "width", &width); mimic_get_property(mimdec->dec, "height", &height); GST_DEBUG ("got WxH %d x %d payload size %d buffer_size %d", width, height, mimdec->payload_size, mimdec->buffer_size); @@ -273,7 +305,7 @@ "bpp", G_TYPE_INT, 24, "depth", G_TYPE_INT, 24, "endianness", G_TYPE_INT, 4321, - "framerate", G_TYPE_DOUBLE, 30.0, + "framerate", GST_TYPE_FRACTION, 30, 1, "red_mask", G_TYPE_INT, 16711680, "green_mask", G_TYPE_INT, 65280, "blue_mask", G_TYPE_INT, 255, @@ -317,9 +349,11 @@ mimdec->buffer_size = -1; mimdec->have_header = FALSE; mimdec->payload_size = -1; + mimdec->gst_timestamp = -1; + mimdec->current_ts = -1; + mimdec->last_ts = -1; } break; - default: break; } diff -Nru gst-plugins-farsight-0.12.5/ext/mimic/gstmimdec.h gst-plugins-farsight-0.12.8/ext/mimic/gstmimdec.h --- gst-plugins-farsight-0.12.5/ext/mimic/gstmimdec.h 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/mimic/gstmimdec.h 2008-02-19 12:05:41.000000000 -0600 @@ -55,6 +55,9 @@ gint buffer_size; gboolean have_header; guint32 payload_size; + guint32 last_ts; + guint32 current_ts; + GstClockTime gst_timestamp; }; struct _GstMimDecClass diff -Nru gst-plugins-farsight-0.12.5/ext/mimic/gstmimenc.c gst-plugins-farsight-0.12.8/ext/mimic/gstmimenc.c --- gst-plugins-farsight-0.12.5/ext/mimic/gstmimenc.c 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/mimic/gstmimenc.c 2008-02-19 12:05:41.000000000 -0600 @@ -319,7 +319,7 @@ *((guint32 *) (p + 8)) = GUINT32_TO_LE(payload_size); *((guint32 *) (p + 12)) = GUINT32_TO_LE(GST_MAKE_FOURCC ('M', 'L', '2', '0')); *((guint32 *) (p + 16)) = 0; - *((guint32 *) (p + 20)) = 0; + *((guint32 *) (p + 20)) = 0; /* FIXME: must be timestamp */ return buf_header; } diff -Nru gst-plugins-farsight-0.12.5/ext/mimic/Makefile.in gst-plugins-farsight-0.12.8/ext/mimic/Makefile.in --- gst-plugins-farsight-0.12.5/ext/mimic/Makefile.in 2007-09-17 16:25:03.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ext/mimic/Makefile.in 2008-05-09 14:56:41.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -64,7 +64,7 @@ libgstmimic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstmimic_la_CFLAGS) \ $(CFLAGS) $(libgstmimic_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -105,6 +105,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -118,6 +119,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -164,6 +167,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -280,8 +284,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -289,8 +293,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -367,8 +371,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -380,8 +384,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -391,13 +395,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/gstdtmf.c gst-plugins-farsight-0.12.8/gst/dtmf/gstdtmf.c --- gst-plugins-farsight-0.12.5/gst/dtmf/gstdtmf.c 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/dtmf/gstdtmf.c 2008-03-20 15:00:25.000000000 -0500 @@ -5,6 +5,7 @@ #include "gstdtmfsrc.h" #include "gstrtpdtmfsrc.h" +#include "gstrtpdtmfdepay.h" static gboolean @@ -17,6 +18,9 @@ return FALSE; + if (!gst_rtp_dtmf_depay_plugin_init (plugin)) + return FALSE; + return TRUE; } diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/gstdtmfsrc.c gst-plugins-farsight-0.12.8/gst/dtmf/gstdtmfsrc.c --- gst-plugins-farsight-0.12.5/gst/dtmf/gstdtmfsrc.c 2007-09-17 16:05:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/dtmf/gstdtmfsrc.c 2008-04-28 13:10:34.000000000 -0500 @@ -64,7 +64,7 @@ * 0-1 * The application uses this field to specify which of the two methods * specified in RFC 2833 to use. The value should be 0 for tones and 1 for - * named events. This element is only capable of generating tones. + * named events. This element is only capable of generating named events. * * * @@ -91,9 +91,9 @@ * * method * G_TYPE_INT - * 1 - * The method used for sending event, this element will react if this field - * is absent or 2. + * 2 + * The method used for sending event, this element will react if this + * field is absent or 2. * * * @@ -109,7 +109,7 @@ * * * structure = gst_structure_new ("dtmf-event", - * "type", G_TYPE_INT, 0, + * "type", G_TYPE_INT, 1, * "number", G_TYPE_INT, 1, * "volume", G_TYPE_INT, 25, * "start", G_TYPE_BOOLEAN, TRUE, NULL); @@ -139,7 +139,7 @@ #include "gstdtmfsrc.h" -#define GST_TONE_DTMF_TYPE_EVENT 0 +#define GST_TONE_DTMF_TYPE_EVENT 1 #define DEFAULT_PACKET_INTERVAL 50 /* ms */ #define MIN_PACKET_INTERVAL 10 /* ms */ #define MAX_PACKET_INTERVAL 50 /* ms */ @@ -225,7 +225,7 @@ GST_STATIC_CAPS ("audio/x-raw-int, " "width = (int) 16, " "depth = (int) 16, " - "endianness = (int) 1234, " + "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " "signed = (bool) true, " "rate = (int) 8000, " "channels = (int) 1") diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfcommon.h gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfcommon.h --- gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfcommon.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfcommon.h 2008-03-20 15:00:25.000000000 -0500 @@ -0,0 +1,22 @@ + +#ifndef __GST_RTP_DTMF_COMMON_H__ +#define __GST_RTP_DTMF_COMMON_H__ + + +typedef struct { + unsigned event:8; /* Current DTMF event */ +#if G_BYTE_ORDER == G_LITTLE_ENDIAN + unsigned volume:6; /* power level of the tone, in dBm0 */ + unsigned r:1; /* Reserved-bit */ + unsigned e:1; /* End-bit */ +#elif G_BYTE_ORDER == G_BIG_ENDIAN + unsigned e:1; /* End-bit */ + unsigned r:1; /* Reserved-bit */ + unsigned volume:6; /* power level of the tone, in dBm0 */ +#else +#error "G_BYTE_ORDER should be big or little endian." +#endif + unsigned duration:16; /* Duration of digit, in timestamp units */ +} GstRTPDTMFPayload; + +#endif /* __GST_RTP_DTMF_COMMON_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfdepay.c gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfdepay.c --- gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfdepay.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfdepay.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,390 @@ +/* GstRtpDtmfDepay + * + * Copyright (C) 2008 Collabora Limited + * Copyright (C) 2008 Nokia Corporation + * Contact: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include +#include "gstrtpdtmfdepay.h" + +#ifndef M_PI +# define M_PI 3.14159265358979323846 /* pi */ +#endif + + +#define DEFAULT_PACKET_INTERVAL 50 /* ms */ +#define MIN_PACKET_INTERVAL 10 /* ms */ +#define MAX_PACKET_INTERVAL 50 /* ms */ +#define SAMPLE_RATE 8000 +#define SAMPLE_SIZE 16 +#define CHANNELS 1 +#define MIN_EVENT 0 +#define MAX_EVENT 16 +#define MIN_VOLUME 0 +#define MAX_VOLUME 36 +#define MIN_INTER_DIGIT_INTERVAL 100 +#define MIN_PULSE_DURATION 250 +#define MIN_DUTY_CYCLE (MIN_INTER_DIGIT_INTERVAL + MIN_PULSE_DURATION) + + +typedef struct st_dtmf_key { + char *event_name; + int event_encoding; + float low_frequency; + float high_frequency; +} DTMF_KEY; + +static const DTMF_KEY DTMF_KEYS[] = { + {"DTMF_KEY_EVENT_0", 0, 941, 1336}, + {"DTMF_KEY_EVENT_1", 1, 697, 1209}, + {"DTMF_KEY_EVENT_2", 2, 697, 1336}, + {"DTMF_KEY_EVENT_3", 3, 697, 1477}, + {"DTMF_KEY_EVENT_4", 4, 770, 1209}, + {"DTMF_KEY_EVENT_5", 5, 770, 1336}, + {"DTMF_KEY_EVENT_6", 6, 770, 1477}, + {"DTMF_KEY_EVENT_7", 7, 852, 1209}, + {"DTMF_KEY_EVENT_8", 8, 852, 1336}, + {"DTMF_KEY_EVENT_9", 9, 852, 1477}, + {"DTMF_KEY_EVENT_S", 10, 941, 1209}, + {"DTMF_KEY_EVENT_P", 11, 941, 1477}, + {"DTMF_KEY_EVENT_A", 12, 697, 1633}, + {"DTMF_KEY_EVENT_B", 13, 770, 1633}, + {"DTMF_KEY_EVENT_C", 14, 852, 1633}, + {"DTMF_KEY_EVENT_D", 15, 941, 1633}, +}; + +#define MAX_DTMF_EVENTS 16 + +enum { +DTMF_KEY_EVENT_1 = 1, +DTMF_KEY_EVENT_2 = 2, +DTMF_KEY_EVENT_3 = 3, +DTMF_KEY_EVENT_4 = 4, +DTMF_KEY_EVENT_5 = 5, +DTMF_KEY_EVENT_6 = 6, +DTMF_KEY_EVENT_7 = 7, +DTMF_KEY_EVENT_8 = 8, +DTMF_KEY_EVENT_9 = 9, +DTMF_KEY_EVENT_0 = 0, +DTMF_KEY_EVENT_STAR = 10, +DTMF_KEY_EVENT_POUND = 11, +DTMF_KEY_EVENT_A = 12, +DTMF_KEY_EVENT_B = 13, +DTMF_KEY_EVENT_C = 14, +DTMF_KEY_EVENT_D = 15, +}; + +/* elementfactory information */ +static const GstElementDetails gst_rtp_dtmfdepay_details = +GST_ELEMENT_DETAILS ("RTP DTMF packet depayloader", + "Codec/Depayloader/Network", + "Generates DTMF Sound from telephone-event RTP packets", + "Youness Alaoui "); + +GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_depay_debug); +#define GST_CAT_DEFAULT gst_rtp_dtmf_depay_debug + +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + ARG_0 +}; + +static GstStaticPadTemplate gst_rtp_dtmf_depay_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/x-raw-int, " + "width = (int) 16, " + "depth = (int) 16, " + "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " + "signed = (boolean) true, " + "rate = (int) [0, MAX], " + "channels = (int) 1") + ); + +static GstStaticPadTemplate gst_rtp_dtmf_depay_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp, " + "media = (string) \"audio\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " + "clock-rate = (int) [ 0, MAX ], " + "encoding-name = (string) \"TELEPHONE-EVENT\"") + ); + +GST_BOILERPLATE (GstRtpDTMFDepay, gst_rtp_dtmf_depay, GstBaseRTPDepayload, + GST_TYPE_BASE_RTP_DEPAYLOAD); + + +static GstBuffer *gst_rtp_dtmf_depay_process (GstBaseRTPDepayload * depayload, + GstBuffer * buf); +gboolean gst_rtp_dtmf_depay_setcaps (GstBaseRTPDepayload * filter, + GstCaps * caps); + +static void +gst_rtp_dtmf_depay_base_init (gpointer klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtp_dtmf_depay_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtp_dtmf_depay_sink_template)); + + + GST_DEBUG_CATEGORY_INIT (gst_rtp_dtmf_depay_debug, + "rtpdtmfdepay", 0, "rtpdtmfdepay element"); + gst_element_class_set_details (element_class, &gst_rtp_dtmfdepay_details); +} + +static void +gst_rtp_dtmf_depay_class_init (GstRtpDTMFDepayClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + GstBaseRTPDepayloadClass *gstbasertpdepayload_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; + + parent_class = g_type_class_peek_parent (klass); + + gstbasertpdepayload_class->process = gst_rtp_dtmf_depay_process; + gstbasertpdepayload_class->set_caps = gst_rtp_dtmf_depay_setcaps; + +} + +static void +gst_rtp_dtmf_depay_init (GstRtpDTMFDepay * rtpdtmfdepay, + GstRtpDTMFDepayClass * klass) +{ + +} + + +gboolean +gst_rtp_dtmf_depay_setcaps (GstBaseRTPDepayload * filter, GstCaps * caps) +{ + GstCaps *srccaps; + GstStructure *structure = gst_caps_get_structure (caps, 0); + gint clock_rate = 8000; /* default */ + + gst_structure_get_int (structure, "clock-rate", &clock_rate); + filter->clock_rate = clock_rate; + + srccaps = gst_caps_new_simple ("audio/x-raw-int", + "width", G_TYPE_INT, 16, + "depth", G_TYPE_INT, 16, + "endianness", G_TYPE_INT, G_BYTE_ORDER, + "signed", G_TYPE_BOOLEAN, TRUE, + "channels", G_TYPE_INT, 1, + "rate", G_TYPE_INT, clock_rate, NULL); + gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (filter), srccaps); + gst_caps_unref (srccaps); + + return TRUE; +} + +static void +gst_dtmf_src_generate_tone(GstRtpDTMFDepay *rtpdtmfdepay, + GstRTPDTMFPayload payload, GstBuffer * buffer) +{ + gint16 *p; + gint tone_size; + double i = 0; + double amplitude, f1, f2; + double volume_factor; + DTMF_KEY key = DTMF_KEYS[payload.event]; + guint32 clock_rate = 8000 /* default */; + GstBaseRTPDepayload * depayload = GST_BASE_RTP_DEPAYLOAD (rtpdtmfdepay); + + clock_rate = depayload->clock_rate; + + /* Create a buffer for the tone */ + tone_size = (payload.duration*SAMPLE_SIZE*CHANNELS)/8; + GST_BUFFER_SIZE (buffer) = tone_size; + GST_BUFFER_MALLOCDATA (buffer) = g_malloc(tone_size); + GST_BUFFER_DATA (buffer) = GST_BUFFER_MALLOCDATA (buffer); + GST_BUFFER_DURATION (buffer) = payload.duration * GST_SECOND / clock_rate; + + p = (gint16 *) GST_BUFFER_MALLOCDATA (buffer); + + volume_factor = pow (10, (-payload.volume) / 20); + + /* + * For each sample point we calculate 'x' as the + * the amplitude value. + */ + for (i = 0; i < (tone_size / (SAMPLE_SIZE/8)); i++) { + /* + * We add the fundamental frequencies together. + */ + f1 = sin(2 * M_PI * key.low_frequency * (rtpdtmfdepay->sample / clock_rate)); + f2 = sin(2 * M_PI * key.high_frequency * (rtpdtmfdepay->sample / clock_rate)); + + amplitude = (f1 + f2) / 2; + + /* Adjust the volume */ + amplitude *= volume_factor; + + /* Make the [-1:1] interval into a [-32767:32767] interval */ + amplitude *= 32767; + + /* Store it in the data buffer */ + *(p++) = (gint16) amplitude; + + (rtpdtmfdepay->sample)++; + } +} + + +static GstBuffer * +gst_rtp_dtmf_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf) +{ + + GstRtpDTMFDepay *rtpdtmfdepay = NULL; + GstBuffer *outbuf = NULL; + gint payload_len; + guint8 *payload = NULL; + guint32 timestamp; + GstRTPDTMFPayload dtmf_payload; + gboolean marker; + GstStructure *structure = NULL; + GstMessage *dtmf_message = NULL; + + rtpdtmfdepay = GST_RTP_DTMF_DEPAY (depayload); + + if (!gst_rtp_buffer_validate (buf)) + goto bad_packet; + + payload_len = gst_rtp_buffer_get_payload_len (buf); + payload = gst_rtp_buffer_get_payload (buf); + + if (payload_len != sizeof(GstRTPDTMFPayload) ) + goto bad_packet; + + memcpy (&dtmf_payload, payload, sizeof (GstRTPDTMFPayload)); + + if (dtmf_payload.event > MAX_EVENT) + goto bad_packet; + + + marker = gst_rtp_buffer_get_marker (buf); + + timestamp = gst_rtp_buffer_get_timestamp (buf); + + dtmf_payload.duration = g_ntohs (dtmf_payload.duration); + + GST_DEBUG_OBJECT (depayload, "Received new RTP DTMF packet : " + "marker=%d - timestamp=%u - event=%d - duration=%d", + marker, timestamp, dtmf_payload.event, dtmf_payload.duration); + + GST_DEBUG_OBJECT (depayload, "Previous information : timestamp=%u - duration=%d", + rtpdtmfdepay->previous_ts, rtpdtmfdepay->previous_duration); + + /* First packet */ + if (marker || rtpdtmfdepay->previous_ts != timestamp) { + rtpdtmfdepay->sample = 0; + rtpdtmfdepay->previous_ts = timestamp; + rtpdtmfdepay->previous_duration = dtmf_payload.duration; + rtpdtmfdepay->first_gst_ts = GST_BUFFER_TIMESTAMP (buf); + + structure = gst_structure_new ("dtmf-event", + "number", G_TYPE_INT, dtmf_payload.event, + "volume", G_TYPE_INT, dtmf_payload.volume, + "type", G_TYPE_INT, 1, + "method", G_TYPE_INT, 1, + NULL); + if (structure) { + dtmf_message = gst_message_new_element (GST_OBJECT (depayload), structure); + if (dtmf_message) { + if (!gst_element_post_message (GST_ELEMENT (depayload), dtmf_message)) { + GST_ERROR_OBJECT (depayload, "Unable to send dtmf-event message to bus"); + } + } else { + GST_ERROR_OBJECT (depayload, "Unable to create dtmf-event message"); + } + } else { + GST_ERROR_OBJECT (depayload, "Unable to create dtmf-event structure"); + } + } else { + guint16 duration = dtmf_payload.duration; + dtmf_payload.duration -= rtpdtmfdepay->previous_duration; + /* If late buffer, ignore */ + if (duration > rtpdtmfdepay->previous_duration) + rtpdtmfdepay->previous_duration = duration; + } + + GST_DEBUG_OBJECT (depayload, "new previous duration : %d - new duration : %d" + " - diff : %d - clock rate : %d - timestamp : %llu", + rtpdtmfdepay->previous_duration, dtmf_payload.duration, + (rtpdtmfdepay->previous_duration - dtmf_payload.duration), + depayload->clock_rate, GST_BUFFER_TIMESTAMP (buf)); + + /* If late or duplicate packet (like the redundant end packet). Ignore */ + if (dtmf_payload.duration > 0) { + outbuf = gst_buffer_new (); + gst_dtmf_src_generate_tone(rtpdtmfdepay, dtmf_payload, outbuf); + + + GST_BUFFER_TIMESTAMP (outbuf) = rtpdtmfdepay->first_gst_ts + + (rtpdtmfdepay->previous_duration - dtmf_payload.duration) * + GST_SECOND / depayload->clock_rate; + GST_BUFFER_OFFSET (outbuf) = + (rtpdtmfdepay->previous_duration - dtmf_payload.duration) * + GST_SECOND / depayload->clock_rate; + GST_BUFFER_OFFSET_END (outbuf) = rtpdtmfdepay->previous_duration * + GST_SECOND / depayload->clock_rate; + + GST_DEBUG_OBJECT (depayload, "timestamp : %llu - time %" GST_TIME_FORMAT, + GST_BUFFER_TIMESTAMP (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf))); + + } + + return outbuf; + + +bad_packet: + GST_ELEMENT_WARNING (rtpdtmfdepay, STREAM, DECODE, + ("Packet did not validate"), (NULL)); + return NULL; +} + +gboolean +gst_rtp_dtmf_depay_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpdtmfdepay", + GST_RANK_MARGINAL, GST_TYPE_RTP_DTMF_DEPAY); +} + diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfdepay.h gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfdepay.h --- gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfdepay.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfdepay.h 2008-03-20 15:00:25.000000000 -0500 @@ -0,0 +1,68 @@ +/* GstRtpDtmfDepay + * + * Copyright (C) 2008 Collabora Limited + * Copyright (C) 2008 Nokia Corporation + * Contact: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_RTP_DTMF_DEPAY_H__ +#define __GST_RTP_DTMF_DEPAY_H__ + +#include +#include +#include + +#include "gstrtpdtmfcommon.h" + +G_BEGIN_DECLS + +#define GST_TYPE_RTP_DTMF_DEPAY \ + (gst_rtp_dtmf_depay_get_type()) +#define GST_RTP_DTMF_DEPAY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_DTMF_DEPAY,GstRtpDTMFDepay)) +#define GST_RTP_DTMF_DEPAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_DTMF_DEPAY,GstRtpDTMFDepayClass)) +#define GST_IS_RTP_DTMF_DEPAY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_DTMF_DEPAY)) +#define GST_IS_RTP_DTMF_DEPAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_DTMF_DEPAY)) + + +typedef struct _GstRtpDTMFDepay GstRtpDTMFDepay; +typedef struct _GstRtpDTMFDepayClass GstRtpDTMFDepayClass; + +struct _GstRtpDTMFDepay +{ + GstBaseRTPDepayload depayload; + double sample; + guint32 previous_ts; + guint16 previous_duration; + GstClockTime first_gst_ts; + +}; + +struct _GstRtpDTMFDepayClass +{ + GstBaseRTPDepayloadClass parent_class; +}; + +gboolean gst_rtp_dtmf_depay_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_DTMF_DEPAY_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfsrc.c gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfsrc.c --- gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfsrc.c 2007-09-17 16:24:08.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfsrc.c 2008-03-20 15:00:25.000000000 -0500 @@ -194,7 +194,7 @@ "payload = (int) [ 96, 127 ], " "clock-rate = (int) [ 0, MAX ], " "ssrc = (int) [ 0, MAX ], " - "encoding-name = (string) \"telephone-event\"") + "encoding-name = (string) \"TELEPHONE-EVENT\"") /* "events = (string) \"1-16\" */ ); @@ -698,7 +698,7 @@ case RTP_DTMF_EVENT_TYPE_START: dtmfsrc->first_packet = TRUE; dtmfsrc->last_packet = FALSE; - /* Set the redundanc on the first packet */ + /* Set the redundancy on the first packet */ dtmfsrc->redundancy_count = dtmfsrc->packet_redundancy; gst_rtp_dtmf_prepare_timestamps (dtmfsrc); @@ -742,7 +742,7 @@ case RTP_DTMF_EVENT_TYPE_STOP: dtmfsrc->first_packet = FALSE; dtmfsrc->last_packet = TRUE; - /* Set the redundanc on the last packet */ + /* Set the redundancy on the last packet */ dtmfsrc->redundancy_count = dtmfsrc->packet_redundancy; break; @@ -857,7 +857,7 @@ srccaps = gst_caps_new_simple ("application/x-rtp", "media", G_TYPE_STRING, "audio", "clock-rate", G_TYPE_INT, dtmfsrc->clock_rate, - "encoding-name", G_TYPE_STRING, "telephone-event", NULL); + "encoding-name", G_TYPE_STRING, "TELEPHONE-EVENT", NULL); /* the peer caps can override some of the defaults */ peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc)); diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfsrc.h gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfsrc.h --- gst-plugins-farsight-0.12.5/gst/dtmf/gstrtpdtmfsrc.h 2007-09-17 16:05:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/dtmf/gstrtpdtmfsrc.h 2008-03-20 15:00:25.000000000 -0500 @@ -29,6 +29,8 @@ #include #include +#include "gstrtpdtmfcommon.h" + G_BEGIN_DECLS #define GST_TYPE_RTP_DTMF_SRC (gst_rtp_dtmf_src_get_type()) @@ -39,21 +41,6 @@ #define GST_IS_RTP_DTMF_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_DTMF_SRC)) #define GST_RTP_DTMF_SRC_CAST(obj) ((GstRTPDTMFSrc *)(obj)) -typedef struct { - unsigned event:8; /* Current DTMF event */ -#if G_BYTE_ORDER == G_LITTLE_ENDIAN - unsigned volume:6; /* power level of the tone, in dBm0 */ - unsigned r:1; /* Reserved-bit */ - unsigned e:1; /* End-bit */ -#elif G_BYTE_ORDER == G_BIG_ENDIAN - unsigned e:1; /* End-bit */ - unsigned r:1; /* Reserved-bit */ - unsigned volume:6; /* power level of the tone, in dBm0 */ -#else -#error "G_BYTE_ORDER should be big or little endian." -#endif - unsigned duration:16; /* Duration of digit, in timestamp units */ -} GstRTPDTMFPayload; typedef struct _GstRTPDTMFSrc GstRTPDTMFSrc; typedef struct _GstRTPDTMFSrcClass GstRTPDTMFSrcClass; diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/Makefile.am gst-plugins-farsight-0.12.8/gst/dtmf/Makefile.am --- gst-plugins-farsight-0.12.5/gst/dtmf/Makefile.am 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/dtmf/Makefile.am 2008-05-01 12:52:06.000000000 -0500 @@ -2,12 +2,15 @@ libgstdtmf_la_SOURCES = gstdtmfsrc.c \ gstrtpdtmfsrc.c \ + gstrtpdtmfdepay.c \ gstdtmf.c noinst_HEADERS = gstdtmfsrc.h \ - gstrtpdtmfsrc.h + gstrtpdtmfsrc.h \ + gstrtpdtmfdepay.h \ + gstrtpdtmfcommon.h libgstdtmf_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT -libgstdtmf_la_LIBADD = $(GST_LIBS_LIBS) +libgstdtmf_la_LIBADD = $(GST_LIBS_LIBS) -lm libgstdtmf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ diff -Nru gst-plugins-farsight-0.12.5/gst/dtmf/Makefile.in gst-plugins-farsight-0.12.8/gst/dtmf/Makefile.in --- gst-plugins-farsight-0.12.5/gst/dtmf/Makefile.in 2007-09-17 16:25:04.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/dtmf/Makefile.in 2008-05-09 14:56:41.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -57,12 +57,13 @@ LTLIBRARIES = $(plugin_LTLIBRARIES) libgstdtmf_la_DEPENDENCIES = am_libgstdtmf_la_OBJECTS = libgstdtmf_la-gstdtmfsrc.lo \ - libgstdtmf_la-gstrtpdtmfsrc.lo libgstdtmf_la-gstdtmf.lo + libgstdtmf_la-gstrtpdtmfsrc.lo \ + libgstdtmf_la-gstrtpdtmfdepay.lo libgstdtmf_la-gstdtmf.lo libgstdtmf_la_OBJECTS = $(am_libgstdtmf_la_OBJECTS) libgstdtmf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstdtmf_la_CFLAGS) \ $(CFLAGS) $(libgstdtmf_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -103,6 +104,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -116,6 +118,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -162,6 +166,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -236,13 +241,16 @@ plugin_LTLIBRARIES = libgstdtmf.la libgstdtmf_la_SOURCES = gstdtmfsrc.c \ gstrtpdtmfsrc.c \ + gstrtpdtmfdepay.c \ gstdtmf.c noinst_HEADERS = gstdtmfsrc.h \ - gstrtpdtmfsrc.h + gstrtpdtmfsrc.h \ + gstrtpdtmfdepay.h \ + gstrtpdtmfcommon.h libgstdtmf_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT -libgstdtmf_la_LIBADD = $(GST_LIBS_LIBS) +libgstdtmf_la_LIBADD = $(GST_LIBS_LIBS) -lm libgstdtmf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ all: all-am @@ -283,8 +291,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -292,8 +300,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -315,6 +323,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstdtmf_la-gstdtmf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstdtmf_la-gstdtmfsrc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstdtmf_la-gstrtpdtmfdepay.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstdtmf_la-gstrtpdtmfsrc.Plo@am__quote@ .c.o: @@ -352,6 +361,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdtmf_la_CFLAGS) $(CFLAGS) -c -o libgstdtmf_la-gstrtpdtmfsrc.lo `test -f 'gstrtpdtmfsrc.c' || echo '$(srcdir)/'`gstrtpdtmfsrc.c +libgstdtmf_la-gstrtpdtmfdepay.lo: gstrtpdtmfdepay.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdtmf_la_CFLAGS) $(CFLAGS) -MT libgstdtmf_la-gstrtpdtmfdepay.lo -MD -MP -MF $(DEPDIR)/libgstdtmf_la-gstrtpdtmfdepay.Tpo -c -o libgstdtmf_la-gstrtpdtmfdepay.lo `test -f 'gstrtpdtmfdepay.c' || echo '$(srcdir)/'`gstrtpdtmfdepay.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstdtmf_la-gstrtpdtmfdepay.Tpo $(DEPDIR)/libgstdtmf_la-gstrtpdtmfdepay.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstrtpdtmfdepay.c' object='libgstdtmf_la-gstrtpdtmfdepay.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdtmf_la_CFLAGS) $(CFLAGS) -c -o libgstdtmf_la-gstrtpdtmfdepay.lo `test -f 'gstrtpdtmfdepay.c' || echo '$(srcdir)/'`gstrtpdtmfdepay.c + libgstdtmf_la-gstdtmf.lo: gstdtmf.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdtmf_la_CFLAGS) $(CFLAGS) -MT libgstdtmf_la-gstdtmf.lo -MD -MP -MF $(DEPDIR)/libgstdtmf_la-gstdtmf.Tpo -c -o libgstdtmf_la-gstdtmf.lo `test -f 'gstdtmf.c' || echo '$(srcdir)/'`gstdtmf.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstdtmf_la-gstdtmf.Tpo $(DEPDIR)/libgstdtmf_la-gstdtmf.Plo @@ -370,8 +386,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -383,8 +399,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -394,13 +410,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/gst/liveadder/liveadder.c gst-plugins-farsight-0.12.8/gst/liveadder/liveadder.c --- gst-plugins-farsight-0.12.5/gst/liveadder/liveadder.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/liveadder/liveadder.c 2008-05-08 14:18:58.000000000 -0500 @@ -0,0 +1,1390 @@ +/* + * Farsight Voice+Video library + * + * Copyright 2008 Collabora Ltd + * Copyright 2008 Nokia Corporation + * @author: Olivier Crete + * + * With parts copied from the adder plugin which is + * Copyright (C) 1999,2000 Erik Walthinsen + * 2001 Thomas + * 2005,2006 Wim Taymans + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "liveadder.h" + +#include + +#include + +#define DEFAULT_LATENCY_MS 60 + +GST_DEBUG_CATEGORY_STATIC (live_adder_debug); +#define GST_CAT_DEFAULT (live_adder_debug) + +/* elementfactory information */ +static const GstElementDetails gst_live_adder_details = +GST_ELEMENT_DETAILS ( + "Live Adder element", + "Generic/Audio", + "Mixes live/discontinuous audio streams", + "Olivier Crete "); + + +static GstStaticPadTemplate gst_live_adder_sink_template = + GST_STATIC_PAD_TEMPLATE ("sink%d", + GST_PAD_SINK, + GST_PAD_REQUEST, + GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS "; " + GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS) + ); + +static GstStaticPadTemplate gst_live_adder_src_template = + GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS "; " + GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS) + ); + +/* Valve signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + PROP_0, + PROP_LATENCY, +}; + +typedef struct _GstLiveAdderPadPrivate +{ + GstSegment segment; + gboolean eos; + + GstClockTime expected_timestamp; + +} GstLiveAdderPadPrivate; + + +GST_BOILERPLATE(GstLiveAdder, gst_live_adder, GstElement, GST_TYPE_ELEMENT); + + +static void +gst_live_adder_finalize (GObject * object); +static void +gst_live_adder_set_property (GObject * object, + guint prop_id, const GValue * value, GParamSpec * pspec); +static void +gst_live_adder_get_property (GObject * object, + guint prop_id, GValue * value, GParamSpec * pspec); + +static GstPad * +gst_live_adder_request_new_pad (GstElement * element, GstPadTemplate * templ, + const gchar * unused); +static void +gst_live_adder_release_pad (GstElement * element, GstPad * pad); +static GstStateChangeReturn +gst_live_adder_change_state (GstElement * element, GstStateChange transition); + +static gboolean +gst_live_adder_setcaps (GstPad * pad, GstCaps * caps); +static GstCaps * +gst_live_adder_sink_getcaps (GstPad * pad); +static gboolean +gst_live_adder_src_activate_push (GstPad * pad, gboolean active); +static gboolean +gst_live_adder_src_event (GstPad * pad, GstEvent * event); + +static void +gst_live_adder_loop (gpointer data); +static gboolean +gst_live_adder_query (GstPad * pad, GstQuery * query); +static gboolean +gst_live_adder_sink_event (GstPad * pad, GstEvent * event); + + +/* clipping versions */ +#define MAKE_FUNC(name,type,ttype,min,max) \ +static void name (type *out, type *in, gint bytes) { \ + gint i; \ + for (i = 0; i < bytes / sizeof (type); i++) \ + out[i] = CLAMP ((ttype)out[i] + (ttype)in[i], min, max); \ +} + +/* non-clipping versions (for float) */ +#define MAKE_FUNC_NC(name,type,ttype) \ +static void name (type *out, type *in, gint bytes) { \ + gint i; \ + for (i = 0; i < bytes / sizeof (type); i++) \ + out[i] = (ttype)out[i] + (ttype)in[i]; \ +} + +/* *INDENT-OFF* */ +MAKE_FUNC (add_int32, gint32, gint64, G_MININT32, G_MAXINT32) +MAKE_FUNC (add_int16, gint16, gint32, G_MININT16, G_MAXINT16) +MAKE_FUNC (add_int8, gint8, gint16, G_MININT8, G_MAXINT8) +MAKE_FUNC (add_uint32, guint32, guint64, 0, G_MAXUINT32) +MAKE_FUNC (add_uint16, guint16, guint32, 0, G_MAXUINT16) +MAKE_FUNC (add_uint8, guint8, guint16, 0, G_MAXUINT8) +MAKE_FUNC_NC (add_float64, gdouble, gdouble) +MAKE_FUNC_NC (add_float32, gfloat, gfloat) +/* *INDENT-ON* */ + + +static void +gst_live_adder_base_init (gpointer klass) +{ +} + +static void +gst_live_adder_class_init (GstLiveAdderClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + + gobject_class = (GObjectClass *) klass; + + gobject_class->finalize = gst_live_adder_finalize; + gobject_class->set_property = gst_live_adder_set_property; + gobject_class->get_property = gst_live_adder_get_property; + + gstelement_class = (GstElementClass *) klass; + + gst_element_class_add_pad_template (gstelement_class, + gst_static_pad_template_get (&gst_live_adder_src_template)); + gst_element_class_add_pad_template (gstelement_class, + gst_static_pad_template_get (&gst_live_adder_sink_template)); + gst_element_class_set_details (gstelement_class, &gst_live_adder_details); + + parent_class = g_type_class_peek_parent (klass); + + gstelement_class->request_new_pad = gst_live_adder_request_new_pad; + gstelement_class->release_pad = gst_live_adder_release_pad; + gstelement_class->change_state = gst_live_adder_change_state; + + g_object_class_install_property (gobject_class, PROP_LATENCY, + g_param_spec_uint ("latency", "Buffer latency in ms", + "Amount of data to buffer", 0, G_MAXUINT, DEFAULT_LATENCY_MS, + G_PARAM_READWRITE)); + + GST_DEBUG_CATEGORY_INIT + (live_adder_debug, "liveadder", 0, "Live Adder"); + +} + +static void +gst_live_adder_init (GstLiveAdder * adder, GstLiveAdderClass *klass) +{ + GstPadTemplate *template; + + template = gst_static_pad_template_get (&gst_live_adder_src_template); + adder->srcpad = gst_pad_new_from_template (template, "src"); + gst_object_unref (template); + gst_pad_set_getcaps_function (adder->srcpad, + GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps)); + gst_pad_set_setcaps_function (adder->srcpad, + GST_DEBUG_FUNCPTR (gst_live_adder_setcaps)); + gst_pad_set_query_function (adder->srcpad, + GST_DEBUG_FUNCPTR (gst_live_adder_query)); + gst_pad_set_event_function (adder->srcpad, + GST_DEBUG_FUNCPTR (gst_live_adder_src_event)); + gst_pad_set_activatepush_function (adder->srcpad, + GST_DEBUG_FUNCPTR (gst_live_adder_src_activate_push)); + gst_element_add_pad (GST_ELEMENT (adder), adder->srcpad); + + adder->format = GST_LIVE_ADDER_FORMAT_UNSET; + adder->padcount = 0; + adder->func = NULL; + adder->not_empty_cond = g_cond_new (); + + adder->next_timestamp = GST_CLOCK_TIME_NONE; + + adder->latency_ms = DEFAULT_LATENCY_MS; + + adder->buffers = g_queue_new (); +} + + + +static void +gst_live_adder_finalize (GObject * object) +{ + GstLiveAdder *adder = GST_LIVE_ADDER (object); + + g_cond_free (adder->not_empty_cond); + + g_queue_foreach (adder->buffers, (GFunc) gst_mini_object_unref, NULL); + while (g_queue_pop_head (adder->buffers)) {} + g_queue_free (adder->buffers); + + g_list_free (adder->sinkpads); + + G_OBJECT_CLASS (parent_class)->finalize (object); +} + + +static void +gst_live_adder_set_property (GObject * object, + guint prop_id, const GValue * value, GParamSpec * pspec) +{ + GstLiveAdder *adder = GST_LIVE_ADDER (object); + + switch (prop_id) { + case PROP_LATENCY: + { + guint64 new_latency, old_latency; + + new_latency = g_value_get_uint (value); + + GST_OBJECT_LOCK (adder); + old_latency = adder->latency_ms; + adder->latency_ms = new_latency; + GST_OBJECT_UNLOCK (adder); + + /* post message if latency changed, this will inform the parent pipeline + * that a latency reconfiguration is possible/needed. */ + if (new_latency != old_latency) { + GST_DEBUG_OBJECT (adder, "latency changed to: %" GST_TIME_FORMAT, + GST_TIME_ARGS (new_latency)); + + gst_element_post_message (GST_ELEMENT_CAST (adder), + gst_message_new_latency (GST_OBJECT_CAST (adder))); + } + break; + } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + +static void +gst_live_adder_get_property (GObject * object, + guint prop_id, GValue * value, GParamSpec * pspec) +{ + GstLiveAdder *adder = GST_LIVE_ADDER (object); + + switch (prop_id) { + case PROP_LATENCY: + GST_OBJECT_LOCK (adder); + g_value_set_uint (value, adder->latency_ms); + GST_OBJECT_UNLOCK (adder); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + +/* we can only accept caps that we and downstream can handle. */ +static GstCaps * +gst_live_adder_sink_getcaps (GstPad * pad) +{ + GstLiveAdder *adder; + GstCaps *result, *peercaps, *sinkcaps; + + adder = GST_LIVE_ADDER (GST_PAD_PARENT (pad)); + + /* get the downstream possible caps */ + peercaps = gst_pad_peer_get_caps (adder->srcpad); + /* get the allowed caps on this sinkpad, we use the fixed caps function so + * that it does not call recursively in this function. */ + sinkcaps = gst_pad_get_fixed_caps_func (pad); + if (peercaps) { + /* if the peer has caps, intersect */ + GST_DEBUG_OBJECT (adder, "intersecting peer and template caps"); + result = gst_caps_intersect (peercaps, sinkcaps); + gst_caps_unref (peercaps); + gst_caps_unref (sinkcaps); + } else { + /* the peer has no caps (or there is no peer), just use the allowed caps + * of this sinkpad. */ + GST_DEBUG_OBJECT (adder, "no peer caps, using sinkcaps"); + result = sinkcaps; + } + + return result; +} + +/* the first caps we receive on any of the sinkpads will define the caps for all + * the other sinkpads because we can only mix streams with the same caps. + * */ +static gboolean +gst_live_adder_setcaps (GstPad * pad, GstCaps * caps) +{ + GstLiveAdder *adder; + GList *pads; + GstStructure *structure; + const char *media_type; + + adder = GST_LIVE_ADDER (GST_PAD_PARENT (pad)); + + GST_LOG_OBJECT (adder, "setting caps on pad %p,%s to %" GST_PTR_FORMAT, pad, + GST_PAD_NAME (pad), caps); + + /* FIXME, see if the other pads can accept the format. Also lock the + * format on the other pads to this new format. */ + GST_OBJECT_LOCK (adder); + pads = GST_ELEMENT (adder)->pads; + while (pads) { + GstPad *otherpad = GST_PAD (pads->data); + + if (otherpad != pad) + gst_caps_replace (&GST_PAD_CAPS (otherpad), caps); + + pads = g_list_next (pads); + } + + /* parse caps now */ + structure = gst_caps_get_structure (caps, 0); + media_type = gst_structure_get_name (structure); + if (strcmp (media_type, "audio/x-raw-int") == 0) { + GST_DEBUG_OBJECT (adder, "parse_caps sets adder to format int"); + adder->format = GST_LIVE_ADDER_FORMAT_INT; + gst_structure_get_int (structure, "width", &adder->width); + gst_structure_get_int (structure, "depth", &adder->depth); + gst_structure_get_int (structure, "endianness", &adder->endianness); + gst_structure_get_boolean (structure, "signed", &adder->is_signed); + + if (adder->endianness != G_BYTE_ORDER) + goto not_supported; + + switch (adder->width) { + case 8: + adder->func = (adder->is_signed ? + (GstLiveAdderFunction) add_int8 : (GstLiveAdderFunction) add_uint8); + break; + case 16: + adder->func = (adder->is_signed ? + (GstLiveAdderFunction) add_int16 : (GstLiveAdderFunction) add_uint16); + break; + case 32: + adder->func = (adder->is_signed ? + (GstLiveAdderFunction) add_int32 : (GstLiveAdderFunction) add_uint32); + break; + default: + goto not_supported; + } + } else if (strcmp (media_type, "audio/x-raw-float") == 0) { + GST_DEBUG_OBJECT (adder, "parse_caps sets adder to format float"); + adder->format = GST_LIVE_ADDER_FORMAT_FLOAT; + gst_structure_get_int (structure, "width", &adder->width); + + switch (adder->width) { + case 32: + adder->func = (GstLiveAdderFunction) add_float32; + break; + case 64: + adder->func = (GstLiveAdderFunction) add_float64; + break; + default: + goto not_supported; + } + } else { + goto not_supported; + } + + gst_structure_get_int (structure, "channels", &adder->channels); + gst_structure_get_int (structure, "rate", &adder->rate); + /* precalc bps */ + adder->bps = (adder->width / 8) * adder->channels; + + GST_OBJECT_UNLOCK (adder); + return TRUE; + + /* ERRORS */ +not_supported: + { + GST_OBJECT_UNLOCK (adder); + GST_DEBUG_OBJECT (adder, "unsupported format set as caps"); + return FALSE; + } +} + +static void +gst_live_adder_flush_start (GstLiveAdder * adder) +{ + GST_DEBUG_OBJECT (adder, "Disabling pop on queue"); + + GST_OBJECT_LOCK (adder); + /* mark ourselves as flushing */ + adder->srcresult = GST_FLOW_WRONG_STATE; + /* unlock clock, we just unschedule, the entry will be released by the + * locking streaming thread. */ + if (adder->clock_id) + gst_clock_id_unschedule (adder->clock_id); + + g_cond_broadcast (adder->not_empty_cond); + GST_OBJECT_UNLOCK (adder); +} + +static void +gst_live_adder_flush_stop (GstLiveAdder * adder) +{ + GST_DEBUG_OBJECT (adder, "Enabling pop on queue"); + + /* Mark as non flushing */ + GST_OBJECT_LOCK (adder); + adder->srcresult = GST_FLOW_OK; + GST_OBJECT_UNLOCK (adder); +} + +static gboolean +gst_live_adder_src_activate_push (GstPad * pad, gboolean active) +{ + gboolean result = TRUE; + GstLiveAdder *adder = NULL; + + adder = GST_LIVE_ADDER (gst_pad_get_parent (pad)); + + if (active) { + /* allow data processing */ + gst_live_adder_flush_stop (adder); + + /* start pushing out buffers */ + GST_DEBUG_OBJECT (adder, "Starting task on srcpad"); + gst_pad_start_task (adder->srcpad, + (GstTaskFunction) gst_live_adder_loop, adder); + } else { + /* make sure all data processing stops ASAP */ + gst_live_adder_flush_start (adder); + + /* NOTE this will hardlock if the state change is called from the src pad + * task thread because we will _join() the thread. */ + GST_DEBUG_OBJECT (adder, "Stopping task on srcpad"); + result = gst_pad_stop_task (pad); + } + + gst_object_unref (adder); + + return result; +} + +static gboolean +gst_live_adder_sink_event (GstPad * pad, GstEvent * event) +{ + gboolean ret = TRUE; + GstLiveAdder *adder = NULL; + GstLiveAdderPadPrivate *padprivate = NULL; + + adder = GST_LIVE_ADDER (gst_pad_get_parent (pad)); + + padprivate = gst_pad_get_element_private (pad); + + if (!padprivate) + return FALSE; + + GST_LOG_OBJECT (adder, "received %s", GST_EVENT_TYPE_NAME (event)); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_NEWSEGMENT: + { + GstFormat format; + gdouble rate, arate; + gint64 start, stop, time; + gboolean update; + + gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format, + &start, &stop, &time); + + gst_event_unref (event); + + /* we need time for now */ + if (format != GST_FORMAT_TIME) + goto newseg_wrong_format; + + GST_DEBUG_OBJECT (adder, + "newsegment: update %d, rate %g, arate %g, start %" GST_TIME_FORMAT + ", stop %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, + update, rate, arate, GST_TIME_ARGS (start), GST_TIME_ARGS (stop), + GST_TIME_ARGS (time)); + + /* now configure the values, we need these to time the release of the + * buffers on the srcpad. */ + GST_OBJECT_LOCK (adder); + gst_segment_set_newsegment_full (&padprivate->segment, update, + rate, arate, format, start, stop, time); + GST_OBJECT_UNLOCK (adder); + break; + } + case GST_EVENT_FLUSH_START: + gst_live_adder_flush_start (adder); + ret = gst_pad_push_event (adder->srcpad, event); + break; + case GST_EVENT_FLUSH_STOP: + ret = gst_pad_push_event (adder->srcpad, event); + ret = gst_live_adder_src_activate_push (adder->srcpad, TRUE); + GST_OBJECT_LOCK (adder); + adder->segment_pending = TRUE; + GST_OBJECT_UNLOCK (adder); + break; + case GST_EVENT_EOS: + { + GST_OBJECT_LOCK (adder); + + ret = adder->srcresult == GST_FLOW_OK; + if (ret && !padprivate->eos) { + GST_DEBUG_OBJECT (adder, "queuing EOS"); + padprivate->eos = TRUE; + g_cond_broadcast (adder->not_empty_cond); + } else if (padprivate->eos) { + GST_DEBUG_OBJECT (adder, "dropping EOS, we are already EOS"); + } else { + GST_DEBUG_OBJECT (adder, "dropping EOS, reason %s", + gst_flow_get_name (adder->srcresult)); + } + + GST_OBJECT_UNLOCK (adder); + + gst_event_unref (event); + break; + } + default: + ret = gst_pad_push_event (adder->srcpad, event); + break; + } + +done: + gst_object_unref (adder); + + return ret; + + /* ERRORS */ +newseg_wrong_format: + { + GST_DEBUG_OBJECT (adder, "received non TIME newsegment"); + ret = FALSE; + goto done; + } +} + +static gboolean +gst_live_adder_query (GstPad * pad, GstQuery * query) +{ + GstLiveAdder *adder; + gboolean res = FALSE; + + adder = GST_LIVE_ADDER (gst_pad_get_parent (pad)); + + switch (GST_QUERY_TYPE (query)) { + case GST_QUERY_LATENCY: + { + /* We need to send the query upstream and add the returned latency to our + * own */ + GstClockTime min_latency = 0, max_latency = G_MAXUINT64; + gpointer item; + GstIterator *iter = NULL; + gboolean done = FALSE; + + iter = gst_element_iterate_sink_pads (GST_ELEMENT (adder)); + + while (!done) { + switch (gst_iterator_next (iter, &item)) { + case GST_ITERATOR_OK: + { + GstPad *sinkpad = item; + GstClockTime pad_min_latency, pad_max_latency; + gboolean pad_us_live; + + if (gst_pad_peer_query (sinkpad, query)) { + gst_query_parse_latency (query, &pad_us_live, &pad_min_latency, + &pad_max_latency); + + res = TRUE; + + GST_DEBUG_OBJECT (adder, "Peer latency for pad %s: min %" + GST_TIME_FORMAT " max %" GST_TIME_FORMAT, + GST_PAD_NAME (sinkpad), + GST_TIME_ARGS (pad_min_latency), GST_TIME_ARGS (pad_max_latency)); + + min_latency = MAX (pad_min_latency, min_latency); + max_latency = MIN (pad_max_latency, max_latency); + } + gst_object_unref (item); + } + break; + case GST_ITERATOR_RESYNC: + min_latency = 0; + max_latency = G_MAXUINT64; + + gst_iterator_resync (iter); + break; + case GST_ITERATOR_ERROR: + GST_ERROR_OBJECT (adder, "Error looping sink pads"); + done = TRUE; + break; + case GST_ITERATOR_DONE: + done = TRUE; + break; + } + } + gst_iterator_free (iter); + + if (res) { + GstClockTime my_latency = adder->latency_ms * GST_MSECOND; + GST_OBJECT_LOCK (adder); + adder->peer_latency = min_latency; + min_latency += my_latency; + GST_OBJECT_UNLOCK (adder); + + /* Make sure we don't risk an overflow */ + if (max_latency < G_MAXUINT64 - my_latency) + max_latency += my_latency; + else + max_latency = G_MAXUINT64; + gst_query_set_latency (query, TRUE, min_latency, max_latency); + GST_DEBUG_OBJECT (adder, "Calculated total latency : min %" + GST_TIME_FORMAT " max %" GST_TIME_FORMAT, + GST_TIME_ARGS (min_latency), GST_TIME_ARGS (max_latency)); + } + break; + } + default: + res = gst_pad_query_default (pad, query); + break; + } + + gst_object_unref (adder); + + return res; +} + +static gboolean +forward_event_func (GstPad * pad, GValue * ret, GstEvent * event) +{ + gst_event_ref (event); + GST_LOG_OBJECT (pad, "About to send event %s", GST_EVENT_TYPE_NAME (event)); + if (!gst_pad_push_event (pad, event)) { + g_value_set_boolean (ret, FALSE); + GST_WARNING_OBJECT (pad, "Sending event %p (%s) failed.", + event, GST_EVENT_TYPE_NAME (event)); + } else { + GST_LOG_OBJECT (pad, "Sent event %p (%s).", + event, GST_EVENT_TYPE_NAME (event)); + } + + /* unref the pad because of a FIXME in gst_iterator_unfold + * it does a gst_iterator_next which refs the pad, but it never unrefs it + */ + gst_object_unref (pad); + return TRUE; +} + +/* forwards the event to all sinkpads, takes ownership of the + * event + * + * Returns: TRUE if the event could be forwarded on all + * sinkpads. + */ +static gboolean +forward_event (GstLiveAdder * adder, GstEvent * event) +{ + gboolean ret; + GstIterator *it; + GValue vret = { 0 }; + + GST_LOG_OBJECT (adder, "Forwarding event %p (%s)", event, + GST_EVENT_TYPE_NAME (event)); + + ret = TRUE; + + g_value_init (&vret, G_TYPE_BOOLEAN); + g_value_set_boolean (&vret, TRUE); + it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (adder)); + gst_iterator_fold (it, (GstIteratorFoldFunction) forward_event_func, &vret, + event); + gst_iterator_free (it); + + ret = g_value_get_boolean (&vret); + + return ret; +} + + +static gboolean +gst_live_adder_src_event (GstPad * pad, GstEvent * event) +{ + GstLiveAdder *adder; + gboolean result; + + adder = GST_LIVE_ADDER (gst_pad_get_parent (pad)); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_QOS: + /* TODO : QoS might be tricky */ + result = FALSE; + break; + case GST_EVENT_SEEK: + /* TODO : I'm not certain how to handle seeks yet */ + result = FALSE; + break; + case GST_EVENT_NAVIGATION: + /* TODO : navigation is rather pointless. */ + result = FALSE; + break; + default: + /* just forward the rest for now */ + result = forward_event (adder, event); + break; + } + + gst_event_unref (event); + gst_object_unref (adder); + + return result; +} + +static guint +gst_live_adder_length_from_duration (GstLiveAdder *adder, GstClockTime duration) +{ + guint64 ret = (duration * adder->rate / GST_SECOND) * adder->bps; + + return (guint) ret; +} + +static GstFlowReturn +gst_live_live_adder_chain (GstPad *pad, GstBuffer *buffer) +{ + GstLiveAdder *adder = GST_LIVE_ADDER (gst_pad_get_parent_element (pad)); + GstLiveAdderPadPrivate *padprivate = NULL; + GstFlowReturn ret = GST_FLOW_OK; + GList *item = NULL; + GstClockTime skip = 0; + + GST_OBJECT_LOCK (adder); + + ret = adder->srcresult; + + if (ret != GST_FLOW_OK) + { + GST_DEBUG_OBJECT (adder, "Passing non-ok result from src: %s", + gst_flow_get_name (ret)); + gst_buffer_unref (buffer); + goto out; + } + + padprivate = gst_pad_get_element_private (pad); + + if (!padprivate) + { + ret = GST_FLOW_NOT_LINKED; + gst_buffer_unref (buffer); + goto out; + } + + if (padprivate->eos) + { + GST_DEBUG_OBJECT (adder, "Received buffer after EOS"); + ret = GST_FLOW_UNEXPECTED; + gst_buffer_unref (buffer); + goto out; + } + + if (!GST_BUFFER_TIMESTAMP_IS_VALID(buffer)) + goto invalid_timestamp; + + if (padprivate->segment.format == GST_FORMAT_UNDEFINED) + { + GST_WARNING_OBJECT (adder, "No new-segment received," + " initializing segment with time 0..-1"); + gst_segment_init (&padprivate->segment, GST_FORMAT_TIME); + gst_segment_set_newsegment (&padprivate->segment, + FALSE, 1.0, GST_FORMAT_TIME, 0, -1, 0); + } + + if (padprivate->segment.format != GST_FORMAT_TIME) + goto invalid_segment; + + /* Just see if we receive invalid timestamp/durations */ + if (GST_CLOCK_TIME_IS_VALID (padprivate->expected_timestamp) && + !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DISCONT) && + GST_BUFFER_TIMESTAMP(buffer) != padprivate->expected_timestamp) + GST_LOG_OBJECT (adder, + "Timestamp discontinuity without the DISCONT flag set" + " (expected %" GST_TIME_FORMAT ", got %" GST_TIME_FORMAT")", + GST_TIME_ARGS (padprivate->expected_timestamp), + GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer))); + + buffer = gst_buffer_make_metadata_writable (buffer); + + /* If there is no duration, lets set one */ + if (!GST_BUFFER_DURATION_IS_VALID (buffer)) { + GST_BUFFER_DURATION (buffer) = + gst_audio_duration_from_pad_buffer (pad, buffer); + padprivate->expected_timestamp = GST_CLOCK_TIME_NONE; + } else { + padprivate->expected_timestamp = GST_BUFFER_TIMESTAMP (buffer) + + GST_BUFFER_DURATION (buffer); + } + + + /* + * Lets clip the buffer to the segment (so we don't have to worry about + * cliping afterwards). + * This should also guarantee us that we'll have valid timestamps and + * durations afterwards + */ + + buffer = gst_audio_buffer_clip (buffer, &padprivate->segment, adder->rate, + adder->bps); + + /* buffer can be NULL if it's completely outside of the segment */ + if (!buffer) + goto out; + + /* + * Make sure all incoming buffers share the same timestamping + */ + GST_BUFFER_TIMESTAMP (buffer) = gst_segment_to_running_time ( + &padprivate->segment, padprivate->segment.format, + GST_BUFFER_TIMESTAMP (buffer)); + + + if (GST_CLOCK_TIME_IS_VALID (adder->next_timestamp) && + GST_BUFFER_TIMESTAMP (buffer) < adder->next_timestamp) { + if (GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) < + adder->next_timestamp) { + GST_DEBUG_OBJECT (adder, "Buffer is late, dropping (ts: %" GST_TIME_FORMAT + " duration: %" GST_TIME_FORMAT ")", + GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)), + GST_TIME_ARGS (GST_BUFFER_DURATION (buffer))); + gst_buffer_unref (buffer); + goto out; + } else { + skip = adder->next_timestamp - GST_BUFFER_TIMESTAMP (buffer); + GST_DEBUG_OBJECT (adder, "Buffer is partially late, skipping %" + GST_TIME_FORMAT, + GST_TIME_ARGS (skip)); + } + } + + /* If our new buffer's head is higher than the queue's head, lets wake up, + * we may not have to wait for as long + */ + if (adder->clock_id && + g_queue_peek_head (adder->buffers) != NULL && + GST_BUFFER_TIMESTAMP (buffer) + skip < + GST_BUFFER_TIMESTAMP (g_queue_peek_head (adder->buffers))) + gst_clock_id_unschedule (adder->clock_id); + + for (item = g_queue_peek_head_link (adder->buffers); + item; + item = g_list_next (item)) { + GstBuffer *oldbuffer = item->data; + GstClockTime old_skip = 0; + GstClockTime mix_duration = 0; + GstClockTime mix_start = 0; + GstClockTime mix_end = 0; + + /* We haven't reached our place yet */ + if (GST_BUFFER_TIMESTAMP (buffer) + skip >= + GST_BUFFER_TIMESTAMP (oldbuffer) + GST_BUFFER_DURATION (oldbuffer)) + continue; + + /* We're past our place, lets insert ouselves here */ + if (GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) <= + GST_BUFFER_TIMESTAMP (oldbuffer)) + break; + + /* if we reach this spot, we have overlap, so we must mix */ + + /* First make a subbuffer with the non-overlapping part */ + if (GST_BUFFER_TIMESTAMP (buffer) + skip < + GST_BUFFER_TIMESTAMP (oldbuffer)) { + GstBuffer *subbuffer = NULL; + GstClockTime subbuffer_duration = GST_BUFFER_TIMESTAMP (oldbuffer) - + (GST_BUFFER_TIMESTAMP (buffer) + skip); + + subbuffer = gst_buffer_create_sub (buffer, + gst_live_adder_length_from_duration (adder, skip), + gst_live_adder_length_from_duration (adder, subbuffer_duration)); + + GST_BUFFER_TIMESTAMP (subbuffer) = GST_BUFFER_TIMESTAMP (buffer) + skip; + GST_BUFFER_DURATION (subbuffer) = subbuffer_duration; + + skip += subbuffer_duration; + + g_queue_insert_before (adder->buffers, item, subbuffer); + } + + /* Now we are on the overlapping part */ + oldbuffer = gst_buffer_make_writable (oldbuffer); + item->data = oldbuffer; + + old_skip = GST_BUFFER_TIMESTAMP (buffer) + skip - + GST_BUFFER_TIMESTAMP (oldbuffer); + + mix_start = GST_BUFFER_TIMESTAMP (oldbuffer) + old_skip; + + if (GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) < + GST_BUFFER_TIMESTAMP (oldbuffer) + GST_BUFFER_DURATION (oldbuffer)) + mix_end = GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer); + else + mix_end = GST_BUFFER_TIMESTAMP (oldbuffer) + + GST_BUFFER_DURATION (oldbuffer); + + mix_duration = mix_end - mix_start; + + adder->func (GST_BUFFER_DATA (oldbuffer) + + gst_live_adder_length_from_duration (adder, old_skip), + GST_BUFFER_DATA (buffer) + + gst_live_adder_length_from_duration (adder, skip), + gst_live_adder_length_from_duration (adder, mix_duration)); + + skip += mix_duration; + } + + g_cond_broadcast (adder->not_empty_cond); + + if (skip == GST_BUFFER_DURATION (buffer)) { + gst_buffer_unref (buffer); + } else { + if (skip) { + GstClockTime subbuffer_duration = GST_BUFFER_DURATION (buffer) - skip; + GstClockTime subbuffer_ts = GST_BUFFER_TIMESTAMP (buffer) + skip; + + buffer = gst_buffer_create_sub (buffer, + gst_live_adder_length_from_duration (adder, skip), + gst_live_adder_length_from_duration (adder, subbuffer_duration)); + GST_BUFFER_TIMESTAMP (buffer) = subbuffer_ts; + GST_BUFFER_DURATION (buffer) = subbuffer_duration; + } + + if (item) + g_queue_insert_before (adder->buffers, item, buffer); + else + g_queue_push_tail (adder->buffers, buffer); + } + + out: + + GST_OBJECT_UNLOCK (adder); + gst_object_unref (adder); + + return ret; + + invalid_timestamp: + + GST_OBJECT_UNLOCK (adder); + gst_buffer_unref (buffer); + GST_ELEMENT_ERROR (adder, STREAM, FAILED, + ("Buffer without a valid timestamp received"), + ("Invalid timestamp received on buffer")); + + return GST_FLOW_ERROR; + + invalid_segment: + { + const gchar *format = gst_format_get_name (padprivate->segment.format); + GST_OBJECT_UNLOCK (adder); + gst_buffer_unref (buffer); + GST_ELEMENT_ERROR (adder, STREAM, FAILED, + ("This element only supports TIME segments, received other type"), + ("Received a segment of type %s, only support time segment", format)); + + return GST_FLOW_ERROR; + } + +} + +/* + * This only works because the GstObject lock is taken + * + * It checks if all sink pads are EOS + */ +static gboolean +check_eos_locked (GstLiveAdder *adder) +{ + GList *item; + + /* We can't be EOS if we have no sinkpads */ + if (adder->sinkpads == NULL) + return FALSE; + + for (item = adder->sinkpads; + item; + item = g_list_next (item)) + { + GstPad *pad = item->data; + GstLiveAdderPadPrivate *padprivate = gst_pad_get_element_private (pad); + + if (padprivate && padprivate->eos != TRUE) + return FALSE; + } + + return TRUE; +} + +static void +gst_live_adder_loop (gpointer data) +{ + GstLiveAdder *adder = GST_LIVE_ADDER (data); + GstClockTime buffer_timestamp = 0; + GstClockTime sync_time = 0; + GstClock *clock = NULL; + GstClockID id = NULL; + GstClockReturn ret; + GstBuffer *buffer = NULL; + GstFlowReturn result; + GstEvent *newseg_event = NULL; + + GST_OBJECT_LOCK (adder); + + again: + + for (;;) + { + if (adder->srcresult != GST_FLOW_OK) + goto flushing; + if (!g_queue_is_empty (adder->buffers)) + break; + if (check_eos_locked (adder)) + goto eos; + g_cond_wait (adder->not_empty_cond, GST_OBJECT_GET_LOCK(adder)); + } + + buffer_timestamp = GST_BUFFER_TIMESTAMP (g_queue_peek_head (adder->buffers)); + + clock = GST_ELEMENT_CLOCK (adder); + + /* If we have no clock, then we can't do anything.. error */ + if (!clock) { + goto no_clock; + } + + GST_DEBUG_OBJECT (adder, "sync to timestamp %" GST_TIME_FORMAT, + GST_TIME_ARGS (buffer_timestamp)); + + sync_time = buffer_timestamp + GST_ELEMENT_CAST (adder)->base_time; + /* add latency, this includes our own latency and the peer latency. */ + sync_time += adder->latency_ms * GST_MSECOND; + sync_time += adder->peer_latency; + + /* create an entry for the clock */ + id = adder->clock_id = gst_clock_new_single_shot_id (clock, sync_time); + GST_OBJECT_UNLOCK (adder); + + ret = gst_clock_id_wait (id, NULL); + + GST_OBJECT_LOCK (adder); + + /* and free the entry */ + gst_clock_id_unref (id); + adder->clock_id = NULL; + + /* at this point, the clock could have been unlocked by a timeout, a new + * head element was added to the queue or because we are shutting down. Check + * for shutdown first. */ + + if (adder->srcresult != GST_FLOW_OK) + goto flushing; + + if (ret == GST_CLOCK_UNSCHEDULED) { + GST_DEBUG_OBJECT (adder, + "Wait got unscheduled, will retry to push with new buffer"); + goto again; + } + + if (ret != GST_CLOCK_OK && ret != GST_CLOCK_EARLY) + goto clock_error; + + buffer = g_queue_pop_head (adder->buffers); + + if (!buffer) + goto again; + + /* + * We make sure the timestamps are exactly contiguous + * If its only small skew (due to rounding errors), we correct it + * silently. Otherwise we put the discont flag + */ + if (GST_CLOCK_TIME_IS_VALID (adder->next_timestamp) && + GST_BUFFER_TIMESTAMP (buffer) != adder->next_timestamp) { + if (llabs (GST_BUFFER_TIMESTAMP (buffer) - adder->next_timestamp) < + GST_SECOND / adder->rate) { + GST_BUFFER_TIMESTAMP (buffer) = adder->next_timestamp; + GST_DEBUG_OBJECT (adder, "Correcting slight skew"); + GST_BUFFER_FLAG_UNSET(buffer, GST_BUFFER_FLAG_DISCONT); + } else { + GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_FLAG_DISCONT); + GST_DEBUG_OBJECT (adder, "Expected buffer at %" GST_TIME_FORMAT + ", but is at %" GST_TIME_FORMAT", setting discont", + GST_TIME_ARGS (adder->next_timestamp), + GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer))); + } + } else { + GST_BUFFER_FLAG_UNSET(buffer, GST_BUFFER_FLAG_DISCONT); + } + + GST_BUFFER_OFFSET(buffer) = GST_BUFFER_OFFSET_NONE; + GST_BUFFER_OFFSET_END(buffer) = GST_BUFFER_OFFSET_NONE; + + if (GST_BUFFER_DURATION_IS_VALID (buffer)) + adder->next_timestamp = GST_BUFFER_TIMESTAMP (buffer) + + GST_BUFFER_DURATION (buffer); + else + adder->next_timestamp = GST_CLOCK_TIME_NONE; + + if (adder->segment_pending) + { + /* + * We set the start at 0, because we re-timestamps to the running time + */ + newseg_event = gst_event_new_new_segment_full (FALSE, 1.0, 1.0, + GST_FORMAT_TIME, 0, -1, 0); + + adder->segment_pending = FALSE; + } + + GST_OBJECT_UNLOCK (adder); + + if (newseg_event) + gst_pad_push_event (adder->srcpad, newseg_event); + + result = gst_pad_push (adder->srcpad, buffer); + if (result != GST_FLOW_OK) + goto pause; + + return; + + flushing: + { + GST_DEBUG_OBJECT (adder, "we are flushing"); + gst_pad_pause_task (adder->srcpad); + GST_OBJECT_UNLOCK (adder); + return; + } + + clock_error: + { + gst_pad_pause_task (adder->srcpad); + GST_OBJECT_UNLOCK (adder); + GST_ELEMENT_ERROR (adder, STREAM, MUX, ("Error with the clock"), + ("Error with the clock: %d", ret)); + GST_ERROR_OBJECT (adder, "Error with the clock: %d", ret); + return; + } + + no_clock: + { + gst_pad_pause_task (adder->srcpad); + GST_OBJECT_UNLOCK (adder); + GST_ELEMENT_ERROR (adder, STREAM, MUX, ("No available clock"), + ("No available clock")); + GST_ERROR_OBJECT (adder, "No available clock"); + return; + } + + pause: + { + const gchar *reason = gst_flow_get_name (result); + + GST_DEBUG_OBJECT (adder, "pausing task, reason %s", reason); + + GST_OBJECT_LOCK (adder); + + /* store result */ + adder->srcresult = result; + /* we don't post errors or anything because upstream will do that for us + * when we pass the return value upstream. */ + gst_pad_pause_task (adder->srcpad); + GST_OBJECT_UNLOCK (adder); + return; + } + + eos: + { + /* store result, we are flushing now */ + GST_DEBUG_OBJECT (adder, "We are EOS, pushing EOS downstream"); + adder->srcresult = GST_FLOW_UNEXPECTED; + gst_pad_pause_task (adder->srcpad); + GST_OBJECT_UNLOCK (adder); + gst_pad_push_event (adder->srcpad, gst_event_new_eos ()); + return; + } +} + +static GstPad * +gst_live_adder_request_new_pad (GstElement * element, GstPadTemplate * templ, + const gchar * unused) +{ + gchar *name; + GstLiveAdder *adder; + GstPad *newpad; + gint padcount; + GstLiveAdderPadPrivate *padprivate = NULL; + + if (templ->direction != GST_PAD_SINK) + goto not_sink; + + adder = GST_LIVE_ADDER (element); + + /* increment pad counter */ + padcount = g_atomic_int_exchange_and_add (&adder->padcount, 1); + + name = g_strdup_printf ("sink%d", padcount); + newpad = gst_pad_new_from_template (templ, name); + GST_DEBUG_OBJECT (adder, "request new pad %s", name); + g_free (name); + + gst_pad_set_getcaps_function (newpad, + GST_DEBUG_FUNCPTR (gst_live_adder_sink_getcaps)); + gst_pad_set_setcaps_function (newpad, + GST_DEBUG_FUNCPTR (gst_live_adder_setcaps)); + gst_pad_set_event_function (newpad, + GST_DEBUG_FUNCPTR (gst_live_adder_sink_event)); + + padprivate = g_new0 (GstLiveAdderPadPrivate, 1); + + gst_segment_init (&padprivate->segment, GST_FORMAT_UNDEFINED); + padprivate->eos = FALSE; + padprivate->expected_timestamp = GST_CLOCK_TIME_NONE; + + gst_pad_set_element_private (newpad, padprivate); + + gst_pad_set_chain_function (newpad, gst_live_live_adder_chain); + + + if (!gst_pad_set_active (newpad, TRUE)) + goto could_not_activate; + + /* takes ownership of the pad */ + if (!gst_element_add_pad (GST_ELEMENT (adder), newpad)) + goto could_not_add; + + GST_OBJECT_LOCK (adder); + adder->sinkpads = g_list_prepend (adder->sinkpads, newpad); + GST_OBJECT_UNLOCK (adder); + + return newpad; + + /* errors */ +not_sink: + { + g_warning ("gstadder: request new pad that is not a SINK pad\n"); + return NULL; + } +could_not_add: + { + GST_DEBUG_OBJECT (adder, "could not add pad"); + g_free (padprivate); + gst_object_unref (newpad); + return NULL; + } +could_not_activate: + { + GST_DEBUG_OBJECT (adder, "could not activate new pad"); + g_free (padprivate); + gst_object_unref (newpad); + return NULL; + } +} + +static void +gst_live_adder_release_pad (GstElement * element, GstPad * pad) +{ + GstLiveAdder *adder; + GstLiveAdderPadPrivate *padprivate; + + adder = GST_LIVE_ADDER (element); + + GST_DEBUG_OBJECT (adder, "release pad %s:%s", GST_DEBUG_PAD_NAME (pad)); + + GST_OBJECT_LOCK (element); + padprivate = gst_pad_get_element_private (pad); + gst_pad_set_element_private (pad, NULL); + adder->sinkpads = g_list_remove_all (adder->sinkpads, pad); + GST_OBJECT_UNLOCK (element); + + g_free (padprivate); + + gst_element_remove_pad (element, pad); +} + +static void +reset_pad_private (gpointer data, gpointer unused) +{ + GstPad *pad = data; + GstLiveAdderPadPrivate *padprivate; + + padprivate = gst_pad_get_element_private (pad); + + if (!padprivate) + return; + + gst_segment_init (&padprivate->segment, GST_FORMAT_UNDEFINED); + + padprivate->expected_timestamp = GST_CLOCK_TIME_NONE; + padprivate->eos = FALSE; +} + +static GstStateChangeReturn +gst_live_adder_change_state (GstElement * element, GstStateChange transition) +{ + GstLiveAdder *adder; + GstStateChangeReturn ret; + + adder = GST_LIVE_ADDER (element); + + switch (transition) { + case GST_STATE_CHANGE_READY_TO_PAUSED: + { + GST_OBJECT_LOCK (adder); + adder->segment_pending = TRUE; + adder->peer_latency = 0; + adder->next_timestamp = GST_CLOCK_TIME_NONE; + g_list_foreach (adder->sinkpads, reset_pad_private, NULL); + GST_OBJECT_UNLOCK (adder); + break; + } + default: + break; + } + + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + return ret; +} + + +static gboolean +plugin_init (GstPlugin * plugin) +{ + if (!gst_element_register (plugin, "liveadder", GST_RANK_NONE, + GST_TYPE_LIVE_ADDER)) { + return FALSE; + } + + return TRUE; +} + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "liveadder", + "Adds multiple live discontinuous streams", + plugin_init, VERSION, "LGPL", "Farsight", "http://farsight.sf.net") diff -Nru gst-plugins-farsight-0.12.5/gst/liveadder/liveadder.h gst-plugins-farsight-0.12.8/gst/liveadder/liveadder.h --- gst-plugins-farsight-0.12.5/gst/liveadder/liveadder.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/liveadder/liveadder.h 2008-04-28 19:55:38.000000000 -0500 @@ -0,0 +1,106 @@ +/* + * Farsight Voice+Video library + * + * Copyright 2008 Collabora Ltd + * Copyright 2008 Nokia Corporation + * @author: Olivier Crete + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + + + +#ifndef __GST_LIVE_ADDER_H__ +#define __GST_LIVE_ADDER_H__ + +#include + +G_BEGIN_DECLS + +#define GST_TYPE_LIVE_ADDER (gst_live_adder_get_type()) +#define GST_LIVE_ADDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_LIVE_ADDER,GstLiveAdder)) +#define GST_IS_LIVE_ADDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_LIVE_ADDER)) +#define GST_LIVE_ADDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_LIVE_ADDER,GstLiveAdderClass)) +#define GST_IS_LIVE_ADDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_LIVE_ADDER)) +#define GST_LIVE_ADDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_LIVE_ADDER,GstLiveAdderClass)) + +typedef struct _GstLiveAdder GstLiveAdder; +typedef struct _GstLiveAdderClass GstLiveAdderClass; + +typedef enum { + GST_LIVE_ADDER_FORMAT_UNSET, + GST_LIVE_ADDER_FORMAT_INT, + GST_LIVE_ADDER_FORMAT_FLOAT +} GstLiveAdderFormat; + +typedef void (*GstLiveAdderFunction) (gpointer out, gpointer in, guint size); + +/** + * GstLiveAdder: + * + * The adder object structure. + */ +struct _GstLiveAdder { + GstElement element; + + GstPad *srcpad; + /* pad counter, used for creating unique request pads */ + gint padcount; + GList *sinkpads; + + GstFlowReturn srcresult; + GstClockID clock_id; + + /* the queue is ordered head to tail */ + GQueue *buffers; + GCond *not_empty_cond; + + GstClockTime next_timestamp; + + /* the next are valid for both int and float */ + GstLiveAdderFormat format; + gint rate; + gint channels; + gint width; + gint endianness; + + /* the next are valid only for format == GST_LIVE_ADDER_FORMAT_INT */ + gint depth; + gboolean is_signed; + + /* number of bytes per sample, actually width/8 * channels */ + gint bps; + + /* function to add samples */ + GstLiveAdderFunction func; + + GstClockTime latency_ms; + GstClockTime peer_latency; + + gboolean segment_pending; +}; + +struct _GstLiveAdderClass { + GstElementClass parent_class; +}; + +GType gst_live_adder_get_type (void); + +G_END_DECLS + + +#endif /* __GST_LIVE_ADDER_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/liveadder/Makefile.am gst-plugins-farsight-0.12.8/gst/liveadder/Makefile.am --- gst-plugins-farsight-0.12.5/gst/liveadder/Makefile.am 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/liveadder/Makefile.am 2008-04-28 19:55:38.000000000 -0500 @@ -0,0 +1,8 @@ +plugin_LTLIBRARIES = libgstliveadder.la + +libgstliveadder_la_SOURCES = liveadder.c +libgstliveadder_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) +libgstliveadder_la_LIBADD = $(GST_LIBS_LIBS) +libgstliveadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-0.10 + +noinst_HEADERS = liveadder.h diff -Nru gst-plugins-farsight-0.12.5/gst/liveadder/Makefile.in gst-plugins-farsight-0.12.8/gst/liveadder/Makefile.in --- gst-plugins-farsight-0.12.5/gst/liveadder/Makefile.in 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/liveadder/Makefile.in 2008-05-09 14:56:41.000000000 -0500 @@ -0,0 +1,532 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 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. + +@SET_MAKE@ + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +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@ +target_triplet = @target@ +subdir = gst/liveadder +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ + $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gst-feature.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +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)$(plugindir)" +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libgstliveadder_la_DEPENDENCIES = +am_libgstliveadder_la_OBJECTS = libgstliveadder_la-liveadder.lo +libgstliveadder_la_OBJECTS = $(am_libgstliveadder_la_OBJECTS) +libgstliveadder_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libgstliveadder_la_CFLAGS) $(CFLAGS) \ + $(libgstliveadder_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libgstliveadder_la_SOURCES) +DIST_SOURCES = $(libgstliveadder_la_SOURCES) +HEADERS = $(noinst_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ERROR_CFLAGS = @ERROR_CFLAGS@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GREP = @GREP@ +GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ +GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ +GST_BASE_LIBS = @GST_BASE_LIBS@ +GST_CFLAGS = @GST_CFLAGS@ +GST_LIBS = @GST_LIBS@ +GST_MAJORMINOR = @GST_MAJORMINOR@ +GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ +GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@ +GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@ +GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@ +GST_PLUGINS_VERSION = @GST_PLUGINS_VERSION@ +GST_PLUGINS_VERSION_MAJOR = @GST_PLUGINS_VERSION_MAJOR@ +GST_PLUGINS_VERSION_MICRO = @GST_PLUGINS_VERSION_MICRO@ +GST_PLUGINS_VERSION_MINOR = @GST_PLUGINS_VERSION_MINOR@ +GST_PLUGINS_VERSION_NANO = @GST_PLUGINS_VERSION_NANO@ +GST_PLUGINS_VERSION_RELEASE = @GST_PLUGINS_VERSION_RELEASE@ +GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +HAVE_CXX = @HAVE_CXX@ +HAVE_GSM = @HAVE_GSM@ +HAVE_JASPER = @HAVE_JASPER@ +HAVE_JINGLEP2P = @HAVE_JINGLEP2P@ +HAVE_PKGCONFIG = @HAVE_PKGCONFIG@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JASPER_LIBS = @JASPER_LIBS@ +JINGLEBASE_CFLAGS = @JINGLEBASE_CFLAGS@ +JINGLEBASE_LIBS = @JINGLEBASE_LIBS@ +JINGLEP2P_CFLAGS = @JINGLEP2P_CFLAGS@ +JINGLEP2P_LIBS = @JINGLEP2P_LIBS@ +JRTP_CFLAGS = @JRTP_CFLAGS@ +JRTP_LIBS = @JRTP_LIBS@ +JTHREAD_CFLAGS = @JTHREAD_CFLAGS@ +JTHREAD_LIBS = @JTHREAD_LIBS@ +LDFLAGS = @LDFLAGS@ +LIBJ2K_PREFIX = @LIBJ2K_PREFIX@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MIMIC_CFLAGS = @MIMIC_CFLAGS@ +MIMIC_LIBS = @MIMIC_LIBS@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plugindir = @plugindir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugin_LTLIBRARIES = libgstliveadder.la +libgstliveadder_la_SOURCES = liveadder.c +libgstliveadder_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) +libgstliveadder_la_LIBADD = $(GST_LIBS_LIBS) +libgstliveadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-0.10 +noinst_HEADERS = liveadder.h +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gst/liveadder/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gst/liveadder/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + else :; fi; \ + done + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libgstliveadder.la: $(libgstliveadder_la_OBJECTS) $(libgstliveadder_la_DEPENDENCIES) + $(libgstliveadder_la_LINK) -rpath $(plugindir) $(libgstliveadder_la_OBJECTS) $(libgstliveadder_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstliveadder_la-liveadder.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +libgstliveadder_la-liveadder.lo: liveadder.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstliveadder_la_CFLAGS) $(CFLAGS) -MT libgstliveadder_la-liveadder.lo -MD -MP -MF $(DEPDIR)/libgstliveadder_la-liveadder.Tpo -c -o libgstliveadder_la-liveadder.lo `test -f 'liveadder.c' || echo '$(srcdir)/'`liveadder.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstliveadder_la-liveadder.Tpo $(DEPDIR)/libgstliveadder_la-liveadder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='liveadder.c' object='libgstliveadder_la-liveadder.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstliveadder_la_CFLAGS) $(CFLAGS) -c -o libgstliveadder_la-liveadder.lo `test -f 'liveadder.c' || echo '$(srcdir)/'`liveadder.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gst-plugins-farsight-0.12.5/gst/Makefile.in gst-plugins-farsight-0.12.8/gst/Makefile.in --- gst-plugins-farsight-0.12.5/gst/Makefile.in 2007-09-17 16:25:03.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/Makefile.in 2008-05-09 14:56:41.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -80,6 +80,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -93,6 +94,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -139,6 +142,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -326,8 +330,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -352,8 +356,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -363,13 +367,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/gst/network-simulator/Makefile.in gst-plugins-farsight-0.12.8/gst/network-simulator/Makefile.in --- gst-plugins-farsight-0.12.5/gst/network-simulator/Makefile.in 2007-09-17 16:25:04.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/network-simulator/Makefile.in 2008-05-09 14:56:41.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -61,7 +61,7 @@ libgstnetsim_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstnetsim_la_CFLAGS) \ $(CFLAGS) $(libgstnetsim_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -102,6 +102,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -115,6 +116,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -161,6 +164,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -277,8 +281,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -286,8 +290,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -348,8 +352,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -361,8 +365,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -372,13 +376,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/gst/rtpdemux/gstrtpdemux.c gst-plugins-farsight-0.12.8/gst/rtpdemux/gstrtpdemux.c --- gst-plugins-farsight-0.12.5/gst/rtpdemux/gstrtpdemux.c 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpdemux/gstrtpdemux.c 2008-02-19 12:03:49.000000000 -0600 @@ -50,6 +50,8 @@ #include #include +#include "gstrtpdemux-marshal.h" + /* generic templates */ static GstStaticPadTemplate rtp_demux_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", @@ -179,7 +181,7 @@ G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRtpDemuxClass, new_payload_type), NULL, NULL, - g_cclosure_marshal_VOID__UINT_POINTER, + gst_rtp_demux_marshal_VOID__UINT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, diff -Nru gst-plugins-farsight-0.12.5/gst/rtpdemux/gstrtpdemux-marshal.c gst-plugins-farsight-0.12.8/gst/rtpdemux/gstrtpdemux-marshal.c --- gst-plugins-farsight-0.12.5/gst/rtpdemux/gstrtpdemux-marshal.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/rtpdemux/gstrtpdemux-marshal.c 2008-03-04 12:58:17.000000000 -0600 @@ -0,0 +1,87 @@ +#include "gstrtpdemux-marshal.h" + +#include + + +#ifdef G_ENABLE_DEBUG +#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) +#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) +#define g_marshal_value_peek_int(v) g_value_get_int (v) +#define g_marshal_value_peek_uint(v) g_value_get_uint (v) +#define g_marshal_value_peek_long(v) g_value_get_long (v) +#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) +#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) +#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) +#define g_marshal_value_peek_enum(v) g_value_get_enum (v) +#define g_marshal_value_peek_flags(v) g_value_get_flags (v) +#define g_marshal_value_peek_float(v) g_value_get_float (v) +#define g_marshal_value_peek_double(v) g_value_get_double (v) +#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) +#define g_marshal_value_peek_param(v) g_value_get_param (v) +#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) +#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) +#define g_marshal_value_peek_object(v) g_value_get_object (v) +#else /* !G_ENABLE_DEBUG */ +/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. + * Do not access GValues directly in your code. Instead, use the + * g_value_get_*() functions + */ +#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int +#define g_marshal_value_peek_char(v) (v)->data[0].v_int +#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint +#define g_marshal_value_peek_int(v) (v)->data[0].v_int +#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint +#define g_marshal_value_peek_long(v) (v)->data[0].v_long +#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong +#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 +#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 +#define g_marshal_value_peek_enum(v) (v)->data[0].v_long +#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong +#define g_marshal_value_peek_float(v) (v)->data[0].v_float +#define g_marshal_value_peek_double(v) (v)->data[0].v_double +#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#endif /* !G_ENABLE_DEBUG */ + + +/* VOID:UINT,OBJECT (gstrtpdemux-marshal.list:1) */ +void +gst_rtp_demux_marshal_VOID__UINT_OBJECT (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__UINT_OBJECT) (gpointer data1, + guint arg_1, + gpointer arg_2, + gpointer data2); + register GMarshalFunc_VOID__UINT_OBJECT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__UINT_OBJECT) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_uint (param_values + 1), + g_marshal_value_peek_object (param_values + 2), + data2); +} + diff -Nru gst-plugins-farsight-0.12.5/gst/rtpdemux/gstrtpdemux-marshal.list gst-plugins-farsight-0.12.8/gst/rtpdemux/gstrtpdemux-marshal.list --- gst-plugins-farsight-0.12.5/gst/rtpdemux/gstrtpdemux-marshal.list 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/rtpdemux/gstrtpdemux-marshal.list 2008-02-19 12:03:49.000000000 -0600 @@ -0,0 +1 @@ +VOID:UINT,OBJECT diff -Nru gst-plugins-farsight-0.12.5/gst/rtpdemux/Makefile.am gst-plugins-farsight-0.12.8/gst/rtpdemux/Makefile.am --- gst-plugins-farsight-0.12.5/gst/rtpdemux/Makefile.am 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpdemux/Makefile.am 2008-02-19 12:03:49.000000000 -0600 @@ -6,10 +6,22 @@ test_rtpdemux_CFLAGS = $(GST_CFLAGS) test_rtpdemux_LDADD = $(GST_LIBS) -libgstrtpdemux_la_SOURCES = gstrtpdemux.c +libgstrtpdemux_la_SOURCES = gstrtpdemux.c gstrtpdemux-marshal.c libgstrtpdemux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT libgstrtpdemux_la_LIBADD = $(GST_LIBS_LIBS) libgstrtpdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ #noinst_HEADERS = gstrrtpdemux.h + +glib_enum_define = GST_RTP_DEMUX +glib_enum_prefix = gst_rtp_demux + +include $(top_srcdir)/common/glib-gen.mak + +BUILT_SOURCES = gstrtpdemux-marshal.c \ + gstrtpdemux-marshal.h + +CLEANFILES = $(BUILT_SOURCES) + +EXTRA_DIST = gstrtpdemux-marshal.list diff -Nru gst-plugins-farsight-0.12.5/gst/rtpdemux/Makefile.in gst-plugins-farsight-0.12.8/gst/rtpdemux/Makefile.in --- gst-plugins-farsight-0.12.5/gst/rtpdemux/Makefile.in 2007-09-17 16:25:04.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpdemux/Makefile.in 2008-05-09 14:56:41.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -14,6 +14,13 @@ @SET_MAKE@ +# these are the variables your Makefile.am should set +# the example is based on the colorbalance interface + +#glib_enum_headers=$(colorbalance_headers) +#glib_enum_define=GST_COLOR_BALANCE +#glib_enum_prefix=gst_color_balance + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -35,8 +42,9 @@ host_triplet = @host@ target_triplet = @target@ noinst_PROGRAMS = test_rtpdemux$(EXEEXT) +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/common/glib-gen.mak subdir = gst/rtpdemux -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gst-feature.m4 \ @@ -56,7 +64,8 @@ pluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(plugin_LTLIBRARIES) libgstrtpdemux_la_DEPENDENCIES = -am_libgstrtpdemux_la_OBJECTS = libgstrtpdemux_la-gstrtpdemux.lo +am_libgstrtpdemux_la_OBJECTS = libgstrtpdemux_la-gstrtpdemux.lo \ + libgstrtpdemux_la-gstrtpdemux-marshal.lo libgstrtpdemux_la_OBJECTS = $(am_libgstrtpdemux_la_OBJECTS) libgstrtpdemux_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -70,7 +79,7 @@ test_rtpdemux_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_rtpdemux_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -110,6 +119,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -123,6 +133,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -169,6 +181,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -244,15 +257,25 @@ test_rtpdemux_SOURCES = test_rtpdemux.c test_rtpdemux_CFLAGS = $(GST_CFLAGS) test_rtpdemux_LDADD = $(GST_LIBS) -libgstrtpdemux_la_SOURCES = gstrtpdemux.c +libgstrtpdemux_la_SOURCES = gstrtpdemux.c gstrtpdemux-marshal.c libgstrtpdemux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT libgstrtpdemux_la_LIBADD = $(GST_LIBS_LIBS) libgstrtpdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ -all: all-am + +#noinst_HEADERS = gstrrtpdemux.h +glib_enum_define = GST_RTP_DEMUX +glib_enum_prefix = gst_rtp_demux +BUILT_SOURCES = gstrtpdemux-marshal.c \ + gstrtpdemux-marshal.h + +CLEANFILES = $(BUILT_SOURCES) +EXTRA_DIST = gstrtpdemux-marshal.list +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/common/glib-gen.mak $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -287,8 +310,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -296,8 +319,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -327,6 +350,7 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtpdemux_la-gstrtpdemux-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtpdemux_la-gstrtpdemux.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rtpdemux-test_rtpdemux.Po@am__quote@ @@ -358,6 +382,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtpdemux_la_CFLAGS) $(CFLAGS) -c -o libgstrtpdemux_la-gstrtpdemux.lo `test -f 'gstrtpdemux.c' || echo '$(srcdir)/'`gstrtpdemux.c +libgstrtpdemux_la-gstrtpdemux-marshal.lo: gstrtpdemux-marshal.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtpdemux_la_CFLAGS) $(CFLAGS) -MT libgstrtpdemux_la-gstrtpdemux-marshal.lo -MD -MP -MF $(DEPDIR)/libgstrtpdemux_la-gstrtpdemux-marshal.Tpo -c -o libgstrtpdemux_la-gstrtpdemux-marshal.lo `test -f 'gstrtpdemux-marshal.c' || echo '$(srcdir)/'`gstrtpdemux-marshal.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstrtpdemux_la-gstrtpdemux-marshal.Tpo $(DEPDIR)/libgstrtpdemux_la-gstrtpdemux-marshal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstrtpdemux-marshal.c' object='libgstrtpdemux_la-gstrtpdemux-marshal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtpdemux_la_CFLAGS) $(CFLAGS) -c -o libgstrtpdemux_la-gstrtpdemux-marshal.lo `test -f 'gstrtpdemux-marshal.c' || echo '$(srcdir)/'`gstrtpdemux-marshal.c + test_rtpdemux-test_rtpdemux.o: test_rtpdemux.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_rtpdemux_CFLAGS) $(CFLAGS) -MT test_rtpdemux-test_rtpdemux.o -MD -MP -MF $(DEPDIR)/test_rtpdemux-test_rtpdemux.Tpo -c -o test_rtpdemux-test_rtpdemux.o `test -f 'test_rtpdemux.c' || echo '$(srcdir)/'`test_rtpdemux.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_rtpdemux-test_rtpdemux.Tpo $(DEPDIR)/test_rtpdemux-test_rtpdemux.Po @@ -383,8 +414,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -396,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -407,13 +438,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -453,13 +483,15 @@ fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) installdirs: for dir in "$(DESTDIR)$(plugindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -476,6 +508,7 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -483,6 +516,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ @@ -560,7 +594,41 @@ uninstall-pluginLTLIBRARIES -#noinst_HEADERS = gstrrtpdemux.h +# these are all the rules generating the relevant files +%-marshal.h: %-marshal.list + glib-genmarshal --header --prefix=$(glib_enum_prefix)_marshal $^ > $*-marshal.h.tmp + mv $*-marshal.h.tmp $*-marshal.h + +%-marshal.c: %-marshal.list + echo "#include \"$*-marshal.h\"" >> $*-marshal.c.tmp + glib-genmarshal --body --prefix=$(glib_enum_prefix)_marshal $^ >> $*-marshal.c.tmp + mv $*-marshal.c.tmp $*-marshal.c + +%-enumtypes.h: $(glib_enum_headers) + glib-mkenums \ + --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ + --fprod "\n/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \ + $^ > $@ + +%-enumtypes.c: $(glib_enum_headers) + @if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi + glib-mkenums \ + --fhead "#include <$*.h>" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^ > $@ + +# a hack rule to make sure .Plo files exist because they get include'd +# from Makefile's +.deps/%-marshal.Plo: + touch $@ + +.deps/%-enumtypes.Plo: + touch $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/async_jitter_queue.c gst-plugins-farsight-0.12.8/gst/rtpjitterbuffer/async_jitter_queue.c --- gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/async_jitter_queue.c 2007-09-17 16:05:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpjitterbuffer/async_jitter_queue.c 2008-03-01 09:48:43.000000000 -0600 @@ -530,7 +530,7 @@ { /* Let's wait until the high threshold is reached */ while (!g_queue_peek_tail (queue->queue) || queue->pop_blocking) { - g_debug ("Sink needs buffer, must wait for buffering to stop"); + //g_debug ("Sink needs buffer, must wait for buffering to stop"); queue->underruns++; queue->waiting_threads++; g_cond_wait(queue->cond, queue->mutex); @@ -545,7 +545,7 @@ else { while (queue->pop_blocking && !g_queue_peek_tail (queue->queue)) { - g_debug ("No packets available for sink! waiting"); + //g_debug ("No packets available for sink! waiting"); queue->waiting_threads++; queue->underruns++; g_cond_wait(queue->cond, queue->mutex); @@ -746,3 +746,28 @@ if (queue->waiting_threads > 0) g_cond_broadcast (queue->cond); } + +/** + * async_jitter_queue_flush_unlocked: + * @queue: a #AsyncJitterQueue. + * @free_func: a function to call to free the elements + * @user_data: user data passed to @free_func + * + * This functions empties the queue, but does not touch the other threads, + * its mostly used when the sequence numbers and timestamps are reset + */ + +void +async_jitter_queue_flush_unlocked (AsyncJitterQueue * queue, + GFunc free_func, gpointer user_data) +{ + gpointer elem; + + while ((elem = g_queue_pop_head (queue->queue))) + { + if (free_func) + { + free_func (elem, user_data); + } + } +} diff -Nru gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/async_jitter_queue.h gst-plugins-farsight-0.12.8/gst/rtpjitterbuffer/async_jitter_queue.h --- gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/async_jitter_queue.h 2007-09-17 16:05:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpjitterbuffer/async_jitter_queue.h 2008-03-01 09:48:43.000000000 -0600 @@ -126,8 +126,11 @@ void async_jitter_queue_unset_flushing_unlocked (AsyncJitterQueue* queue); void async_jitter_queue_set_blocking_unlocked (AsyncJitterQueue* queue, gboolean blocking); -guint32 -async_jitter_queue_length_ts_units_unlocked (AsyncJitterQueue *queue); +guint32 async_jitter_queue_length_ts_units_unlocked (AsyncJitterQueue *queue); + +void async_jitter_queue_flush_unlocked (AsyncJitterQueue * queue, + GFunc free_func, + gpointer user_data); G_END_DECLS diff -Nru gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/gstrtpjitterbuffer.c gst-plugins-farsight-0.12.8/gst/rtpjitterbuffer/gstrtpjitterbuffer.c --- gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/gstrtpjitterbuffer.c 2007-09-17 16:05:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpjitterbuffer/gstrtpjitterbuffer.c 2008-05-09 14:56:23.000000000 -0500 @@ -164,13 +164,19 @@ #define GST_QUERY_JB_STATS "jitterbuffer-statistics" #define GST_QUERY_JB_STATS_DESC "Query for jitterbuffer statistics" +/* Any seqnum jump larger than this value is invalid */ +#define MAX_SEQNUM_JUMP 100 +/* The JB will be reset after this number of consecutive invalid seqnums */ +#define MIN_VALID_PACKETS_FOR_RESET 5 + enum { PROP_0, PROP_LATENCY, PROP_LOW_THRESHOLD, PROP_HIGH_THRESHOLD, - PROP_DROP_ON_LATENCY + PROP_DROP_ON_LATENCY, + PROP_HOLD }; struct _GstRTPJitterBufferPrivate @@ -182,6 +188,7 @@ /* properties */ guint latency_ms; gboolean drop_on_latency; + gboolean on_hold; /* the last seqnum we pushed out */ guint32 last_popped_seqnum; @@ -200,6 +207,14 @@ GstClockID clock_id; guint32 waiting_seqnum; + /* for resync after an seqnum jump */ + /* seqnum of last valid packet received */ + guint16 last_valid_seqnum; + /* if there was a seqnum jump, this is the next seqnum to expect */ + guint16 next_seqnum_after_jump; + /* this is the count of sequential seqnums received */ + guint32 valid_packets_after_jump; + /* some accounting */ guint64 num_packets; guint64 num_late; @@ -321,6 +336,16 @@ "Drop buffers when maximum latency is reached", "Tells the jitterbuffer to never exceed the given latency in size", DEFAULT_DROP_ON_LATENCY, G_PARAM_READWRITE)); + /** + * GstRTPJitterBuffer::hold: + * + * Hold the call by pausing the streaming task + */ + g_object_class_install_property (gobject_class, PROP_HOLD, + g_param_spec_boolean ("hold", + "Hold the call", + "Hold the call by pausing the streaming task", + FALSE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_HIGH_THRESHOLD, g_param_spec_float ("high_threshold", "The high threshold", @@ -801,8 +826,12 @@ /* check for flushing, we need to discard the event and return FALSE when * we are flushing */ ret = priv->srcresult == GST_FLOW_OK; - if (ret) - async_jitter_queue_push_unlocked (priv->queue, event); + if (ret) { + if (priv->latency_ms == 0) + gst_pad_push_event (priv->srcpad, event); + else + async_jitter_queue_push_unlocked (priv->queue, event); + } else gst_event_unref (event); async_jitter_queue_unlock (priv->queue); @@ -907,6 +936,54 @@ if (ret != GST_FLOW_OK) goto out_flushing; + /* Lets see if there is any sequence number re-setting done */ + /* First, we check if there was a valid seqnum + * Then we compare the last valid seqnum with that of the current packet + * and we check if the "jump" is larger than the maximum accepted jump + * but we also check if its not a roll-over + */ + if (priv->last_valid_seqnum && + abs (priv->last_valid_seqnum - seqnum) > MAX_SEQNUM_JUMP && + abs (priv->last_valid_seqnum - seqnum) < G_MAXUINT16 - MAX_SEQNUM_JUMP) + { + if (seqnum == priv->next_seqnum_after_jump) + { + priv->next_seqnum_after_jump++; + priv->valid_packets_after_jump++; + if (priv->valid_packets_after_jump > MIN_VALID_PACKETS_FOR_RESET) + { + /* We had enough valid seqnums in the new streams, lets flush the + * JB and start anew + */ + GST_DEBUG_OBJECT (jitterbuffer, + "Flushing queue, resetting sequence numbers"); + priv->last_popped_seqnum = -1; + priv->next_seqnum = -1; + priv->next_seqnum_after_jump = 0; + priv->valid_packets_after_jump = 0; + async_jitter_queue_flush_unlocked (jitterbuffer->priv->queue, + (GFunc) free_func, jitterbuffer); + } + else + { + goto invalid_seqnum; + } + } + else + { + priv->next_seqnum_after_jump = seqnum + 1; + priv->valid_packets_after_jump = 0; + goto invalid_seqnum; + } + } + else + { + priv->next_seqnum_after_jump = 0; + priv->valid_packets_after_jump = 0; + } + + priv->last_valid_seqnum = seqnum; + /* let's check if this buffer is too late, we cannot accept packets with * bigger seqnum than the one we already pushed. */ if (priv->last_popped_seqnum != -1) { @@ -920,8 +997,10 @@ if (async_jitter_queue_length_ts_units_unlocked (priv->queue) >= priv->latency_ms * priv->clock_rate / 1000) { guint32 latency_ts_units; - - priv->times_overrun++; + + if (!priv->on_hold) { + priv->times_overrun++; + } GST_DEBUG_OBJECT (jitterbuffer, "Queue full, dropping old packet #%d", seqnum); @@ -1005,6 +1084,14 @@ gst_buffer_unref (buffer); goto finished; } +invalid_seqnum: + { + GST_DEBUG_OBJECT (jitterbuffer, "Received packet with invalid seqnum %u," + " last was %u", seqnum, priv->last_valid_seqnum); + priv->num_late++; + gst_buffer_unref (buffer); + goto finished; + } } /** @@ -1219,7 +1306,6 @@ { /* store result, we are flushing now */ GST_DEBUG_OBJECT (jitterbuffer, "Pop returned NULL, we're flushing"); - priv->srcresult = GST_FLOW_WRONG_STATE; gst_pad_pause_task (priv->srcpad); async_jitter_queue_unlock (priv->queue); return; @@ -1261,6 +1347,10 @@ jitterbuffer = GST_RTP_JITTER_BUFFER (gst_pad_get_parent (pad)); priv = jitterbuffer->priv; + if (stats_query_type == GST_QUERY_TYPE (query)) { + return gst_rtp_jitter_buffer_sink_query (pad, query); + } + switch (GST_QUERY_TYPE (query)) { #if GST_VERSION_NANO @@ -1417,6 +1507,31 @@ jitterbuffer->priv->drop_on_latency = g_value_get_boolean (value); break; } + case PROP_HOLD: + { + gboolean old_value = jitterbuffer->priv->on_hold; + jitterbuffer->priv->on_hold = g_value_get_boolean (value); + if (old_value != jitterbuffer->priv->on_hold) { + if (jitterbuffer->priv->on_hold) { + async_jitter_queue_lock (jitterbuffer->priv->queue); + GST_DEBUG_OBJECT (jitterbuffer, "Holding call : Pausing task on srcpad"); + async_jitter_queue_set_flushing_unlocked (jitterbuffer->priv->queue, + (GFunc) free_func, jitterbuffer); + async_jitter_queue_unlock (jitterbuffer->priv->queue); + + gst_pad_pause_task (jitterbuffer->priv->srcpad); + } else { + async_jitter_queue_lock (jitterbuffer->priv->queue); + GST_DEBUG_OBJECT (jitterbuffer, "Unholding call : Starting task on srcpad"); + async_jitter_queue_unset_flushing_unlocked (jitterbuffer->priv->queue); + async_jitter_queue_unlock (jitterbuffer->priv->queue); + + gst_pad_start_task (jitterbuffer->priv->srcpad, + (GstTaskFunction) gst_rtp_jitter_buffer_loop, jitterbuffer); + } + } + break; + } default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1444,6 +1559,9 @@ case PROP_DROP_ON_LATENCY: g_value_set_boolean (value, jitterbuffer->priv->drop_on_latency); break; + case PROP_HOLD: + g_value_set_boolean (value, jitterbuffer->priv->on_hold); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff -Nru gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/Makefile.in gst-plugins-farsight-0.12.8/gst/rtpjitterbuffer/Makefile.in --- gst-plugins-farsight-0.12.5/gst/rtpjitterbuffer/Makefile.in 2007-09-17 16:25:04.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpjitterbuffer/Makefile.in 2008-05-09 14:56:42.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -75,7 +75,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libgstrtpjitterbuffer_la_CFLAGS) $(CFLAGS) \ $(libgstrtpjitterbuffer_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -117,6 +117,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -130,6 +131,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -176,6 +179,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -302,8 +306,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -311,8 +315,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -389,8 +393,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -402,8 +406,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -413,13 +417,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/gst/rtpmux/Makefile.in gst-plugins-farsight-0.12.8/gst/rtpmux/Makefile.in --- gst-plugins-farsight-0.12.5/gst/rtpmux/Makefile.in 2007-09-17 16:25:04.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpmux/Makefile.in 2008-05-09 14:56:42.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -64,7 +64,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libgstrtpmuxer_la_CFLAGS) $(CFLAGS) \ $(libgstrtpmuxer_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -105,6 +105,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -118,6 +119,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -164,6 +167,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -280,8 +284,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -289,8 +293,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -367,8 +371,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -380,8 +384,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -391,13 +395,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/gst/rtppayloads/gstr263depayload.c gst-plugins-farsight-0.12.8/gst/rtppayloads/gstr263depayload.c --- gst-plugins-farsight-0.12.5/gst/rtppayloads/gstr263depayload.c 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtppayloads/gstr263depayload.c 1969-12-31 18:00:00.000000000 -0600 @@ -1,224 +0,0 @@ -/* Farsight - * Copyright (C) <2005> Philippe Khalaf - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -#include - -GST_DEBUG_CATEGORY (r263depayload_debug); -#define GST_CAT_DEFAULT (r263depayload_debug) - -/* Filter signals and args */ -enum { - /* FILL ME */ - LAST_SIGNAL -}; - -enum { - ARG_0, -}; - -static GstStaticPadTemplate src_factory = -GST_STATIC_PAD_TEMPLATE ( - "src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-h263 ," - "framerate = (double) 30" ) -// GST_STATIC_CAPS("ANY") - ); - -static void gst_r263depayload_class_init (GstR263DepayloadClass *klass); -static void gst_r263depayload_base_init (GstR263DepayloadClass *klass); -static void gst_r263depayload_init (GstR263Depayload *filter); -static void gst_r263depayload_finalize (GObject * object); -static void gst_r263depayload_set_property (GObject *object, guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void gst_r263depayload_get_property (GObject *object, guint prop_id, - GValue *value, - GParamSpec *pspec); - -static GstBuffer *gst_r263depayload_process (GstBaseRTPDepayload *base, - GstBuffer *in); - -static GstElementClass *parent_class = NULL; - -GType -gst_r263depayload_get_type (void) -{ - static GType plugin_type = 0; - - if (!plugin_type) - { - static const GTypeInfo plugin_info = - { - sizeof (GstR263DepayloadClass), - (GBaseInitFunc) gst_r263depayload_base_init, - NULL, - (GClassInitFunc) gst_r263depayload_class_init, - NULL, - NULL, - sizeof (GstR263Depayload), - 0, - (GInstanceInitFunc) gst_r263depayload_init, - }; - plugin_type = g_type_register_static (GST_TYPE_BASE_RTP_DEPAYLOAD, - "GstR263Depayload", - &plugin_info, 0); - } - return plugin_type; -} - -static void -gst_r263depayload_base_init (GstR263DepayloadClass *klass) -{ - static GstElementDetails plugin_details = { - "h.263 video RTP Depayloader", - "Codec/Depayr/Network", - "Depayloader for H263 RTP streams using GstBaseRTPDepayload", - "Philippe Khalaf " - }; - GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_factory)); - - gst_element_class_set_details (element_class, &plugin_details); -} - -/* initialize the plugin's class */ -static void -gst_r263depayload_class_init (GstR263DepayloadClass *klass) -{ - GObjectClass *gobject_class; - GstElementClass *gstelement_class; - GstBaseRTPDepayloadClass *gstbasertpdepayload_class; - - gobject_class = (GObjectClass*) klass; - gstelement_class = (GstElementClass*) klass; - gstbasertpdepayload_class = (GstBaseRTPDepayloadClass*) klass; - - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - - gobject_class->set_property = gst_r263depayload_set_property; - gobject_class->get_property = gst_r263depayload_get_property; - - gobject_class->finalize = gst_r263depayload_finalize; - - gstbasertpdepayload_class->process = gst_r263depayload_process; - - GST_DEBUG_CATEGORY_INIT (r263depayload_debug, "r263depayload", 0, "R263 RTP Depayloader"); -} - -/* initialize the new element - * instantiate pads and add them to element - * set functions - * initialize structure - */ -static void -gst_r263depayload_init (GstR263Depayload *filter) -{ -// GstElementClass *klass = GST_ELEMENT_GET_CLASS (filter); - GstBaseRTPDepayload *base = GST_BASE_RTP_DEPAYLOAD (filter); - - // clock rate for this payload type - base->clock_rate = 90000; -} - -static void gst_r263depayload_finalize (GObject * object) -{ - if (G_OBJECT_CLASS (parent_class)->finalize) - G_OBJECT_CLASS (parent_class)->finalize (object); -} - -static GstBuffer *gst_r263depayload_process (GstBaseRTPDepayload *base, GstBuffer *in) -{ - static GstBuffer *collector = NULL; - GstBuffer *ret = NULL; - GstBuffer *sub_buf; - - GstBuffer *buf = in; - - // If it's an H263 payload, put all the peaces together - // Remove payload/rtp header - //gst_util_dump_mem (GST_BUFFER_DATA(buf), 32); - // TODO : make it check the mode, and remove correct size - // for now we assume mode A (4 bytes) - // rtp header 12 bytes + mode A 4 bytes = 16 bytes - sub_buf = gst_buffer_create_sub(GST_BUFFER(buf), 16, GST_BUFFER_SIZE(buf)-16); - //gst_util_dump_mem (GST_BUFFER_DATA(sub_buf), 32); - - GST_DEBUG ("process : got %d %d bytes, mark %d ts %u seqn %d", - GST_BUFFER_SIZE (buf), GST_BUFFER_SIZE(sub_buf), - gst_rtp_buffer_get_marker (buf), - gst_rtp_buffer_get_timestamp (buf), - gst_rtp_buffer_get_seq (buf)); - - // Assemble packets into a frame - if(collector == NULL) - { - GST_DEBUG ("Got first part"); - collector = sub_buf; - } - else - { - collector = gst_buffer_join(collector, GST_BUFFER(sub_buf)); - } - - if (gst_rtp_buffer_get_marker (buf)) - { - //gst_util_dump_mem (GST_BUFFER_DATA(collector), 32); - GST_DEBUG("Got mark, Pushing collector now size %d", GST_BUFFER_SIZE(collector)); - ret = collector; - collector = NULL; - } - return ret; -} - -static void -gst_r263depayload_set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) -{ - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_r263depayload_get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) -{ - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -gboolean -gst_r263depayload_plugin_init (GstPlugin * plugin) -{ - return gst_element_register (plugin, "r263depayloader", - GST_RANK_NONE, GST_TYPE_R263DEPAYLOAD); -} diff -Nru gst-plugins-farsight-0.12.5/gst/rtppayloads/gstr263depayload.h gst-plugins-farsight-0.12.8/gst/rtppayloads/gstr263depayload.h --- gst-plugins-farsight-0.12.5/gst/rtppayloads/gstr263depayload.h 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtppayloads/gstr263depayload.h 1969-12-31 18:00:00.000000000 -0600 @@ -1,58 +0,0 @@ -/* Farsight - * Copyright (C) <2005> Philippe Khalaf - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GST_R263DEPAYLOAD_H__ -#define __GST_R263DEPAYLOAD_H__ - -#include -#include - -G_BEGIN_DECLS - -/* #define's don't like whitespacey bits */ -#define GST_TYPE_R263DEPAYLOAD (gst_r263depayload_get_type()) -#define GST_R263DEPAYLOAD(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_R263DEPAYLOAD,GstR263Depayload)) -#define GST_R263DEPAYLOAD_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_R263DEPAYLOAD,GstR263Depayload)) -#define GST_IS_R263DEPAYLOAD(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_R263DEPAYLOAD)) -#define GST_IS_R263DEPAYLOAD_CLASS(obj) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_R263DEPAYLOAD)) - -typedef struct _GstR263Depayload GstR263Depayload; -typedef struct _GstR263DepayloadClass GstR263DepayloadClass; - -struct _GstR263Depayload -{ - GstBaseRTPDepayload parent; -}; - -struct _GstR263DepayloadClass -{ - GstBaseRTPDepayloadClass parent_class; -}; - -GType gst_r263depayload_get_type (void); - -gboolean gst_r263depayload_plugin_init (GstPlugin * plugin); - -G_END_DECLS - -#endif /* __GST_R263DEPAYLOAD_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/rtppayloads/gstrtppayloads.c gst-plugins-farsight-0.12.8/gst/rtppayloads/gstrtppayloads.c --- gst-plugins-farsight-0.12.5/gst/rtppayloads/gstrtppayloads.c 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtppayloads/gstrtppayloads.c 2007-09-25 10:35:27.000000000 -0500 @@ -21,7 +21,6 @@ #include "config.h" #endif -#include "gstr263depayload.h" #include "gstmsgsmpayload.h" #include "gstmsgsmdepayload.h" #include "gstdvpayload.h" @@ -40,8 +39,6 @@ return FALSE; if (!gst_msgsmdepayload_plugin_init (plugin)) return FALSE; - if (!gst_r263depayload_plugin_init (plugin)) - return FALSE; if (!gst_dvpayload_plugin_init (plugin)) return FALSE; if (!gst_dvdepayload_plugin_init (plugin)) diff -Nru gst-plugins-farsight-0.12.5/gst/rtppayloads/Makefile.am gst-plugins-farsight-0.12.8/gst/rtppayloads/Makefile.am --- gst-plugins-farsight-0.12.5/gst/rtppayloads/Makefile.am 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtppayloads/Makefile.am 2007-10-05 09:02:17.000000000 -0500 @@ -5,8 +5,6 @@ gstmsgsmpayload.h \ gstmsgsmdepayload.c \ gstmsgsmdepayload.h \ - gstr263depayload.c \ - gstr263depayload.h \ gstdvpayload.c \ gstdvpayload.h \ gstdvdepayload.c \ diff -Nru gst-plugins-farsight-0.12.5/gst/rtppayloads/Makefile.in gst-plugins-farsight-0.12.8/gst/rtppayloads/Makefile.in --- gst-plugins-farsight-0.12.5/gst/rtppayloads/Makefile.in 2007-09-17 16:25:04.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtppayloads/Makefile.in 2008-05-09 14:56:42.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -62,18 +62,17 @@ libgstrtppayloads_la_DEPENDENCIES = am__libgstrtppayloads_la_SOURCES_DIST = gstmsgsmpayload.c \ gstmsgsmpayload.h gstmsgsmdepayload.c gstmsgsmdepayload.h \ - gstr263depayload.c gstr263depayload.h gstdvpayload.c \ - gstdvpayload.h gstdvdepayload.c gstdvdepayload.h \ - gstrtpcnpayload.c gstrtpcnpayload.h gstrtpcndepayload.c \ - gstrtpcndepayload.h gstrtppayloads.c gstrtpg729depay.c \ - gstrtpg729depay.h gstrtpg729pay.c gstrtpg729pay.h + gstdvpayload.c gstdvpayload.h gstdvdepayload.c \ + gstdvdepayload.h gstrtpcnpayload.c gstrtpcnpayload.h \ + gstrtpcndepayload.c gstrtpcndepayload.h gstrtppayloads.c \ + gstrtpg729depay.c gstrtpg729depay.h gstrtpg729pay.c \ + gstrtpg729pay.h @ENABLE_G729_TRUE@am__objects_1 = \ @ENABLE_G729_TRUE@ libgstrtppayloads_la-gstrtpg729depay.lo \ @ENABLE_G729_TRUE@ libgstrtppayloads_la-gstrtpg729pay.lo am_libgstrtppayloads_la_OBJECTS = \ libgstrtppayloads_la-gstmsgsmpayload.lo \ libgstrtppayloads_la-gstmsgsmdepayload.lo \ - libgstrtppayloads_la-gstr263depayload.lo \ libgstrtppayloads_la-gstdvpayload.lo \ libgstrtppayloads_la-gstdvdepayload.lo \ libgstrtppayloads_la-gstrtpcnpayload.lo \ @@ -84,7 +83,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libgstrtppayloads_la_CFLAGS) $(CFLAGS) \ $(libgstrtppayloads_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -124,6 +123,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -137,6 +137,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -183,6 +185,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -256,11 +259,10 @@ top_srcdir = @top_srcdir@ plugin_LTLIBRARIES = libgstrtppayloads.la libgstrtppayloads_la_SOURCES = gstmsgsmpayload.c gstmsgsmpayload.h \ - gstmsgsmdepayload.c gstmsgsmdepayload.h gstr263depayload.c \ - gstr263depayload.h gstdvpayload.c gstdvpayload.h \ - gstdvdepayload.c gstdvdepayload.h gstrtpcnpayload.c \ - gstrtpcnpayload.h gstrtpcndepayload.c gstrtpcndepayload.h \ - gstrtppayloads.c $(am__append_1) + gstmsgsmdepayload.c gstmsgsmdepayload.h gstdvpayload.c \ + gstdvpayload.h gstdvdepayload.c gstdvdepayload.h \ + gstrtpcnpayload.c gstrtpcnpayload.h gstrtpcndepayload.c \ + gstrtpcndepayload.h gstrtppayloads.c $(am__append_1) libgstrtppayloads_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT libgstrtppayloads_la_LIBADD = $(GST_LIBS_LIBS) libgstrtppayloads_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ @@ -303,8 +305,8 @@ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ else :; fi; \ done @@ -312,8 +314,8 @@ @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ done clean-pluginLTLIBRARIES: @@ -337,7 +339,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtppayloads_la-gstdvpayload.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtppayloads_la-gstmsgsmdepayload.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtppayloads_la-gstmsgsmpayload.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtppayloads_la-gstr263depayload.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtppayloads_la-gstrtpcndepayload.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtppayloads_la-gstrtpcnpayload.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtppayloads_la-gstrtpg729depay.Plo@am__quote@ @@ -379,13 +380,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtppayloads_la_CFLAGS) $(CFLAGS) -c -o libgstrtppayloads_la-gstmsgsmdepayload.lo `test -f 'gstmsgsmdepayload.c' || echo '$(srcdir)/'`gstmsgsmdepayload.c -libgstrtppayloads_la-gstr263depayload.lo: gstr263depayload.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtppayloads_la_CFLAGS) $(CFLAGS) -MT libgstrtppayloads_la-gstr263depayload.lo -MD -MP -MF $(DEPDIR)/libgstrtppayloads_la-gstr263depayload.Tpo -c -o libgstrtppayloads_la-gstr263depayload.lo `test -f 'gstr263depayload.c' || echo '$(srcdir)/'`gstr263depayload.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstrtppayloads_la-gstr263depayload.Tpo $(DEPDIR)/libgstrtppayloads_la-gstr263depayload.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstr263depayload.c' object='libgstrtppayloads_la-gstr263depayload.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtppayloads_la_CFLAGS) $(CFLAGS) -c -o libgstrtppayloads_la-gstr263depayload.lo `test -f 'gstr263depayload.c' || echo '$(srcdir)/'`gstr263depayload.c - libgstrtppayloads_la-gstdvpayload.lo: gstdvpayload.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtppayloads_la_CFLAGS) $(CFLAGS) -MT libgstrtppayloads_la-gstdvpayload.lo -MD -MP -MF $(DEPDIR)/libgstrtppayloads_la-gstdvpayload.Tpo -c -o libgstrtppayloads_la-gstdvpayload.lo `test -f 'gstdvpayload.c' || echo '$(srcdir)/'`gstdvpayload.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstrtppayloads_la-gstdvpayload.Tpo $(DEPDIR)/libgstrtppayloads_la-gstdvpayload.Plo @@ -446,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -459,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -470,13 +464,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gst-plugins-farsight-0.12.5/gst/rtpssrcdemux/gstrtpssrcdemux.c gst-plugins-farsight-0.12.8/gst/rtpssrcdemux/gstrtpssrcdemux.c --- gst-plugins-farsight-0.12.5/gst/rtpssrcdemux/gstrtpssrcdemux.c 2007-08-29 12:38:02.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpssrcdemux/gstrtpssrcdemux.c 1969-12-31 18:00:00.000000000 -0600 @@ -1,513 +0,0 @@ -/* - * RTP SSRC Demux element - * - * Copyright (C) 2006 Websterwood consulting - * @author Behan Webster - * - * Loosely based on GStreamer gstdecodebin - * Copyright (C) <2004> Wim Taymans - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -/* generic templates */ -static GstStaticPadTemplate rtp_ssrcdemux_sink_template = -GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("application/x-rtp, " - "clock-rate = (int) [ 0, 2147483647 ]") - ); - -static GstStaticPadTemplate rtp_ssrcdemux_src_template = -GST_STATIC_PAD_TEMPLATE ("src%d", - GST_PAD_SRC, - GST_PAD_SOMETIMES, - GST_STATIC_CAPS_ANY); - -GST_DEBUG_CATEGORY_STATIC (gst_rtp_ssrcdemux_debug); -#define GST_CAT_DEFAULT gst_rtp_ssrcdemux_debug - -#define GST_TYPE_RTP_DEMUX (gst_rtp_ssrcdemux_get_type()) -#define GST_RTP_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_DEMUX,GstRtpSsrcDemux)) -#define GST_RTP_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_DEMUX,GstRtpSsrcDemuxClass)) -#define GST_IS_RTP_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_DEMUX)) -#define GST_IS_RTP_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_DEMUX)) - -typedef struct _GstRtpSsrcDemux GstRtpSsrcDemux; -typedef struct _GstRtpSsrcDemuxClass GstRtpSsrcDemuxClass; -typedef struct _GstRtpSsrcDemuxPad GstRtpSsrcDemuxPad; - -struct _GstRtpSsrcDemux -{ - GstElement parent; /**< parent class */ - - GstPad *sink; /**< the sink pad */ - GSList *srcpads; /**< a linked list of GstRtpSsrcDemuxPad objects */ - guint16 num_pads; - guint16 max_pads; -}; - -struct _GstRtpSsrcDemuxClass -{ - GstElementClass parent_class; - - /* signal emmited when a new SSRC is found from a new incoming stream */ - void (* new_ssrc) (GstElement *element, gint ssrc, GstPad *pad); - /* signal emmited when a SSRC is no longer used in an incoming stream */ - void (* remove_ssrc) (GstElement *element, gint ssrc, GstPad *pad); -}; - -/** - * Item for storing GstPad<->ssrc pairs. - */ -struct _GstRtpSsrcDemuxPad { - GstPad *pad; /**< pointer to the actual pad */ - gint ssrc; /**< RTP SSRC attached to pad */ -}; - -/* props */ -enum -{ - ARG_0, - ARG_MAX_PADS, - LAST_ARG -}; - -/* signals */ -enum -{ - SIGNAL_NEW_SSRC, - SIGNAL_REMOVE_SSRC, - LAST_SIGNAL -}; - -#define DEBUG_INIT(bla) \ - GST_DEBUG_CATEGORY_INIT (gst_rtp_ssrcdemux_debug, "rtpssrcdemux", 0, "RTP SSRC Demux"); - -GST_BOILERPLATE_FULL (GstRtpSsrcDemux, gst_rtp_ssrcdemux, GstElement, GST_TYPE_ELEMENT, DEBUG_INIT); - -static void gst_rtp_ssrcdemux_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static void gst_rtp_ssrcdemux_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); - -static void gst_rtp_ssrcdemux_dispose (GObject *object); - -static void gst_rtp_ssrcdemux_release (GstElement *element); -static gboolean gst_rtp_ssrcdemux_setup (GstElement *element); - -static GstFlowReturn gst_rtp_ssrcdemux_chain (GstPad *pad, - GstBuffer *buf); -static GstStateChangeReturn gst_rtp_ssrcdemux_change_state (GstElement *element, - GstStateChange transition); - -static void lru_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, -#if 0 - GstRtpSsrcDemuxPad *pad); -#else - GSList *pad); -#endif -static GstPad *find_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, - guint8 ssrc); -static GstPad *reuse_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, - guint8 ssrc); -static GstPad *new_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, - guint8 ssrc); - -static guint gst_rtp_ssrcdemux_signals[LAST_SIGNAL] = { 0 }; - -static GstElementDetails gst_rtp_ssrcdemux_details = { - "RTP SSRC Demux", - /* XXX: what's the correct hierarchy? */ - "Codec/SsrcDemux/Network", - "Demuxes RTP Streams (each with it's own SSRC) received as a part of the same Multicast group", - "Behan Webster " -}; - -static void -gst_rtp_ssrcdemux_base_init (gpointer g_class) -{ - GstElementClass *gstelement_klass = GST_ELEMENT_CLASS (g_class); - - gst_element_class_add_pad_template (gstelement_klass, - gst_static_pad_template_get (&rtp_ssrcdemux_sink_template)); - gst_element_class_add_pad_template (gstelement_klass, - gst_static_pad_template_get (&rtp_ssrcdemux_src_template)); - - gst_element_class_set_details (gstelement_klass, &gst_rtp_ssrcdemux_details); -} - -static void -gst_rtp_ssrcdemux_class_init (GstRtpSsrcDemuxClass * klass) -{ - GObjectClass *gobject_klass; - GstElementClass *gstelement_klass; - - gobject_klass = (GObjectClass *) klass; - gstelement_klass = (GstElementClass *) klass; - - parent_class = g_type_class_peek_parent (klass); - - gobject_klass->set_property = gst_rtp_ssrcdemux_set_property; - gobject_klass->get_property = gst_rtp_ssrcdemux_get_property; - - g_object_class_install_property (gobject_klass, ARG_MAX_PADS, - g_param_spec_uint ("max_pads", "Maximum number of src pads", - "Maximum number of src pads to create. After this number of pads, the least recently used src pads will be reused. 0 means an unlimited number of pads (currently up to 2^16 pads)", - 0, G_MAXUINT16, 0, G_PARAM_READWRITE)); - - gst_rtp_ssrcdemux_signals[SIGNAL_NEW_SSRC] = - g_signal_new ("new-ssrc", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRtpSsrcDemuxClass, new_ssrc), - NULL, NULL, - g_cclosure_marshal_VOID__UINT_POINTER, - G_TYPE_NONE, - 2, - G_TYPE_INT, - GST_TYPE_PAD); - - gst_rtp_ssrcdemux_signals[SIGNAL_REMOVE_SSRC] = - g_signal_new ("remove-ssrc", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRtpSsrcDemuxClass, remove_ssrc), - NULL, NULL, - g_cclosure_marshal_VOID__UINT_POINTER, - G_TYPE_NONE, - 2, - G_TYPE_INT, - GST_TYPE_PAD); - - gobject_klass->dispose = GST_DEBUG_FUNCPTR (gst_rtp_ssrcdemux_dispose); - - gstelement_klass->change_state = - GST_DEBUG_FUNCPTR (gst_rtp_ssrcdemux_change_state); -} - -static void -gst_rtp_ssrcdemux_init (GstRtpSsrcDemux *rtp_ssrcdemux, - GstRtpSsrcDemuxClass *g_class) -{ - GstElementClass *klass = GST_ELEMENT_GET_CLASS(rtp_ssrcdemux); - - rtp_ssrcdemux->sink = gst_pad_new_from_template ( - gst_element_class_get_pad_template (klass, "sink"), "sink"); - g_assert (rtp_ssrcdemux->sink != NULL); - - gst_pad_set_chain_function (rtp_ssrcdemux->sink, gst_rtp_ssrcdemux_chain); - - gst_element_add_pad (GST_ELEMENT(rtp_ssrcdemux), rtp_ssrcdemux->sink); -} - -static void -gst_rtp_ssrcdemux_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstRtpSsrcDemux *rtp_ssrc_demux; - - g_return_if_fail (GST_IS_RTP_DEMUX (object)); - - rtp_ssrc_demux = GST_RTP_DEMUX (object); - - GST_DEBUG("Setting props"); - - switch (prop_id) { - case ARG_MAX_PADS: - rtp_ssrc_demux->max_pads = g_value_get_uint (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_rtp_ssrcdemux_get_property (GObject * object, guint prop_id, GValue * value, - GParamSpec * pspec) -{ - GstRtpSsrcDemux *rtp_ssrc_demux; - - g_return_if_fail (GST_IS_RTP_DEMUX (object)); - - rtp_ssrc_demux = GST_RTP_DEMUX (object); - - switch (prop_id) { - case ARG_MAX_PADS: - g_value_set_uint (value, rtp_ssrc_demux->max_pads); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_rtp_ssrcdemux_dispose (GObject *object) -{ - gst_rtp_ssrcdemux_release (GST_ELEMENT (object)); - - if (G_OBJECT_CLASS (parent_class)->dispose) { - G_OBJECT_CLASS (parent_class)->dispose (object); - } -} - -static GstFlowReturn -gst_rtp_ssrcdemux_chain (GstPad *pad, GstBuffer *buf) -{ - GstFlowReturn ret = GST_FLOW_OK; - GstRtpSsrcDemux *rtpssrcdemux; - guint8 ssrc; - GstPad *srcpad; - - g_return_val_if_fail (gst_rtp_buffer_validate (buf), GST_FLOW_ERROR); - - rtpssrcdemux = GST_RTP_DEMUX (GST_OBJECT_PARENT (pad)); - ssrc = gst_rtp_buffer_get_ssrc (buf); - - /* Look for previously used ssrc->pad mapping */ - //GST_DEBUG ("Look for SSRC=%d", ssrc); - srcpad = find_pad_for_ssrc (rtpssrcdemux, ssrc); - if (srcpad == NULL) { - /* See if we've exceeded the maximum number of pads we can create */ - if ( rtpssrcdemux->max_pads && rtpssrcdemux->num_pads >= rtpssrcdemux->max_pads) { - /* Reuse the Least Recently used pad, - * making the assumption that it's no longer used */ - srcpad = reuse_pad_for_ssrc (rtpssrcdemux, ssrc); - } else { - /* Create new SSRC-> pad mapping */ - GstElement *element = GST_ELEMENT(GST_OBJECT_PARENT (pad)); - srcpad = new_pad_for_ssrc (rtpssrcdemux, ssrc); - - /* This could break with gstreamer 0.10.9 */ - gst_pad_set_active (srcpad, TRUE); - - /* XXX: set _link () function */ - gst_element_add_pad (element, srcpad); - } - } - - /* push buf to srcpad */ - if (srcpad) { - //GST_DEBUG ("Push SSRC=%d to PAD:%08X", ssrc, srcpad); - gst_pad_push (srcpad, GST_BUFFER (buf)); - } - - return ret; -} - -#if 0 -/* Put the found pad at the end of ssrcpads list for LRU */ -static void -lru_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, GstRtpSsrcDemuxPad *pad) -{ - //GST_DEBUG ("Most recent pad SSRC=%d PAD:%08X", pad->ssrc, pad->pad); - - GSList *item; - item = rtpssrcdemux->srcpads; - item = g_slist_remove (item, pad); - item = g_slist_append (item, pad); - rtpssrcdemux->srcpads = item; -} -#else -/* Put the found pad at the end of ssrcpads list for LRU */ -static void -lru_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, GSList *pad) -{ - //GST_DEBUG ("Most recent pad SSRC=%d PAD:%08X", pad->ssrc, pad->pad); - - GSList *item = rtpssrcdemux->srcpads; - item = g_slist_remove_link (item, pad); - item = g_slist_concat (item, pad); - rtpssrcdemux->srcpads = item; -} -#endif - -/* Look for previous SSRC->pad mapping - */ -static GstPad * -find_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, guint8 ssrc) -{ - GSList *item = rtpssrcdemux->srcpads; - for (; item ; item = g_slist_next (item)) { - GstRtpSsrcDemuxPad *pad = item->data; - if (pad->ssrc == ssrc) { - //lru_pad_for_ssrc(rtpssrcdemux, pad); - lru_pad_for_ssrc(rtpssrcdemux, item); - return pad->pad; - } - } - - return NULL; -} - -/* If we are at our maximum number of pads, reuse the least recently used pad. - * The LRU pad should be the first one in the list. - */ -static GstPad * -reuse_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, guint8 ssrc) -{ - GSList *item = rtpssrcdemux->srcpads; - GstRtpSsrcDemuxPad *pad = item->data; - GstPad *srcpad = pad->pad; - - GST_DEBUG ("emitting remove-ssrc for SSRC=%d", ssrc); - g_signal_emit (G_OBJECT (rtpssrcdemux), - gst_rtp_ssrcdemux_signals[SIGNAL_REMOVE_SSRC], 0, pad->ssrc, srcpad); - - GST_DEBUG ("Reusing pad SSRC %d->%d PAD:%08X", pad->ssrc, ssrc, srcpad); - pad->ssrc = ssrc; - - //lru_pad_for_ssrc(rtpssrcdemux, pad); - lru_pad_for_ssrc(rtpssrcdemux, item); - - return srcpad; -} - -/* Create new SSRC->pad mapping - */ -static GstPad * -new_pad_for_ssrc (GstRtpSsrcDemux *rtpssrcdemux, guint8 ssrc) -{ - GstElementClass *klass; - GstPadTemplate *templ; - gchar *padname; - GstPad *srcpad; - - GST_DEBUG ("New srcpad for SSRC=%d", ssrc); - - /* new SSRC, create a src pad */ - klass = GST_ELEMENT_GET_CLASS (rtpssrcdemux); - templ = gst_element_class_get_pad_template (klass, "src%d"); - padname = g_strdup_printf ("src%d", ssrc); - srcpad = gst_pad_new_from_template (templ, padname); - g_free (padname); - - if (srcpad) { - /* Add SSRC->pad mapping to list */ - GstRtpSsrcDemuxPad *rtpssrcdemuxpad; - GST_DEBUG ("Adding SSRC=%d -> %08X to the list.", ssrc, srcpad); - rtpssrcdemuxpad = g_new0 (GstRtpSsrcDemuxPad, 1); - rtpssrcdemuxpad->ssrc = ssrc; - rtpssrcdemuxpad->pad = srcpad; - rtpssrcdemux->srcpads = g_slist_append (rtpssrcdemux->srcpads, rtpssrcdemuxpad); - rtpssrcdemux->num_pads++; - - GST_DEBUG ("emitting new-ssrc for SSRC=%d", ssrc); - g_signal_emit (G_OBJECT (rtpssrcdemux), - gst_rtp_ssrcdemux_signals[SIGNAL_NEW_SSRC], 0, ssrc, srcpad); - } - - return srcpad; -} - -/** - * Reserves resources for the object. - */ -static gboolean -gst_rtp_ssrcdemux_setup (GstElement * element) -{ - GstRtpSsrcDemux *rtp_ssrcdemux = GST_RTP_DEMUX (element); - gboolean res = TRUE; - - if (rtp_ssrcdemux) { - rtp_ssrcdemux->srcpads = NULL; - } - - return res; -} - -/** - * Free resources for the object. - */ -static void -gst_rtp_ssrcdemux_release (GstElement * element) -{ - GstRtpSsrcDemux *rtp_ssrcdemux = GST_RTP_DEMUX (element); - - if (rtp_ssrcdemux) { - /* note: GstElement's dispose() will handle the pads */ - g_slist_free (rtp_ssrcdemux->srcpads); - rtp_ssrcdemux->srcpads = NULL; - } -} - -static GstStateChangeReturn -gst_rtp_ssrcdemux_change_state (GstElement * element, GstStateChange transition) -{ - GstStateChangeReturn ret; - GstRtpSsrcDemux *rtp_ssrcdemux; - - rtp_ssrcdemux = GST_RTP_DEMUX (element); - - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - if (gst_rtp_ssrcdemux_setup (element) != TRUE) - ret = GST_STATE_CHANGE_FAILURE; - break; - case GST_STATE_CHANGE_READY_TO_PAUSED: - case GST_STATE_CHANGE_PAUSED_TO_PLAYING: - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - case GST_STATE_CHANGE_PLAYING_TO_PAUSED: - case GST_STATE_CHANGE_PAUSED_TO_READY: - break; - case GST_STATE_CHANGE_READY_TO_NULL: - gst_rtp_ssrcdemux_release (element); - break; - default: - break; - } - - return ret; -} - -static gboolean -plugin_init (GstPlugin * plugin) -{ - GST_DEBUG_CATEGORY_INIT (gst_rtp_ssrcdemux_debug, - "rtpssrcdemux", 0, "RTP codec SSRC demuxer"); - - return gst_element_register (plugin, - "rtpssrcdemux", GST_RANK_NONE, GST_TYPE_RTP_DEMUX); -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "rtpssrcdemux", - "RTP codec SSRC demuxer", - plugin_init, - VERSION, - "LGPL", - "Farsight", - "http://farsight.sf.net") diff -Nru gst-plugins-farsight-0.12.5/gst/rtpssrcdemux/Makefile.am gst-plugins-farsight-0.12.8/gst/rtpssrcdemux/Makefile.am --- gst-plugins-farsight-0.12.5/gst/rtpssrcdemux/Makefile.am 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpssrcdemux/Makefile.am 1969-12-31 18:00:00.000000000 -0600 @@ -1,14 +0,0 @@ -plugin_LTLIBRARIES = libgstrtpssrcdemux.la - -#noinst_PROGRAMS = test_rtpssrcdemux -#test_rtpssrcdemux_SOURCES = test_rtpssrcdemux.c -#test_rtpssrcdemux_CFLAGS = $(GST_CFLAGS) -#test_rtpssrcdemux_LDADD = $(GST_LIBS) - -libgstrtpssrcdemux_la_SOURCES = gstrtpssrcdemux.c - -libgstrtpssrcdemux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT -libgstrtpssrcdemux_la_LIBADD = $(GST_LIBS_LIBS) -libgstrtpssrcdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ - -#noinst_HEADERS = gstrrtpssrcdemux.h diff -Nru gst-plugins-farsight-0.12.5/gst/rtpssrcdemux/Makefile.in gst-plugins-farsight-0.12.8/gst/rtpssrcdemux/Makefile.in --- gst-plugins-farsight-0.12.5/gst/rtpssrcdemux/Makefile.in 2007-09-17 16:25:04.000000000 -0500 +++ gst-plugins-farsight-0.12.8/gst/rtpssrcdemux/Makefile.in 1969-12-31 18:00:00.000000000 -0600 @@ -1,533 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 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. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -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@ -target_triplet = @target@ -subdir = gst/rtpssrcdemux -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gst-feature.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -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)$(plugindir)" -pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(plugin_LTLIBRARIES) -libgstrtpssrcdemux_la_DEPENDENCIES = -am_libgstrtpssrcdemux_la_OBJECTS = \ - libgstrtpssrcdemux_la-gstrtpssrcdemux.lo -libgstrtpssrcdemux_la_OBJECTS = $(am_libgstrtpssrcdemux_la_OBJECTS) -libgstrtpssrcdemux_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libgstrtpssrcdemux_la_CFLAGS) $(CFLAGS) \ - $(libgstrtpssrcdemux_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libgstrtpssrcdemux_la_SOURCES) -DIST_SOURCES = $(libgstrtpssrcdemux_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ERROR_CFLAGS = @ERROR_CFLAGS@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GREP = @GREP@ -GSM_LIBS = @GSM_LIBS@ -GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ -GST_BASE_LIBS = @GST_BASE_LIBS@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ -GST_MAJORMINOR = @GST_MAJORMINOR@ -GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ -GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@ -GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@ -GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@ -GST_PLUGINS_VERSION = @GST_PLUGINS_VERSION@ -GST_PLUGINS_VERSION_MAJOR = @GST_PLUGINS_VERSION_MAJOR@ -GST_PLUGINS_VERSION_MICRO = @GST_PLUGINS_VERSION_MICRO@ -GST_PLUGINS_VERSION_MINOR = @GST_PLUGINS_VERSION_MINOR@ -GST_PLUGINS_VERSION_NANO = @GST_PLUGINS_VERSION_NANO@ -GST_PLUGINS_VERSION_RELEASE = @GST_PLUGINS_VERSION_RELEASE@ -GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ -HAVE_CXX = @HAVE_CXX@ -HAVE_GSM = @HAVE_GSM@ -HAVE_JASPER = @HAVE_JASPER@ -HAVE_JINGLEP2P = @HAVE_JINGLEP2P@ -HAVE_PKGCONFIG = @HAVE_PKGCONFIG@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JASPER_LIBS = @JASPER_LIBS@ -JINGLEBASE_CFLAGS = @JINGLEBASE_CFLAGS@ -JINGLEBASE_LIBS = @JINGLEBASE_LIBS@ -JINGLEP2P_CFLAGS = @JINGLEP2P_CFLAGS@ -JINGLEP2P_LIBS = @JINGLEP2P_LIBS@ -JRTP_CFLAGS = @JRTP_CFLAGS@ -JRTP_LIBS = @JRTP_LIBS@ -JTHREAD_CFLAGS = @JTHREAD_CFLAGS@ -JTHREAD_LIBS = @JTHREAD_LIBS@ -LDFLAGS = @LDFLAGS@ -LIBJ2K_PREFIX = @LIBJ2K_PREFIX@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MIMIC_CFLAGS = @MIMIC_CFLAGS@ -MIMIC_LIBS = @MIMIC_LIBS@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -plugindir = @plugindir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -plugin_LTLIBRARIES = libgstrtpssrcdemux.la - -#noinst_PROGRAMS = test_rtpssrcdemux -#test_rtpssrcdemux_SOURCES = test_rtpssrcdemux.c -#test_rtpssrcdemux_CFLAGS = $(GST_CFLAGS) -#test_rtpssrcdemux_LDADD = $(GST_LIBS) -libgstrtpssrcdemux_la_SOURCES = gstrtpssrcdemux.c -libgstrtpssrcdemux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT -libgstrtpssrcdemux_la_LIBADD = $(GST_LIBS_LIBS) -libgstrtpssrcdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gst/rtpssrcdemux/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gst/rtpssrcdemux/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - -clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgstrtpssrcdemux.la: $(libgstrtpssrcdemux_la_OBJECTS) $(libgstrtpssrcdemux_la_DEPENDENCIES) - $(libgstrtpssrcdemux_la_LINK) -rpath $(plugindir) $(libgstrtpssrcdemux_la_OBJECTS) $(libgstrtpssrcdemux_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstrtpssrcdemux_la-gstrtpssrcdemux.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -libgstrtpssrcdemux_la-gstrtpssrcdemux.lo: gstrtpssrcdemux.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtpssrcdemux_la_CFLAGS) $(CFLAGS) -MT libgstrtpssrcdemux_la-gstrtpssrcdemux.lo -MD -MP -MF $(DEPDIR)/libgstrtpssrcdemux_la-gstrtpssrcdemux.Tpo -c -o libgstrtpssrcdemux_la-gstrtpssrcdemux.lo `test -f 'gstrtpssrcdemux.c' || echo '$(srcdir)/'`gstrtpssrcdemux.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstrtpssrcdemux_la-gstrtpssrcdemux.Tpo $(DEPDIR)/libgstrtpssrcdemux_la-gstrtpssrcdemux.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstrtpssrcdemux.c' object='libgstrtpssrcdemux_la-gstrtpssrcdemux.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrtpssrcdemux_la_CFLAGS) $(CFLAGS) -c -o libgstrtpssrcdemux_la-gstrtpssrcdemux.lo `test -f 'gstrtpssrcdemux.c' || echo '$(srcdir)/'`gstrtpssrcdemux.c - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(plugindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-pluginLTLIBRARIES - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pluginLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pluginLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pluginLTLIBRARIES - - -#noinst_HEADERS = gstrrtpssrcdemux.h -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gst-plugins-farsight-0.12.5/gst/selector/fsselector.c gst-plugins-farsight-0.12.8/gst/selector/fsselector.c --- gst-plugins-farsight-0.12.5/gst/selector/fsselector.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/selector/fsselector.c 2008-02-20 16:02:15.000000000 -0600 @@ -0,0 +1,1356 @@ +/* GStreamer + * + * Copyright 2007 Collabora Ltd + * @author: Olivier Crete + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "fsselector.h" + +#include + + +GST_DEBUG_CATEGORY (fsselector_debug); +#define GST_CAT_DEFAULT (fsselector_debug) + +/* elementfactory information */ +static const GstElementDetails fs_selector_details = +GST_ELEMENT_DETAILS ( + "Element selector", + "Generic/Bin", + "Selects the right transform element from a list", + "Olivier Crete "); + + +static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + +static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + + +static GstStaticPadTemplate sink_internal_template = GST_STATIC_PAD_TEMPLATE ( + "sink_internal", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + +static GstStaticPadTemplate src_internal_template = GST_STATIC_PAD_TEMPLATE ( + "src_internal", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + +/* FsSelector signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + PROP_0, + PROP_FACTORIES, +}; + + +static void fs_selector_set_property (GObject *object, + guint prop_id, const GValue * value, GParamSpec * pspec); +static void fs_selector_get_property (GObject *object, + guint prop_id, GValue *value, GParamSpec *pspec); +static void fs_selector_dispose (GObject *object); + +static GstElement *fs_selector_get_subelement (FsSelector *selector); +static GstPad *fs_selector_get_internal_sinkpad (FsSelector *selector); +static GstPad *fs_selector_get_internal_srcpad (FsSelector *selector); + +static gboolean fs_selector_sink_setcaps (GstPad *pad, GstCaps *caps); +static GstCaps* fs_selector_sink_getcaps (GstPad *pad); +static GstFlowReturn fs_selector_sink_chain (GstPad *pad, GstBuffer *buffer); +static gboolean fs_selector_sink_event (GstPad *pad, GstEvent *event); +static gboolean fs_selector_sink_query (GstPad *pad, GstQuery *query); +static const GstQueryType* fs_selector_sink_query_type (GstPad *pad); +static GstFlowReturn fs_selector_sink_buffer_alloc (GstPad *pad, guint64 offset, + guint size, GstCaps *caps, GstBuffer **buf); +static void fs_selector_sink_fixatecaps (GstPad *pad, GstCaps *caps); + +static gboolean fs_selector_src_event (GstPad *pad, GstEvent *event); +static gboolean fs_selector_src_query (GstPad *pad, GstQuery *query); +static const GstQueryType* fs_selector_src_query_type (GstPad *pad); + + +static GstFlowReturn fs_selector_internal_sink_chain (GstPad *pad, + GstBuffer *buffer); +static gboolean fs_selector_internal_sink_event (GstPad *pad, GstEvent *event); +static gboolean fs_selector_internal_sink_query (GstPad *pad, GstQuery *query); +static const GstQueryType* fs_selector_internal_sink_query_type (GstPad *pad); +static GstCaps* fs_selector_internal_sink_getcaps (GstPad *pad); +static gboolean fs_selector_internal_sink_acceptcaps (GstPad *pad, + GstCaps *caps); +static GstFlowReturn fs_selector_internal_sink_buffer_alloc (GstPad *pad, + guint64 offset, guint size, GstCaps *caps, GstBuffer **buf); +static void fs_selector_internal_sink_fixatecaps (GstPad *pad, GstCaps *caps); + +static gboolean fs_selector_internal_src_event (GstPad *pad, GstEvent *event); +static gboolean fs_selector_internal_src_query (GstPad *pad, GstQuery *query); +static const GstQueryType* fs_selector_internal_src_query_type (GstPad *pad); + + +static void fs_selector_load_factories (FsSelector *selector); + +GQuark internal_srcpad_quark = 0; +GQuark internal_sinkpad_quark = 0; +GQuark parent_quark = 0; + +static void +fs_selector_do_init (GType type) +{ + GST_DEBUG_CATEGORY_INIT + (fsselector_debug, "fsselector", 0, "RTP logger"); +} + +GST_BOILERPLATE_FULL (FsSelector, fs_selector, GstBin, + GST_TYPE_BIN, fs_selector_do_init); + +static void +fs_selector_base_init (gpointer klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&srctemplate)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&sinktemplate)); + + gst_element_class_set_details (element_class, &fs_selector_details); +} + +static void +fs_selector_class_init (FsSelectorClass *klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + GstBinClass *gstbin_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + gstbin_class = (GstBinClass *) klass; + + gobject_class->dispose = GST_DEBUG_FUNCPTR (fs_selector_dispose); + + gobject_class->set_property = GST_DEBUG_FUNCPTR (fs_selector_set_property); + gobject_class->get_property = GST_DEBUG_FUNCPTR (fs_selector_get_property); + + g_object_class_install_property (gobject_class, PROP_FACTORIES, + g_param_spec_pointer ("factories", + "GList of GstElementFactory", + "GList of GstElementFactory objects to pick from (the element takes" + " ownership of the list (NULL means it will go through all possible" + " elements), can only be set once", + G_PARAM_READWRITE)); + + parent_class = g_type_class_peek_parent (klass); + + internal_srcpad_quark = g_quark_from_string ("internal_srcpad"); + internal_sinkpad_quark = g_quark_from_string ("internal_sinkpad"); + parent_quark = g_quark_from_string ("parent"); +} + +static void +fs_selector_init (FsSelector *fsselector, + FsSelectorClass *klass) +{ + + fsselector->sinkpad = gst_pad_new_from_static_template (&sinktemplate, "sink"); + fsselector->srcpad = gst_pad_new_from_static_template (&srctemplate, "src"); + + gst_element_add_pad (GST_ELEMENT (fsselector), fsselector->sinkpad); + gst_element_add_pad (GST_ELEMENT (fsselector), fsselector->srcpad); + + gst_pad_set_setcaps_function (fsselector->sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_sink_setcaps)); + gst_pad_set_getcaps_function (fsselector->sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_sink_getcaps)); + gst_pad_set_chain_function (fsselector->sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_sink_chain)); + gst_pad_set_event_function (fsselector->sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_sink_event)); + gst_pad_set_query_function (fsselector->sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_sink_query)); + gst_pad_set_query_type_function (fsselector->sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_sink_query_type)); + gst_pad_set_bufferalloc_function (fsselector->sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_sink_buffer_alloc)); + + gst_pad_set_event_function (fsselector->srcpad, + GST_DEBUG_FUNCPTR (fs_selector_src_event)); + gst_pad_set_query_function (fsselector->srcpad, + GST_DEBUG_FUNCPTR (fs_selector_src_query)); + gst_pad_set_query_type_function (fsselector->srcpad, + GST_DEBUG_FUNCPTR (fs_selector_src_query_type)); +} + +static void +fs_selector_dispose (GObject *object) +{ + FsSelector *selector = FS_SELECTOR (object); + + gst_pad_set_fixatecaps_function (selector->sinkpad, NULL); + + GST_OBJECT_LOCK (object); + if (selector->current_subelement) { + gst_object_unref (selector->current_subelement); + selector->current_subelement = NULL; + selector->current_internal_sinkpad = NULL; + selector->current_internal_srcpad = NULL; + } + GST_OBJECT_UNLOCK (object); + + G_OBJECT_CLASS (parent_class)->dispose (object); +} + + +static void +fs_selector_set_property (GObject *object, + guint prop_id, const GValue *value, GParamSpec *pspec) +{ + FsSelector *fsselector = FS_SELECTOR (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + case PROP_FACTORIES: + GST_OBJECT_LOCK (fsselector); + if (fsselector->factories == NULL) + fsselector->factories = g_value_get_pointer (value); + else + GST_WARNING_OBJECT (object, "Can not reset factories after they" + " have been set or auto-discovered"); + GST_OBJECT_UNLOCK (fsselector); + break; + } +} + +static void +fs_selector_get_property (GObject *object, + guint prop_id, GValue *value, GParamSpec *pspec) +{ + FsSelector *fsselector = FS_SELECTOR (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + case PROP_FACTORIES: + GST_OBJECT_LOCK (fsselector); + g_value_set_pointer (value, &fsselector->factories); + GST_OBJECT_UNLOCK (fsselector); + break; + } +} + +static GstElement * +fs_selector_get_element_by_type (FsSelector *selector, GType type) +{ + GstIterator *iter = NULL; + GstElement *elem = NULL; + gboolean done; + + g_return_val_if_fail (type != 0, NULL); + + iter = gst_bin_iterate_elements (GST_BIN (selector)); + + if (!iter) + return NULL; + + done = FALSE; + while (!done) { + switch (gst_iterator_next (iter, (gpointer) &elem)) { + case GST_ITERATOR_OK: + if (G_OBJECT_TYPE (elem) == type) + done = TRUE; + else + gst_object_unref (elem); + break; + case GST_ITERATOR_RESYNC: + gst_iterator_resync (iter); + elem = NULL; + break; + case GST_ITERATOR_ERROR: + GST_ERROR ("Error iterating elements in bin"); + elem = NULL; + done = TRUE; + break; + case GST_ITERATOR_DONE: + elem = NULL; + done = TRUE; + break; + } + } + gst_iterator_free (iter); + + return elem; +} + +/** + * get_pad_by_direction: + * @element: The Element + * @direction: The direction + * + * Gets a #GstPad that goes in the requested direction. I will return NULL + * if there is no pad or if there is more than one pad in this direction + */ + +static GstPad * +get_pad_by_direction (GstElement *element, GstPadDirection direction) +{ + GstIterator *iter = gst_element_iterate_pads (element); + GstPad *pad = NULL; + GstPad *selected_pad = NULL; + gboolean done; + + if (!iter) + return NULL; + + done = FALSE; + while (!done) { + switch (gst_iterator_next (iter, (gpointer) &pad)) { + case GST_ITERATOR_OK: + if (gst_pad_get_direction (pad) == direction) + { + /* We check if there is more than one pad in this direction, + * if there is, we return NULL so that the element is refused + */ + if (selected_pad) { + done = TRUE; + gst_object_unref (selected_pad); + selected_pad = NULL; + } + else + { + selected_pad = pad; + } + } + else + { + gst_object_unref (pad); + } + break; + case GST_ITERATOR_RESYNC: + if (selected_pad) + { + gst_object_unref (selected_pad); + selected_pad = NULL; + } + gst_iterator_resync (iter); + break; + case GST_ITERATOR_ERROR: + GST_ERROR ("Error iterating pads of element %s", + GST_OBJECT_NAME (element)); + gst_object_unref (selected_pad); + selected_pad = NULL; + done = TRUE; + break; + case GST_ITERATOR_DONE: + done = TRUE; + break; + } + } + gst_iterator_free (iter); + + if (!selected_pad) + GST_ERROR ("Did not find pad of direction %d in %s", + direction, GST_OBJECT_NAME (element)); + + return selected_pad; +} + +static GstElement * +fs_selector_get_subelement (FsSelector *selector) +{ + GstElement *element = NULL; + + GST_OBJECT_LOCK (selector); + if (selector->current_subelement) + element = gst_object_ref (selector->current_subelement); + GST_OBJECT_UNLOCK (selector); + + return element; +} + +static GstPad * +fs_selector_get_internal_sinkpad (FsSelector *selector) +{ + GstPad *pad = NULL; + + GST_OBJECT_LOCK (selector); + if (selector->current_internal_sinkpad) + pad = gst_object_ref (selector->current_internal_sinkpad); + GST_OBJECT_UNLOCK (selector); + + return pad; +} + + +static GstPad * +fs_selector_get_internal_srcpad (FsSelector *selector) +{ + GstPad *pad = NULL; + + GST_OBJECT_LOCK (selector); + if (selector->current_internal_srcpad) + pad = gst_object_ref (selector->current_internal_srcpad); + GST_OBJECT_UNLOCK (selector); + + return pad; +} + +/* + * This function creates and adds an element to the FsSelector + * it then creates the internal pads and links them + * + */ + +static GstElement * +fs_selector_add_element (FsSelector *selector, GstElementFactory *factory) +{ + GstElement *element = NULL; + GstPad *internal_sinkpad = NULL; + GstPad *internal_srcpad = NULL; + GstPad *sinkpad; + GstPad *srcpad; + GstPadLinkReturn padlinkret; + + GST_DEBUG_OBJECT (selector, "Adding element %s to the selector bin", + gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory))); + + element = gst_element_factory_create (factory, NULL); + if (!element) + return NULL; + + if (!gst_bin_add (GST_BIN (selector), element)) { + GST_ERROR_OBJECT (selector, "Could not add element %s to the bin", + GST_OBJECT_NAME (element)); + gst_object_unref (element); + return NULL; + } + + gst_object_ref (element); + + srcpad = get_pad_by_direction (element, GST_PAD_SRC); + if (!srcpad) { + GST_ERROR_OBJECT (selector, "Could not find source in %s", + GST_OBJECT_NAME (element)); + goto error; + } + + sinkpad = get_pad_by_direction (element, GST_PAD_SINK); + if (!sinkpad) { + GST_ERROR_OBJECT (selector, "Could not find sink in %s", + GST_OBJECT_NAME (element)); + goto error; + } + + internal_sinkpad = + gst_pad_new_from_static_template (&sink_internal_template, + "sink_internal"); + internal_srcpad = + gst_pad_new_from_static_template (&src_internal_template, + "src_internal"); + + if (!internal_sinkpad || !internal_srcpad) { + GST_ERROR_OBJECT (selector, "Could not create internal pads"); + goto error; + } + + g_object_weak_ref (G_OBJECT (element), (GWeakNotify) gst_object_unref, + internal_sinkpad); + g_object_weak_ref (G_OBJECT (element), (GWeakNotify) gst_object_unref, + internal_srcpad); + + gst_pad_set_active (internal_sinkpad, TRUE); + gst_pad_set_active (internal_srcpad, TRUE); + + g_object_set_qdata (G_OBJECT (internal_srcpad), parent_quark, + selector); + g_object_set_qdata (G_OBJECT (internal_sinkpad), parent_quark, + selector); + + gst_pad_set_chain_function (internal_sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_sink_chain)); + gst_pad_set_event_function (internal_sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_sink_event)); + gst_pad_set_query_function (internal_sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_sink_query)); + gst_pad_set_query_type_function (internal_sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_sink_query_type)); + gst_pad_set_getcaps_function (internal_sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_sink_getcaps)); + gst_pad_set_acceptcaps_function (internal_sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_sink_acceptcaps)); + gst_pad_set_bufferalloc_function (internal_sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_sink_buffer_alloc)); + gst_pad_set_fixatecaps_function (internal_sinkpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_sink_fixatecaps)); + + gst_pad_set_event_function (internal_srcpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_src_event)); + gst_pad_set_query_function (internal_srcpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_src_query)); + gst_pad_set_query_type_function (internal_srcpad, + GST_DEBUG_FUNCPTR (fs_selector_internal_src_query_type)); + + padlinkret = gst_pad_link (internal_srcpad, sinkpad); + if (GST_PAD_LINK_FAILED (padlinkret)) { + GST_WARNING_OBJECT (selector, "Could not links pad %s:%s to %s:%s" + " for reason %d", + GST_DEBUG_PAD_NAME (internal_srcpad), + GST_DEBUG_PAD_NAME (sinkpad), + padlinkret); + goto error; + } + + padlinkret = gst_pad_link (srcpad, internal_sinkpad); + if (GST_PAD_LINK_FAILED (padlinkret)) { + GST_WARNING_OBJECT (selector, "Could not links pad %s:%s to %s:%s" + " for reason %d", + GST_DEBUG_PAD_NAME (internal_srcpad), + GST_DEBUG_PAD_NAME (sinkpad), + padlinkret); + goto error; + } + + g_object_set_qdata (G_OBJECT (element), + internal_srcpad_quark, internal_srcpad); + g_object_set_qdata (G_OBJECT (element), + internal_sinkpad_quark, internal_sinkpad); + + /* Iffy */ + gst_element_sync_state_with_parent (element); + + return element; + + error: + gst_bin_remove (GST_BIN (selector), element); + gst_object_unref (element); + + return NULL; +} + +static GstElement * +fs_selector_get_or_make_element_from_factory (FsSelector *selector, + GstElementFactory *factory) +{ + GstElement *element = NULL; + GstElementFactory *loaded_factory = + GST_ELEMENT_FACTORY (gst_plugin_feature_load ( + GST_PLUGIN_FEATURE (factory))); + + if (!loaded_factory) + return NULL; + + element = fs_selector_get_element_by_type (selector, + gst_element_factory_get_element_type (loaded_factory)); + + if (!element) { + element = fs_selector_add_element (selector, loaded_factory); + } + + gst_object_unref (loaded_factory); + + return element; +} + +/* + * This function checks if there is one and only one pad template on the + * factory that can accept the given caps. If there is one and only one, + * it returns TRUE, otherwise, its FALSE + */ + +static gboolean +factory_can_intersect (GstElementFactory *factory, GstPadDirection direction, + GstCaps *caps) +{ + GList *templates; + gint has_direction = FALSE; + gboolean ret = FALSE; + + g_return_val_if_fail (factory != NULL, FALSE); + g_return_val_if_fail (caps != NULL, FALSE); + + templates = factory->staticpadtemplates; + + while (templates) { + GstStaticPadTemplate *template = (GstStaticPadTemplate *) templates->data; + + if (template->direction == direction) { + GstCaps *intersect = NULL; + + /* If there is more than one pad in this direction, we return FALSE + * Only transform elements (with one sink and one source pad) + * are accepted + */ + if (has_direction) + return FALSE; + has_direction = TRUE; + + intersect = gst_caps_intersect ( + gst_static_caps_get (&template->static_caps), caps); + + if (intersect) { + if (!gst_caps_is_empty (intersect)) + ret = TRUE; + + gst_caps_unref (intersect); + } + } + templates = g_list_next (templates); + } + + return ret; +} + +/* + * If there is already an internal element, it will try to call set_caps on it + * + * If there isn't an internal element or if the set_caps() on the internal + * element failed, it will try to find another element where it would succeed + * and will change the internal element. + */ + +static gboolean +fs_selector_sink_setcaps (GstPad *pad, GstCaps *caps) +{ + GList *elem; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstElement *subelement; + GstCaps *other_caps = NULL; + GstPad *peer; + GList *factories; + + g_return_val_if_fail (selector != NULL, FALSE); + + subelement = fs_selector_get_subelement (selector); + if (subelement) { + if (gst_pad_set_caps (selector->current_internal_srcpad, caps)) { + /* If we can set the new caps on the current element, + * then we just get out + */ + GST_DEBUG_OBJECT (selector, "Could set %s:%s to %" GST_PTR_FORMAT, + GST_DEBUG_PAD_NAME (selector->current_internal_srcpad), caps); + gst_object_unref (subelement); + goto get_out; + } else { + /* If the current element doesn't work, + * then we remove the current element before finding a new one. + * By unsetting the fixatecaps function, we go back to the default one + */ + gst_pad_set_fixatecaps_function (selector->sinkpad, NULL); + GST_OBJECT_LOCK (selector); + if (selector->current_subelement == subelement) { + gst_object_unref (selector->current_subelement); + selector->current_subelement = NULL; + selector->current_internal_srcpad = NULL; + selector->current_internal_sinkpad = NULL; + } + GST_OBJECT_UNLOCK (selector); + gst_object_unref (subelement); + } + } + + peer = gst_pad_get_peer (selector->srcpad); + if (peer) { + other_caps = gst_pad_get_caps (peer); + gst_object_unref (peer); + } + + GST_OBJECT_LOCK (selector); + factories = selector->factories; + GST_OBJECT_UNLOCK (selector); + + if (!factories) { + fs_selector_load_factories (selector); + + GST_OBJECT_LOCK (selector); + factories = selector->factories; + GST_OBJECT_UNLOCK (selector); + } + + for (elem = factories; elem; elem = g_list_next (elem)) { + GstElementFactory *factory = GST_ELEMENT_FACTORY (elem->data); + GstElement *element; + GstPad *internal_srcpad = NULL; + GstPad *internal_sinkpad = NULL; + + /* Lets first check if according to the static pad templates on the factory + * these caps have any chance of success + */ + if (!factory_can_intersect (factory, GST_PAD_SINK, caps)) { + GST_LOG_OBJECT (selector, "Factory %s does not accept sink caps %" + GST_PTR_FORMAT, + gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)), caps); + continue; + } + if (other_caps != NULL) { + if (!factory_can_intersect (factory, GST_PAD_SRC, other_caps)) { + GST_LOG_OBJECT (selector, "Factory %s does not accept src caps %" + GST_PTR_FORMAT, + gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)), other_caps); + continue; + } + } + + /* The element had a chance of success, lets make it */ + + element = fs_selector_get_or_make_element_from_factory (selector, factory); + + if (!element) { + continue; + } + + internal_srcpad = g_object_get_qdata (G_OBJECT (element), + internal_srcpad_quark); + internal_sinkpad = g_object_get_qdata (G_OBJECT (element), + internal_sinkpad_quark); + + /* Now we check if the element can really accept said caps */ + if (!gst_pad_set_caps (internal_srcpad, caps)) { + GST_DEBUG_OBJECT (selector, "Could not set %s:%s to %" GST_PTR_FORMAT, + GST_DEBUG_PAD_NAME (internal_srcpad), caps); + goto next_element; + } + + gst_pad_set_fixatecaps_function (selector->sinkpad, + fs_selector_sink_fixatecaps); + GST_OBJECT_LOCK (selector); + selector->current_subelement = element; + selector->current_internal_srcpad = internal_srcpad; + selector->current_internal_sinkpad = internal_sinkpad; + GST_OBJECT_UNLOCK (selector); + + GST_INFO_OBJECT (selector, + "Selected element %s", + GST_OBJECT_NAME (GST_OBJECT (selector->current_subelement))); + + break; + + next_element: + continue; + } + +get_out: + if (other_caps) + gst_caps_unref (other_caps); + gst_object_unref (selector); + + if (selector->current_subelement) { + return TRUE; + } else { + return FALSE; + } +} + +/* + * This function filters the pad pad templates, taking only transform element + * (with one sink and one src pad) + */ + +static gboolean +fs_selector_default_filter_func (GstPluginFeature *feature, gpointer user_data) +{ + GstElementFactory *factory = NULL; + const GList *static_pad_templates, *tmp; + GstStaticPadTemplate *src = NULL, *sink = NULL; + + if (!GST_IS_ELEMENT_FACTORY (feature)) + return FALSE; + + factory = GST_ELEMENT_FACTORY (feature); + + static_pad_templates = gst_element_factory_get_static_pad_templates (factory); + + for (tmp = static_pad_templates; tmp; tmp = g_list_next (tmp)) { + GstStaticPadTemplate *template = tmp->data; + GstCaps *caps; + + if (template->presence == GST_PAD_SOMETIMES) + return FALSE; + + if (template->presence != GST_PAD_ALWAYS) + continue; + + switch (template->direction) { + case GST_PAD_SRC: + if (src) + return FALSE; + src = template; + break; + case GST_PAD_SINK: + if (sink) + return FALSE; + sink = template; + break; + default: + return FALSE; + } + + caps = gst_static_pad_template_get_caps (template); + + if (gst_caps_is_any (caps) || gst_caps_is_empty (caps)) + return FALSE; + } + + if (!src || !sink) + return FALSE; + + return TRUE; +} + +/* function used to sort element features + * Copy-pasted from decodebin */ +static gint +compare_ranks (GstPluginFeature * f1, GstPluginFeature * f2) +{ + gint diff; + const gchar *rname1, *rname2; + + diff = gst_plugin_feature_get_rank (f2) - gst_plugin_feature_get_rank (f1); + if (diff != 0) + return diff; + + rname1 = gst_plugin_feature_get_name (f1); + rname2 = gst_plugin_feature_get_name (f2); + + diff = strcmp (rname2, rname1); + + return diff; +} + +static void +fs_selector_load_factories (FsSelector *selector) +{ + GList *all_factories; + + all_factories = gst_default_registry_feature_filter ( + fs_selector_default_filter_func, FALSE, NULL); + + all_factories = g_list_sort (all_factories, (GCompareFunc) compare_ranks); + + g_assert (all_factories); + + GST_OBJECT_LOCK (selector); + if (selector->factories == NULL) { + selector->factories = all_factories; + all_factories = NULL; + } + GST_OBJECT_UNLOCK (selector); + + if (all_factories) { + /* In this case, someone set the property while we were looking! */ + gst_plugin_feature_list_free (all_factories); + } +} + +/* In this case, we should almost always have an internal element, because + * set_caps() should have been called first + */ + +static GstFlowReturn +fs_selector_sink_chain (GstPad *pad, GstBuffer *buffer) +{ + GstFlowReturn ret = GST_FLOW_NOT_NEGOTIATED; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstPad *internal_srcpad; + + internal_srcpad = fs_selector_get_internal_srcpad (selector); + if (internal_srcpad) { + ret = gst_pad_push (internal_srcpad, buffer); + gst_object_unref (internal_srcpad); + } + + gst_object_unref (selector); + + return ret; +} + +static gboolean +fs_selector_sink_event (GstPad *pad, GstEvent *event) +{ + gboolean ret = TRUE; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstPad *internal_srcpad; + + internal_srcpad = fs_selector_get_internal_srcpad (selector); + if (internal_srcpad) { + ret = gst_pad_push_event (internal_srcpad, event); + gst_object_unref (internal_srcpad); + } else { + GST_WARNING_OBJECT (selector, "Got event while not element was selected," + "letting through"); + ret = gst_pad_push_event (selector->srcpad, event); + } + + gst_object_unref (selector); + + return ret; +} + +/* TODO Properly test that this code works well for queries */ +static gboolean +fs_selector_sink_query (GstPad *pad, GstQuery *query) +{ + gboolean ret = TRUE; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstElement *subelement; + + subelement = fs_selector_get_subelement (selector); + if (subelement) { + GstPad *sub_sinkpad = get_pad_by_direction (subelement, GST_PAD_SINK); + + ret = gst_pad_query (sub_sinkpad, query); + + gst_object_unref (sub_sinkpad); + gst_object_unref (subelement); + } + else { + GST_WARNING_OBJECT (selector, "Got query while no element was selected," + "letting through"); + ret = gst_pad_query_default (pad, query); + } + + gst_object_unref (selector); + + return ret; +} + +/* TODO Test that this code works properly for queries */ +static const GstQueryType* +fs_selector_sink_query_type (GstPad *pad) +{ + const GstQueryType *ret = NULL; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstElement *subelement; + + subelement = fs_selector_get_subelement (selector); + if (subelement) { + GstPad *sub_sinkpad = get_pad_by_direction (subelement, GST_PAD_SINK); + + ret = gst_pad_get_query_types (sub_sinkpad); + + gst_object_unref (sub_sinkpad); + gst_object_unref (subelement); + } + else { + ret = gst_pad_get_query_types_default (pad); + } + + gst_object_unref (selector); + + return ret; +} + +static void +fs_selector_sink_fixatecaps (GstPad *pad, GstCaps *caps) +{ + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstElement *subelement; + + subelement = fs_selector_get_subelement (selector); + if (subelement) { + GstPad *sinkpad = get_pad_by_direction (subelement, GST_PAD_SINK); + gst_pad_fixate_caps (sinkpad, caps); + gst_object_unref (sinkpad); + gst_object_unref (subelement); + } +} + +/** + * fs_selector_sink_getcaps: + * @pad: the sink #GstPad + * + * This function returns the union of the caps of all the possible element + * factories, based on the static pad templates. + * It also checks does a getcaps on the downstream element and ignores all + * factories whose static caps can not satisfy it. + * + * It does not try to use each elements getcaps() function + */ + +static GstCaps* +fs_selector_sink_getcaps (GstPad *pad) +{ + GstCaps *caps = NULL, *other_caps = NULL; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstPad *peer; + GList *elem, *factories; + + caps = gst_caps_new_empty (); + + peer = gst_pad_get_peer (selector->srcpad); + if (peer) { + other_caps = gst_pad_get_caps (peer); + gst_object_unref (peer); + } + + GST_DEBUG_OBJECT (selector, + "Lets find all the element that can fit here with src caps %" + GST_PTR_FORMAT, other_caps); + + if (other_caps && gst_caps_is_empty (other_caps)) { + goto out; + } + + GST_OBJECT_LOCK (selector); + factories = selector->factories; + GST_OBJECT_UNLOCK (selector); + + if (!factories) { + fs_selector_load_factories (selector); + + GST_OBJECT_LOCK (selector); + factories = selector->factories; + GST_OBJECT_UNLOCK (selector); + } + + for (elem = factories; elem; elem = g_list_next (elem)) { + GstElementFactory *factory = GST_ELEMENT_FACTORY (elem->data); + GstElement *element = NULL; + GstCaps *element_caps; + GstPad *internal_srcpad = NULL; + + if (other_caps != NULL) { + if (!factory_can_intersect (factory, GST_PAD_SRC, other_caps)) { + GST_LOG_OBJECT (selector, "Factory %s does not accept src caps %" + GST_PTR_FORMAT, + gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)), other_caps); + continue; + } + } + + if (other_caps) { + + element = fs_selector_get_or_make_element_from_factory (selector, factory); + + if (!element) { + continue; + } + + internal_srcpad = g_object_get_qdata (G_OBJECT (element), + internal_srcpad_quark); + + element_caps = gst_pad_peer_get_caps (internal_srcpad); + + if (element_caps) { + if (!gst_caps_is_any (element_caps) && + !gst_caps_is_empty (element_caps)) { + GstCaps *tmpcaps = NULL; + + tmpcaps = gst_caps_union (caps, element_caps); + gst_caps_unref (caps); + caps = tmpcaps; + + } + gst_caps_unref (element_caps); + } + + gst_object_unref (element); + } else { + const GList *tmp; + + for (tmp = gst_element_factory_get_static_pad_templates (factory); + tmp; + tmp = g_list_next (tmp)) { + GstStaticPadTemplate *template = tmp->data; + GstCaps *static_caps = gst_static_pad_template_get_caps (template); + + if (static_caps && !gst_caps_is_any (static_caps) && + !gst_caps_is_empty (static_caps)) { + GstCaps *tmpcaps = NULL; + + tmpcaps = gst_caps_union (caps, static_caps); + gst_caps_unref (caps); + caps = tmpcaps; + } + } + } + } + + GST_DEBUG_OBJECT (selector, "Returning unioned caps %" GST_PTR_FORMAT, caps); + +out: + gst_object_unref (selector); + + if (other_caps) + gst_caps_unref (other_caps); + + return caps; +} + + +static GstFlowReturn +fs_selector_sink_buffer_alloc (GstPad *pad, guint64 offset, + guint size, GstCaps *caps, GstBuffer **buf) +{ + GstFlowReturn ret = GST_FLOW_OK; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstPad *internal_srcpad; + + g_return_val_if_fail (selector != NULL, GST_FLOW_ERROR); + + internal_srcpad = fs_selector_get_internal_srcpad (selector); + if (internal_srcpad) { + ret = gst_pad_alloc_buffer (internal_srcpad, offset, size, caps, buf); + gst_object_unref (internal_srcpad); + } else + /* Fallback to the default */ + *buf = NULL; + + gst_object_unref (selector); + + return ret; +} + +static gboolean +fs_selector_src_event (GstPad *pad, GstEvent *event) +{ + gboolean ret = TRUE; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstPad *internal_sinkpad; + + internal_sinkpad = fs_selector_get_internal_sinkpad (selector); + if (internal_sinkpad) { + ret = gst_pad_push_event (internal_sinkpad, event); + gst_object_unref (internal_sinkpad); + } else { + GST_WARNING_OBJECT (selector, "Got event while not element was selected," + "letting through"); + ret = gst_pad_push_event (selector->sinkpad, event); + } + + gst_object_unref (selector); + + return ret; +} + +/* TODO Properly test that this code works well for queries */ +static gboolean +fs_selector_src_query (GstPad *pad, GstQuery *query) +{ + gboolean ret = TRUE; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstElement *subelement; + + subelement = fs_selector_get_subelement (selector); + if (subelement) { + GstPad *sub_srcpad = get_pad_by_direction (subelement, GST_PAD_SRC); + + ret = gst_pad_query (sub_srcpad, query); + + gst_object_unref (sub_srcpad); + gst_object_unref (subelement); + } + else { + GST_WARNING_OBJECT (selector, "Got query while not element was selected," + "letting through"); + ret = gst_pad_query_default (pad, query); + } + + gst_object_unref (selector); + + return ret; +} + +/* TODO Properly test that this code works well for queries */ +static const GstQueryType* +fs_selector_src_query_type (GstPad *pad) +{ + const GstQueryType *ret = NULL; + FsSelector *selector = FS_SELECTOR (gst_pad_get_parent (pad)); + GstElement *subelement; + + subelement = fs_selector_get_subelement (selector); + if (subelement) { + GstPad *sub_srcpad = get_pad_by_direction (subelement, GST_PAD_SRC); + + ret = gst_pad_get_query_types (sub_srcpad); + + gst_object_unref (sub_srcpad); + gst_object_unref (subelement); + } + else { + ret = gst_pad_get_query_types_default (pad); + } + + gst_object_unref (selector); + + return ret; +} + +static GstFlowReturn +fs_selector_internal_sink_chain (GstPad *pad, GstBuffer *buffer) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + + return gst_pad_push (selector->srcpad, buffer); +} + +static gboolean +fs_selector_internal_sink_event (GstPad *pad, GstEvent *event) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + + return gst_pad_push_event (selector->srcpad, event); +} + +static gboolean +fs_selector_internal_sink_query (GstPad *pad, GstQuery *query) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + GstPad *peerpad = gst_pad_get_peer (selector->srcpad); + gboolean ret = FALSE; + + if (peerpad) { + ret = gst_pad_query (peerpad, query); + gst_object_unref (peerpad); + } + + return ret; +} + +static const GstQueryType * +fs_selector_internal_sink_query_type (GstPad *pad) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + GstPad *peerpad = gst_pad_get_peer (selector->srcpad); + const GstQueryType *ret = NULL; + + if (peerpad) { + ret = gst_pad_get_query_types (peerpad); + gst_object_unref (peerpad); + } else + ret = gst_pad_get_query_types_default (pad); + + return ret; +} + +static GstCaps* +fs_selector_internal_sink_getcaps (GstPad *pad) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + + return gst_pad_get_caps (selector->srcpad); +} + +static gboolean +fs_selector_internal_sink_acceptcaps (GstPad *pad, GstCaps *caps) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + + return gst_pad_accept_caps (selector->srcpad, caps); +} + +static void +fs_selector_internal_sink_fixatecaps (GstPad *pad, GstCaps *caps) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + GstPad *peerpad = gst_pad_get_peer (selector->sinkpad); + + if (peerpad) { + gst_pad_fixate_caps (peerpad, caps); + gst_object_unref (peerpad); + } +} + +static GstFlowReturn +fs_selector_internal_sink_buffer_alloc (GstPad *pad, guint64 offset, + guint size, GstCaps *caps, GstBuffer **buf) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + + return gst_pad_alloc_buffer (selector->srcpad, offset, size, caps, buf); +} + +static gboolean +fs_selector_internal_src_event (GstPad *pad, GstEvent *event) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + + return gst_pad_push_event (selector->sinkpad, event); +} + +static gboolean +fs_selector_internal_src_query (GstPad *pad, GstQuery *query) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + GstPad *peerpad = gst_pad_get_peer (selector->sinkpad); + gboolean ret = FALSE; + + if (peerpad) { + ret = gst_pad_query (peerpad, query); + gst_object_unref (peerpad); + } + + return ret; +} + +static const GstQueryType * +fs_selector_internal_src_query_type (GstPad *pad) +{ + FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad), + parent_quark)); + GstPad *peerpad = gst_pad_get_peer (selector->sinkpad); + const GstQueryType* ret = NULL; + + if (peerpad) { + ret = gst_pad_get_query_types (peerpad); + gst_object_unref (peerpad); + } else { + ret = gst_pad_get_query_types_default (pad); + } + + return ret; +} + +gboolean +fs_selector_plugin_init (GstPlugin *plugin) +{ + return gst_element_register (plugin, "fsselector", + GST_RANK_MARGINAL, FS_TYPE_SELECTOR); +} + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "fsselector", + "Element selector", + fs_selector_plugin_init, VERSION, "LGPL", "Farsight", + "http://farsight.freedesktop.org") diff -Nru gst-plugins-farsight-0.12.5/gst/selector/fsselector.h gst-plugins-farsight-0.12.8/gst/selector/fsselector.h --- gst-plugins-farsight-0.12.5/gst/selector/fsselector.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/selector/fsselector.h 2008-01-17 12:21:47.000000000 -0600 @@ -0,0 +1,67 @@ +/* GStreamer + * + * Copyright 2007 Collabora Ltd + * @author: Olivier Crete + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef __FS_SELECTOR_H__ +#define __FS_SELECTOR_H__ + +#include +#include + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +G_BEGIN_DECLS +#define FS_TYPE_SELECTOR (fs_selector_get_type()) +#define FS_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_SELECTOR,FsSelector)) +#define FS_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), FS_TYPE_SELECTOR,FsSelectorClass)) +#define FS_IS_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), FS_TYPE_SELECTOR)) +#define FS_IS_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), FS_TYPE_SELECTOR)) + +typedef struct _FsSelector FsSelector; +typedef struct _FsSelectorClass FsSelectorClass; + +struct _FsSelector +{ + GstBin bin; /* we extend GstBin */ + + /* Protected by the object lock too */ + GList *factories; + + GstPad *sinkpad; + GstPad *srcpad; + + /* Have to be set all at once + * Protected by the object lock */ + GstElement *current_subelement; + GstPad *current_internal_srcpad; + GstPad *current_internal_sinkpad; +}; + +struct _FsSelectorClass +{ + GstBinClass parent_class; +}; + +G_END_DECLS + +#endif /* __FS_SELECTOR_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/selector/Makefile.am gst-plugins-farsight-0.12.8/gst/selector/Makefile.am --- gst-plugins-farsight-0.12.5/gst/selector/Makefile.am 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/selector/Makefile.am 2008-01-17 12:21:47.000000000 -0600 @@ -0,0 +1,7 @@ +plugin_LTLIBRARIES = libfsselector.la + +libfsselector_la_SOURCES = fsselector.c fsselector.h + +libfsselector_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) +libfsselector_la_LIBADD = $(GST_LIBS_LIBS) +libfsselector_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) diff -Nru gst-plugins-farsight-0.12.5/gst/selector/Makefile.in gst-plugins-farsight-0.12.8/gst/selector/Makefile.in --- gst-plugins-farsight-0.12.5/gst/selector/Makefile.in 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/selector/Makefile.in 2008-05-09 14:56:42.000000000 -0500 @@ -0,0 +1,527 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 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. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +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@ +target_triplet = @target@ +subdir = gst/selector +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ + $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gst-feature.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +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)$(plugindir)" +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libfsselector_la_DEPENDENCIES = +am_libfsselector_la_OBJECTS = libfsselector_la-fsselector.lo +libfsselector_la_OBJECTS = $(am_libfsselector_la_OBJECTS) +libfsselector_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libfsselector_la_CFLAGS) \ + $(CFLAGS) $(libfsselector_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libfsselector_la_SOURCES) +DIST_SOURCES = $(libfsselector_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ERROR_CFLAGS = @ERROR_CFLAGS@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GREP = @GREP@ +GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ +GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ +GST_BASE_LIBS = @GST_BASE_LIBS@ +GST_CFLAGS = @GST_CFLAGS@ +GST_LIBS = @GST_LIBS@ +GST_MAJORMINOR = @GST_MAJORMINOR@ +GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ +GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@ +GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@ +GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@ +GST_PLUGINS_VERSION = @GST_PLUGINS_VERSION@ +GST_PLUGINS_VERSION_MAJOR = @GST_PLUGINS_VERSION_MAJOR@ +GST_PLUGINS_VERSION_MICRO = @GST_PLUGINS_VERSION_MICRO@ +GST_PLUGINS_VERSION_MINOR = @GST_PLUGINS_VERSION_MINOR@ +GST_PLUGINS_VERSION_NANO = @GST_PLUGINS_VERSION_NANO@ +GST_PLUGINS_VERSION_RELEASE = @GST_PLUGINS_VERSION_RELEASE@ +GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +HAVE_CXX = @HAVE_CXX@ +HAVE_GSM = @HAVE_GSM@ +HAVE_JASPER = @HAVE_JASPER@ +HAVE_JINGLEP2P = @HAVE_JINGLEP2P@ +HAVE_PKGCONFIG = @HAVE_PKGCONFIG@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JASPER_LIBS = @JASPER_LIBS@ +JINGLEBASE_CFLAGS = @JINGLEBASE_CFLAGS@ +JINGLEBASE_LIBS = @JINGLEBASE_LIBS@ +JINGLEP2P_CFLAGS = @JINGLEP2P_CFLAGS@ +JINGLEP2P_LIBS = @JINGLEP2P_LIBS@ +JRTP_CFLAGS = @JRTP_CFLAGS@ +JRTP_LIBS = @JRTP_LIBS@ +JTHREAD_CFLAGS = @JTHREAD_CFLAGS@ +JTHREAD_LIBS = @JTHREAD_LIBS@ +LDFLAGS = @LDFLAGS@ +LIBJ2K_PREFIX = @LIBJ2K_PREFIX@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MIMIC_CFLAGS = @MIMIC_CFLAGS@ +MIMIC_LIBS = @MIMIC_LIBS@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plugindir = @plugindir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugin_LTLIBRARIES = libfsselector.la +libfsselector_la_SOURCES = fsselector.c fsselector.h +libfsselector_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) +libfsselector_la_LIBADD = $(GST_LIBS_LIBS) +libfsselector_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gst/selector/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gst/selector/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + else :; fi; \ + done + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libfsselector.la: $(libfsselector_la_OBJECTS) $(libfsselector_la_DEPENDENCIES) + $(libfsselector_la_LINK) -rpath $(plugindir) $(libfsselector_la_OBJECTS) $(libfsselector_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfsselector_la-fsselector.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +libfsselector_la-fsselector.lo: fsselector.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfsselector_la_CFLAGS) $(CFLAGS) -MT libfsselector_la-fsselector.lo -MD -MP -MF $(DEPDIR)/libfsselector_la-fsselector.Tpo -c -o libfsselector_la-fsselector.lo `test -f 'fsselector.c' || echo '$(srcdir)/'`fsselector.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libfsselector_la-fsselector.Tpo $(DEPDIR)/libfsselector_la-fsselector.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fsselector.c' object='libfsselector_la-fsselector.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfsselector_la_CFLAGS) $(CFLAGS) -c -o libfsselector_la-fsselector.lo `test -f 'fsselector.c' || echo '$(srcdir)/'`fsselector.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gst-plugins-farsight-0.12.5/gst/siren/common.c gst-plugins-farsight-0.12.8/gst/siren/common.c --- gst-plugins-farsight-0.12.5/gst/siren/common.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/common.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,505 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "siren7.h" + +int region_size; +float region_size_inverse; + +float standard_deviation[64]; +float deviation_inverse[64]; +float region_power_table_boundary[63]; + +int expected_bits_table[8] = {52, 47, 43, 37, 29, 22, 16, 0}; +int vector_dimension[8] = {2, 2, 2, 4, 4, 5, 5, 1}; +int number_of_vectors[8] = {10, 10, 10, 5, 5, 4, 4, 20}; +float dead_zone[8] = {0.3f, 0.33f, 0.36f, 0.39f, 0.42f, 0.45f, 0.5f, 0.5f}; + +int max_bin[8] = { + 13, + 9, + 6, + 4, + 3, + 2, + 1, + 1}; + +float step_size[8] = { + 0.3536f, + 0.5f, + 0.70709997f, + 1.0f, + 1.4141999f, + 2.0f, + 2.8283999f, + 2.8283999f}; + +float step_size_inverse[8]; + +static int siren_initialized = 0; + +/* + STEPSIZE = 2.0 * log(sqrt(2)); +*/ +#define STEPSIZE 0.3010299957 + +void siren_init() { + int i; + float region_power; + + if (siren_initialized == 1) + return; + + region_size = 20; + region_size_inverse = 1.0f/region_size; + + for (i = 0; i < 64; i++) { + region_power = (float) pow(10, (i-24) * STEPSIZE); + standard_deviation[i] = (float) sqrt(region_power); + deviation_inverse[i] = (float) 1.0 / standard_deviation[i]; + } + + for (i = 0; i < 63; i++) + region_power_table_boundary[i] = (float) pow(10, (i-24 + 0.5) * STEPSIZE); + + for (i = 0; i < 8; i++) + step_size_inverse[i] = (float) 1.0 / step_size[i]; + + siren_dct4_init(); + siren_rmlt_init(); + + siren_initialized = 1; +} + + +int categorize_regions(int number_of_regions, int number_of_available_bits, int *absolute_region_power_index, int *power_categories, int *category_balance) { + int region, delta, i, temp; + int expected_number_of_code_bits; + int min, max; + int offset, + num_rate_control_possibilities, + raw_value, + raw_max_idx = 0, + raw_min_idx = 0; + int max_rate_categories[28]; + int min_rate_categories[28]; + int temp_category_balances[64]; + int *min_rate_ptr = NULL; + int *max_rate_ptr = NULL; + + if (number_of_regions == 14) { + num_rate_control_possibilities = 16; + if ( number_of_available_bits > 320) + number_of_available_bits = ((number_of_available_bits - 320) * 5/8) + 320; + } else { + num_rate_control_possibilities = 32; + if (number_of_regions == 28 && number_of_available_bits > 640) + number_of_available_bits = ((number_of_available_bits - 640) * 5/8) + 640; + } + + offset = -32; + for (delta = 32; number_of_regions > 0 && delta > 0; delta /= 2) { + expected_number_of_code_bits = 0; + for (region = 0; region < number_of_regions; region++) { + i = (delta + offset - absolute_region_power_index[region]) >> 1; + if (i > 7) + i = 7; + else if (i < 0) + i = 0; + + power_categories[region] = i; + expected_number_of_code_bits += expected_bits_table[i]; + + } + if (expected_number_of_code_bits >= number_of_available_bits-32) + offset += delta; + } + + expected_number_of_code_bits = 0; + for (region = 0; region < number_of_regions; region++) { + i = (offset - absolute_region_power_index[region]) >> 1; + if (i > 7) + i = 7; + else if (i < 0) + i = 0; + max_rate_categories[region] = min_rate_categories[region] = power_categories[region] = i; + expected_number_of_code_bits += expected_bits_table[i]; + } + + + min = max = expected_number_of_code_bits; + min_rate_ptr = max_rate_ptr = temp_category_balances + num_rate_control_possibilities; + for (i = 0; i < num_rate_control_possibilities -1; i++) { + if (min + max > number_of_available_bits * 2) { + raw_value = -99; + for (region = number_of_regions-1; region >= 0; region--) { + if (min_rate_categories[region] < 7) { + temp = offset - absolute_region_power_index[region] - 2*min_rate_categories[region]; + if (temp > raw_value) { + raw_value = temp; + raw_min_idx = region; + } + } + } + *min_rate_ptr++ = raw_min_idx; + min += expected_bits_table[min_rate_categories[raw_min_idx] + 1] - expected_bits_table[min_rate_categories[raw_min_idx]]; + min_rate_categories[raw_min_idx]++; + } else { + raw_value = 99; + for (region = 0; region < number_of_regions; region++) { + if (max_rate_categories[region] > 0 ) { + temp = offset - absolute_region_power_index[region] - 2*max_rate_categories[region]; + if (temp < raw_value) { + raw_value = temp; + raw_max_idx = region; + } + } + } + + *--max_rate_ptr = raw_max_idx; + max += expected_bits_table[max_rate_categories[raw_max_idx] - 1] - expected_bits_table[max_rate_categories[raw_max_idx]]; + max_rate_categories[raw_max_idx]--; + } + } + + for (region = 0; region < number_of_regions; region++) + power_categories[region] = max_rate_categories[region]; + + for (i = 0; i < num_rate_control_possibilities-1; i++) + category_balance[i] = *max_rate_ptr++; + + + return 0; +} + + + +/* + Looks like the flag means what kind of encoding is used + for now, it looks like : + 0 : the sample rate is not encoded in the frame + 1 - 2 : the sample rate is fixed in the frame + 3 : sample rate is variable and there is one for each frame +*/ + +int GetSirenCodecInfo(int flag, int sample_rate, int *number_of_coefs, int *sample_rate_bits, int *rate_control_bits, int *rate_control_possibilities, int *checksum_bits, int *esf_adjustment, int *scale_factor, int *number_of_regions, int *sample_rate_code, int *bits_per_frame ) { + switch (flag) { + case 0: + *number_of_coefs = 320; + *sample_rate_bits = 0; + *rate_control_bits = 4; + *rate_control_possibilities = 16; + *checksum_bits = 0; + *esf_adjustment = 7; + *number_of_regions = 14; + *sample_rate_code = 0; + *scale_factor = 22; + break; + case 1: + *number_of_coefs = 320; + *sample_rate_bits = 2; + *rate_control_bits = 4; + *rate_control_possibilities = 16; + *checksum_bits = 4; + *esf_adjustment = -2; + *number_of_regions = 14; + *scale_factor = 1; + if (sample_rate == 16000) + *sample_rate_code = 1; + else if (sample_rate == 24000) + *sample_rate_code = 2; + else if (sample_rate == 32000) + *sample_rate_code = 3; + else + return 3; + break; + case 2: + *number_of_coefs = 640; + *sample_rate_bits = 2; + *rate_control_bits = 5; + *rate_control_possibilities = 32; + *checksum_bits = 4; + *esf_adjustment = 7; + *number_of_regions = 28; + *scale_factor = 33; + + if (sample_rate == 24000) + *sample_rate_code = 1; + else if (sample_rate == 24000) + *sample_rate_code = 2; + else if (sample_rate == 48000) + *sample_rate_code = 3; + else + return 3; + + break; + case 3: + *number_of_coefs = 640; + *sample_rate_bits = 6; + *rate_control_bits = 5; + *rate_control_possibilities = 32; + *checksum_bits = 4; + *esf_adjustment = 7; + *scale_factor = 33; + + switch (sample_rate) { + case 8800: + *number_of_regions = 12; + *sample_rate_code = 59; + break; + case 9600: + *number_of_regions = 12; + *sample_rate_code = 1; + break; + case 10400: + *number_of_regions = 12; + *sample_rate_code = 13; + break; + case 10800: + *number_of_regions = 12; + *sample_rate_code = 14; + break; + case 11200: + *number_of_regions = 12; + *sample_rate_code = 15; + break; + case 11600: + *number_of_regions = 12; + *sample_rate_code = 16; + break; + case 12000: + *number_of_regions = 12; + *sample_rate_code = 2; + break; + case 12400: + *number_of_regions = 12; + *sample_rate_code = 17; + break; + case 12800: + *number_of_regions = 12; + *sample_rate_code = 18; + break; + case 13200: + *number_of_regions = 12; + *sample_rate_code = 19; + break; + case 13600: + *number_of_regions = 12; + *sample_rate_code = 20; + break; + case 14000: + *number_of_regions = 12; + *sample_rate_code = 21; + break; + case 14400: + *number_of_regions = 16; + *sample_rate_code = 3; + break; + case 14800: + *number_of_regions = 16; + *sample_rate_code = 22; + break; + case 15200: + *number_of_regions = 16; + *sample_rate_code = 23; + break; + case 15600: + *number_of_regions = 16; + *sample_rate_code = 24; + break; + case 16000: + *number_of_regions = 16; + *sample_rate_code = 25; + break; + case 16400: + *number_of_regions = 16; + *sample_rate_code = 26; + break; + case 16800: + *number_of_regions = 18; + *sample_rate_code = 4; + break; + case 17200: + *number_of_regions = 18; + *sample_rate_code = 27; + break; + case 17600: + *number_of_regions = 18; + *sample_rate_code = 28; + break; + case 18000: + *number_of_regions = 18; + *sample_rate_code = 29; + break; + case 18400: + *number_of_regions = 18; + *sample_rate_code = 30; + break; + case 18800: + *number_of_regions = 18; + *sample_rate_code = 31; + break; + case 19200: + *number_of_regions = 20; + *sample_rate_code = 5; + break; + case 19600: + *number_of_regions = 20; + *sample_rate_code = 32; + break; + case 20000: + *number_of_regions = 20; + *sample_rate_code = 33; + break; + case 20400: + *number_of_regions = 20; + *sample_rate_code = 34; + break; + case 20800: + *number_of_regions = 20; + *sample_rate_code = 35; + break; + case 21200: + *number_of_regions = 20; + *sample_rate_code = 36; + break; + case 21600: + *number_of_regions = 22; + *sample_rate_code = 6; + break; + case 22000: + *number_of_regions = 22; + *sample_rate_code = 37; + break; + case 22400: + *number_of_regions = 22; + *sample_rate_code = 38; + break; + case 22800: + *number_of_regions = 22; + *sample_rate_code = 39; + break; + case 23200: + *number_of_regions = 22; + *sample_rate_code = 40; + break; + case 23600: + *number_of_regions = 22; + *sample_rate_code = 41; + break; + case 24000: + *number_of_regions = 24; + *sample_rate_code = 7; + break; + case 24400: + *number_of_regions = 24; + *sample_rate_code = 42; + break; + case 24800: + *number_of_regions = 24; + *sample_rate_code = 43; + break; + case 25200: + *number_of_regions = 24; + *sample_rate_code = 44; + break; + case 25600: + *number_of_regions = 24; + *sample_rate_code = 45; + break; + case 26000: + *number_of_regions = 24; + *sample_rate_code = 46; + break; + case 26400: + *number_of_regions = 26; + *sample_rate_code = 8; + break; + case 26800: + *number_of_regions = 26; + *sample_rate_code = 47; + break; + case 27200: + *number_of_regions = 26; + *sample_rate_code = 48; + break; + case 27600: + *number_of_regions = 26; + *sample_rate_code = 49; + break; + case 28000: + *number_of_regions = 26; + *sample_rate_code = 50; + break; + case 28400: + *number_of_regions = 26; + *sample_rate_code = 51; + break; + case 28800: + *number_of_regions = 28; + *sample_rate_code = 9; + break; + case 29200: + *number_of_regions = 28; + *sample_rate_code = 52; + break; + case 29600: + *number_of_regions = 28; + *sample_rate_code = 53; + break; + case 30000: + *number_of_regions = 28; + *sample_rate_code = 54; + break; + case 30400: + *number_of_regions = 28; + *sample_rate_code = 55; + break; + case 30800: + *number_of_regions = 28; + *sample_rate_code = 56; + break; + case 31200: + *number_of_regions = 28; + *sample_rate_code = 10; + break; + case 31600: + *number_of_regions = 28; + *sample_rate_code = 57; + break; + case 32000: + *number_of_regions = 28; + *sample_rate_code = 58; + break; + default: + return 3; + break; + } + break; + default: + return 6; + } + + *bits_per_frame = sample_rate / 50; + return 0; +} + diff -Nru gst-plugins-farsight-0.12.5/gst/siren/common.h gst-plugins-farsight-0.12.8/gst/siren/common.h --- gst-plugins-farsight-0.12.5/gst/siren/common.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/common.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,146 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef _SIREN_COMMON_H +#define _SIREN_COMMON_H + +typedef struct { + unsigned int RiffId; + unsigned int RiffSize; +} RiffHeader; + +typedef struct { + unsigned short Format; + unsigned short Channels; + unsigned int SampleRate; + unsigned int ByteRate; + unsigned short BlockAlign; + unsigned short BitsPerSample; +} FmtChunk; + + +typedef struct { + FmtChunk fmt; + unsigned short ExtraSize; + unsigned short DctLength; +} SirenFmtChunk; + +typedef struct { + RiffHeader riff; + unsigned int WaveId; + + unsigned int FmtId; + unsigned int FmtSize; + + SirenFmtChunk fmt; + + unsigned int FactId; + unsigned int FactSize; + unsigned int Samples; + + unsigned int DataId; + unsigned int DataSize; +} SirenWavHeader; + +typedef struct { + RiffHeader riff; + unsigned int WaveId; + + unsigned int FmtId; + unsigned int FmtSize; + + FmtChunk fmt; + + unsigned int FactId; + unsigned int FactSize; + unsigned int Samples; + + unsigned int DataId; + unsigned int DataSize; +} PCMWavHeader; + +#define RIFF_ID 0x46464952 +#define WAVE_ID 0x45564157 +#define FMT__ID 0x20746d66 +#define DATA_ID 0x61746164 +#define FACT_ID 0x74636166 + + +extern int region_size; +extern float region_size_inverse; +extern float standard_deviation[64]; +extern float deviation_inverse[64]; +extern float region_power_table_boundary[63]; +extern int expected_bits_table[8]; +extern int vector_dimension[8]; +extern int number_of_vectors[8]; +extern float dead_zone[8]; +extern int max_bin[8]; +extern float step_size[8]; +extern float step_size_inverse[8]; + + + +extern void siren_init(); +extern int categorize_regions(int number_of_regions, int number_of_available_bits, int *absolute_region_power_index, int *power_categories, int *category_balance); +extern int GetSirenCodecInfo(int flag, int sample_rate, int *number_of_coefs, int *sample_rate_bits, int *rate_control_bits, int *rate_control_possibilities, int *checksum_bits, int *esf_adjustment, int *scale_factor, int *number_of_regions, int *sample_rate_code, int *bits_per_frame ); + + +#ifdef __BIG_ENDIAN__ + +#define POW_2_8 256 +#define POW_2_16 65536 +#define POW_2_24 16777216 + +#define IDX(val, i) ((unsigned int) ((unsigned char *) &val)[i]) + + + +#define ME_FROM_LE16(val) ( (unsigned short) ( IDX(val, 0) + IDX(val, 1) * 256 )) +#define ME_FROM_LE32(val) ( (unsigned int) (IDX(val, 0) + IDX(val, 1) * 256 + \ + IDX(val, 2) * 65536 + IDX(val, 3) * 16777216)) + + +#define ME_TO_LE16(val) ( (unsigned short) ( \ + (((unsigned short)val % 256) & 0xff) << 8 | \ + ((((unsigned short)val / POW_2_8) % 256) & 0xff) )) + +#define ME_TO_LE32(val) ( (unsigned int) ( \ + ((((unsigned int) val ) % 256) & 0xff) << 24 | \ + ((((unsigned int) val / POW_2_8 ) % 256) & 0xff) << 16| \ + ((((unsigned int) val / POW_2_16) % 256) & 0xff) << 8 | \ + ((((unsigned int) val / POW_2_24) % 256) & 0xff) )) + +#else + +#define ME_TO_LE16(val) ( (unsigned short) (val)) +#define ME_TO_LE32(val) ( (unsigned int) (val)) +#define ME_FROM_LE16(val) ( (unsigned short) (val)) +#define ME_FROM_LE32(val) ( (unsigned int) (val)) + + +#endif + + + +#endif /* _SIREN_COMMON_H */ + diff -Nru gst-plugins-farsight-0.12.5/gst/siren/dct4.c gst-plugins-farsight-0.12.8/gst/siren/dct4.c --- gst-plugins-farsight-0.12.5/gst/siren/dct4.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/dct4.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,184 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#include "siren7.h" + + +#define PI 3.1415926 + +typedef struct { + float cos; + float msin; +} dct_table_type; + +static float dct_core_320[100]; +static float dct_core_640[100]; +static dct_table_type dct_table_5[5]; +static dct_table_type dct_table_10[10]; +static dct_table_type dct_table_20[20]; +static dct_table_type dct_table_40[40]; +static dct_table_type dct_table_80[80]; +static dct_table_type dct_table_160[160]; +static dct_table_type dct_table_320[320]; +static dct_table_type dct_table_640[640]; +static dct_table_type *dct_tables[8] = {dct_table_5, + dct_table_10, + dct_table_20, + dct_table_40, + dct_table_80, + dct_table_160, + dct_table_320, + dct_table_640}; + +static int dct4_initialized = 0; + +void siren_dct4_init() { + int i, j = 0; + double scale_320 = (float) sqrt(2.0/320); + double scale_640 = (float) sqrt(2.0/640); + double angle; + double scale; + + /* set up dct4 tables */ + for(i = 0; i < 10; i++) { + angle = (float) ((i + 0.5) * PI); + for (j = 0 ; j < 10; j++) { + dct_core_320[(i*10)+j] = (float) (scale_320 * cos((j + 0.5) * angle / 10)); + dct_core_640[(i*10)+j] = (float) (scale_640 * cos((j + 0.5) * angle / 10)); + } + } + + for(i = 0; i < 8; i++) { + scale = (float) (PI / ((5 << i) * 4)); + for (j = 0 ; j < (5 << i); j++) { + angle = (float) (j + 0.5) * scale; + dct_tables[i][j].cos = (float) cos(angle); + dct_tables[i][j].msin = (float) -sin(angle); + } + } + + dct4_initialized = 1; +} + + +void siren_dct4(float *Source, float *Destination, int dct_length) { + int log_length = 0; + float * dct_core = NULL; + dct_table_type ** dct_table_ptr_ptr = NULL; + dct_table_type * dct_table_ptr = NULL; + float OutBuffer1[640]; + float OutBuffer2[640]; + float *Out_ptr; + float *NextOut_ptr; + float *In_Ptr = NULL; + float *In_Ptr_low = NULL; + float *In_Ptr_high = NULL; + float In_val_low; + float In_val_high; + float *Out_ptr_low = NULL; + float *Out_ptr_high = NULL; + float mult1, mult2, mult3, mult4, mult5, mult6, mult7, mult8, mult9, mult10; + int i,j; + + if (dct4_initialized == 0) + siren_dct4_init(); + + if (dct_length == 640) { + log_length = 5; + dct_core = dct_core_640; + } else { + log_length = 4; + dct_core = dct_core_320; + } + + Out_ptr = OutBuffer1; + NextOut_ptr = OutBuffer2; + In_Ptr = Source; + for (i = 0; i <= log_length; i++) { + for (j = 0; j < (1 << i); j++) { + Out_ptr_low = Out_ptr + (j * (dct_length >> i)); + Out_ptr_high = Out_ptr + ( (j+1) * (dct_length >> i)); + do { + In_val_low = *In_Ptr++; + In_val_high = *In_Ptr++; + *Out_ptr_low++ = In_val_low + In_val_high; + *--Out_ptr_high = In_val_low - In_val_high; + } while (Out_ptr_low < Out_ptr_high); + } + + In_Ptr = Out_ptr; + Out_ptr = NextOut_ptr; + NextOut_ptr = In_Ptr; + } + + for (i = 0; i < (2 << log_length); i++) { + for (j = 0 ; j < 10 ; j ++) { + mult1 = In_Ptr[(i*10)] * dct_core[j*10]; + mult2 = In_Ptr[(i*10) + 1] * dct_core[(j*10) + 1]; + mult3 = In_Ptr[(i*10) + 2] * dct_core[(j*10) + 2]; + mult4 = In_Ptr[(i*10) + 3] * dct_core[(j*10) + 3]; + mult5 = In_Ptr[(i*10) + 4] * dct_core[(j*10) + 4]; + mult6 = In_Ptr[(i*10) + 5] * dct_core[(j*10) + 5]; + mult7 = In_Ptr[(i*10) + 6] * dct_core[(j*10) + 6]; + mult8 = In_Ptr[(i*10) + 7] * dct_core[(j*10) + 7]; + mult9 = In_Ptr[(i*10) + 8] * dct_core[(j*10) + 8]; + mult10 = In_Ptr[(i*10) + 9] * dct_core[(j*10) + 9]; + Out_ptr[(i*10)+j] = mult1 + mult2 + mult3 + mult4 + + mult5 + mult6 + mult7 + mult8 + + mult9 + mult10; + } + } + + + In_Ptr = Out_ptr; + Out_ptr = NextOut_ptr; + NextOut_ptr = In_Ptr; + dct_table_ptr_ptr = dct_tables; + for (i = log_length; i >= 0; i--) { + dct_table_ptr_ptr++; + for (j = 0; j < (1 << i); j++) { + dct_table_ptr = *dct_table_ptr_ptr; + if ( i == 0 ) + Out_ptr_low = Destination + (j * (dct_length >> i)); + else + Out_ptr_low = Out_ptr + (j * (dct_length >> i)); + + Out_ptr_high = Out_ptr_low + (dct_length >> i); + + In_Ptr_low = In_Ptr + (j * (dct_length >> i)); + In_Ptr_high = In_Ptr_low + (dct_length >> (i+1)); + do { + *Out_ptr_low++ = (*In_Ptr_low * (*dct_table_ptr).cos) - (*In_Ptr_high * (*dct_table_ptr).msin); + *--Out_ptr_high = (*In_Ptr_high++ * (*dct_table_ptr).cos) + (*In_Ptr_low++ * (*dct_table_ptr).msin); + dct_table_ptr++; + *Out_ptr_low++ = (*In_Ptr_low * (*dct_table_ptr).cos) + (*In_Ptr_high * (*dct_table_ptr).msin); + *--Out_ptr_high = (*In_Ptr_low++ * (*dct_table_ptr).msin) - (*In_Ptr_high++ * (*dct_table_ptr).cos); + dct_table_ptr++; + } while (Out_ptr_low < Out_ptr_high); + } + + In_Ptr = Out_ptr; + Out_ptr = NextOut_ptr; + NextOut_ptr = In_Ptr; + } + +} diff -Nru gst-plugins-farsight-0.12.5/gst/siren/dct4.h gst-plugins-farsight-0.12.8/gst/siren/dct4.h --- gst-plugins-farsight-0.12.5/gst/siren/dct4.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/dct4.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,30 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef _SIREN7_DCT4_H_ +#define _SIREN7_DCT4_H_ + +extern void siren_dct4_init(); +extern void siren_dct4(float *Source, float *Destination, int dct_length); + + +#endif /* _SIREN7_DCT4_H_ */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/decoder.c gst-plugins-farsight-0.12.8/gst/siren/decoder.c --- gst-plugins-farsight-0.12.5/gst/siren/decoder.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/decoder.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,234 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#include "siren7.h" + +SirenDecoder Siren7_NewDecoder(int sample_rate) { + SirenDecoder decoder = (SirenDecoder) malloc(sizeof(struct stSirenDecoder)); + decoder->sample_rate = sample_rate; + + decoder->WavHeader.riff.RiffId = ME_TO_LE32(RIFF_ID); + decoder->WavHeader.riff.RiffSize = sizeof(PCMWavHeader) - 2*sizeof(int); + decoder->WavHeader.riff.RiffSize = ME_TO_LE32(decoder->WavHeader.riff.RiffSize); + decoder->WavHeader.WaveId = ME_TO_LE32(WAVE_ID); + + decoder->WavHeader.FmtId = ME_TO_LE32(FMT__ID); + decoder->WavHeader.FmtSize = ME_TO_LE32(sizeof(FmtChunk)); + + decoder->WavHeader.fmt.Format = ME_TO_LE16(0x01); + decoder->WavHeader.fmt.Channels = ME_TO_LE16(1); + decoder->WavHeader.fmt.SampleRate = ME_TO_LE32(16000); + decoder->WavHeader.fmt.ByteRate = ME_TO_LE32(32000); + decoder->WavHeader.fmt.BlockAlign = ME_TO_LE16(2); + decoder->WavHeader.fmt.BitsPerSample = ME_TO_LE16(16); + + decoder->WavHeader.FactId = ME_TO_LE32(FACT_ID); + decoder->WavHeader.FactSize = ME_TO_LE32(sizeof(int)); + decoder->WavHeader.Samples = ME_TO_LE32(0); + + decoder->WavHeader.DataId = ME_TO_LE32(DATA_ID); + decoder->WavHeader.DataSize = ME_TO_LE32(0); + + memset(decoder->context, 0, sizeof(decoder->context)); + memset(decoder->backup_frame, 0, sizeof(decoder->backup_frame)); + + decoder->dw1 = 1; + decoder->dw2 = 1; + decoder->dw3 = 1; + decoder->dw4 = 1; + + siren_init(); + return decoder; +} + +void Siren7_CloseDecoder(SirenDecoder decoder) { + free(decoder); +} + +int Siren7_DecodeFrame(SirenDecoder decoder, unsigned char *DataIn, unsigned char *DataOut) { + int number_of_coefs, + sample_rate_bits, + rate_control_bits, + rate_control_possibilities, + checksum_bits, + esf_adjustment, + scale_factor, + number_of_regions, + sample_rate_code, + bits_per_frame; + int decoded_sample_rate_code; + + static int absolute_region_power_index[28] = {0}; + static float decoder_standard_deviation[28] = {0}; + static int power_categories[28] = {0}; + static int category_balance[28] = {0}; + int ChecksumTable[4] = {0x7F80, 0x7878, 0x6666, 0x5555}; + int i, j; + + int dwRes = 0; + int envelope_bits = 0; + int rate_control = 0; + int number_of_available_bits; + int number_of_valid_coefs; + int frame_error = 0; + + int In[20]; + float coefs[320]; + float BufferOut[320]; + int sum; + int checksum; + int calculated_checksum; + int idx; + int temp1; + int temp2; + + for (i = 0; i < 20; i++) +#ifdef __BIG_ENDIAN__ + In[i] = ((short *) DataIn)[i]; +#else + In[i] = ((((short *) DataIn)[i] << 8) & 0xFF00) | ((((short *) DataIn)[i] >> 8) & 0x00FF); +#endif + + dwRes = GetSirenCodecInfo(1, decoder->sample_rate, &number_of_coefs, &sample_rate_bits, &rate_control_bits, &rate_control_possibilities, &checksum_bits, &esf_adjustment, &scale_factor, &number_of_regions, &sample_rate_code, &bits_per_frame ); + + if (dwRes != 0) + return dwRes; + + + set_bitstream(In); + + decoded_sample_rate_code = 0; + for (i = 0; i < sample_rate_bits; i++) { + decoded_sample_rate_code <<= 1; + decoded_sample_rate_code |= next_bit(); + } + + + if (decoded_sample_rate_code != sample_rate_code) + return 7; + + number_of_valid_coefs = region_size * number_of_regions; + number_of_available_bits = bits_per_frame - sample_rate_bits - checksum_bits ; + + + envelope_bits = decode_envelope(number_of_regions, decoder_standard_deviation, absolute_region_power_index, esf_adjustment); + + number_of_available_bits -= envelope_bits; + + for (i = 0; i < rate_control_bits; i++) { + rate_control <<= 1; + rate_control |= next_bit(); + } + + number_of_available_bits -= rate_control_bits; + + categorize_regions(number_of_regions, number_of_available_bits, absolute_region_power_index, power_categories, category_balance); + + for (i = 0; i < rate_control; i++) { + power_categories[category_balance[i]]++; + } + + number_of_available_bits = decode_vector(decoder, number_of_regions, number_of_available_bits, decoder_standard_deviation, power_categories, coefs, scale_factor); + + + frame_error = 0; + if (number_of_available_bits > 0) { + for (i = 0; i < number_of_available_bits; i++) { + if (next_bit() == 0) + frame_error = 1; + } + } else if (number_of_available_bits < 0 && rate_control + 1 < rate_control_possibilities) { + frame_error |= 2; + } + + for (i = 0; i < number_of_regions; i++) { + if (absolute_region_power_index[i] > 33 || absolute_region_power_index[i] < -31) + frame_error |= 4; + } + + if (checksum_bits > 0) { + bits_per_frame >>= 4; + checksum = In[bits_per_frame - 1] & ((1 << checksum_bits) - 1); + In[bits_per_frame - 1] &= ~checksum; + sum = 0; + idx = 0; + do { + sum ^= (In[idx] & 0xFFFF) << (idx % 15); + } while (++idx < bits_per_frame); + + sum = (sum >> 15) ^ (sum & 0x7FFF); + calculated_checksum = 0; + for (i = 0; i < 4; i++) { + temp1 = ChecksumTable[i] & sum; + for (j = 8; j > 0; j >>= 1) { + temp2 = temp1 >> j; + temp1 ^= temp2; + } + calculated_checksum <<= 1; + calculated_checksum |= temp1 & 1; + } + + if (checksum != calculated_checksum) + frame_error |= 8; + } + + if (frame_error != 0) { + for (i = 0; i < number_of_valid_coefs; i++) { + coefs[i] = decoder->backup_frame[i]; + decoder->backup_frame[i] = 0; + } + } else { + for (i = 0; i < number_of_valid_coefs; i++) + decoder->backup_frame[i] = coefs[i]; + } + + + for (i = number_of_valid_coefs; i < number_of_coefs; i++) + coefs[i] = 0; + + + dwRes = siren_rmlt_decode_samples(coefs, decoder->context, 320, BufferOut); + + + for (i = 0; i < 320; i++) { + if (BufferOut[i] > 32767.0) + ((short *)DataOut)[i] = (short) ME_TO_LE16((short) 32767); + else if (BufferOut[i] <= -32768.0) + ((short *)DataOut)[i] = (short) ME_TO_LE16((short) 32768); + else + ((short *)DataOut)[i] = (short) ME_TO_LE16((short) BufferOut[i]); + } + + decoder->WavHeader.Samples = ME_FROM_LE32(decoder->WavHeader.Samples); + decoder->WavHeader.Samples += 320; + decoder->WavHeader.Samples = ME_TO_LE32(decoder->WavHeader.Samples); + decoder->WavHeader.DataSize = ME_FROM_LE32(decoder->WavHeader.DataSize); + decoder->WavHeader.DataSize += 640; + decoder->WavHeader.DataSize = ME_TO_LE32(decoder->WavHeader.DataSize); + decoder->WavHeader.riff.RiffSize = ME_FROM_LE32(decoder->WavHeader.riff.RiffSize); + decoder->WavHeader.riff.RiffSize += 640; + decoder->WavHeader.riff.RiffSize = ME_TO_LE32(decoder->WavHeader.riff.RiffSize); + + + return 0; +} + diff -Nru gst-plugins-farsight-0.12.5/gst/siren/decoder.h gst-plugins-farsight-0.12.8/gst/siren/decoder.h --- gst-plugins-farsight-0.12.5/gst/siren/decoder.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/decoder.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,52 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef _SIREN_DECODER_H +#define _SIREN_DECODER_H + +#include +#include +#include +#include "dct4.h" +#include "rmlt.h" +#include "huffman.h" +#include "common.h" + + +typedef struct stSirenDecoder { + int sample_rate; + PCMWavHeader WavHeader; + float context[320]; + float backup_frame[320]; + int dw1; + int dw2; + int dw3; + int dw4; +} * SirenDecoder; + + +/* MUST be 16000 to be compatible with MSN Voice clips (I think) */ +extern SirenDecoder Siren7_NewDecoder(int sample_rate); +extern void Siren7_CloseDecoder(SirenDecoder decoder); +extern int Siren7_DecodeFrame(SirenDecoder decoder, unsigned char *DataIn, unsigned char *DataOut); + +#endif /* _SIREN_DECODER_H */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/encoder.c gst-plugins-farsight-0.12.8/gst/siren/encoder.c --- gst-plugins-farsight-0.12.5/gst/siren/encoder.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/encoder.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,234 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + + +#include "siren7.h" + + +SirenEncoder Siren7_NewEncoder(int sample_rate) { + SirenEncoder encoder = (SirenEncoder) malloc(sizeof(struct stSirenEncoder)); + encoder->sample_rate = sample_rate; + + encoder->WavHeader.riff.RiffId = ME_TO_LE32(RIFF_ID); + encoder->WavHeader.riff.RiffSize = sizeof(SirenWavHeader) - 2*sizeof(int); + encoder->WavHeader.riff.RiffSize = ME_TO_LE32(encoder->WavHeader.riff.RiffSize); + encoder->WavHeader.WaveId = ME_TO_LE32(WAVE_ID); + + encoder->WavHeader.FmtId = ME_TO_LE32(FMT__ID); + encoder->WavHeader.FmtSize = ME_TO_LE32(sizeof(SirenFmtChunk)); + + encoder->WavHeader.fmt.fmt.Format = ME_TO_LE16(0x028E); + encoder->WavHeader.fmt.fmt.Channels = ME_TO_LE16(1); + encoder->WavHeader.fmt.fmt.SampleRate = ME_TO_LE32(16000); + encoder->WavHeader.fmt.fmt.ByteRate = ME_TO_LE32(2000); + encoder->WavHeader.fmt.fmt.BlockAlign = ME_TO_LE16(40); + encoder->WavHeader.fmt.fmt.BitsPerSample = ME_TO_LE16(0); + encoder->WavHeader.fmt.ExtraSize = ME_TO_LE16(2); + encoder->WavHeader.fmt.DctLength = ME_TO_LE16(320); + + encoder->WavHeader.FactId = ME_TO_LE32(FACT_ID); + encoder->WavHeader.FactSize = ME_TO_LE32(sizeof(int)); + encoder->WavHeader.Samples = ME_TO_LE32(0); + + encoder->WavHeader.DataId = ME_TO_LE32(DATA_ID); + encoder->WavHeader.DataSize = ME_TO_LE32(0); + + memset(encoder->context, 0, sizeof(encoder->context)); + + siren_init(); + return encoder; +} + +void Siren7_CloseEncoder(SirenEncoder encoder) { + free(encoder); +} + + + +int Siren7_EncodeFrame(SirenEncoder encoder, unsigned char *DataIn, unsigned char *DataOut) { + int number_of_coefs, + sample_rate_bits, + rate_control_bits, + rate_control_possibilities, + checksum_bits, + esf_adjustment, + scale_factor, + number_of_regions, + sample_rate_code, + bits_per_frame; + int sample_rate = encoder->sample_rate; + + static int absolute_region_power_index[28] = {0}; + static int power_categories[28] = {0}; + static int category_balance[28] = {0}; + static int drp_num_bits[30] = {0}; + static int drp_code_bits[30] = {0}; + static int region_mlt_bit_counts[28] = {0}; + static int region_mlt_bits[112] = {0}; + int ChecksumTable[4] = {0x7F80, 0x7878, 0x6666, 0x5555}; + int i, j; + + int dwRes = 0; + short out_word; + int bits_left; + int current_word_bits_left; + int region_bit_count; + unsigned int current_word; + unsigned int sum; + unsigned int checksum; + int temp1 = 0; + int temp2 = 0; + int region; + int idx = 0; + int envelope_bits = 0; + int rate_control; + int number_of_available_bits; + + float coefs[320]; + float In[320]; + short BufferOut[20]; + float *context = encoder->context; + + for (i = 0; i < 320; i++) + In[i] = (float) ((short) ME_FROM_LE16(((short *) DataIn)[i])); + + dwRes = siren_rmlt_encode_samples(In, context, 320, coefs); + + + if (dwRes != 0) + return dwRes; + + dwRes = GetSirenCodecInfo(1, sample_rate, &number_of_coefs, &sample_rate_bits, &rate_control_bits, &rate_control_possibilities, &checksum_bits, &esf_adjustment, &scale_factor, &number_of_regions, &sample_rate_code, &bits_per_frame ); + + if (dwRes != 0) + return dwRes; + + envelope_bits = compute_region_powers(number_of_regions, coefs, drp_num_bits, drp_code_bits, absolute_region_power_index, esf_adjustment); + + number_of_available_bits = bits_per_frame - rate_control_bits - envelope_bits - sample_rate_bits - checksum_bits ; + + categorize_regions(number_of_regions, number_of_available_bits, absolute_region_power_index, power_categories, category_balance); + + for(region = 0; region < number_of_regions; region++) { + absolute_region_power_index[region] += 24; + region_mlt_bit_counts[region] = 0; + } + + rate_control = quantize_mlt(number_of_regions, rate_control_possibilities, number_of_available_bits, coefs, absolute_region_power_index, power_categories, category_balance, region_mlt_bit_counts, region_mlt_bits); + + idx = 0; + bits_left = 16 - sample_rate_bits; + out_word = sample_rate_code << (16 - sample_rate_bits); + drp_num_bits[number_of_regions] = rate_control_bits; + drp_code_bits[number_of_regions] = rate_control; + for (region = 0; region <= number_of_regions; region++) { + i = drp_num_bits[region] - bits_left; + if (i < 0) { + out_word += drp_code_bits[region] << -i; + bits_left -= drp_num_bits[region]; + } else { + BufferOut[idx++] = out_word + (drp_code_bits[region] >> i); + bits_left += 16 - drp_num_bits[region]; + out_word = drp_code_bits[region] << bits_left; + } + } + + for (region = 0; region < number_of_regions && (16*idx) < bits_per_frame; region++) { + current_word_bits_left = region_bit_count = region_mlt_bit_counts[region]; + if (current_word_bits_left > 32) + current_word_bits_left = 32; + + current_word = region_mlt_bits[region*4]; + i = 1; + while(region_bit_count > 0 && (16*idx) < bits_per_frame) { + if (current_word_bits_left < bits_left) { + bits_left -= current_word_bits_left; + out_word += (current_word >> (32 - current_word_bits_left)) << bits_left; + current_word_bits_left = 0; + } else { + BufferOut[idx++] = (short) (out_word + (current_word >> (32 - bits_left))); + current_word_bits_left -= bits_left; + current_word <<= bits_left; + bits_left = 16; + out_word = 0; + } + if (current_word_bits_left == 0) { + region_bit_count -= 32; + current_word = region_mlt_bits[(region*4) + i++]; + current_word_bits_left = region_bit_count; + if (current_word_bits_left > 32) + current_word_bits_left = 32; + } + } + } + + + while ( (16*idx) < bits_per_frame) { + BufferOut[idx++] = (short) ((0xFFFF >> (16 - bits_left)) + out_word); + bits_left = 16; + out_word = 0; + } + + if (checksum_bits > 0) { + BufferOut[idx-1] &= (-1 << checksum_bits); + sum = 0; + idx = 0; + do { + sum ^= (BufferOut[idx] & 0xFFFF) << (idx % 15); + } while ((16*++idx) < bits_per_frame); + + sum = (sum >> 15) ^ (sum & 0x7FFF); + checksum = 0; + for (i = 0; i < 4; i++) { + temp1 = ChecksumTable[i] & sum; + for (j = 8; j > 0; j >>= 1) { + temp2 = temp1 >> j; + temp1 ^= temp2; + } + checksum <<= 1; + checksum |= temp1 & 1; + } + BufferOut[idx-1] |= ((1 << checksum_bits) -1) & checksum; + } + + + for (i = 0; i < 20; i++) +#ifdef __BIG_ENDIAN__ + ((short *) DataOut)[i] = BufferOut[i]; +#else + ((short *) DataOut)[i] = ((BufferOut[i] << 8) & 0xFF00) | ((BufferOut[i] >> 8) & 0x00FF); +#endif + + encoder->WavHeader.Samples = ME_FROM_LE32(encoder->WavHeader.Samples); + encoder->WavHeader.Samples += 320; + encoder->WavHeader.Samples = ME_TO_LE32(encoder->WavHeader.Samples); + encoder->WavHeader.DataSize = ME_FROM_LE32(encoder->WavHeader.DataSize); + encoder->WavHeader.DataSize += 40; + encoder->WavHeader.DataSize = ME_TO_LE32(encoder->WavHeader.DataSize); + encoder->WavHeader.riff.RiffSize = ME_FROM_LE32(encoder->WavHeader.riff.RiffSize); + encoder->WavHeader.riff.RiffSize += 40; + encoder->WavHeader.riff.RiffSize = ME_TO_LE32(encoder->WavHeader.riff.RiffSize); + + + return 0; +} + diff -Nru gst-plugins-farsight-0.12.5/gst/siren/encoder.h gst-plugins-farsight-0.12.8/gst/siren/encoder.h --- gst-plugins-farsight-0.12.5/gst/siren/encoder.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/encoder.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,47 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef _SIREN_ENCODER_H +#define _SIREN_ENCODER_H + +#include +#include +#include +#include "dct4.h" +#include "rmlt.h" +#include "huffman.h" +#include "common.h" + + +typedef struct stSirenEncoder { + int sample_rate; + SirenWavHeader WavHeader; + float context[320]; +} * SirenEncoder; + +/* sample_rate MUST be 16000 to be compatible with MSN Voice clips (I think) */ +extern SirenEncoder Siren7_NewEncoder(int sample_rate); +extern void Siren7_CloseEncoder(SirenEncoder encoder); +extern int Siren7_EncodeFrame(SirenEncoder encoder, unsigned char *DataIn, unsigned char *DataOut); + + +#endif /* _SIREN_ENCODER_H */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstrtpsirendepay.c gst-plugins-farsight-0.12.8/gst/siren/gstrtpsirendepay.c --- gst-plugins-farsight-0.12.5/gst/siren/gstrtpsirendepay.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstrtpsirendepay.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,134 @@ +/* + * Siren Depayloader Gst Element + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include "gstrtpsirendepay.h" + +/* elementfactory information */ +static const GstElementDetails gst_rtp_siren_depay_details = +GST_ELEMENT_DETAILS ("RTP Siren packet depayloader", + "Codec/Depayloader/Network", + "Extracts Siren audio from RTP packets", + "Philippe Kalaf "); + + +static GstStaticPadTemplate gst_rtp_siren_depay_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp, " + "media = (string) \"audio\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " + "clock-rate = (int) 16000, " + "encoding-name = (string) \"SIREN\", " + "dct-length = (int) 320") + ); + +static GstStaticPadTemplate gst_rtp_siren_depay_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/x-siren, " "dct-length = (int) 320") + ); + +static GstBuffer *gst_rtp_siren_depay_process (GstBaseRTPDepayload * depayload, + GstBuffer * buf); +static gboolean gst_rtp_siren_depay_setcaps (GstBaseRTPDepayload * depayload, + GstCaps * caps); + +GST_BOILERPLATE (GstRTPSirenDepay, gst_rtp_siren_depay, GstBaseRTPDepayload, + GST_TYPE_BASE_RTP_DEPAYLOAD); + +static void +gst_rtp_siren_depay_base_init (gpointer klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtp_siren_depay_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtp_siren_depay_sink_template)); + gst_element_class_set_details (element_class, &gst_rtp_siren_depay_details); +} + +static void +gst_rtp_siren_depay_class_init (GstRTPSirenDepayClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + GstBaseRTPDepayloadClass *gstbasertpdepayload_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; + + gstbasertpdepayload_class->process = gst_rtp_siren_depay_process; + gstbasertpdepayload_class->set_caps = gst_rtp_siren_depay_setcaps; +} + +static void +gst_rtp_siren_depay_init (GstRTPSirenDepay * rtpsirendepay, + GstRTPSirenDepayClass * klass) +{ + +} + +static gboolean +gst_rtp_siren_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps) +{ + GstCaps *srccaps; + gboolean ret; + + srccaps = gst_caps_new_simple ("audio/x-siren", + "dct-length", G_TYPE_INT, 320, NULL); + ret = gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (depayload), srccaps); + + GST_DEBUG ("set caps on source: %" GST_PTR_FORMAT " (ret=%d)", srccaps, ret); + gst_caps_unref (srccaps); + + /* always fixed clock rate of 16000 */ + depayload->clock_rate = 16000; + + return ret; +} + +static GstBuffer * +gst_rtp_siren_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf) +{ + GstBuffer *outbuf; + + outbuf = gst_rtp_buffer_get_payload_buffer (buf); + + return outbuf; +} + +gboolean +gst_rtp_siren_depay_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpsirendepay", + GST_RANK_MARGINAL, GST_TYPE_RTP_SIREN_DEPAY); +} diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstrtpsirendepay.h gst-plugins-farsight-0.12.8/gst/siren/gstrtpsirendepay.h --- gst-plugins-farsight-0.12.5/gst/siren/gstrtpsirendepay.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstrtpsirendepay.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,60 @@ +/* + * Siren Depayloader Gst Element + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_RTP_SIREN_DEPAY_H__ +#define __GST_RTP_SIREN_DEPAY_H__ + +#include +#include + +G_BEGIN_DECLS + +typedef struct _GstRTPSirenDepay GstRTPSirenDepay; +typedef struct _GstRTPSirenDepayClass GstRTPSirenDepayClass; + +#define GST_TYPE_RTP_SIREN_DEPAY \ + (gst_rtp_siren_depay_get_type()) +#define GST_RTP_SIREN_DEPAY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_SIREN_DEPAY,GstRTPSirenDepay)) +#define GST_RTP_SIREN_DEPAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_SIREN_DEPAY,GstRTPSirenDepayClass)) +#define GST_IS_RTP_SIREN_DEPAY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_SIREN_DEPAY)) +#define GST_IS_RTP_SIREN_DEPAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_SIREN_DEPAY)) + + +struct _GstRTPSirenDepay +{ + GstBaseRTPDepayload depayload; + +}; + +struct _GstRTPSirenDepayClass +{ + GstBaseRTPDepayloadClass parent_class; +}; + +gboolean gst_rtp_siren_depay_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_SIREN_DEPAY_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstrtpsirenpay.c gst-plugins-farsight-0.12.8/gst/siren/gstrtpsirenpay.c --- gst-plugins-farsight-0.12.5/gst/siren/gstrtpsirenpay.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstrtpsirenpay.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,163 @@ +/* + * Siren Payloader Gst Element + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gstrtpsirenpay.h" +#include + +/* elementfactory information */ +static GstElementDetails gst_rtpsirenpay_details = { + "RTP Payloader for Siren Audio", + "Codec/Payloader/Network", + "Packetize Siren audio streams into RTP packets", + "Youness Alaoui " +}; + +GST_DEBUG_CATEGORY_STATIC (rtpsirenpay_debug); +#define GST_CAT_DEFAULT (rtpsirenpay_debug) + +static GstStaticPadTemplate gst_rtpsirenpay_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/x-siren, " "dct-length = (int) 320") + ); + +static GstStaticPadTemplate gst_rtpsirenpay_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp, " + "media = (string) \"audio\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " + "clock-rate = (int) 16000, " + "encoding-name = (string) \"SIREN\", " + "dct-length = (int) 320") + ); + +static gboolean gst_rtpsirenpay_setcaps (GstBaseRTPPayload * payload, + GstCaps * caps); + +GST_BOILERPLATE (GstRTPSirenPay, gst_rtpsirenpay, GstBaseRTPAudioPayload, + GST_TYPE_BASE_RTP_AUDIO_PAYLOAD); + +static void +gst_rtpsirenpay_base_init (gpointer klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpsirenpay_sink_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpsirenpay_src_template)); + gst_element_class_set_details (element_class, &gst_rtpsirenpay_details); +} + +static void +gst_rtpsirenpay_class_init (GstRTPSirenPayClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + GstBaseRTPPayloadClass *gstbasertppayload_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass; + + parent_class = g_type_class_ref (GST_TYPE_BASE_RTP_PAYLOAD); + + gstbasertppayload_class->set_caps = gst_rtpsirenpay_setcaps; + + GST_DEBUG_CATEGORY_INIT (rtpsirenpay_debug, "rtpsirenpay", 0, + "siren audio RTP payloader"); +} + +static void +gst_rtpsirenpay_init (GstRTPSirenPay * rtpsirenpay, GstRTPSirenPayClass * klass) +{ + GstBaseRTPPayload *basertppayload; + GstBaseRTPAudioPayload *basertpaudiopayload; + + basertppayload = GST_BASE_RTP_PAYLOAD (rtpsirenpay); + basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (rtpsirenpay); + + /* we don't set the payload type, it should be set by the application using + * the pt property or the default 96 will be used */ + basertppayload->clock_rate = 16000; + + /* tell basertpaudiopayload that this is a frame based codec */ + gst_base_rtp_audio_payload_set_frame_based (basertpaudiopayload); +} + +static gboolean +gst_rtpsirenpay_setcaps (GstBaseRTPPayload * basertppayload, GstCaps * caps) +{ + GstRTPSirenPay *rtpsirenpay; + GstBaseRTPAudioPayload *basertpaudiopayload; + gboolean ret; + gint dct_length; + GstStructure *structure; + const char *payload_name; + + rtpsirenpay = GST_RTP_SIREN_PAY (basertppayload); + basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (basertppayload); + + structure = gst_caps_get_structure (caps, 0); + + gst_structure_get_int (structure, "dct-length", &dct_length); + if (dct_length != 320) + goto wrong_dct; + + payload_name = gst_structure_get_name (structure); + if (g_strcasecmp ("audio/x-siren", payload_name)) + goto wrong_caps; + + gst_basertppayload_set_options (basertppayload, "audio", TRUE, "SIREN", 16000); + /* set options for this frame based audio codec */ + gst_base_rtp_audio_payload_set_frame_options (basertpaudiopayload, 20, 40); + + ret = gst_basertppayload_set_outcaps (basertppayload, NULL); + + return TRUE; + + /* ERRORS */ +wrong_dct: + { + GST_ERROR_OBJECT (rtpsirenpay, "dct-length must be 320, received %d", dct_length); + return FALSE; + } +wrong_caps: + { + GST_ERROR_OBJECT (rtpsirenpay, "expected audio/x-siren, received %s", + payload_name); + return FALSE; + } +} + +gboolean +gst_rtp_siren_pay_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpsirenpay", + GST_RANK_NONE, GST_TYPE_RTP_SIREN_PAY); +} diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstrtpsirenpay.h gst-plugins-farsight-0.12.8/gst/siren/gstrtpsirenpay.h --- gst-plugins-farsight-0.12.5/gst/siren/gstrtpsirenpay.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstrtpsirenpay.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,58 @@ +/* + * Siren Payloader Gst Element + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_RTP_SIREN_PAY_H__ +#define __GST_RTP_SIREN_PAY_H__ + +#include +#include + +G_BEGIN_DECLS + +#define GST_TYPE_RTP_SIREN_PAY \ + (gst_rtpsirenpay_get_type()) +#define GST_RTP_SIREN_PAY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_SIREN_PAY,GstRTPSirenPay)) +#define GST_RTP_SIREN_PAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_SIREN_PAY,GstRTPSirenPayClass)) +#define GST_IS_RTP_SIREN_PAY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_SIREN_PAY)) +#define GST_IS_RTP_SIREN_PAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_SIREN_PAY)) + +typedef struct _GstRTPSirenPay GstRTPSirenPay; +typedef struct _GstRTPSirenPayClass GstRTPSirenPayClass; + +struct _GstRTPSirenPay +{ + GstBaseRTPAudioPayload audiopayload; +}; + +struct _GstRTPSirenPayClass +{ + GstBaseRTPAudioPayloadClass parent_class; +}; + +gboolean gst_rtp_siren_pay_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_SIREN_PAY_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstsiren.c gst-plugins-farsight-0.12.8/gst/siren/gstsiren.c --- gst-plugins-farsight-0.12.5/gst/siren/gstsiren.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstsiren.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,55 @@ +/* + * Siren encoding/Decoder Gst plugin + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gstsirendec.h" +#include "gstsirenenc.h" +#include "gstrtpsirenpay.h" +#include "gstrtpsirendepay.h" + + +static gboolean +plugin_init (GstPlugin * plugin) +{ + if (!gst_siren_dec_plugin_init (plugin)) + return FALSE; + + if (!gst_siren_enc_plugin_init (plugin)) + return FALSE; + + if (!gst_rtp_siren_pay_plugin_init (plugin)) + return FALSE; + + if (!gst_rtp_siren_depay_plugin_init (plugin)) + return FALSE; + + return TRUE; +} + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "gstsiren", + "Siren encoder/decoder/payloader/depayloader plugins", + plugin_init, "0.1" , "LGPL", "Siren", ""); diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstsirendec.c gst-plugins-farsight-0.12.8/gst/siren/gstsirendec.c --- gst-plugins-farsight-0.12.5/gst/siren/gstsirendec.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstsirendec.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,341 @@ +/* + * Siren Decoder Gst Element + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gstsirendec.h" + +#include + +GST_DEBUG_CATEGORY (sirendec_debug); +#define GST_CAT_DEFAULT (sirendec_debug) + +/* elementfactory information */ +static const GstElementDetails gst_siren_dec_details = +GST_ELEMENT_DETAILS ( + "Siren Decoder element", + "Codec/Decoder/Audio ", + "Decode streams encoded with the Siren7 codec into 16bit PCM", + "Youness Alaoui "); + + +static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/x-siren, " + "dct-length = (int) 320")); + +static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/x-raw-int, " + "width = (int) 16, " + "depth = (int) 16, " + "endianness = (int) 1234, " + "signed = (boolean) true, " + "rate = (int) 16000, " + "channels = (int) 1")); + +/* signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + ARG_0, +}; + + + +static void gst_siren_dec_dispose (GObject *object); + +static GstFlowReturn gst_siren_dec_transform (GstBaseTransform *trans, + GstBuffer *inbuf, GstBuffer *outbuf); +static gboolean gst_siren_dec_transform_size (GstBaseTransform *trans, + GstPadDirection direction, GstCaps *caps, guint size, + GstCaps *othercaps, guint *othersize); +static GstCaps * gst_siren_dec_transform_caps (GstBaseTransform * base, + GstPadDirection direction, GstCaps * caps); +static gboolean gst_siren_dec_start (GstBaseTransform *trans); +static gboolean gst_siren_dec_stop (GstBaseTransform *trans); + + +static void +_do_init (GType type) +{ + GST_DEBUG_CATEGORY_INIT + (sirendec_debug, "sirendec", 0, "sirendec"); +} + +GST_BOILERPLATE_FULL (GstSirenDec, gst_siren_dec, GstBaseTransform, + GST_TYPE_BASE_TRANSFORM, _do_init); + +static void +gst_siren_dec_base_init (gpointer klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&srctemplate)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&sinktemplate)); + + gst_element_class_set_details (element_class, &gst_siren_dec_details); +} + +static void +gst_siren_dec_class_init (GstSirenDecClass *klass) +{ + GObjectClass *gobject_class; + GstBaseTransformClass *gstbasetransform_class; + + gobject_class = (GObjectClass *) klass; + gstbasetransform_class = (GstBaseTransformClass *) klass; + + GST_DEBUG ("Initializing Class"); + + gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_siren_dec_dispose); + + gstbasetransform_class->transform = + GST_DEBUG_FUNCPTR (gst_siren_dec_transform); + gstbasetransform_class->transform_caps = + GST_DEBUG_FUNCPTR (gst_siren_dec_transform_caps); + gstbasetransform_class->transform_size = + GST_DEBUG_FUNCPTR (gst_siren_dec_transform_size); + gstbasetransform_class->start = + GST_DEBUG_FUNCPTR (gst_siren_dec_start); + gstbasetransform_class->stop = + GST_DEBUG_FUNCPTR (gst_siren_dec_stop); + + parent_class = g_type_class_peek_parent (klass); + + GST_DEBUG ("Class Init done"); +} + +static void +gst_siren_dec_init (GstSirenDec *dec, GstSirenDecClass *klass) +{ + + GST_DEBUG ("Initializing"); + dec->decoder = NULL; + dec->adapter = gst_adapter_new (); + + GST_DEBUG ("Init done"); +} + +static void +gst_siren_dec_dispose (GObject *object) +{ + GstSirenDec *dec = GST_SIREN_DEC (object); + + GST_DEBUG ("Disposing"); + + if (dec->decoder) { + Siren7_CloseDecoder (dec->decoder); + dec->decoder = NULL; + } + if (dec->adapter) { + g_object_unref (dec->adapter); + dec->adapter = NULL; + } + + G_OBJECT_CLASS (parent_class)->dispose (object); + + GST_DEBUG ("Dispose done"); + +} + +static gboolean +gst_siren_dec_start (GstBaseTransform *trans) +{ + GstSirenDec *dec = GST_SIREN_DEC (trans); + + GST_DEBUG ("Start"); + + if (dec->decoder) { + Siren7_CloseDecoder (dec->decoder); + dec->decoder = NULL; + } + dec->decoder = Siren7_NewDecoder (16000); + gst_adapter_clear (dec->adapter); + + return dec->decoder != NULL; +} + + + +static gboolean +gst_siren_dec_stop (GstBaseTransform *trans) +{ + GstSirenDec *dec = GST_SIREN_DEC (trans); + + GST_DEBUG ("Stop"); + + if (dec->decoder) { + Siren7_CloseDecoder (dec->decoder); + dec->decoder = NULL; + } + gst_adapter_clear (dec->adapter); + return TRUE; +} + + +static gboolean gst_siren_dec_transform_size (GstBaseTransform *trans, + GstPadDirection direction, GstCaps *caps, guint size, + GstCaps *othercaps, guint *othersize) +{ + GstSirenDec *dec = GST_SIREN_DEC (trans); + GstStructure *structure = NULL; + const gchar *in_name = NULL; + const gchar *out_name = NULL; + gboolean decoding; + + if (caps != NULL && othercaps != NULL) { + structure = gst_caps_get_structure (caps, 0); + in_name = gst_structure_get_name (structure); + structure = gst_caps_get_structure (othercaps, 0); + out_name = gst_structure_get_name (structure); + } + + GST_DEBUG ("Transform size from caps '%s' to '%s'", in_name, out_name); + + if (in_name == NULL || out_name == NULL) { + if (direction == GST_PAD_SINK) + decoding = TRUE; + else + decoding = FALSE; + } else if (strcmp (in_name, "audio/x-raw-int") == 0 && + strcmp (out_name, "audio/x-siren") == 0 ) { + decoding = FALSE; + } else if (strcmp (in_name, "audio/x-siren") == 0 && + strcmp (out_name, "audio/x-raw-int") == 0 ) { + decoding = TRUE; + } else { + GST_DEBUG ("Unknown in/out caps"); + return FALSE; + } + + if (decoding) { + size += gst_adapter_available (dec->adapter); + *othersize = size * 16; + *othersize -= *othersize % 640; + if ((size * 16) % 640 > 0) + *othersize+= 640; + } else { + *othersize = size / 16; + *othersize -= *othersize % 40; + if ((size / 16) % 40 > 0) + *othersize+= 40; + } + GST_DEBUG ("Transform size %d to %d", size, *othersize); + + return TRUE; +} + +static GstCaps * gst_siren_dec_transform_caps (GstBaseTransform * base, + GstPadDirection direction, GstCaps * caps) +{ + GstCaps *othercaps = NULL; + GST_DEBUG ("Transforming caps"); + + if (direction == GST_PAD_SINK) { + return gst_static_pad_template_get_caps (&srctemplate); + } else if (direction == GST_PAD_SRC) { + return gst_static_pad_template_get_caps (&sinktemplate); + } + + GST_DEBUG ("Transform caps"); + + return othercaps; +} + +static GstFlowReturn +gst_siren_dec_transform (GstBaseTransform *trans, GstBuffer *inbuf, + GstBuffer *outbuf) +{ + + GstSirenDec *dec = GST_SIREN_DEC (trans); + GstFlowReturn ret = GST_FLOW_OK; + guint8 *data = NULL; + gint offset = 0; + gint decode_ret = 0; + + GST_DEBUG ("Transform"); + + if (dec->decoder == NULL) { + GST_DEBUG ("Siren decoder not set"); + return GST_FLOW_WRONG_STATE; + } + if (dec->adapter == NULL) { + GST_DEBUG ("Adapter not set"); + return GST_FLOW_UNEXPECTED; + } + + gst_buffer_ref (inbuf); + gst_adapter_push (dec->adapter, inbuf); + + GST_DEBUG ("Received buffer of size %d with adapter of size : %d", + GST_BUFFER_SIZE (inbuf), gst_adapter_available (dec->adapter)); + + data = GST_BUFFER_DATA (outbuf); + offset = 0; + while((gst_adapter_available (dec->adapter) >= 40) && + (offset + 640 <= GST_BUFFER_SIZE (outbuf)) && + ret == GST_FLOW_OK) { + + GST_DEBUG ("Decoding frame"); + + decode_ret = Siren7_DecodeFrame (dec->decoder, + (guint8 *) gst_adapter_peek (dec->adapter, 40), + data + offset); + if (decode_ret != 0) { + GST_DEBUG ("Siren7_DecodeFrame returned %d", decode_ret); + ret = GST_FLOW_ERROR; + } + + gst_adapter_flush (dec->adapter, 40); + offset += 640; + } + + GST_DEBUG ("Finished decoding : %d", offset); + if (offset != GST_BUFFER_SIZE (outbuf)) { + GST_DEBUG ("didn't decode enough : offfset (%d) != BUFFER_SIZE (%d)", + offset, GST_BUFFER_SIZE (outbuf)); + return GST_FLOW_ERROR; + } + + return ret; +} + + + +gboolean +gst_siren_dec_plugin_init (GstPlugin *plugin) +{ + return gst_element_register (plugin, "sirendec", + GST_RANK_MARGINAL, GST_TYPE_SIREN_DEC); +} diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstsirendec.h gst-plugins-farsight-0.12.8/gst/siren/gstsirendec.h --- gst-plugins-farsight-0.12.5/gst/siren/gstsirendec.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstsirendec.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,79 @@ +/* + * Siren Decoder Gst Element + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + +#ifndef __GST_SIREN_DEC_H__ +#define __GST_SIREN_DEC_H__ + +#include +#include +#include + +#include "siren7.h" + +G_BEGIN_DECLS + +/* #define's don't like whitespacey bits */ +#define GST_TYPE_SIREN_DEC \ + (gst_siren_dec_get_type()) +#define GST_SIREN_DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + GST_TYPE_SIREN_DEC,GstSirenDec)) +#define GST_SIREN_DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), \ + GST_TYPE_SIREN_DEC,GstSirenDecClass)) +#define GST_IS_SIREN_DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SIREN_DEC)) +#define GST_IS_SIREN_DEC_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SIREN_DEC)) + +typedef struct _GstSirenDec GstSirenDec; +typedef struct _GstSirenDecClass GstSirenDecClass; +typedef struct _GstSirenDecPrivate GstSirenDecPrivate; + +struct _GstSirenDec +{ + GstBaseTransform parent; + + SirenDecoder decoder; + GstAdapter *adapter; + + /*< private > */ + gpointer _gst_reserved[GST_PADDING]; +}; + +struct _GstSirenDecClass +{ + GstBaseTransformClass parent_class; + + + /*< private > */ + gpointer _gst_reserved[GST_PADDING]; +}; + +GType gst_siren_dec_get_type (void); + +gboolean +gst_siren_dec_plugin_init (GstPlugin *plugin); + +G_END_DECLS + +#endif /* __GST_SIREN_DEC_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstsirenenc.c gst-plugins-farsight-0.12.8/gst/siren/gstsirenenc.c --- gst-plugins-farsight-0.12.5/gst/siren/gstsirenenc.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstsirenenc.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,330 @@ +/* + * Siren Encoder Gst Element + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gstsirenenc.h" + +#include + +GST_DEBUG_CATEGORY (sirenenc_debug); +#define GST_CAT_DEFAULT (sirenenc_debug) + +/* elementfactory information */ +static const GstElementDetails gst_siren_enc_details = +GST_ELEMENT_DETAILS ( + "Siren Encoder element", + "Codec/Encoder/Audio ", + "Encode 16bit PCM streams into the Siren7 codec", + "Youness Alaoui "); + + +static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/x-siren, " + "dct-length = (int) 320")); + +static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/x-raw-int, " + "width = (int) 16, " + "depth = (int) 16, " + "endianness = (int) 1234, " + "signed = (boolean) true, " + "rate = (int) 16000, " + "channels = (int) 1")); + +/* signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + ARG_0, +}; + + + +static void gst_siren_enc_dispose (GObject *object); + +static GstFlowReturn gst_siren_enc_transform (GstBaseTransform *trans, + GstBuffer *inbuf, GstBuffer *outbuf); +static gboolean gst_siren_enc_transform_size (GstBaseTransform *trans, + GstPadDirection direction, GstCaps *caps, guint size, + GstCaps *othercaps, guint *othersize); +static GstCaps * gst_siren_enc_transform_caps (GstBaseTransform * base, + GstPadDirection direction, GstCaps * caps); +static gboolean gst_siren_enc_start (GstBaseTransform *trans); +static gboolean gst_siren_enc_stop (GstBaseTransform *trans); + + +static void +_do_init (GType type) +{ + GST_DEBUG_CATEGORY_INIT + (sirenenc_debug, "sirenenc", 0, "sirenenc"); +} + +GST_BOILERPLATE_FULL (GstSirenEnc, gst_siren_enc, GstBaseTransform, + GST_TYPE_BASE_TRANSFORM, _do_init); + +static void +gst_siren_enc_base_init (gpointer klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&srctemplate)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&sinktemplate)); + + gst_element_class_set_details (element_class, &gst_siren_enc_details); +} + +static void +gst_siren_enc_class_init (GstSirenEncClass *klass) +{ + GObjectClass *gobject_class; + GstBaseTransformClass *gstbasetransform_class; + + gobject_class = (GObjectClass *) klass; + gstbasetransform_class = (GstBaseTransformClass *) klass; + + GST_DEBUG ("Initializing Class"); + + gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_siren_enc_dispose); + + gstbasetransform_class->transform = + GST_DEBUG_FUNCPTR (gst_siren_enc_transform); + gstbasetransform_class->transform_caps = + GST_DEBUG_FUNCPTR (gst_siren_enc_transform_caps); + gstbasetransform_class->transform_size = + GST_DEBUG_FUNCPTR (gst_siren_enc_transform_size); + gstbasetransform_class->start = + GST_DEBUG_FUNCPTR (gst_siren_enc_start); + gstbasetransform_class->stop = + GST_DEBUG_FUNCPTR (gst_siren_enc_stop); + + parent_class = g_type_class_peek_parent (klass); + + GST_DEBUG ("Class Init done"); +} + +static void +gst_siren_enc_init (GstSirenEnc *enc, GstSirenEncClass *klass) +{ + + GST_DEBUG ("Initializing"); + enc->encoder = NULL; + enc->adapter = gst_adapter_new (); + + GST_DEBUG ("Init done"); +} + +static void +gst_siren_enc_dispose (GObject *object) +{ + GstSirenEnc *enc = GST_SIREN_ENC (object); + + GST_DEBUG ("Disposing"); + + if (enc->encoder) { + Siren7_CloseEncoder (enc->encoder); + enc->encoder = NULL; + } + if (enc->adapter) { + g_object_unref (enc->adapter); + enc->adapter = NULL; + } + + G_OBJECT_CLASS (parent_class)->dispose (object); + + GST_DEBUG ("Dispose done"); + +} + +static gboolean +gst_siren_enc_start (GstBaseTransform *trans) +{ + GstSirenEnc *enc = GST_SIREN_ENC (trans); + + GST_DEBUG ("Start"); + + if (enc->encoder) { + Siren7_CloseEncoder (enc->encoder); + enc->encoder = NULL; + } + enc->encoder = Siren7_NewEncoder (16000); + gst_adapter_clear (enc->adapter); + + return enc->encoder != NULL; +} + + + +static gboolean +gst_siren_enc_stop (GstBaseTransform *trans) +{ + GstSirenEnc *enc = GST_SIREN_ENC (trans); + + GST_DEBUG ("Stop"); + + if (enc->encoder) { + Siren7_CloseEncoder (enc->encoder); + enc->encoder = NULL; + } + gst_adapter_clear (enc->adapter); + return TRUE; +} + + +static gboolean gst_siren_enc_transform_size (GstBaseTransform *trans, + GstPadDirection direction, GstCaps *caps, guint size, + GstCaps *othercaps, guint *othersize) +{ + GstSirenEnc *enc = GST_SIREN_ENC (trans); + GstStructure *structure; + const gchar *in_name; + const gchar *out_name; + + if (caps == NULL || othercaps == NULL) { + GST_WARNING ("caps NULL"); + return FALSE; + } + + structure = gst_caps_get_structure (caps, 0); + in_name = gst_structure_get_name (structure); + structure = gst_caps_get_structure (othercaps, 0); + out_name = gst_structure_get_name (structure); + + GST_DEBUG ("Transform size from caps '%s' to '%s'", in_name, out_name); + + if (in_name == NULL || out_name == NULL) { + return FALSE; + } else if (strcmp (in_name, "audio/x-raw-int") == 0 && + strcmp (out_name, "audio/x-siren") == 0 ) { + size += gst_adapter_available (enc->adapter); + *othersize = size / 16; + *othersize -= *othersize % 40; + if ((size / 16) % 40 > 0) + *othersize+=40; + } else if (strcmp (in_name, "audio/x-siren") == 0 && + strcmp (out_name, "audio/x-raw-int") == 0 ) { + *othersize = size * 16; + *othersize -= *othersize % 640; + if ((size * 16) % 640 > 0) + *othersize+= 640; + } else { + GST_DEBUG ("Unknown in/out caps"); + return FALSE; + } + + GST_DEBUG ("Transform size %d to %d", size, *othersize); + + return TRUE; +} + +static GstCaps * gst_siren_enc_transform_caps (GstBaseTransform * base, + GstPadDirection direction, GstCaps * caps) +{ + GST_DEBUG ("Transforming caps"); + + if (direction == GST_PAD_SRC) { + return gst_static_pad_template_get_caps (&sinktemplate); + } else if (direction == GST_PAD_SINK) { + return gst_static_pad_template_get_caps (&srctemplate); + } + + /* Make gcc happy */ + return NULL; +} + +static GstFlowReturn +gst_siren_enc_transform (GstBaseTransform *trans, GstBuffer *inbuf, + GstBuffer *outbuf) +{ + + GstSirenEnc *enc = GST_SIREN_ENC (trans); + GstFlowReturn ret = GST_FLOW_OK; + guint8 *data = NULL; + gint offset = 0; + gint encode_ret = 0; + + GST_DEBUG ("Transform"); + + if (enc->encoder == NULL) { + GST_DEBUG ("Siren encoder not set"); + return GST_FLOW_WRONG_STATE; + } + if (enc->adapter == NULL) { + GST_DEBUG ("Adapter not set"); + return GST_FLOW_UNEXPECTED; + } + + gst_buffer_ref (inbuf); + gst_adapter_push (enc->adapter, inbuf); + + GST_DEBUG ("Received buffer of size %d with adapter of size : %d", + GST_BUFFER_SIZE (inbuf), gst_adapter_available (enc->adapter)); + + data = GST_BUFFER_DATA (outbuf); + offset = 0; + while(gst_adapter_available (enc->adapter) >= 640 && + offset + 40 <= GST_BUFFER_SIZE (outbuf) && + ret == GST_FLOW_OK) { + + GST_DEBUG ("Encoding frame"); + + encode_ret = Siren7_EncodeFrame (enc->encoder, + (guint8 *)gst_adapter_peek (enc->adapter, 640), + data + offset); + if (encode_ret != 0) { + GST_DEBUG ("Siren7_EncodeFrame returned %d", encode_ret); + ret = GST_FLOW_ERROR; + } + + gst_adapter_flush (enc->adapter, 640); + offset += 40; + } + + GST_DEBUG ("Finished encoding : %d", offset); + + GST_BUFFER_SIZE (outbuf) = offset; + + return ret; +} + + + +gboolean +gst_siren_enc_plugin_init (GstPlugin *plugin) +{ + return gst_element_register (plugin, "sirenenc", + GST_RANK_MARGINAL, GST_TYPE_SIREN_ENC); +} diff -Nru gst-plugins-farsight-0.12.5/gst/siren/gstsirenenc.h gst-plugins-farsight-0.12.8/gst/siren/gstsirenenc.h --- gst-plugins-farsight-0.12.5/gst/siren/gstsirenenc.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/gstsirenenc.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,79 @@ +/* + * Siren Encoder Gst Element + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + +#ifndef __GST_SIREN_ENC_H__ +#define __GST_SIREN_ENC_H__ + +#include +#include +#include + +#include "siren7.h" + +G_BEGIN_DECLS + +/* #define's don't like whitespacey bits */ +#define GST_TYPE_SIREN_ENC \ + (gst_siren_enc_get_type()) +#define GST_SIREN_ENC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + GST_TYPE_SIREN_ENC,GstSirenEnc)) +#define GST_SIREN_ENC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), \ + GST_TYPE_SIREN_ENC,GstSirenEncClass)) +#define GST_IS_SIREN_ENC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SIREN_ENC)) +#define GST_IS_SIREN_ENC_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SIREN_ENC)) + +typedef struct _GstSirenEnc GstSirenEnc; +typedef struct _GstSirenEncClass GstSirenEncClass; +typedef struct _GstSirenEncPrivate GstSirenEncPrivate; + +struct _GstSirenEnc +{ + GstBaseTransform parent; + + SirenEncoder encoder; + GstAdapter *adapter; + + /*< private > */ + gpointer _gst_reserved[GST_PADDING]; +}; + +struct _GstSirenEncClass +{ + GstBaseTransformClass parent_class; + + + /*< private > */ + gpointer _gst_reserved[GST_PADDING]; +}; + +GType gst_siren_enc_get_type (void); + +gboolean +gst_siren_enc_plugin_init (GstPlugin *plugin); + +G_END_DECLS + +#endif /* __GST_SIREN_ENC_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/huffman.c gst-plugins-farsight-0.12.8/gst/siren/huffman.c --- gst-plugins-farsight-0.12.5/gst/siren/huffman.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/huffman.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,382 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#include "siren7.h" +#include "huffman_consts.h" + + +static short current_word = 0; +static int bit_idx = 0; +static int *bitstream_ptr = NULL; + +int next_bit() { + if (bitstream_ptr == NULL) + return -1; + + if (bit_idx == 0) { + current_word = *bitstream_ptr++; + bit_idx = 16; + } + + return (current_word >> --bit_idx) & 1; +} + +void set_bitstream(int *stream) { + bitstream_ptr = stream; + current_word = *bitstream_ptr; + bit_idx = 0; +} + + +int compute_region_powers(int number_of_regions, float *coefs, int *drp_num_bits, int *drp_code_bits, int *absolute_region_power_index, int esf_adjustment) { + float region_power = 0; + int num_bits; + int idx; + int max_idx, min_idx; + int region, i; + + for (region = 0; region < number_of_regions; region++) { + region_power = 0.0f; + for (i = 0 ; i < region_size; i++) { + region_power += coefs[(region*region_size)+i] * coefs[(region*region_size)+i]; + } + region_power *= region_size_inverse; + + min_idx = 0; + max_idx = 64; + for (i = 0; i < 6; i++) { + idx = (min_idx + max_idx) / 2; + if (region_power_table_boundary[idx-1] <= region_power) { + min_idx = idx; + } else { + max_idx = idx; + } + } + absolute_region_power_index[region] = min_idx - 24; + + } + + for (region = number_of_regions-2; region >= 0; region--) { + if (absolute_region_power_index[region] < absolute_region_power_index[region+1] - 11) + absolute_region_power_index[region] = absolute_region_power_index[region+1] - 11; + } + + if (absolute_region_power_index[0] < (1-esf_adjustment)) + absolute_region_power_index[0] = (1-esf_adjustment); + + if (absolute_region_power_index[0] > (31-esf_adjustment)) + absolute_region_power_index[0] = (31-esf_adjustment); + + drp_num_bits[0] = 5; + drp_code_bits[0] = absolute_region_power_index[0] + esf_adjustment; + + + for(region = 1; region < number_of_regions; region++) { + if (absolute_region_power_index[region] < (-8 - esf_adjustment)) + absolute_region_power_index[region] = (-8 - esf_adjustment); + if (absolute_region_power_index[region] > (31-esf_adjustment)) + absolute_region_power_index[region] = (31-esf_adjustment); + } + + num_bits = 5; + + for(region = 0; region < number_of_regions-1; region++) { + idx = absolute_region_power_index[region+1] - absolute_region_power_index[region] + 12; + if (idx < 0) + idx = 0; + + absolute_region_power_index[region+1] = absolute_region_power_index[region] + idx - 12; + drp_num_bits[region+1] = differential_region_power_bits[region][idx]; + drp_code_bits[region+1] = differential_region_power_codes[region][idx]; + num_bits += drp_num_bits[region+1]; + } + + return num_bits; +} + + +int decode_envelope(int number_of_regions, float *decoder_standard_deviation, int *absolute_region_power_index, int esf_adjustment) { + int index; + int i; + int envelope_bits = 0; + + index = 0; + for (i = 0; i < 5; i++) + index = (index<<1) | next_bit(); + envelope_bits = 5; + + absolute_region_power_index[0] = index - esf_adjustment; + decoder_standard_deviation[0] = standard_deviation[absolute_region_power_index[0] + 24]; + + for (i = 1; i < number_of_regions; i++) { + index = 0; + do { + index = differential_decoder_tree[i-1][index][next_bit()]; + envelope_bits++; + } while (index > 0); + + absolute_region_power_index[i] = absolute_region_power_index[i-1] - index - 12; + decoder_standard_deviation[i] = standard_deviation[absolute_region_power_index[i] + 24]; + } + + return envelope_bits; +} + + + +static int huffman_vector(int category, int power_idx, float *mlts, int *out) { + int i, j; + float temp_value = deviation_inverse[power_idx] * step_size_inverse[category]; + int sign_idx, idx, non_zeroes, max, bits_available; + int current_word = 0; + int region_bits = 0; + + bits_available = 32; + for (i = 0; i < number_of_vectors[category]; i++) { + sign_idx = idx = non_zeroes = 0; + for (j = 0; j < vector_dimension[category]; j++) { + max = (int) ((fabs(*mlts) * temp_value) + dead_zone[category]); + if (max != 0) { + sign_idx <<= 1; + non_zeroes++; + if (*mlts > 0) + sign_idx++; + if (max > max_bin[category] || max < 0) + max = max_bin[category]; + + } + mlts++; + idx = (idx * (max_bin[category] + 1)) + max; + } + + region_bits += bitcount_tables[category][idx] + non_zeroes; + bits_available -= bitcount_tables[category][idx] + non_zeroes; + if (bits_available < 0) { + *out++ = current_word + (((code_tables[category][idx] << non_zeroes) + sign_idx) >> -bits_available); + bits_available += 32; + current_word = ((code_tables[category][idx] << non_zeroes) + sign_idx) << bits_available; + } else { + current_word += ((code_tables[category][idx] << non_zeroes) + sign_idx) << bits_available; + } + + } + + *out = current_word; + return region_bits; +} + +int quantize_mlt(int number_of_regions, int rate_control_possibilities, int number_of_available_bits, float *coefs, int *absolute_region_power_index, int *power_categories, int *category_balance, int *region_mlt_bit_counts, int *region_mlt_bits) { + int region; + int mlt_bits = 0; + int rate_control; + + for (rate_control = 0; rate_control < ((rate_control_possibilities >> 1) - 1); rate_control++) + power_categories[category_balance[rate_control]]++; + + for (region = 0; region < number_of_regions; region++) { + if (power_categories[region] > 6) + region_mlt_bit_counts[region] = 0; + else + region_mlt_bit_counts[region] = huffman_vector(power_categories[region], absolute_region_power_index[region], coefs + (region_size * region), + region_mlt_bits + (4*region)); + mlt_bits += region_mlt_bit_counts[region]; + } + + while (mlt_bits < number_of_available_bits && rate_control > 0) { + rate_control--; + region = category_balance[rate_control]; + power_categories[region]--; + + if (power_categories[region] < 0) + power_categories[region] = 0; + + mlt_bits -= region_mlt_bit_counts[region]; + + if (power_categories[region] > 6) + region_mlt_bit_counts[region] = 0; + else + region_mlt_bit_counts[region] = huffman_vector(power_categories[region], absolute_region_power_index[region], coefs + (region_size * region), + region_mlt_bits + (4*region)); + + mlt_bits += region_mlt_bit_counts[region]; + } + + while(mlt_bits > number_of_available_bits && rate_control < rate_control_possibilities) { + region = category_balance[rate_control]; + power_categories[region]++; + mlt_bits -= region_mlt_bit_counts[region]; + + if (power_categories[region] > 6) + region_mlt_bit_counts[region] = 0; + else + region_mlt_bit_counts[region] = huffman_vector(power_categories[region], absolute_region_power_index[region], coefs + (region_size * region), + region_mlt_bits + (4*region)); + + mlt_bits += region_mlt_bit_counts[region]; + + rate_control++; + } + + return rate_control; +} + +static int get_dw(SirenDecoder decoder) { + int ret = decoder->dw1 + decoder->dw4; + + if ((ret & 0x8000) != 0) + ret++; + + decoder->dw1 = decoder->dw2; + decoder->dw2 = decoder->dw3; + decoder->dw3 = decoder->dw4; + decoder->dw4 = ret; + + return ret; +} + + + + +int decode_vector(SirenDecoder decoder, int number_of_regions, int number_of_available_bits, float *decoder_standard_deviation, int *power_categories, float *coefs, int scale_factor) { + float *coefs_ptr; + float decoded_value; + float noise; + int *decoder_tree; + + int region; + int category; + int i, j; + int index; + int error; + int dw1; + int dw2; + + error = 0; + for (region = 0; region < number_of_regions; region++) { + category = power_categories[region]; + coefs_ptr = coefs + (region * region_size); + + if (category < 7) { + decoder_tree = decoder_tables[category]; + + for (i = 0; i < number_of_vectors[category]; i++) { + index = 0; + do { + if (number_of_available_bits <= 0) { + error = 1; + break; + } + + index = decoder_tree[index + next_bit()]; + number_of_available_bits--; + } while ((index & 1) == 0); + + index >>= 1; + + if (error == 0 && number_of_available_bits >= 0) { + for (j = 0; j < vector_dimension[category]; j++) { + decoded_value = mlt_quant[category][index & ((1 << index_table[category]) - 1)]; + index >>= index_table[category]; + + if (decoded_value != 0) { + if (next_bit() == 0) + decoded_value *= -decoder_standard_deviation[region]; + else + decoded_value *= decoder_standard_deviation[region]; + number_of_available_bits--; + } + + *coefs_ptr++ = decoded_value * scale_factor; + } + } else { + error = 1; + break; + } + } + + if (error == 1) { + for (j = region + 1; j < number_of_regions; j++) + power_categories[j] = 7; + category = 7; + } + } + + + coefs_ptr = coefs + (region * region_size); + + if (category == 5) { + i = 0; + for (j = 0; j < region_size; j++) { + if (*coefs_ptr != 0) { + i++; + if (fabs(*coefs_ptr) > 2.0 * decoder_standard_deviation[region]) { + i += 3; + } + } + coefs_ptr++; + } + + noise = decoder_standard_deviation[region] * noise_category5[i]; + } else if (category == 6) { + i = 0; + for (j = 0; j < region_size; j++) { + if (*coefs_ptr++ != 0) + i++; + } + + noise = decoder_standard_deviation[region] * noise_category6[i]; + } else if (category == 7) { + noise = decoder_standard_deviation[region] * noise_category7; + } else { + noise = 0; + } + + coefs_ptr = coefs + (region * region_size); + + if (category == 5 || category == 6 || category == 7) { + dw1 = get_dw(decoder); + dw2 = get_dw(decoder); + + for (j=0; j<10; j++) { + if (category == 7 || *coefs_ptr == 0) { + if ((dw1 & 1)) + *coefs_ptr = noise; + else + *coefs_ptr = -noise; + } + coefs_ptr++; + dw1 >>= 1; + + if (category == 7 || *coefs_ptr == 0) { + if ((dw2 & 1)) + *coefs_ptr = noise; + else + *coefs_ptr = -noise; + } + coefs_ptr++; + dw2 >>= 1; + } + } + } + + return error == 1 ? -1 : number_of_available_bits; +} diff -Nru gst-plugins-farsight-0.12.5/gst/siren/huffman_consts.h gst-plugins-farsight-0.12.8/gst/siren/huffman_consts.h --- gst-plugins-farsight-0.12.5/gst/siren/huffman_consts.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/huffman_consts.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,528 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef _HUFFMAN_CONSTS_H +#define _HUFFMAN_CONSTS_H + + +static int differential_region_power_bits[28][24] = { + {4, 6, 5, 5, 4, 4, 4, 4, 4, 4, 3, 3, 3, 4, 5, 7, 8, 9, 11, 11, 12, 12, 12, 12}, + {10, 8, 6, 5, 5, 4, 3, 3, 3, 3, 3, 3, 4, 5, 7, 9, 11, 12, 13, 15, 15, 15, 16, 16}, + {12, 10, 8, 6, 5, 4, 4, 4, 4, 4, 4, 3, 3, 3, 4, 4, 5, 5, 7, 9, 11, 13, 14, 14}, + {13, 10, 9, 9, 7, 7, 5, 5, 4, 3, 3, 3, 3, 3, 4, 4, 4, 5, 7, 9, 11, 13, 13, 13}, + {12, 13, 10, 8, 6, 6, 5, 5, 4, 4, 3, 3, 3, 3, 3, 4, 5, 5, 6, 7, 9, 11, 14, 14}, + {12, 11, 9, 8, 8, 7, 5, 4, 4, 3, 3, 3, 3, 3, 4, 4, 5, 5, 7, 8, 10, 13, 14, 14}, + {15, 16, 15, 12, 10, 8, 6, 5, 4, 3, 3, 3, 2, 3, 4, 5, 5, 7, 9, 11, 13, 16, 16, 16}, + {14, 14, 11, 10, 9, 7, 7, 5, 5, 4, 3, 3, 2, 3, 3, 4, 5, 7, 9, 9, 12, 14, 15, 15}, + {9, 9, 9, 8, 7, 6, 5, 4, 3, 3, 3, 3, 3, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 13}, + {14, 12, 10, 8, 6, 6, 5, 4, 3, 3, 3, 3, 3, 3, 4, 5, 6, 8, 8, 9, 11, 14, 14, 14}, + {13, 10, 9, 8, 6, 6, 5, 4, 4, 4, 3, 3, 2, 3, 4, 5, 6, 8, 9, 9, 11, 12, 14, 14}, + {16, 13, 12, 11, 9, 6, 5, 5, 4, 4, 4, 3, 2, 3, 3, 4, 5, 7, 8, 10, 14, 16, 16, 16}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14}, + {13, 14, 14, 14, 10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9, 11, 14, 14, 14} +}; + + +static int differential_region_power_codes[28][24] = { + {8, 38, 18, 10, 7, 6, 3, 2, 0, 1, 7, 6, 5, 4, 11, 78, 158, 318, 1278, 1279, 2552, 2553, 2554, 2555}, + {36, 8, 3, 5, 0, 1, 7, 6, 4, 3, 2, 5, 3, 4, 5, 19, 74, 150, 302, 1213, 1214, 1215, 2424, 2425}, + {2582, 644, 160, 41, 5, 11, 7, 5, 4, 1, 0, 6, 4, 7, 3, 6, 4, 21, 81, 323, 1290, 5167, 10332, 10333}, + {2940, 366, 181, 180, 47, 46, 27, 10, 8, 5, 1, 0, 3, 7, 4, 9, 12, 26, 44, 182, 734, 2941, 2942, 2943}, + {3982, 7967, 994, 249, 63, 26, 19, 18, 14, 8, 6, 1, 0, 2, 5, 7, 12, 30, 27, 125, 496, 1990, 15932, 15933}, + {3254, 1626, 407, 206, 202, 100, 30, 14, 3, 5, 3, 0, 2, 4, 2, 13, 24, 31, 102, 207, 812, 6511, 13020, 13021}, + {1110, 2216, 1111, 139, 35, 9, 3, 20, 11, 4, 2, 1, 3, 3, 1, 0, 21, 5, 16, 68, 276, 2217, 2218, 2219}, + {1013, 1014, 127, 62, 29, 6, 4, 16, 0, 1, 3, 2, 3, 1, 5, 9, 17, 5, 28, 30, 252, 1015, 2024, 2025}, + {381, 380, 372, 191, 94, 44, 16, 10, 7, 3, 1, 0, 2, 6, 9, 17, 45, 92, 187, 746, 1494, 2991, 5980, 5981}, + {3036, 758, 188, 45, 43, 10, 4, 3, 6, 4, 2, 0, 3, 7, 11, 20, 42, 44, 46, 95, 378, 3037, 3038, 3039}, + {751, 92, 45, 20, 26, 4, 12, 7, 4, 0, 4, 1, 3, 5, 5, 3, 27, 21, 44, 47, 186, 374, 1500, 1501}, + {45572, 5697, 2849, 1425, 357, 45, 23, 6, 10, 7, 2, 2, 3, 0, 4, 6, 7, 88, 179, 713, 11392, 45573, 45574, 45575}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021}, + {2511, 5016, 5018, 5017, 312, 79, 38, 36, 30, 14, 6, 0, 2, 1, 3, 5, 8, 31, 37, 157, 626, 5019, 5020, 5021} +}; + + +static int bitcount_table_category0[196] = { + 1, 4, 6, 6, 7, 7, 8, 8, 8, 9, 9, 10, 11, 11, 4, 5, 6, 7, 7, 8, 8, + 9, 9, 9, 9, 10, 11, 11, 5, 6, 7, 8, 8, 9, 9, 9, 9, 10, 10, 10, 11, + 12, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 12, 13, 7, 7, 8, 9, 9, + 9, 10, 10, 10, 10, 11, 11, 12, 13, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, + 11, 12, 13, 14, 8, 8, 9, 9, 10, 10, 11, 11, 11, 12, 12, 13, 13, 15, 8, + 8, 9, 9, 10, 10, 11, 11, 11, 12, 12, 13, 14, 15, 9, 9, 9, 10, 10, 10, + 11, 11, 12, 13, 12, 14, 15, 16, 9, 9, 10, 10, 10, 10, 11, 12, 12, 14, + 14, 16, 16, 16, 9, 9, 10, 10, 11, 11, 12, 13, 13, 14, 14, 15, 15, 16, + 10, 10, 10, 11, 11, 12, 12, 13, 15, 15, 16, 14, 15, 15, 11, 11, 11, 12, + 13, 13, 13, 15, 16, 16, 16, 16, 14, 15, 11, 11, 12, 13, 13, 14, 15, 16, + 16, 16, 16, 16, 16, 14}; + +static int code_table_category0[196] = { + 1, 2, 1, 24, 14, 51, 9, 68, 110, 26, 218, 54, 154, 761, 3, 10, 22, 8, 58, + 22, 71, 16, 30, 50, 213, 75, 94, 632, 15, 18, 52, 23, 107, 5, 54, 63, 239, + 46, 276, 271, 851, 252, 28, 10, 12, 1, 22, 133, 191, 55, 105, 278, 317, 554, + 310, 276, 32, 50, 94, 20, 187, 219, 13, 268, 473, 445, 145, 849, 1277, 623, + 1, 14, 0, 55, 238, 121, 120, 269, 318, 530, 639, 1117, 509, 556, 24, 78, 51, + 153, 62, 308, 16, 25, 68, 1058, 428, 277, 2233, 1114, 92, 108, 141, 223, 270, + 381, 24, 212, 760, 35, 1063, 279, 1717, 3439, 7, 21, 152, 73, 309, 310, 95, 944, + 1890, 2232, 1891, 5107, 10213, 4981, 61, 62, 9, 79, 474, 475, 848, 1059, 1056, 1716, + 139, 4978, 4983, 4983, 140, 186, 76, 444, 144, 633, 1057, 838, 2237, 4472, 4473, + 10212, 10212, 4983, 74, 78, 311, 213, 850, 1062, 1119, 508, 276, 277, 4982, 4473, + 10212, 10212, 208, 70, 555, 418, 68, 510, 2552, 1115, 4980, 4979, 4982, 4982, 4473, + 10212, 215, 71, 253, 511, 839, 1718, 2488, 6876, 6877, 4979, 4979, 4982, 4982, 4473}; + + +static int bitcount_table_category1[100] = { + 1, 4, 5, 6, 7, 8, 8, 9, 10, 10, 4, 5, 6, 7, 7, 8, 8, 9, 9, 11, 5, 5, 6, 7, 8, 8, 9, 9, + 10, 11, 6, 6, 7, 8, 8, 9, 9, 10, 11, 12, 7, 7, 8, 8, 9, 9, 10, 11, 11, 13, 8, 8, 8, + 9, 9, 10, 10, 11, 12, 14, 8, 8, 8, 9, 10, 11, 11, 12, 13, 15, 9, 9, 9, 10, 11, 12, + 12, 14, 14, 14, 9, 9, 9, 10, 11, 12, 14, 16, 14, 14, 10, 10, 11, 12, 13, 14, 16, 16, + 16, 14}; + +static int code_table_category1[100] = { + 1, 2, 11, 27, 31, 9, 120, 31, 275, 310, 1, 0, 12, 5, 33, 54, 102, 111, 246, 448, 10, 14, + 31, 39, 59, 100, 114, 202, 485, 969, 24, 26, 36, 52, 103, 30, 120, 242, 69, 1244, 35, + 32, 14, 61, 113, 117, 233, 486, 487, 2491, 13, 12, 69, 110, 149, 35, 495, 449, 1978, + 7751, 76, 75, 122, 136, 213, 68, 623, 930, 3959, 9961, 115, 16, 107, 225, 424, 850, + 1936, 7916, 4981, 4981, 148, 154, 243, 407, 988, 851, 7750, 19920, 7916, 4981, 406, 274, + 464, 931, 3874, 7917, 19921, 19920, 19920, 7916}; + + +static int bitcount_table_category2[64] = { + 1, 4, 5, 7, 8, 9, 10, 3, 4, 5, 7, 8, 9, 10, 5, 5, 6, 7, 8, 10, 10, 7, 6, 7, 8, 9, 10, 12, + 8, 8, 8, 9, 10, 12, 14, 8, 9, 9, 10, 11, 15, 16, 9, 10, 11, 12, 13, 16, 15, 1, 1, 1}; + +static int code_table_category2[52] = { + 1, 0, 10, 11, 28, 62, 363, 3, 2, 9, 8, 24, 53, 352, 7, 8, 13, 25, 89, 74, 355, 10, 23, 24, + 29, 55, 354, 1449, 25, 19, 30, 52, 108, 438, 5793, 91, 36, 63, 353, 725, 11584, 23170, 180, + 75, 218, 439, 2897, 23171, 11584}; + + +static int bitcount_table_category3[625] = { + 2, 4, 6, 8, 10, 5, 5, 6, 8, 10, 7, 8, 8, 10, 12, 9, 9, 10, 12, 15, 10, 11, 13, 16, 16, 5, 6, 8, + 10, 11, 5, 6, 8, 10, 12, 7, 7, 8, 10, 13, 9, 9, 10, 12, 15, 12, 11, 13, 16, 16, 7, 9, 10, 12, + 15, 7, 8, 10, 12, 13, 9, 9, 11, 13, 16, 11, 11, 12, 14, 16, 12, 12, 14, 16, 14, 9, 11, 12, 16, + 16, 9, 10, 13, 15, 16, 10, 11, 12, 16, 16, 13, 13, 16, 16, 16, 16, 16, 15, 16, 16, 11, 13, 16, + 16, 15, 11, 13, 15, 16, 16, 13, 13, 16, 16, 16, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 4, 6, 8, + 10, 13, 6, 6, 8, 10, 13, 9, 8, 10, 12, 16, 10, 10, 11, 15, 16, 13, 12, 14, 16, 16, 5, 6, 8, 11, 13, + 6, 6, 8, 10, 13, 8, 8, 9, 11, 14, 10, 10, 12, 12, 16, 13, 12, 13, 15, 16, 7, 8, 9, 12, 16, 7, 8, + 10, 12, 14, 9, 9, 10, 13, 16, 11, 10, 12, 15, 16, 13, 13, 16, 16, 15, 9, 11, 13, 16, 16, 9, 10, + 12, 15, 16, 10, 11, 13, 16, 16, 13, 12, 16, 16, 16, 16, 16, 16, 16, 16, 11, 13, 16, 16, 16, 11, + 13, 16, 16, 16, 12, 13, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 6, 8, 11, 13, 16, 8, + 8, 10, 12, 16, 11, 10, 11, 13, 16, 12, 13, 13, 15, 16, 16, 16, 14, 16, 15, 6, 8, 10, 13, 16, 8, + 8, 10, 12, 16, 10, 10, 11, 13, 16, 13, 12, 13, 16, 16, 14, 14, 14, 16, 16, 8, 9, 11, 13, 16, 8, + 9, 11, 16, 14, 10, 10, 12, 15, 16, 12, 12, 13, 16, 16, 15, 16, 16, 16, 16, 10, 12, 15, 16, 16, + 10, 12, 12, 14, 16, 12, 12, 13, 16, 16, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 12, 15, 15, 16, + 16, 13, 13, 16, 16, 14, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 14, 15, 16, 16, 16, 8, 10, 13, + 15, 16, 10, 11, 13, 16, 16, 13, 13, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 8, 10, + 11, 15, 16, 9, 10, 12, 16, 16, 12, 12, 15, 16, 16, 16, 14, 16, 16, 16, 16, 16, 16, 16, 16, 9, 11, + 14, 16, 16, 10, 11, 13, 16, 16, 14, 13, 14, 16, 16, 16, 15, 15, 16, 16, 16, 16, 16, 16, 16, 11, 13, + 16, 16, 16, 11, 13, 15, 16, 16, 13, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 15, 16, + 16, 16, 16, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 9, 13, + 16, 16, 16, 11, 13, 16, 16, 16, 14, 15, 16, 16, 16, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 9, 13, + 15, 15, 16, 12, 13, 14, 16, 16, 16, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 13, + 15, 16, 16, 12, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 15, 15, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 15, 16, 16, 13, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16}; + +static int code_table_category3[625] = { + 3, 8, 46, 145, 228, 4, 8, 47, 28, 455, 89, 2, 180, 5, 1335, 250, 12, 644, 1311, 139, 729, 251, 870, + 2172, 2211, 5, 23, 112, 334, 1469, 21, 3, 5, 111, 2014, 88, 79, 152, 124, 2685, 297, 48, 110, 1310, + 149, 501, 1231, 153, 2267, 2569, 57, 13, 653, 2587, 143, 75, 124, 118, 2611, 5242, 61, 50, 253, 3633, + 2216, 476, 39, 57, 1926, 2236, 2586, 1329, 1920, 2566, 1926, 296, 233, 2590, 2240, 2217, 253, 613, + 867, 144, 318, 614, 252, 2589, 2242, 2218, 872, 866, 2187, 2296, 2155, 2568, 2227, 150, 2567, 2296, + 199, 2686, 2160, 2290, 19145, 232, 2680, 128, 2192, 2212, 2684, 793, 2281, 2223, 2242, 1934, 2165, + 2146, 2291, 2296, 2222, 2189, 2187, 2296, 2296, 6, 4, 82, 725, 3632, 15, 21, 56, 599, 148, 3, 162, + 42, 411, 2301, 735, 654, 930, 137, 2586, 869, 1334, 1931, 2300, 2213, 9, 22, 146, 1290, 5240, 5, 12, + 53, 630, 875, 80, 9, 8, 86, 2002, 210, 117, 56, 2019, 2162, 146, 397, 868, 131, 2151, 77, 160, 365, + 2610, 2252, 59, 54, 41, 2591, 1928, 226, 14, 121, 5792, 2295, 1197, 728, 408, 130, 2157, 3635, 155, + 2573, 2587, 130, 314, 64, 144, 2173, 2176, 115, 30, 409, 153, 2590, 631, 26, 4787, 2221, 2174, 2683, + 1863, 2572, 319, 2150, 2177, 2194, 2571, 2257, 319, 65, 145, 2251, 2156, 2161, 909, 864, 2193, 2197, + 2246, 2588, 5797, 156, 2258, 2221, 2158, 2199, 2214, 2152, 319, 2188, 2264, 2572, 319, 319, 30, 117, + 219, 865, 2263, 147, 127, 239, 410, 2247, 27, 324, 1468, 2681, 2180, 1328, 5241, 147, 142, 2237, 2241, + 2245, 1921, 2262, 142, 41, 11, 505, 2682, 2591, 0, 26, 229, 2015, 2577, 464, 98, 87, 5243, 2166, 149, + 2016, 5244, 2190, 2198, 9573, 11598, 11599, 2235, 2190, 144, 298, 1004, 5245, 2277, 156, 104, 254, 2560, + 1922, 612, 325, 2017, 129, 2588, 2608, 1330, 871, 2144, 2145, 132, 2147, 2148, 2149, 2144, 119, 1331, + 133, 2153, 2154, 211, 58, 2609, 1923, 2159, 510, 163, 5246, 2163, 2164, 1924, 134, 2167, 2168, 2168, 2169, + 2170, 2171, 2168, 2168, 1332, 135, 136, 2175, 2153, 150, 873, 2178, 2179, 1923, 1925, 2181, 2182, 2183, + 2163, 2184, 2185, 2186, 2168, 2168, 1924, 134, 2167, 2168, 2168, 58, 326, 2687, 138, 2191, 31, 66, 874, + 2195, 2196, 151, 152, 1927, 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2205, 55, + 103, 1230, 140, 2215, 118, 15, 1333, 2219, 2220, 2018, 511, 141, 2224, 2225, 2226, 1929, 2228, 2229, 2230, + 2231, 2232, 2233, 2234, 2229, 366, 1005, 1930, 2238, 2239, 12, 1006, 5247, 2243, 2244, 1932, 3634, 1933, + 2248, 2249, 2250, 145, 146, 2253, 2253, 2254, 2255, 2256, 2253, 2253, 1291, 5793, 2259, 2260, 2261, 477, + 5794, 147, 2265, 2266, 5795, 2268, 2269, 2270, 2270, 2271, 2272, 2273, 2274, 2274, 2275, 2276, 2273, 2274, + 2274, 148, 2278, 2279, 2280, 2260, 1935, 2282, 2283, 2284, 2265, 2285, 2286, 2287, 2270, 2270, 2288, 2289, + 2273, 2274, 2274, 2271, 2272, 2273, 2274, 2274, 233, 5796, 2292, 2293, 2294, 1292, 3724, 2297, 2298, 2299, + 2000, 151, 2302, 2303, 2200, 152, 2561, 2562, 2563, 2205, 2564, 2565, 2204, 2205, 2205, 363, 154, 154, 155, + 2570, 59, 3725, 2001, 2574, 2575, 2576, 157, 2578, 2579, 2224, 2580, 2581, 2582, 2583, 2229, 2584, 2585, 2228, + 2229, 2229, 654, 5798, 158, 2589, 2238, 2392, 2003, 2592, 2593, 2243, 2594, 2595, 2596, 2597, 2248, 2598, 2599, + 2600, 2253, 2253, 2250, 145, 146, 2253, 2253, 2601, 2602, 2603, 2604, 2260, 2605, 2606, 2607, 6336, 2265, 6337, + 6338, 6339, 2270, 2270, 6340, 6341, 2273, 2274, 2274, 2271, 2272, 2273, 2274, 2274, 6342, 6343, 2259, 2260, + 2260, 38288, 38289, 147, 2265, 2265, 5795, 2268, 2269, 2270, 2270, 2271, 2272, 2273, 2274, 2274, 2271, 2272, + 2273, 2274, 2274}; + + +static int bitcount_table_category4[256] = { + 2, 4, 7, 10, 4, 5, 7, 10, 7, 8, 10, 14, 11, 11, 15, 15, 4, 5, 9, + 12, 5, 5, 8, 12, 8, 7, 10, 15, 11, 11, 15, 15, 7, 9, 12, 15, 8, 8, + 12, 15, 10, 10, 13, 15, 14, 14, 15, 13, 11, 13, 15, 15, 11, 13, 15, + 15, 14, 15, 15, 13, 15, 15, 13, 13, 4, 5, 9, 13, 5, 6, 9, 13, 9, 9, + 11, 15, 14, 13, 15, 15, 4, 6, 9, 12, 5, 6, 9, 13, 9, 8, 11, 15, 13, + 12, 15, 15, 7, 9, 12, 15, 7, 8, 11, 15, 10, 10, 14, 15, 14, 15, 15, + 14, 10, 12, 15, 15, 11, 13, 15, 15, 15, 15, 15, 14, 15, 15, 14, 14, + 6, 9, 13, 14, 8, 9, 12, 15, 12, 12, 15, 15, 15, 15, 15, 15, 7, 9, 13, + 15, 8, 9, 12, 15, 11, 12, 15, 15, 15, 15, 15, 15, 9, 11, 15, 15, 9, + 11, 15, 15, 14, 14, 15, 15, 15, 15, 15, 15, 14, 15, 15, 15, 14, 15, + 15, 15, 15, 15, 15, 15, 14, 14, 15, 15, 9, 12, 15, 15, 12, 13, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 10, 12, 15, 15, 12, 14, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 14, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 14, + 15, 15, 14, 14, 15, 15}; + +static int code_table_category4[256] = { + 1, 2, 4, 572, 10, 0, 69, 712, 91, 10, 46, 9182, 1426, 1430, 30172, 30194, + 9, 28, 22, 2258, 16, 25, 142, 2179, 15, 111, 719, 1521, 1131, 1437, 1520, + 30196, 88, 283, 3803, 30193, 13, 236, 2856, 30166, 545, 951, 5709, 1522, + 3241, 9180, 30179, 5709, 1088, 4356, 30410, 30175, 1146, 377, 30162, 30163, + 8715, 30176, 30165, 5709, 30197, 30184, 5709, 5709, 1, 23, 28, 5710, 26, 14, + 29, 7538, 102, 103, 1429, 1524, 3237, 7060, 30401, 30201, 15, 13, 470, 3768, + 24, 15, 281, 5747, 24, 181, 1128, 30206, 5711, 3531, 30156, 30158, 116, 100, + 2260, 30187, 119, 234, 1764, 30171, 716, 883, 9183, 30164, 3236, 1528, 30180, + 9183, 885, 2870, 1532, 30160, 1431, 5708, 30192, 30205, 30402, 30168, 30173, + 9183, 30157, 30161, 9183, 9183, 54, 25, 1621, 15211, 180, 287, 2261, 30198, 808, + 811, 30411, 30413, 30414, 22986, 22987, 30411, 24, 273, 376, 30159, 137, 280, + 2871, 1523, 1768, 2259, 1525, 30167, 1526, 30169, 30170, 1525, 443, 1434, 1527, + 30174, 474, 1769, 30177, 30178, 3238, 3239, 30181, 30181, 30182, 30183, 30181, + 30181, 3240, 30185, 30186, 1527, 9181, 30188, 30189, 30177, 30190, 30191, 30181, + 30181, 3238, 3239, 30181, 30181, 440, 2857, 1529, 30195, 2294, 7061, 1530, 30199, + 30200, 1531, 30202, 30411, 30203, 30204, 30411, 30411, 203, 2872, 30207, 30400, + 189, 11492, 30403, 30404, 30405, 30406, 30407, 1525, 30408, 30409, 1525, 1525, + 8714, 1533, 30412, 1527, 1534, 1535, 30415, 30177, 30416, 30417, 30181, 30181, + 3238, 3239, 30181, 30181, 30418, 30419, 1527, 1527, 30420, 30421, 30177, 30177, + 3238, 3239, 30181, 30181, 3238, 3239, 30181, 30181}; + + +static int bitcount_table_category5[256] = { + 2, 4, 8, 4, 5, 9, 9, 10, 14, 4, 6, 11, 5, 6, 12,10, 11, 15, 9, 11, 15, 10, 13, 15, + 14, 15, 6, 4, 6, 12, 6, 7, 12, 12, 12, 15, 5, 7, 13, 6, 7, 13, 12, 13, 15, 10, 12, + 15, 11, 13, 15, 15, 15, 7, 8, 13, 15, 11, 12, 15, 15, 15, 7, 10, 13, 15, 12, 15, 15, + 15, 15, 7, 15, 15, 7, 15, 15, 7, 6, 7, 7, 4, 5, 11, 5, 7, 12, 11, 12, 15, 6, 7, 13, 7, + 8, 14, 12, 14, 15, 11, 13, 15, 12, 13, 15, 15, 15, 8, 5, 6, 13, 7, 8, 15, 12, 14, 15, + 6, 8, 14, 7, 8, 15, 14, 15, 15, 12, 12, 15, 12, 13, 15, 15, 15, 8, 9, 13, 15, 12, 13, + 15, 15, 15, 8, 11, 13, 15, 13, 13, 15, 15, 15, 8, 14, 15, 8, 15, 15, 8, 7, 8, 8, 8, 10, + 15, 11, 12, 15, 15, 15, 7, 10, 12, 15, 12, 13, 15, 15, 15, 8, 14, 15, 7, 15, 15, 8, 7, + 8, 8, 8, 12, 15, 12, 13, 15, 15, 15, 8, 11, 13, 15, 13, 15, 15, 15, 15, 8, 15, 15, 8, + 15, 15, 8, 7, 8, 8, 14, 15, 6, 15, 15, 8, 7, 8, 8, 15, 15, 8, 15, 15, 8, 7, 8, 8, 6, + 8, 8, 7, 8, 8, 7, 8, 8}; + +static int code_table_category5[243] = { + 0, 5, 220, 10, 16, 443, 390, 391, 14333, 11, 26, 1566, 26, 54, 3135, 508, 1558, 28581, + 255, 1782, 28599, 885, 6208, 28578, 14335, 28579, 54, 9, 35, 3129, 27, 68, 3537, 1562, + 3568, 28610, 25, 62, 4078, 58, 118, 7763, 3107, 7758, 28563, 778, 3131, 28598, 780, 7123, + 28630, 28593, 28586, 118, 243, 6210, 28614, 1018, 3567, 28601, 28611, 28570, 68, 388, 6256, + 28619, 1559, 28562, 28606, 28565, 28591, 118, 28594, 28571, 62, 28618, 28590, 118, 58, + 118, 118, 4, 28, 1781, 31, 60, 3134, 1938, 3882, 28574, 25, 96, 7757, 49, 126, 14244, + 3883, 14334, 28613, 1769, 4077, 28602, 3106, 7756, 28582, 28621, 28566, 126, 14, 61, 4079, + 61, 138, 28491, 3536, 8153, 28573, 49, 96, 12442, 119, 240, 28490, 12443, 28560, 28561, 3111, + 3580, 28564, 3130, 7759, 28567, 28568, 28569, 240, 444, 6209, 28572, 3569, 6211, 28575, 28576, + 28577, 138, 778, 7760, 28580, 7761, 7762, 28583, 28584, 28585, 240, 14319, 28587, 96, 28588, 28589, + 240, 119, 240, 240, 139, 968, 28592, 1554, 3581, 28595, 28596, 28597, 60, 971, 3560, 28600,3582, + 7132, 28603, 28604, 28605, 126, 14332, 28607, 96, 28608, 28609, 126, 49, 126, 126, 241, 1558, 28612, + 1563, 6257, 28615, 28616, 28617, 138, 1559, 7133, 28620, 6220, 28622, 28623, 28624, 28625, 240, 28626, + 28627, 96, 28628, 28629, 240, 119, 240, 240, 8152, 28631, 61, 28632, 28633, 138, 61, 138, 138, 28634, + 28635, 96, 28636, 28637, 240, 119, 240, 240, 49, 96, 96, 119, 240, 240, 119, 240, 240}; + + +static int bitcount_table_category6[32] = {1, 4, 4, 6, 4, 6, 6, 8, 4, 6, 6, 8, 6, 9, 8, 10, 4, 6, 7, 8, 6, 9, 8, 11, 6, 9, 8, 10, 8, 10, 9, 11}; + +static int code_table_category6[32] = {1, 2, 4, 2, 5, 29, 24, 101, 3, 31, 28, 105, 3, 5, 102, 424, 1, 30, 0, 107, 27, 200, 103, 806, 1, 4, 104, 402, 3, 425, 213, 807}; + + + +static int *bitcount_tables[7] = { + bitcount_table_category0, + bitcount_table_category1, + bitcount_table_category2, + bitcount_table_category3, + bitcount_table_category4, + bitcount_table_category5, + bitcount_table_category6}; + +static int *code_tables[7] = { + code_table_category0, + code_table_category1, + code_table_category2, + code_table_category3, + code_table_category4, + code_table_category5, + code_table_category6}; + + + + +static int differential_decoder_tree[27][24][2] = { + {{1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, -12}, {-11, -10}, {-8, -9}, {-7, -6}, {-13, 12}, {-5, -4}, {0, 13}, {-3, -14}, {-2, 14}, {-1, 15}, {-15, 16}, {-16, 17}, {-17, 18}, {19, 20}, {21, 22}, {-18, -19}, {-20, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, 6}, {7, 8}, {-10, -9}, {-8, -11}, {-7, -6}, {9, -5}, {10, -12}, {-4, 11}, {-13, -3}, {12, -2}, {13, -14}, {-1, 14}, {15, -15}, {0, 16}, {-16, 17}, {-17, 18}, {-18, 19}, {20, 21},{22, -19}, {-20, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {-12, 11}, {-11, -13}, {-10, -9}, {12, -14}, {-8, -7}, {-15, -6}, {13, -5}, {-16, -4}, {14, -17}, {15, -3}, {16, -18}, {-2, 17}, {18, -19}, {-1, 19}, {-20, 20}, {0, 21}, {22, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, 6}, {-11, -10}, {7, -12}, {8, -9}, {9, -13}, {-14, 10}, {-8, -15}, {-16, 11}, {-7, 12}, {-17, -6}, {13, 14}, {-18, 15}, {-5, -4}, {16, 17}, {-3, -2}, {-19, 18}, {-1, 19}, {-20, 20}, {21, 22}, {0, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, 6}, {-12, -11}, {-13, 7}, {8, -14}, {-10, 9}, {10, -15}, {-9, 11}, {-8, 12}, {-16, 13}, {-7, -6}, {-17, 14}, {-5, -18}, {15, -4}, {16, -19}, {17, -3}, {-20, 18}, {-2, 19}, {-21, 20}, {0, 21}, {22, -1}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, 6}, {-11, 7}, {-12, -10}, {-13, -9}, {8, 9}, {-14, -8}, {10, -15}, {-7, 11}, {-16, 12}, {-6, -17}, {13, 14}, {-5, 15}, {-18, 16}, {-4, 17}, {-3, -19}, {18, -2}, {-20, 19}, {-1, 20}, {0, 21}, {22, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, -12}, {6, -11}, {-10, -13}, {-9, 7}, {8, -14}, {9, -8}, {-15, 10}, {-7, -16}, {11, -6}, {12, -17}, {13, -5}, {-18, 14}, {15, -4}, {-19, 16}, {17, -3}, {-20, 18}, {19, 20}, {21, 22}, {0, -2}, {-1, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, -12}, {6, -13}, {-11, -10}, {7, -14}, {8, -9}, {9, -15}, {-8, 10}, {-7, -16}, {11, 12}, {-6, -17}, {-5, 13}, {14, 15}, {-18, -4}, {-19, 16}, {-3, 17}, {18, -2}, {-20, 19}, {20, 21}, {22, 0}, {-1, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, 6}, {-11, -10}, {-12, -9}, {7, 8}, {-13, -8}, {9, -14}, {-7, 10}, {-6, -15}, {11, 12}, {-5, -16}, {13, 14}, {-17, 15}, {-4, 16}, {17, -18}, {18, -3}, {-2, 19}, {-1, 0}, {-19, 20}, {-20, 21}, {22, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, 6}, {-11, 7}, {-10, -12}, {-9, 8}, {-8, -13}, {9, -7}, {10, -14}, {-6, 11}, {-15, 12}, {-5, 13}, {-16, -4}, {14, 15}, {-17, -3}, {-18, 16}, {17, -19}, {-2, 18}, {-20, 19}, {-1, 20}, {21, 22}, {0, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, -12}, {6, -11}, {7, 8}, {-10, -13}, {-9, 9}, {-8, -14}, {10, -7}, {11, -15}, {-6, 12}, {-5, 13}, {-4, -16}, {14, 15}, {-3, -17}, {16, 17}, {-18, -2}, {18, -19}, {-1, 19}, {-20, 20}, {-21, 21}, {22, 0}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {5, -12}, {-13, 6}, {-11, 7}, {-14, 8}, {-10, 9}, {-15, -9}, {-8, 10}, {-7, -16}, {11, -6}, {12, -5}, {-17, 13}, {14, -18}, {15, -4}, {16, -19}, {17, -3}, {18, -2}, {19, -1}, {-20, 20}, {21, 22}, {0, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}, + {{1, 2}, {3, 4}, {-12, 5}, {-11, -13}, {6, -14}, {-10, 7}, {8, -15}, {-9, 9}, {-16, 10}, {-8, -17}, {11, 12}, {-7, -18}, {-6, 13}, {14, -5}, {15, -19}, {-4, 16}, {-20, 17}, {18, 19}, {20, 21}, {22, 0}, {-1, -3}, {-2, -21}, {-22, -23}, {-32, -32}}}; + + + +static float mlt_quant[7][14] = { + { 0.0f, 0.392f, 0.761f, 1.120f, 1.477f, 1.832f, 2.183f, 2.541f, 2.893f, 3.245f, 3.598f, 3.942f, 4.288f, 4.724f}, + { 0.0f, 0.544f, 1.060f, 1.563f, 2.068f, 2.571f, 3.072f, 3.562f, 4.070f, 4.620f, 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 0.746f, 1.464f, 2.180f, 2.882f, 3.584f, 4.316f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 1.006f, 2.000f, 2.993f, 3.985f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 1.321f, 2.703f, 3.983f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 1.657f, 3.491f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 1.964f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}}; + + +static int decoder_tree0[360] = { + 2, 1, 4, 6, 8, 10, 12, 14, 16, 18, 33, 3, 20, 22, 24, 26, 28, 30, + 32, 34, 36, 38, 35, 40, 42, 44, 46, 5, 48, 65, 50, 52, 54, 56, 58, 60, + 62, 64, 37, 66, 67, 68, 97, 70, 72, 74, 7, 76, 78, 80, 82, 84, 86, 88, + 99, 90, 39, 92, 94, 96, 129, 98, 9, 100, 102, 104, 106, 108, 110, 112, 41, 161, + 69, 114, 116, 118, 131, 120, 122, 11, 124, 126, 128, 193, 130, 132, 71, 134, 43, 136, + 138, 140, 163, 101, 13, 142, 144, 146, 148, 150, 152, 154, 225, 156, 158, 195, 160, 162, + 45, 164, 15, 166, 73, 168, 170, 133, 47, 172, 257, 174, 176, 178, 75, 103, 180, 165, + 182, 17, 227, 184, 105, 49, 135, 186, 289, 188, 259, 190, 192, 194, 196, 198, 291, 77, + 200, 202, 197, 107, 204, 19, 51, 229, 206, 167, 208, 210, 212, 214, 21, 79, 81, 109, + 216, 218, 220, 222, 53, 137, 224, 199, 226, 323, 321, 169, 228, 111, 230, 232, 139, 261, + 234, 83, 236, 201, 238, 240, 293, 242, 353, 231, 141, 244, 246, 113, 23, 355, 85, 248, + 55, 115, 250, 263, 252, 254, 203, 171, 256, 258, 233, 235, 143, 357, 325, 260, 295, 262, + 173, 145, 177, 87, 264, 327, 267, 266, 268, 175, 270, 272, 117, 297, 274, 265, 147, 179, + 205, 276, 207, 237, 269, 278, 57, 59, 387, 209, 280, 282, 149, 329, 385, 284, 25, 286, + 239, 119, 288, 27, 290, 292, 299, 294, 359, 89, 296, 298, 419, 181, 300, 331, 271, 417, + 211, 361, 151, 389, 241, 302, 304, 303, 306, 308, 421, 91, 310, 312, 391, 314, 121, 316, + 333, 318, 275, 213, 301, 243, 183, 335, 320, 363, 322, 215, 324, 393, 273, 337, 153, 326, + 423, 365, 328, 367, 247, 395, 185, 123, 330, 425, 245, 155, 332, 334, 305, 397, 336, 277, + 217, 338, 340, 339, 427, 342, 344, 346, 307, 399, 187, 348, 309, 341, 350, 369, 279, 311, + 429, 249, 219, 352, 354, 356, 358, 431, 373, 401, 371, 313, 281, 433, 343, 403, 251, 283}; + + +static int decoder_tree1[188] = { + 2, 1, 4, 6, 8, 10, 12, 14, 16, 3, 33, 18, 20, 22, 24, 26, 35, 28, 30, + 32, 34, 36, 5, 65, 38, 40, 37, 42, 44, 46, 67, 48, 50, 52, 54, 56, 58, + 60, 7, 62, 39, 97, 64, 69, 66, 99, 68, 70, 72, 74, 76, 78, 80, 129, 41, + 131, 82, 9, 71, 84, 86, 101, 88, 90, 92, 94, 96, 161, 43, 11, 73, 98, 103, + 100, 163, 102, 104, 106, 108, 133, 110, 105, 112, 75, 114, 45, 13, 116, 165, 118, 195, + 135, 193, 120, 77, 122, 47, 124, 167, 225, 126, 79, 107, 227, 128, 137, 197, 15, 130, + 169, 199, 132, 109, 134, 17, 139, 49, 136, 229, 138, 140, 81, 259, 142, 144, 171, 146, + 141, 148, 111, 150, 201, 231, 152, 51, 257, 289, 154, 19, 113, 156, 261, 158, 203, 173, + 263, 143, 160, 291, 235, 83, 162, 233, 265, 164, 205, 166, 293, 145, 168, 175, 177, 237, + 115, 295, 170, 207, 172, 267, 174, 176, 297, 147, 178, 180, 269, 182, 271, 209, 299, 239, + 179, 184, 301, 241, 211, 0, 0}; + +static int decoder_tree2[96] = { + 2, 1, 4, 6, 8, 10, 12, 3, 17, 14, 19, 16, 18, 20, 22, 24, 26, 5, 21, + 35, 33, 28, 30, 32, 34, 36, 38, 37, 40, 23, 51, 42, 7, 49, 44, 46, 48, 50, + 39, 53, 52, 54, 56, 25, 67, 9, 58, 60, 65, 55, 41, 62, 64, 69, 66, 11, 27, + 68, 57, 83, 70, 71, 81, 43, 72, 74, 13, 76, 85, 29, 73, 78, 99, 59, 87, 101, + 80, 97, 45, 82, 84, 75, 89, 61, 86, 103, 88, 77, 90, 105, 91, 92, 107, 93, 0, 0}; + +static int decoder_tree3[1040] = { + 2, 4, 6, 8, 10, 1, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 3, 36, + 1025, 38, 40, 42, 44, 46, 48, 50, 129, 17, 52, 54, 1153, 19, 56, 58, 60, 62, 64, + 66, 68, 145, 70, 72, 74, 76, 78, 1169, 1027, 147, 80, 82, 1171, 84, 86, 131, 88, 1155, + 1043, 1041, 90, 92, 5, 94, 96, 98, 100, 102, 104, 21, 106, 108, 2049, 2177, 110, 112, 114, + 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 142, 33, 144, 163, 146, 148, + 150, 152, 154, 161, 156, 35, 158, 1297, 160, 162, 273, 257, 164, 166, 149, 168, 1281, 170, 172, + 2193, 174, 176, 178, 1299, 180, 1045, 182, 184, 1173, 186, 3201, 188, 190, 192, 194, 2195, 1187, 23, + 2179, 196, 7, 198, 275, 200, 2051, 202, 2065, 204, 206, 1029, 1185, 208, 210, 1157, 37, 3073, 2067, + 133, 212, 214, 2321, 216, 165, 218, 1059, 220, 1283, 222, 2305, 224, 226, 228, 230, 259, 232, 234, + 2323, 236, 1409, 1057, 1315, 238, 240, 242, 244, 246, 1425, 248, 1313, 250, 252, 254, 256, 258, 260, + 289, 262, 264, 1189, 266, 268, 179, 151, 270, 272, 274, 276, 278, 291, 280, 282, 9, 385, 284, + 286, 177, 49, 401, 1061, 288, 290, 292, 51, 294, 296, 298, 300, 302, 304, 25, 306, 2083, 39, + 308, 310, 3329, 167, 312, 314, 1175, 316, 318, 1203, 135, 320, 322, 324, 326, 328, 2211, 2307, 330, + 1301, 332, 334, 1047, 336, 338, 2449, 3217, 340, 1427, 2209, 53, 342, 2339, 3345, 344, 346, 348, 403, + 181, 4097, 2197, 350, 2181, 1285, 1317, 1031, 352, 354, 356, 3089, 358, 360, 4225, 277, 362, 364, 366, + 368, 2069, 370, 3203, 293, 1201, 305, 372, 3219, 307, 2433, 374, 376, 378, 380, 2081, 1411, 382, 384, + 3075, 1443, 513, 386, 387, 388, 390, 1331, 261, 392, 394, 396, 398, 400, 1441, 1075, 67, 1159, 402, + 404, 406, 408, 410, 412, 414, 3347, 2325, 416, 65, 418, 420, 422, 424, 426, 2053, 193, 1073, 428, + 430, 432, 1537, 1329, 2337, 2213, 434, 417, 183, 41, 436, 438, 440, 442, 444, 446, 448, 450, 195, + 2435, 452, 2085, 1063, 1191, 454, 456, 458, 460, 419, 2071, 1553, 3091, 55, 137, 462, 464, 466, 468, + 470, 472, 474, 476, 478, 2309, 4113, 480, 482, 484, 486, 2451, 2465, 1205, 153, 488, 490, 492, 494, + 496, 498, 500, 502, 504, 506, 508, 510, 512, 514, 516, 518, 520, 522, 524, 1333, 526, 1555, 2467, + 2227, 3205, 3331, 528, 530, 532, 534, 536, 538, 540, 542, 544, 546, 548, 529, 309, 1303, 3473, 3457, + 389, 1569, 1445, 1077, 69, 2199, 1539, 4353, 550, 552, 554, 556, 558, 560, 562, 1459, 4241, 3221, 1429, + 2341, 279, 3475, 169, 564, 545, 3105, 323, 2353, 2097, 3235, 421, 2229, 3107, 3233, 566, 568, 570, 572, + 574, 576, 578, 580, 582, 584, 586, 588, 590, 592, 594, 596, 2099, 1091, 531, 2437, 4227, 405, 197, + 263, 1287, 2577, 1049, 1571, 598, 600, 602, 604, 606, 608, 610, 612, 614, 616, 618, 620, 622, 624, 626, + 628, 630, 632, 634, 636, 638, 640, 642, 644, 646, 648, 650, 1345, 1219, 3077, 1457, 2225, 2579, 515, 2561, + 2469, 433, 1221, 2183, 4243, 652, 654, 656, 658, 660, 662, 664, 666, 668, 670, 1217, 3333, 3093, 435, 321, + 4369, 1089, 2055, 4099, 3361, 1319, 547, 1161, 1177, 672, 2355, 4115, 1413, 4257, 3349, 2453, 3109, 2357, 2215, 3363, + 1079, 1207, 311, 1033, 1347, 1065, 674, 676, 678, 680, 682, 684, 686, 688, 690, 692, 694, 696, 698, 700, + 702, 704, 706, 708, 710, 712, 714, 716, 718, 720, 722, 724, 726, 728, 730, 732, 734, 736, 738, 740, + 742, 744, 746, 748, 750, 752, 754, 756, 758, 760, 762, 764, 766, 768, 770, 772, 774, 776, 778, 780, + 782, 784, 786, 788, 790, 792, 794, 796, 798, 800, 802, 804, 806, 808, 810, 812, 814, 2593, 2565, 4261, + 3253, 437, 325, 3489, 2311, 4259, 1431, 2087, 2563, 295, 2343, 449, 199, 265, 2201, 4371, 1193, 816, 533, 1557, + 2581, 2241, 3365, 3491, 3603, 549, 2101, 1461, 1093, 2117, 3459, 3079, 4481, 3095, 2327, 3461, 4129, 3249, 1447, 2471, + 2231, 71, 4497, 2609, 1289, 393, 3251, 2073, 3097, 2371, 1305, 2089, 818, 820, 822, 824, 826, 828, 830, 832, + 834, 836, 838, 840, 842, 844, 846, 848, 850, 852, 854, 856, 858, 860, 862, 864, 866, 868, 870, 872, + 874, 876, 878, 880, 882, 884, 886, 888, 890, 892, 894, 896, 898, 900, 902, 904, 906, 908, 910, 912, + 914, 916, 918, 920, 922, 924, 926, 928, 930, 932, 934, 936, 938, 940, 942, 944, 946, 948, 950, 952, + 954, 956, 958, 960, 962, 964, 966, 968, 970, 972, 974, 976, 978, 980, 982, 984, 986, 988, 990, 992, + 994, 996, 998, 1000, 1002, 1004, 1006, 1008, 1010, 1012, 1014, 1016, 1018, 1020, 1022, 1024, 1026, 1028, 1030, 1032, + 1034, 1036, 4161, 4273, 3507, 3493, 4517, 2497, 1573, 2597, 3621, 4531, 4627, 3523, 3125, 4149, 4529, 3139, 4515, 451, + 4277, 2113, 4163, 4499, 3381, 4405, 1473, 4373, 2485, 3509, 565, 1589, 2613, 3585, 3123, 4403, 3141, 4147, 563, 2245, + 3269, 4357, 1349, 2373, 3397, 453, 1477, 2501, 2481, 579, 1601, 3477, 4103, 3265, 2243, 1587, 3207, 4231, 3267, 4501, + 1475, 3335, 4359, 391, 1415, 2439, 3463, 4487, 519, 1543, 2567, 3591, 4609, 4289, 4611, 2499, 4119, 4385, 4145, 4401, + 3223, 4247, 3379, 577, 3393, 3351, 4375, 407, 1585, 2455, 3479, 4503, 535, 1559, 2583, 3607, 3605, 4513, 4485, 3111, + 4135, 3121, 517, 3377, 3239, 4263, 1541, 4291, 4229, 3367, 4391, 423, 2115, 4131, 3495, 551, 1575, 2599, 3635, 3395, + 2103, 3127, 4151, 3589, 4101, 1603, 3255, 4279, 3601, 1335, 2359, 3383, 439, 1463, 2487, 3511, 567, 1591, 4133, 1095, + 2119, 3143, 2369, 1223, 2247, 3271, 327, 1351, 2375, 455, 1479, 3137, 3521, 2057, 3081, 4105, 4387, 3505, 2185, 3209, + 4233, 3587, 4355, 2313, 3337, 3237, 1417, 2441, 3465, 521, 1545, 3617, 3633, 561, 4625, 4121, 2611, 2483, 2595, 3225, + 4249, 281, 4245, 2329, 3353, 409, 1433, 2457, 3481, 537, 1561, 4483, 3619, 4389, 3113, 4275, 4117, 2217, 3241, 297, + 1321, 2345, 3369, 425, 1449, 2473, 57, 1081, 2105, 3129, 185, 1209, 2233, 3257, 313, 1337, 2361, 441, 1465, 73, + 1097, 201, 1225, 0, 0}; + + +static int decoder_tree4[416] = { + 2, 4, 6, 1, 8, 10, 12, 14, 16, 18, 20, 22, 24, 3, 129, 26, 28, 9, 33, 30, 32, + 34, 36, 11, 161, 38, 40, 42, 41, 44, 46, 131, 43, 169, 35, 48, 137, 50, 52, 54, 56, 139, + 163, 171, 58, 60, 62, 64, 5, 66, 68, 70, 257, 72, 74, 76, 13, 78, 80, 289, 82, 84, 17, + 86, 88, 65, 90, 201, 19, 92, 94, 51, 193, 96, 98, 49, 100, 73, 102, 104, 106, 45, 108, 110, + 297, 112, 114, 116, 37, 203, 118, 120, 179, 122, 177, 124, 265, 126, 75, 133, 259, 291, 147, 128, 67, + 195, 130, 141, 173, 299, 132, 145, 134, 165, 136, 138, 140, 142, 7, 144, 146, 21, 267, 148, 53, 150, + 321, 152, 154, 15, 156, 81, 158, 160, 385, 162, 417, 164, 166, 168, 83, 170, 172, 329, 174, 211, 176, + 27, 178, 180, 182, 209, 184, 186, 188, 190, 25, 192, 331, 194, 196, 105, 57, 198, 97, 200, 202, 323, + 225, 59, 149, 204, 206, 233, 307, 208, 77, 181, 210, 212, 214, 216, 218, 220, 222, 47, 224, 226, 69, + 228, 230, 197, 232, 425, 393, 205, 275, 293, 39, 234, 236, 238, 305, 135, 155, 301, 143, 240, 242, 235, + 395, 244, 246, 248, 250, 252, 254, 256, 258, 260, 262, 273, 269, 185, 264, 266, 268, 270, 272, 274, 276, + 261, 153, 278, 280, 282, 187, 337, 387, 107, 284, 427, 227, 167, 419, 286, 288, 290, 292, 294, 296, 298, + 300, 302, 304, 306, 308, 310, 312, 314, 316, 318, 320, 322, 324, 326, 328, 330, 332, 334, 336, 338, 115, + 99, 85, 213, 29, 113, 23, 89, 241, 61, 449, 339, 175, 340, 342, 344, 346, 348, 350, 352, 354, 356, + 358, 360, 362, 364, 366, 368, 370, 372, 374, 376, 378, 380, 382, 384, 386, 388, 390, 392, 394, 396, 398, + 400, 402, 404, 406, 408, 410, 412, 414, 389, 361, 457, 465, 429, 451, 333, 109, 277, 243, 263, 295, 199, + 283, 151, 55, 183, 229, 357, 363, 123, 491, 397, 411, 251, 313, 441, 467, 345, 433, 461, 219, 237, 365, + 435, 353, 347, 405, 409, 217, 309, 437, 369, 371, 341, 117, 245, 249, 157, 285, 403, 189, 317, 93, 221, + 315, 401, 481, 391, 489, 121, 421, 423, 71, 483, 327, 103, 231, 443, 459, 271, 399, 355, 91, 303, 431, + 79, 207, 335, 111, 239, 281, 325, 279, 453, 101, 311, 87, 215, 31, 159, 63, 191}; + +static int decoder_tree5[384] = { + 2, 4, 1, 6, 8, 10, 12, 14, 16, 18, 20, 22, 3, 513, 24, 26, 28, 9, 129, 33, 30, + 32, 34, 36, 38, 40, 11, 42, 641, 44, 46, 41, 161, 48, 515, 50, 52, 131, 54, 35, 545, 137, + 56, 58, 60, 521, 62, 43, 673, 64, 169, 66, 68, 523, 70, 163, 643, 139, 553, 72, 649, 74, 547, + 76, 78, 80, 681, 171, 82, 84, 555, 86, 675, 88, 651, 5, 90, 92, 1025, 94, 96, 98, 683, 13, + 100, 17, 102, 104, 106, 65, 108, 110, 257, 112, 114, 1153, 19, 116, 118, 120, 122, 124, 49, 126, 128, + 769, 289, 130, 132, 134, 73, 136, 138, 140, 142, 193, 144, 146, 148, 150, 152, 154, 517, 156, 158, 37, + 51, 160, 201, 162, 145, 164, 166, 168, 133, 170, 801, 45, 172, 174, 1057, 176, 178, 67, 180, 1027, 577, + 182, 184, 186, 188, 190, 192, 194, 196, 198, 259, 200, 202, 204, 525, 177, 265, 141, 206, 208, 210, 212, + 195, 297, 214, 75, 216, 1033, 203, 585, 1155, 1185, 267, 1161, 549, 218, 220, 657, 777, 147, 222, 224, 226, + 228, 230, 232, 234, 236, 238, 240, 587, 645, 165, 242, 244, 246, 248, 250, 771, 291, 252, 579, 1065, 1035, + 705, 531, 529, 659, 173, 254, 561, 653, 256, 713, 677, 557, 258, 260, 262, 264, 266, 268, 270, 272, 274, + 276, 278, 280, 282, 284, 286, 288, 290, 292, 294, 296, 298, 300, 707, 1059, 809, 715, 563, 179, 691, 1193, + 21, 779, 1067, 299, 1187, 302, 304, 306, 308, 310, 312, 314, 316, 318, 320, 322, 324, 326, 328, 330, 332, + 334, 336, 338, 340, 342, 344, 346, 348, 350, 352, 354, 356, 358, 360, 362, 364, 366, 368, 370, 372, 374, + 376, 378, 380, 83, 69, 1281, 803, 321, 1195, 1163, 811, 1323, 689, 1321, 1099, 305, 835, 1227, 331, 843, 785, + 593, 1043, 1291, 1283, 1171, 275, 787, 1217, 833, 1075, 1313, 1219, 1203, 307, 819, 841, 595, 211, 723, 721, 817, + 1029, 329, 81, 1157, 261, 773, 1097, 1089, 1061, 1169, 1091, 1189, 293, 805, 1201, 581, 197, 709, 1289, 273, 1037, + 1315, 1041, 1165, 269, 781, 209, 1073, 1069, 323, 685, 1197, 301, 813, 77, 589, 205, 717, 1225, 533, 149, 661, + 53, 565, 181, 693, 0, 0}; + + +static int decoder_tree6[62] = { + 2, 1, 4, 6, 8, 10, 12, 14, 16, 3, + 33, 5, 17, 9, 18, 20, 22, 24, 26, 28, + 30, 32, 34, 7, 49, 13, 25, 36, 38, 11, + 21, 41, 35, 37, 19, 40, 42, 44, 46, 48, + 50, 15, 52, 57, 29, 27, 23, 53, 54, 51, + 39, 45, 43, 56, 58, 31, 55, 60, 61, 47, + 59, 63}; + +static int *decoder_tables[7] = { + decoder_tree0, + decoder_tree1, + decoder_tree2, + decoder_tree3, + decoder_tree4, + decoder_tree5, + decoder_tree6, +}; + +static float noise_category5[20] = {0.70711f, 0.6179f, 0.5005f, 0.3220f, + 0.17678f, 0.17678f, 0.17678f, 0.17678f, + 0.17678f, 0.17678f, 0.17678f, 0.17678f, + 0.17678f, 0.17678f, 0.17678f, 0.17678f, + 0.17678f, 0.17678f, 0.17678f, 0.17678f}; + +static float noise_category6[20] = {0.70711f, 0.5686f, 0.3563f, 0.25f, + 0.25f, 0.25f, 0.25f, 0.25f, + 0.25f, 0.25f, 0.25f, 0.25f, + 0.25f, 0.25f, 0.25f, 0.25f, + 0.25f, 0.25f, 0.25f, 0.25f}; + +static float noise_category7 = 0.70711f; + + +static int index_table[8] = {4, 4, 3, 3, 2, 2, 1, 0}; + +#endif /* _HUFFMAN_CONSTS_H */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/huffman.h gst-plugins-farsight-0.12.8/gst/siren/huffman.h --- gst-plugins-farsight-0.12.5/gst/siren/huffman.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/huffman.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,35 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef _SIREN7_HUFFMAN_H_ +#define _SIREN7_HUFFMAN_H_ + +#include "decoder.h" + +extern int compute_region_powers(int number_of_regions, float *coefs, int *drp_num_bits, int *drp_code_bits, int *absolute_region_power_index, int esf_adjustment); +extern int quantize_mlt(int number_of_regions, int rate_control_possibilities, int number_of_available_bits, float *coefs, int *absolute_region_power_index, int *power_categories, int *category_balance, int *region_mlt_bit_counts, int *region_mlt_bits); +extern int decode_envelope(int number_of_regions, float *decoder_standard_deviation, int *absolute_region_power_index, int esf_adjustment); +extern int decode_vector(SirenDecoder decoder, int number_of_regions, int number_of_available_bits, float *decoder_standard_deviation, int *power_categories, float *coefs, int scale_factor); + +extern void set_bitstream(int *stream); +extern int next_bit(); + +#endif /* _SIREN7_HUFFMAN_H_ */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/Makefile.am gst-plugins-farsight-0.12.8/gst/siren/Makefile.am --- gst-plugins-farsight-0.12.5/gst/siren/Makefile.am 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/Makefile.am 2008-05-01 12:52:06.000000000 -0500 @@ -0,0 +1,16 @@ +plugin_LTLIBRARIES = libgstsiren.la + +libgstsiren_la_SOURCES = gstsiren.c \ + gstsirendec.c gstsirendec.h \ + gstsirenenc.c gstsirenenc.h \ + gstrtpsirenpay.c gstrtpsirenpay.h \ + gstrtpsirendepay.c gstrtpsirendepay.h \ + common.c dct4.c decoder.c encoder.c huffman.c \ + huffman.h rmlt.h common.h dct4.h decoder.h \ + encoder.h huffman_consts.h rmlt.c siren7.h + + +libgstsiren_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) +libgstsiren_la_LIBADD = $(GST_LIBS_LIBS) $(GST_BASE_LIBS) \ + -lgstrtp-@GST_MAJORMINOR@ -lm +libgstsiren_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) diff -Nru gst-plugins-farsight-0.12.5/gst/siren/Makefile.in gst-plugins-farsight-0.12.8/gst/siren/Makefile.in --- gst-plugins-farsight-0.12.5/gst/siren/Makefile.in 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/Makefile.in 2008-05-09 14:56:42.000000000 -0500 @@ -0,0 +1,624 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 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. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +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@ +target_triplet = @target@ +subdir = gst/siren +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ + $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gst-feature.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +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)$(plugindir)" +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +libgstsiren_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_libgstsiren_la_OBJECTS = libgstsiren_la-gstsiren.lo \ + libgstsiren_la-gstsirendec.lo libgstsiren_la-gstsirenenc.lo \ + libgstsiren_la-gstrtpsirenpay.lo \ + libgstsiren_la-gstrtpsirendepay.lo libgstsiren_la-common.lo \ + libgstsiren_la-dct4.lo libgstsiren_la-decoder.lo \ + libgstsiren_la-encoder.lo libgstsiren_la-huffman.lo \ + libgstsiren_la-rmlt.lo +libgstsiren_la_OBJECTS = $(am_libgstsiren_la_OBJECTS) +libgstsiren_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstsiren_la_CFLAGS) \ + $(CFLAGS) $(libgstsiren_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libgstsiren_la_SOURCES) +DIST_SOURCES = $(libgstsiren_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ERROR_CFLAGS = @ERROR_CFLAGS@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GREP = @GREP@ +GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ +GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ +GST_BASE_LIBS = @GST_BASE_LIBS@ +GST_CFLAGS = @GST_CFLAGS@ +GST_LIBS = @GST_LIBS@ +GST_MAJORMINOR = @GST_MAJORMINOR@ +GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ +GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@ +GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@ +GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@ +GST_PLUGINS_VERSION = @GST_PLUGINS_VERSION@ +GST_PLUGINS_VERSION_MAJOR = @GST_PLUGINS_VERSION_MAJOR@ +GST_PLUGINS_VERSION_MICRO = @GST_PLUGINS_VERSION_MICRO@ +GST_PLUGINS_VERSION_MINOR = @GST_PLUGINS_VERSION_MINOR@ +GST_PLUGINS_VERSION_NANO = @GST_PLUGINS_VERSION_NANO@ +GST_PLUGINS_VERSION_RELEASE = @GST_PLUGINS_VERSION_RELEASE@ +GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +HAVE_CXX = @HAVE_CXX@ +HAVE_GSM = @HAVE_GSM@ +HAVE_JASPER = @HAVE_JASPER@ +HAVE_JINGLEP2P = @HAVE_JINGLEP2P@ +HAVE_PKGCONFIG = @HAVE_PKGCONFIG@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JASPER_LIBS = @JASPER_LIBS@ +JINGLEBASE_CFLAGS = @JINGLEBASE_CFLAGS@ +JINGLEBASE_LIBS = @JINGLEBASE_LIBS@ +JINGLEP2P_CFLAGS = @JINGLEP2P_CFLAGS@ +JINGLEP2P_LIBS = @JINGLEP2P_LIBS@ +JRTP_CFLAGS = @JRTP_CFLAGS@ +JRTP_LIBS = @JRTP_LIBS@ +JTHREAD_CFLAGS = @JTHREAD_CFLAGS@ +JTHREAD_LIBS = @JTHREAD_LIBS@ +LDFLAGS = @LDFLAGS@ +LIBJ2K_PREFIX = @LIBJ2K_PREFIX@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MIMIC_CFLAGS = @MIMIC_CFLAGS@ +MIMIC_LIBS = @MIMIC_LIBS@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plugindir = @plugindir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugin_LTLIBRARIES = libgstsiren.la +libgstsiren_la_SOURCES = gstsiren.c \ + gstsirendec.c gstsirendec.h \ + gstsirenenc.c gstsirenenc.h \ + gstrtpsirenpay.c gstrtpsirenpay.h \ + gstrtpsirendepay.c gstrtpsirendepay.h \ + common.c dct4.c decoder.c encoder.c huffman.c \ + huffman.h rmlt.h common.h dct4.h decoder.h \ + encoder.h huffman_consts.h rmlt.c siren7.h + +libgstsiren_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) +libgstsiren_la_LIBADD = $(GST_LIBS_LIBS) $(GST_BASE_LIBS) \ + -lgstrtp-@GST_MAJORMINOR@ -lm + +libgstsiren_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gst/siren/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gst/siren/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + else :; fi; \ + done + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libgstsiren.la: $(libgstsiren_la_OBJECTS) $(libgstsiren_la_DEPENDENCIES) + $(libgstsiren_la_LINK) -rpath $(plugindir) $(libgstsiren_la_OBJECTS) $(libgstsiren_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-common.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-dct4.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-decoder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-encoder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-gstrtpsirendepay.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-gstrtpsirenpay.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-gstsiren.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-gstsirendec.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-gstsirenenc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-huffman.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstsiren_la-rmlt.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +libgstsiren_la-gstsiren.lo: gstsiren.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-gstsiren.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-gstsiren.Tpo -c -o libgstsiren_la-gstsiren.lo `test -f 'gstsiren.c' || echo '$(srcdir)/'`gstsiren.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-gstsiren.Tpo $(DEPDIR)/libgstsiren_la-gstsiren.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstsiren.c' object='libgstsiren_la-gstsiren.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-gstsiren.lo `test -f 'gstsiren.c' || echo '$(srcdir)/'`gstsiren.c + +libgstsiren_la-gstsirendec.lo: gstsirendec.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-gstsirendec.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-gstsirendec.Tpo -c -o libgstsiren_la-gstsirendec.lo `test -f 'gstsirendec.c' || echo '$(srcdir)/'`gstsirendec.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-gstsirendec.Tpo $(DEPDIR)/libgstsiren_la-gstsirendec.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstsirendec.c' object='libgstsiren_la-gstsirendec.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-gstsirendec.lo `test -f 'gstsirendec.c' || echo '$(srcdir)/'`gstsirendec.c + +libgstsiren_la-gstsirenenc.lo: gstsirenenc.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-gstsirenenc.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-gstsirenenc.Tpo -c -o libgstsiren_la-gstsirenenc.lo `test -f 'gstsirenenc.c' || echo '$(srcdir)/'`gstsirenenc.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-gstsirenenc.Tpo $(DEPDIR)/libgstsiren_la-gstsirenenc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstsirenenc.c' object='libgstsiren_la-gstsirenenc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-gstsirenenc.lo `test -f 'gstsirenenc.c' || echo '$(srcdir)/'`gstsirenenc.c + +libgstsiren_la-gstrtpsirenpay.lo: gstrtpsirenpay.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-gstrtpsirenpay.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-gstrtpsirenpay.Tpo -c -o libgstsiren_la-gstrtpsirenpay.lo `test -f 'gstrtpsirenpay.c' || echo '$(srcdir)/'`gstrtpsirenpay.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-gstrtpsirenpay.Tpo $(DEPDIR)/libgstsiren_la-gstrtpsirenpay.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstrtpsirenpay.c' object='libgstsiren_la-gstrtpsirenpay.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-gstrtpsirenpay.lo `test -f 'gstrtpsirenpay.c' || echo '$(srcdir)/'`gstrtpsirenpay.c + +libgstsiren_la-gstrtpsirendepay.lo: gstrtpsirendepay.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-gstrtpsirendepay.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-gstrtpsirendepay.Tpo -c -o libgstsiren_la-gstrtpsirendepay.lo `test -f 'gstrtpsirendepay.c' || echo '$(srcdir)/'`gstrtpsirendepay.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-gstrtpsirendepay.Tpo $(DEPDIR)/libgstsiren_la-gstrtpsirendepay.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstrtpsirendepay.c' object='libgstsiren_la-gstrtpsirendepay.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-gstrtpsirendepay.lo `test -f 'gstrtpsirendepay.c' || echo '$(srcdir)/'`gstrtpsirendepay.c + +libgstsiren_la-common.lo: common.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-common.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-common.Tpo -c -o libgstsiren_la-common.lo `test -f 'common.c' || echo '$(srcdir)/'`common.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-common.Tpo $(DEPDIR)/libgstsiren_la-common.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common.c' object='libgstsiren_la-common.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-common.lo `test -f 'common.c' || echo '$(srcdir)/'`common.c + +libgstsiren_la-dct4.lo: dct4.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-dct4.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-dct4.Tpo -c -o libgstsiren_la-dct4.lo `test -f 'dct4.c' || echo '$(srcdir)/'`dct4.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-dct4.Tpo $(DEPDIR)/libgstsiren_la-dct4.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dct4.c' object='libgstsiren_la-dct4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-dct4.lo `test -f 'dct4.c' || echo '$(srcdir)/'`dct4.c + +libgstsiren_la-decoder.lo: decoder.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-decoder.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-decoder.Tpo -c -o libgstsiren_la-decoder.lo `test -f 'decoder.c' || echo '$(srcdir)/'`decoder.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-decoder.Tpo $(DEPDIR)/libgstsiren_la-decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='decoder.c' object='libgstsiren_la-decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-decoder.lo `test -f 'decoder.c' || echo '$(srcdir)/'`decoder.c + +libgstsiren_la-encoder.lo: encoder.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-encoder.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-encoder.Tpo -c -o libgstsiren_la-encoder.lo `test -f 'encoder.c' || echo '$(srcdir)/'`encoder.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-encoder.Tpo $(DEPDIR)/libgstsiren_la-encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='encoder.c' object='libgstsiren_la-encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-encoder.lo `test -f 'encoder.c' || echo '$(srcdir)/'`encoder.c + +libgstsiren_la-huffman.lo: huffman.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-huffman.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-huffman.Tpo -c -o libgstsiren_la-huffman.lo `test -f 'huffman.c' || echo '$(srcdir)/'`huffman.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-huffman.Tpo $(DEPDIR)/libgstsiren_la-huffman.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='huffman.c' object='libgstsiren_la-huffman.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-huffman.lo `test -f 'huffman.c' || echo '$(srcdir)/'`huffman.c + +libgstsiren_la-rmlt.lo: rmlt.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -MT libgstsiren_la-rmlt.lo -MD -MP -MF $(DEPDIR)/libgstsiren_la-rmlt.Tpo -c -o libgstsiren_la-rmlt.lo `test -f 'rmlt.c' || echo '$(srcdir)/'`rmlt.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstsiren_la-rmlt.Tpo $(DEPDIR)/libgstsiren_la-rmlt.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmlt.c' object='libgstsiren_la-rmlt.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsiren_la_CFLAGS) $(CFLAGS) -c -o libgstsiren_la-rmlt.lo `test -f 'rmlt.c' || echo '$(srcdir)/'`rmlt.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gst-plugins-farsight-0.12.5/gst/siren/rmlt.c gst-plugins-farsight-0.12.8/gst/siren/rmlt.c --- gst-plugins-farsight-0.12.5/gst/siren/rmlt.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/rmlt.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,133 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#include "siren7.h" + + +static int rmlt_initialized = 0; +static float rmlt_window_640[640]; +static float rmlt_window_320[320]; + +#define PI_2 1.57079632679489661923 + +void siren_rmlt_init() { + int i = 0; + float angle; + + for (i = 0; i < 640; i++) { + angle = (float) (((i + 0.5) * PI_2) / 640); + rmlt_window_640[i] = (float) sin(angle); + } + for (i = 0; i < 320; i++) { + angle = (float) (((i + 0.5) * PI_2) / 320); + rmlt_window_320[i] = (float) sin(angle); + } + + rmlt_initialized = 1; +} + +int siren_rmlt_encode_samples(float *samples, float *old_samples, int dct_length, float *rmlt_coefs) { + int half_dct_length = dct_length / 2; + float *old_ptr = old_samples + half_dct_length; + float *coef_high = rmlt_coefs + half_dct_length; + float *coef_low = rmlt_coefs + half_dct_length; + float *samples_low = samples; + float *samples_high = samples + dct_length; + float *window_low = NULL; + float *window_high = NULL; + int i = 0; + + if (rmlt_initialized == 0) + siren_rmlt_init(); + + if (dct_length == 320) + window_low = rmlt_window_320; + else if (dct_length == 640) + window_low = rmlt_window_640; + else + return 4; + + window_high = window_low + dct_length; + + + for (i = 0; i < half_dct_length; i++) { + *--coef_low = *--old_ptr; + *coef_high++ = (*samples_low * *--window_high) - (*--samples_high * *window_low); + *old_ptr = (*samples_high * *window_high) + (*samples_low++ * *window_low++); + } + siren_dct4(rmlt_coefs, rmlt_coefs, dct_length); + + return 0; +} + + + +int siren_rmlt_decode_samples(float *coefs, float *old_coefs, int dct_length, float *samples) { + int half_dct_length = dct_length / 2; + float *old_low = old_coefs; + float *old_high = old_coefs + half_dct_length; + float *samples_low = samples ; + float *samples_high = samples + dct_length; + float *samples_middle_low = samples + half_dct_length; + float *samples_middle_high = samples + half_dct_length; + float *window_low = NULL; + float *window_high = NULL; + float *window_middle_low = NULL; + float *window_middle_high = NULL; + float sample_low_val; + float sample_high_val; + float sample_middle_low_val; + float sample_middle_high_val; + int i = 0; + + if (rmlt_initialized == 0) + siren_rmlt_init(); + + if (dct_length == 320) + window_low = rmlt_window_320; + else if (dct_length == 640) + window_low = rmlt_window_640; + else + return 4; + + + window_high = window_low + dct_length; + window_middle_low = window_low + half_dct_length; + window_middle_high = window_low + half_dct_length; + + siren_dct4(coefs, samples, dct_length); + + for (i = 0; i < half_dct_length; i+=2) { + sample_low_val = *samples_low; + sample_high_val = *--samples_high; + sample_middle_low_val = *--samples_middle_low; + sample_middle_high_val = *samples_middle_high; + *samples_low++ = (*old_low * *--window_high) + (sample_middle_low_val * *window_low); + *samples_high = (sample_middle_low_val * *window_high) - (*old_low * *window_low++); + *samples_middle_high++ = (sample_low_val * *window_middle_high) - (*--old_high * *--window_middle_low); + *samples_middle_low = (*old_high * *window_middle_high++) + (sample_low_val * *window_middle_low); + *old_low++ = sample_middle_high_val; + *old_high = sample_high_val; + } + + return 0; +} diff -Nru gst-plugins-farsight-0.12.5/gst/siren/rmlt.h gst-plugins-farsight-0.12.8/gst/siren/rmlt.h --- gst-plugins-farsight-0.12.5/gst/siren/rmlt.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/rmlt.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,30 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef _SIREN7_RMLT_H_ +#define _SIREN7_RMLT_H_ + +extern void siren_rmlt_init(); +extern int siren_rmlt_encode_samples(float *samples, float *old_samples, int dct_length, float *rmlt_coefs); +extern int siren_rmlt_decode_samples(float *coefs, float *old_coefs, int dct_length, float *samples); + +#endif /* _SIREN7_RMLT_H_ */ diff -Nru gst-plugins-farsight-0.12.5/gst/siren/siren7.h gst-plugins-farsight-0.12.8/gst/siren/siren7.h --- gst-plugins-farsight-0.12.5/gst/siren/siren7.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/siren/siren7.h 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,30 @@ +/* + * Siren Encoder/Decoder library + * + * @author: Youness Alaoui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#ifndef _SIREN7_H +#define _SIREN7_H + +#include "encoder.h" +#include "decoder.h" + + +#endif /* _SIREN7_H */ diff -Nru gst-plugins-farsight-0.12.5/gst/valve/gstvalve.c gst-plugins-farsight-0.12.8/gst/valve/gstvalve.c --- gst-plugins-farsight-0.12.5/gst/valve/gstvalve.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/valve/gstvalve.c 2008-04-28 13:10:34.000000000 -0500 @@ -0,0 +1,293 @@ +/* + * Farsight Voice+Video library + * + * Copyright 2007 Collabora Ltd, + * Copyright 2007 Nokia Corporation + * @author: Olivier Crete + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gstvalve.h" + +#include + +GST_DEBUG_CATEGORY (valve_debug); +#define GST_CAT_DEFAULT (valve_debug) + +/* elementfactory information */ +static const GstElementDetails gst_valve_details = +GST_ELEMENT_DETAILS ( + "Valve element", + "Filter", + "This element drops all packets when drop is TRUE", + "Olivier Crete "); + + +static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + +static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + +/* Valve signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + ARG_0, + ARG_DROP, +}; + + + + +static void gst_valve_set_property (GObject *object, + guint prop_id, const GValue * value, GParamSpec * pspec); +static void gst_valve_get_property (GObject *object, + guint prop_id, GValue *value, GParamSpec *pspec); + +static GstFlowReturn gst_valve_transform_ip (GstBaseTransform *trans, + GstBuffer *buf); +static gboolean gst_valve_event (GstBaseTransform *trans, GstEvent *event); +static GstFlowReturn gst_valve_buffer_alloc (GstPad * pad, guint64 offset, + guint size, GstCaps * caps, GstBuffer ** buf); +static GstFlowReturn gst_valve_prepare_output_buffer (GstBaseTransform *trans, + GstBuffer * in_buf, gint out_size, GstCaps * out_caps, + GstBuffer ** out_buf); + +static void +_do_init (GType type) +{ + GST_DEBUG_CATEGORY_INIT + (valve_debug, "valve", 0, "Valve"); +} + +GST_BOILERPLATE_FULL (GstValve, gst_valve, GstBaseTransform, + GST_TYPE_BASE_TRANSFORM, _do_init); + +static void +gst_valve_base_init (gpointer klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&srctemplate)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&sinktemplate)); + + gst_element_class_set_details (element_class, &gst_valve_details); +} + +static void +gst_valve_class_init (GstValveClass *klass) +{ + GObjectClass *gobject_class; + GstBaseTransformClass *gstbasetransform_class; + + gobject_class = (GObjectClass *) klass; + gstbasetransform_class = (GstBaseTransformClass *) klass; + + gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_valve_set_property); + gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_valve_get_property); + + gstbasetransform_class->transform_ip = + GST_DEBUG_FUNCPTR (gst_valve_transform_ip); + gstbasetransform_class->prepare_output_buffer = + GST_DEBUG_FUNCPTR (gst_valve_prepare_output_buffer); + gstbasetransform_class->event = + GST_DEBUG_FUNCPTR (gst_valve_event); + gstbasetransform_class->src_event = + GST_DEBUG_FUNCPTR (gst_valve_event); + + g_object_class_install_property (gobject_class, ARG_DROP, + g_param_spec_boolean ("drop", + "Drops all buffers if TRUE", + "If this property if TRUE, the element will drop all buffers, if its FALSE, it will let them through", + FALSE, G_PARAM_READWRITE)); + + parent_class = g_type_class_peek_parent (klass); +} + +static void +gst_valve_init (GstValve *valve, GstValveClass *klass) +{ + + valve->drop = FALSE; + valve->discont = FALSE; + + valve->original_allocfunc = + GST_BASE_TRANSFORM (valve)->sinkpad->bufferallocfunc; + + gst_pad_set_bufferalloc_function ( + GST_BASE_TRANSFORM (valve)->sinkpad, + GST_DEBUG_FUNCPTR(gst_valve_buffer_alloc)); + + +#if GST_VERSION_MINOR >= 10 && GST_VERSION_MICRO >= 13 + gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (valve), FALSE); +#endif + +} + + +static void +gst_valve_set_property (GObject *object, + guint prop_id, const GValue *value, GParamSpec *pspec) +{ + GstValve *valve = GST_VALVE (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + case ARG_DROP: + GST_OBJECT_LOCK (object); + valve->drop = g_value_get_boolean (value); + GST_OBJECT_UNLOCK (object); + break; + } +} + +static void +gst_valve_get_property (GObject *object, + guint prop_id, GValue *value, GParamSpec *pspec) +{ + GstValve *valve = GST_VALVE (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + case ARG_DROP: + GST_OBJECT_LOCK (object); + g_value_set_boolean (value, valve->drop); + GST_OBJECT_UNLOCK (object); + break; + } +} + +static GstFlowReturn +gst_valve_prepare_output_buffer (GstBaseTransform *trans, GstBuffer * in_buf, + gint out_size, GstCaps * out_caps, + GstBuffer ** out_buf) +{ + GstValve *valve = GST_VALVE (trans); + GstFlowReturn ret = GST_FLOW_OK; + + GST_OBJECT_LOCK (GST_OBJECT (trans)); + if (valve->drop) + { +#if GST_VERSION_MINOR >= 10 && GST_VERSION_MICRO >= 13 + ret = GST_BASE_TRANSFORM_FLOW_DROPPED; +#endif + *out_buf = NULL; + valve->discont = TRUE; + } + else + { + if (valve->discont) + { + *out_buf = gst_buffer_make_metadata_writable (in_buf); + GST_BUFFER_FLAG_SET (*out_buf, GST_BUFFER_FLAG_DISCONT); + valve->discont = FALSE; + + } + else + { + *out_buf = in_buf; + } + gst_buffer_ref (*out_buf); + } + GST_OBJECT_UNLOCK (GST_OBJECT (trans)); + + return ret; +} + +static GstFlowReturn +gst_valve_transform_ip (GstBaseTransform *trans, GstBuffer *buf) +{ + return GST_FLOW_OK; +} + + +static gboolean +gst_valve_event (GstBaseTransform *trans, GstEvent *event) +{ + GstValve *valve = GST_VALVE (trans); + gboolean ret = TRUE; + + GST_OBJECT_LOCK (GST_OBJECT (trans)); + if (valve->drop) + ret = FALSE; + GST_OBJECT_UNLOCK (GST_OBJECT (trans)); + + return ret; +} + +static GstFlowReturn +gst_valve_buffer_alloc (GstPad * pad, guint64 offset, guint size, + GstCaps * caps, GstBuffer ** buf) +{ + GstValve *valve = GST_VALVE (gst_pad_get_parent_element (pad)); + GstFlowReturn ret = GST_FLOW_OK; + + GST_OBJECT_LOCK (GST_OBJECT (valve)); + if (valve->drop) + { + GST_OBJECT_UNLOCK (GST_OBJECT (valve)); + *buf = gst_buffer_new_and_alloc (size); + GST_BUFFER_OFFSET (*buf) = offset; + gst_buffer_set_caps (*buf, caps); + } + else + { + GstPadBufferAllocFunction allocfunc = valve->original_allocfunc; + GST_OBJECT_UNLOCK (GST_OBJECT (valve)); + ret = allocfunc (pad, offset, size, caps, buf); + } + + gst_object_unref (valve); + + return ret; +} + + +gboolean +gst_valve_plugin_init (GstPlugin *plugin) +{ + return gst_element_register (plugin, "fsvalve", + GST_RANK_MARGINAL, GST_TYPE_VALVE); +} + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "fsvalve", + "Valve", + gst_valve_plugin_init, VERSION, "LGPL", "Farsight", "http://farsight.sf.net") diff -Nru gst-plugins-farsight-0.12.5/gst/valve/gstvalve.h gst-plugins-farsight-0.12.8/gst/valve/gstvalve.h --- gst-plugins-farsight-0.12.5/gst/valve/gstvalve.h 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/valve/gstvalve.h 2008-01-17 12:38:39.000000000 -0600 @@ -0,0 +1,79 @@ +/* + * Farsight Voice+Video library + * + * Copyright 2007 Collabora Ltd, + * Copyright 2007 Nokia Corporation + * @author: Olivier Crete + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + +#ifndef __GST_VALVE_H__ +#define __GST_VALVE_H__ + +#include +#include + +G_BEGIN_DECLS + +/* #define's don't like whitespacey bits */ +#define GST_TYPE_VALVE \ + (gst_valve_get_type()) +#define GST_VALVE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + GST_TYPE_VALVE,GstValve)) +#define GST_VALVE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), \ + GST_TYPE_VALVE,GstValveClass)) +#define GST_IS_VALVE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VALVE)) +#define GST_IS_VALVE_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VALVE)) + +typedef struct _GstValve GstValve; +typedef struct _GstValveClass GstValveClass; +typedef struct _GstValvePrivate GstValvePrivate; + +struct _GstValve +{ + GstBaseTransform parent; + + /* Protected by the object lock */ + gboolean drop; + + /* Protected by the stream lock*/ + gboolean discont; + + GstPadBufferAllocFunction original_allocfunc; + + /*< private > */ + gpointer _gst_reserved[GST_PADDING]; +}; + +struct _GstValveClass +{ + GstBaseTransformClass parent_class; + + /*< private > */ + gpointer _gst_reserved[GST_PADDING]; +}; + +GType gst_valve_get_type (void); + +G_END_DECLS + +#endif /* __GST_VALVE_H__ */ diff -Nru gst-plugins-farsight-0.12.5/gst/valve/Makefile.am gst-plugins-farsight-0.12.8/gst/valve/Makefile.am --- gst-plugins-farsight-0.12.5/gst/valve/Makefile.am 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/valve/Makefile.am 2007-10-26 13:00:27.000000000 -0500 @@ -0,0 +1,7 @@ +plugin_LTLIBRARIES = libfsvalve.la + +libfsvalve_la_SOURCES = gstvalve.c gstvalve.h + +libfsvalve_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) +libfsvalve_la_LIBADD = $(GST_LIBS_LIBS) +libfsvalve_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) diff -Nru gst-plugins-farsight-0.12.5/gst/valve/Makefile.in gst-plugins-farsight-0.12.8/gst/valve/Makefile.in --- gst-plugins-farsight-0.12.5/gst/valve/Makefile.in 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/gst/valve/Makefile.in 2008-05-09 14:56:42.000000000 -0500 @@ -0,0 +1,527 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 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. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +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@ +target_triplet = @target@ +subdir = gst/valve +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ + $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gst-feature.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +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)$(plugindir)" +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +libfsvalve_la_DEPENDENCIES = +am_libfsvalve_la_OBJECTS = libfsvalve_la-gstvalve.lo +libfsvalve_la_OBJECTS = $(am_libfsvalve_la_OBJECTS) +libfsvalve_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libfsvalve_la_CFLAGS) \ + $(CFLAGS) $(libfsvalve_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libfsvalve_la_SOURCES) +DIST_SOURCES = $(libfsvalve_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ERROR_CFLAGS = @ERROR_CFLAGS@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GREP = @GREP@ +GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ +GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ +GST_BASE_LIBS = @GST_BASE_LIBS@ +GST_CFLAGS = @GST_CFLAGS@ +GST_LIBS = @GST_LIBS@ +GST_MAJORMINOR = @GST_MAJORMINOR@ +GST_PLUGINS_ALL = @GST_PLUGINS_ALL@ +GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@ +GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@ +GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@ +GST_PLUGINS_VERSION = @GST_PLUGINS_VERSION@ +GST_PLUGINS_VERSION_MAJOR = @GST_PLUGINS_VERSION_MAJOR@ +GST_PLUGINS_VERSION_MICRO = @GST_PLUGINS_VERSION_MICRO@ +GST_PLUGINS_VERSION_MINOR = @GST_PLUGINS_VERSION_MINOR@ +GST_PLUGINS_VERSION_NANO = @GST_PLUGINS_VERSION_NANO@ +GST_PLUGINS_VERSION_RELEASE = @GST_PLUGINS_VERSION_RELEASE@ +GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +HAVE_CXX = @HAVE_CXX@ +HAVE_GSM = @HAVE_GSM@ +HAVE_JASPER = @HAVE_JASPER@ +HAVE_JINGLEP2P = @HAVE_JINGLEP2P@ +HAVE_PKGCONFIG = @HAVE_PKGCONFIG@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JASPER_LIBS = @JASPER_LIBS@ +JINGLEBASE_CFLAGS = @JINGLEBASE_CFLAGS@ +JINGLEBASE_LIBS = @JINGLEBASE_LIBS@ +JINGLEP2P_CFLAGS = @JINGLEP2P_CFLAGS@ +JINGLEP2P_LIBS = @JINGLEP2P_LIBS@ +JRTP_CFLAGS = @JRTP_CFLAGS@ +JRTP_LIBS = @JRTP_LIBS@ +JTHREAD_CFLAGS = @JTHREAD_CFLAGS@ +JTHREAD_LIBS = @JTHREAD_LIBS@ +LDFLAGS = @LDFLAGS@ +LIBJ2K_PREFIX = @LIBJ2K_PREFIX@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MIMIC_CFLAGS = @MIMIC_CFLAGS@ +MIMIC_LIBS = @MIMIC_LIBS@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plugindir = @plugindir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugin_LTLIBRARIES = libfsvalve.la +libfsvalve_la_SOURCES = gstvalve.c gstvalve.h +libfsvalve_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) +libfsvalve_la_LIBADD = $(GST_LIBS_LIBS) +libfsvalve_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gst/valve/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gst/valve/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + else :; fi; \ + done + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libfsvalve.la: $(libfsvalve_la_OBJECTS) $(libfsvalve_la_DEPENDENCIES) + $(libfsvalve_la_LINK) -rpath $(plugindir) $(libfsvalve_la_OBJECTS) $(libfsvalve_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfsvalve_la-gstvalve.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +libfsvalve_la-gstvalve.lo: gstvalve.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfsvalve_la_CFLAGS) $(CFLAGS) -MT libfsvalve_la-gstvalve.lo -MD -MP -MF $(DEPDIR)/libfsvalve_la-gstvalve.Tpo -c -o libfsvalve_la-gstvalve.lo `test -f 'gstvalve.c' || echo '$(srcdir)/'`gstvalve.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libfsvalve_la-gstvalve.Tpo $(DEPDIR)/libfsvalve_la-gstvalve.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstvalve.c' object='libfsvalve_la-gstvalve.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfsvalve_la_CFLAGS) $(CFLAGS) -c -o libfsvalve_la-gstvalve.lo `test -f 'gstvalve.c' || echo '$(srcdir)/'`gstvalve.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gst-plugins-farsight-0.12.5/ltmain.sh gst-plugins-farsight-0.12.8/ltmain.sh --- gst-plugins-farsight-0.12.5/ltmain.sh 2007-08-22 13:01:38.000000000 -0500 +++ gst-plugins-farsight-0.12.8/ltmain.sh 2008-03-03 17:11:27.000000000 -0600 @@ -2,7 +2,7 @@ # NOTE: Changing this file will not affect anything until you rerun configure. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2008 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.24 -TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" +VERSION=1.5.26 +TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -113,15 +113,21 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +lt_env= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${$lt_var+set}\" = set; then save_$lt_var=\$$lt_var + lt_env=\"$lt_var=\$$lt_var \$lt_env\" $lt_var=C export $lt_var fi" done +if test -n "$lt_env"; then + lt_env="env $lt_env" +fi + # Make sure IFS has a sensible default lt_nl=' ' @@ -499,7 +505,7 @@ echo "\ $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? @@ -802,6 +808,7 @@ *.for) xform=for ;; *.java) xform=java ;; *.obj) xform=obj ;; + *.sx) xform=sx ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -970,7 +977,7 @@ $run $rm "$lobj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else test -n "$output_obj" && $run $rm $removelist exit $EXIT_FAILURE @@ -1042,7 +1049,7 @@ command="$command$suppress_output" $run $rm "$obj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else $run $rm $removelist exit $EXIT_FAILURE @@ -1175,6 +1182,7 @@ thread_safe=no vinfo= vinfo_number=no + single_module="${wl}-single_module" func_infer_tag $base_compile @@ -1660,6 +1668,11 @@ continue ;; + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + -module) module=yes continue @@ -2163,7 +2176,12 @@ continue fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library lib="$searchdir/lib${name}${search_ext}" @@ -2959,12 +2977,18 @@ # we do not want to link against static libs, # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do depdepl=$tmp done - if test -f "$path/$depdepl" ; then + if test -f "$deplibdir/$depdepl" ; then + depdepl="$deplibdir/$depdepl" + elif test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" + else + # Can't find it, oh well... + depdepl= fi # do not add paths which are already there case " $newlib_search_path " in @@ -3112,9 +3136,10 @@ case $linkmode in oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 @@ -4251,9 +4276,10 @@ ;; obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 @@ -5688,53 +5714,9 @@ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit $EXIT_FAILURE fi - if test "X$EGREP" = X ; then - EGREP=egrep - fi - # We do not want portage's install root ($D) present. Check only for - # this if the .la is being installed. - if test "$installed" = yes && test "$D"; then - eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` - else - mynewdependency_lib="$libdir/$name" - fi - # Do not add duplicates - if test "$mynewdependency_lib"; then - my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` - if test -z "$my_little_ninja_foo_1"; then - newdependency_libs="$newdependency_libs $mynewdependency_lib" - fi - fi - ;; - *) - if test "$installed" = yes; then - # Rather use S=WORKDIR if our version of portage supports it. - # This is because some ebuild (gcc) do not use $S as buildroot. - if test "$PWORKDIR"; then - S="$PWORKDIR" - fi - # We do not want portage's build root ($S) present. - my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` - # We do not want portage's install root ($D) present. - my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` - if test -n "$my_little_ninja_foo_2" && test "$S"; then - mynewdependency_lib="" - elif test -n "$my_little_ninja_foo_3" && test "$D"; then - eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` - else - mynewdependency_lib="$deplib" - fi - else - mynewdependency_lib="$deplib" - fi - # Do not add duplicates - if test "$mynewdependency_lib"; then - my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` - if test -z "$my_little_ninja_foo_4"; then - newdependency_libs="$newdependency_libs $mynewdependency_lib" - fi - fi + newdependency_libs="$newdependency_libs $libdir/$name" ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -5786,10 +5768,6 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac - # Do not add duplicates - if test "$installed" = yes && test "$D"; then - install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` - fi $echo > $output "\ # $outputname - a libtool library file # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP @@ -6545,7 +6523,7 @@ fi # Restore saved environment variables - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${save_$lt_var+set}\" = set; then $lt_var=\$save_$lt_var; export $lt_var diff -Nru gst-plugins-farsight-0.12.5/m4/Makefile.in gst-plugins-farsight-0.12.8/m4/Makefile.in --- gst-plugins-farsight-0.12.5/m4/Makefile.in 2007-09-17 16:25:05.000000000 -0500 +++ gst-plugins-farsight-0.12.8/m4/Makefile.in 2008-05-09 14:56:42.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -69,6 +69,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -82,6 +83,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -128,6 +131,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff -Nru gst-plugins-farsight-0.12.5/Makefile.in gst-plugins-farsight-0.12.8/Makefile.in --- gst-plugins-farsight-0.12.5/Makefile.in 2007-09-17 16:25:05.000000000 -0500 +++ gst-plugins-farsight-0.12.8/Makefile.in 2008-05-09 14:56:43.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -96,6 +96,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -109,6 +110,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -155,6 +158,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -367,8 +371,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -393,8 +397,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -404,13 +408,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,6 +487,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -510,6 +517,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -661,18 +670,18 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am + dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am dist-hook: diff -Nru gst-plugins-farsight-0.12.5/tests/dtmfdepay.c gst-plugins-farsight-0.12.8/tests/dtmfdepay.c --- gst-plugins-farsight-0.12.5/tests/dtmfdepay.c 1969-12-31 18:00:00.000000000 -0600 +++ gst-plugins-farsight-0.12.8/tests/dtmfdepay.c 2008-04-28 19:52:19.000000000 -0500 @@ -0,0 +1,157 @@ +/* + * test7.c - Farsight tests + * + * Farsight Voice+Video library test suite + * Copyright 2005,2006 Collabora Ltd. + * @author: Youness Alaoui . + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include + +GMainLoop *mainloop = NULL; + +gboolean dtmf_io_cb (GIOChannel *source, GIOCondition condition, gpointer data) { + GstElement * pipeline = (GstElement *) data; + GstStructure *structure = NULL; + GstEvent *event = NULL; + gchar c; + gsize size; + gint ev = 0; + static gboolean sending = FALSE; + + g_io_channel_read_chars (source, &c, 1, &size, NULL); + + + if (c >= '0' && c <= '9') { + ev = c -'0'; + } else if (c < ' ') { + return TRUE; + } else { + switch (c) { + case '*': + ev = 10; + break; + case '#': + ev = 11; + break; + default: + ev = -1; + if (sending) + break; + else + return TRUE; + } + } + + + if (sending) { + structure = gst_structure_new ("dtmf-event", + "start", G_TYPE_BOOLEAN, FALSE, + "type", G_TYPE_INT, 1, + "method", G_TYPE_INT, 1, + NULL); + sending = FALSE; + g_debug ("Stopping DTMF event"); + event = gst_event_new_custom (GST_EVENT_CUSTOM_UPSTREAM, structure); + + gst_element_send_event (pipeline, event); + } + if (ev >= 0) { + structure = gst_structure_new ("dtmf-event", + "number", G_TYPE_INT, ev, + "volume", G_TYPE_INT, 30, + "start", G_TYPE_BOOLEAN, TRUE, + "type", G_TYPE_INT, 1, + "method", G_TYPE_INT, 1, + NULL); + sending = TRUE; + g_debug ("Sending DTMF event %d", ev); + } + + event = gst_event_new_custom (GST_EVENT_CUSTOM_UPSTREAM, structure); + + gst_element_send_event (pipeline, event); + + return TRUE; +} + + + +static gboolean +bus_watch_cb (GstBus *bus, GstMessage *message, + gpointer user_data) +{ + + switch (GST_MESSAGE_TYPE (message)) { + case GST_MESSAGE_EOS: + g_debug ("%s (%d): end of stream on stream pipeline", + __FUNCTION__, __LINE__); + break; + case GST_MESSAGE_ERROR: + { + gchar *debug; + GError *err; + + gst_message_parse_error (message, &err, &debug); + g_free (debug); + + g_warning ("%s (%d): error on stream pipeline. " + "Error code=%d message=%s", + __FUNCTION__, __LINE__, err->code, err->message); + g_error_free (err); + + g_main_loop_quit (mainloop); + + break; + } + default: + break; + } + + return TRUE; +} + + +/* Read usage */ +int main(int argc, char **argv) +{ + GIOChannel *ioc = g_io_channel_unix_new (0); + GstElement* bin = NULL; + GstBus *pipe_bus; + GError *err = NULL; + + + gst_init (&argc, &argv); + + mainloop = g_main_loop_new (NULL, FALSE); + + + bin = gst_parse_launch ("rtpdtmfsrc ! rtpdtmfdepay ! audioconvert ! audiorate ! autoaudiosink sync=true", &err); + if (bin) { + g_io_add_watch (ioc, G_IO_IN, dtmf_io_cb, (gpointer) bin); + pipe_bus = gst_pipeline_get_bus (GST_PIPELINE (bin)); + gst_bus_add_watch (pipe_bus, bus_watch_cb, NULL); + + gst_element_set_state (bin, GST_STATE_PLAYING); + + g_main_loop_run(mainloop); + } + + return 0; +} diff -Nru gst-plugins-farsight-0.12.5/tests/Makefile.am gst-plugins-farsight-0.12.8/tests/Makefile.am --- gst-plugins-farsight-0.12.5/tests/Makefile.am 2007-08-29 12:38:01.000000000 -0500 +++ gst-plugins-farsight-0.12.8/tests/Makefile.am 2008-04-28 19:52:19.000000000 -0500 @@ -1,5 +1,5 @@ noinst_PROGRAMS = h263send h263recv msgsmsend msgsmrecv gsmsend gsmrecv \ - gsmsendrecv g711send g711recv dtmfsend + gsmsendrecv g711send g711recv dtmfsend dtmfdepay h263send_SOURCES = h263send.c h263send_CFLAGS = $(GST_CFLAGS) @@ -40,3 +40,7 @@ dtmfsend_SOURCES = dtmfsend.c dtmfsend_CFLAGS = $(GST_CFLAGS) dtmfsend_LDADD = $(GST_LIBS) + +dtmfdepay_SOURCES = dtmfdepay.c +dtmfdepay_CFLAGS = $(GST_CFLAGS) +dtmfdepay_LDADD = $(GST_LIBS) diff -Nru gst-plugins-farsight-0.12.5/tests/Makefile.in gst-plugins-farsight-0.12.8/tests/Makefile.in --- gst-plugins-farsight-0.12.5/tests/Makefile.in 2007-09-17 16:25:05.000000000 -0500 +++ gst-plugins-farsight-0.12.8/tests/Makefile.in 2008-05-09 14:56:43.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -36,7 +36,7 @@ noinst_PROGRAMS = h263send$(EXEEXT) h263recv$(EXEEXT) \ msgsmsend$(EXEEXT) msgsmrecv$(EXEEXT) gsmsend$(EXEEXT) \ gsmrecv$(EXEEXT) gsmsendrecv$(EXEEXT) g711send$(EXEEXT) \ - g711recv$(EXEEXT) dtmfsend$(EXEEXT) + g711recv$(EXEEXT) dtmfsend$(EXEEXT) dtmfdepay$(EXEEXT) subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -49,9 +49,15 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) +am_dtmfdepay_OBJECTS = dtmfdepay-dtmfdepay.$(OBJEXT) +dtmfdepay_OBJECTS = $(am_dtmfdepay_OBJECTS) +am__DEPENDENCIES_1 = +dtmfdepay_DEPENDENCIES = $(am__DEPENDENCIES_1) +dtmfdepay_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(dtmfdepay_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_dtmfsend_OBJECTS = dtmfsend-dtmfsend.$(OBJEXT) dtmfsend_OBJECTS = $(am_dtmfsend_OBJECTS) -am__DEPENDENCIES_1 = dtmfsend_DEPENDENCIES = $(am__DEPENDENCIES_1) dtmfsend_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(dtmfsend_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -110,7 +116,7 @@ msgsmsend_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(msgsmsend_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -122,14 +128,14 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(dtmfsend_SOURCES) $(g711recv_SOURCES) $(g711send_SOURCES) \ - $(gsmrecv_SOURCES) $(gsmsend_SOURCES) $(gsmsendrecv_SOURCES) \ - $(h263recv_SOURCES) $(h263send_SOURCES) $(msgsmrecv_SOURCES) \ - $(msgsmsend_SOURCES) -DIST_SOURCES = $(dtmfsend_SOURCES) $(g711recv_SOURCES) \ +SOURCES = $(dtmfdepay_SOURCES) $(dtmfsend_SOURCES) $(g711recv_SOURCES) \ $(g711send_SOURCES) $(gsmrecv_SOURCES) $(gsmsend_SOURCES) \ $(gsmsendrecv_SOURCES) $(h263recv_SOURCES) $(h263send_SOURCES) \ $(msgsmrecv_SOURCES) $(msgsmsend_SOURCES) +DIST_SOURCES = $(dtmfdepay_SOURCES) $(dtmfsend_SOURCES) \ + $(g711recv_SOURCES) $(g711send_SOURCES) $(gsmrecv_SOURCES) \ + $(gsmsend_SOURCES) $(gsmsendrecv_SOURCES) $(h263recv_SOURCES) \ + $(h263send_SOURCES) $(msgsmrecv_SOURCES) $(msgsmsend_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -156,6 +162,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -169,6 +176,8 @@ GCONF_LIBS = @GCONF_LIBS@ GREP = @GREP@ GSM_LIBS = @GSM_LIBS@ +GST_13_CFLAGS = @GST_13_CFLAGS@ +GST_13_LIBS = @GST_13_LIBS@ GST_BASE_CFLAGS = @GST_BASE_CFLAGS@ GST_BASE_LIBS = @GST_BASE_LIBS@ GST_CFLAGS = @GST_CFLAGS@ @@ -215,6 +224,7 @@ MIMIC_CFLAGS = @MIMIC_CFLAGS@ MIMIC_LIBS = @MIMIC_LIBS@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -316,6 +326,9 @@ dtmfsend_SOURCES = dtmfsend.c dtmfsend_CFLAGS = $(GST_CFLAGS) dtmfsend_LDADD = $(GST_LIBS) +dtmfdepay_SOURCES = dtmfdepay.c +dtmfdepay_CFLAGS = $(GST_CFLAGS) +dtmfdepay_LDADD = $(GST_LIBS) all: all-am .SUFFIXES: @@ -356,6 +369,9 @@ echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done +dtmfdepay$(EXEEXT): $(dtmfdepay_OBJECTS) $(dtmfdepay_DEPENDENCIES) + @rm -f dtmfdepay$(EXEEXT) + $(dtmfdepay_LINK) $(dtmfdepay_OBJECTS) $(dtmfdepay_LDADD) $(LIBS) dtmfsend$(EXEEXT): $(dtmfsend_OBJECTS) $(dtmfsend_DEPENDENCIES) @rm -f dtmfsend$(EXEEXT) $(dtmfsend_LINK) $(dtmfsend_OBJECTS) $(dtmfsend_LDADD) $(LIBS) @@ -393,6 +409,7 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtmfdepay-dtmfdepay.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtmfsend-dtmfsend.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g711recv-g711recv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g711send-g711send.Po@am__quote@ @@ -425,6 +442,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +dtmfdepay-dtmfdepay.o: dtmfdepay.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dtmfdepay_CFLAGS) $(CFLAGS) -MT dtmfdepay-dtmfdepay.o -MD -MP -MF $(DEPDIR)/dtmfdepay-dtmfdepay.Tpo -c -o dtmfdepay-dtmfdepay.o `test -f 'dtmfdepay.c' || echo '$(srcdir)/'`dtmfdepay.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dtmfdepay-dtmfdepay.Tpo $(DEPDIR)/dtmfdepay-dtmfdepay.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dtmfdepay.c' object='dtmfdepay-dtmfdepay.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dtmfdepay_CFLAGS) $(CFLAGS) -c -o dtmfdepay-dtmfdepay.o `test -f 'dtmfdepay.c' || echo '$(srcdir)/'`dtmfdepay.c + +dtmfdepay-dtmfdepay.obj: dtmfdepay.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dtmfdepay_CFLAGS) $(CFLAGS) -MT dtmfdepay-dtmfdepay.obj -MD -MP -MF $(DEPDIR)/dtmfdepay-dtmfdepay.Tpo -c -o dtmfdepay-dtmfdepay.obj `if test -f 'dtmfdepay.c'; then $(CYGPATH_W) 'dtmfdepay.c'; else $(CYGPATH_W) '$(srcdir)/dtmfdepay.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dtmfdepay-dtmfdepay.Tpo $(DEPDIR)/dtmfdepay-dtmfdepay.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dtmfdepay.c' object='dtmfdepay-dtmfdepay.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dtmfdepay_CFLAGS) $(CFLAGS) -c -o dtmfdepay-dtmfdepay.obj `if test -f 'dtmfdepay.c'; then $(CYGPATH_W) 'dtmfdepay.c'; else $(CYGPATH_W) '$(srcdir)/dtmfdepay.c'; fi` + dtmfsend-dtmfsend.o: dtmfsend.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dtmfsend_CFLAGS) $(CFLAGS) -MT dtmfsend-dtmfsend.o -MD -MP -MF $(DEPDIR)/dtmfsend-dtmfsend.Tpo -c -o dtmfsend-dtmfsend.o `test -f 'dtmfsend.c' || echo '$(srcdir)/'`dtmfsend.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dtmfsend-dtmfsend.Tpo $(DEPDIR)/dtmfsend-dtmfsend.Po @@ -576,8 +607,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -589,8 +620,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -600,13 +631,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique