diff -Nru libccaudio2-2.1.1/aclocal.m4 libccaudio2-2.1.3/aclocal.m4 --- libccaudio2-2.1.1/aclocal.m4 2013-10-08 11:43:28.000000000 +0000 +++ libccaudio2-2.1.3/aclocal.m4 2014-05-24 16:15:28.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.14 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -1326,7 +1326,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1347,7 +1347,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1366,7 +1369,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8791,7 +8797,7 @@ [am__api_version='1.14' 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.14], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8807,7 +8813,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -9329,7 +9335,8 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff -Nru libccaudio2-2.1.1/autoconf/ltmain.sh libccaudio2-2.1.3/autoconf/ltmain.sh --- libccaudio2-2.1.1/autoconf/ltmain.sh 2013-10-08 11:43:26.000000000 +0000 +++ libccaudio2-2.1.3/autoconf/ltmain.sh 2014-05-24 16:15:27.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.3" +VERSION="2.4.2 Debian-2.4.2-1.7" TIMESTAMP="" package_revision=1.3337 diff -Nru libccaudio2-2.1.1/autoconf/missing libccaudio2-2.1.3/autoconf/missing --- libccaudio2-2.1.1/autoconf/missing 2013-10-08 11:43:29.000000000 +0000 +++ libccaudio2-2.1.3/autoconf/missing 2014-05-24 16:15:30.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -Nru libccaudio2-2.1.1/ccaudio2-config.1 libccaudio2-2.1.3/ccaudio2-config.1 --- libccaudio2-2.1.1/ccaudio2-config.1 2013-10-04 17:54:05.000000000 +0000 +++ libccaudio2-2.1.3/ccaudio2-config.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -.\" ccaudio-config - script to get information about ccaudio library -.\" Copyright (c) 2009 David Sugar -.\" -.\" This manual page is free software; you can redistribute it and/or modify -.\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation; either version 3 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 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. -.\" -.\" This manual page is written especially for Debian GNU/Linux. -.\" -.TH ccaudio-config "1" "July 2009" "GNU ccAudio" "GNU Telephony" -.SH NAME -ccaudio-config \- script to get information about ccaudio library -.SH SYNOPSIS -.B ccaudio-config -.BI [--prefix[= DIR ]] -.BI [--exec-prefix[= DIR ]] -.B [--version] -.B [--cflags] -.B [--libs] -.SH DESCRIPTION -.B ccaudio-config -is a tool that is used to configure to determine the compiler and -linker flags that should be used to compile and link programs that use the -.BR ccaudio -library. -.IR Note : -.B ccaudio-config -is provided for compatibility with legacy software only. Current -projects should use -.B pkg-config -instead! -.SH OPTIONS -.TP -.B --version -Print the currently installed version of -.B ccaudio -on the standard output. -.TP -.B --libs -Print the linker flags that are necessary to link a program with -.BR ccaudio . -.TP -.B --cflags -Print the compiler flags that are necessary to compile a program with -.BR ccaudio . -.TP -.BI --prefix= PREFIX -If specified, use -.I PREFIX -instead of the installation prefix that -.B ccaudio -was built with when computing the output for the -.B --cflags -and -.B --libs -options. This option is also used for the exec prefix if -.B --exec-prefix -was not specified. This option must be specified before any -.B --libs -or -.B --cflags -options. -.TP -.BI --exec-prefix= PREFIX -If specified, use -.I PREFIX -instead of the installation exec prefix that -.B ccaudio -was built with when computing the output for the -.B --cflags -and -.B --libs -options. This option must be specified before any -.B --libs -or -.B --cflags -options. -.SH "SEE ALSO" -.IR pkg-config (1). -.SH AUTHOR -.B ccaudio-config -was written by David Sugar . -.SH COPYRIGHT -Copyright \(co 2009 David Sugar, Tycho Softworks. -.br -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR -PURPOSE. - - - diff -Nru libccaudio2-2.1.1/ccaudio2-config.in libccaudio2-2.1.3/ccaudio2-config.in --- libccaudio2-2.1.1/ccaudio2-config.in 2013-10-04 18:21:59.000000000 +0000 +++ libccaudio2-2.1.3/ccaudio2-config.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -#!/bin/sh -# Copyright (C) 2009 David Sugar, Tycho Softworks. -# -# This file is free software; as a special exception the author 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. - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -includedir=@includedir@ - -if [ "`ldd /bin/sh | grep lib64`" = "" ] -then - libdir=${exec_prefix}/lib -else - libdir=${exec_prefix}/lib64 -fi - -usage() -{ - cat <= 6.0.0 +Libs: -lccaudio2 ${PACKAGE_LIBS} +Cflags: ${PACKAGE_FLAGS} + diff -Nru libccaudio2-2.1.1/ccaudio2.spec libccaudio2-2.1.3/ccaudio2.spec --- libccaudio2-2.1.1/ccaudio2.spec 2013-10-08 11:43:35.000000000 +0000 +++ libccaudio2-2.1.3/ccaudio2.spec 2014-05-24 16:15:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2009 David Sugar, Tycho Softworks. +# Copyright (c) 2014 David Sugar, Tycho Softworks. # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. @@ -10,14 +10,17 @@ Name: ccaudio2 Summary: C++ class framework for telephonic audio applications -Version: 2.1.1 +Version: 2.1.3 Release: 0%{?dist} License: LGPLv3+ -URL: http://www.gnu.org/software/ccaudio +URL: http://www.gnutelephony.org/index.php/GNU_ccAudio2 Group: System Environment/Libraries -Source0: http://www.gnutelephony.org/dist/tarballs/ccaudio2-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source0: http://dev.gnutelephony.org/dist/tarballs/ccaudio2-%{version}.tar.gz BuildRequires: ucommon-devel >= 6.0.0 +BuildRequires: gsm-devel +BuildRequires: speex-devel +BuildRequires: pkgconfig(ucommon) +BuildRequires: cmake %description The GNU telephonic audio library covers a range of functionality including @@ -25,12 +28,22 @@ frames, accessing of audio files on disk, phrasebook management, and audio utilities. +%package bin +Requires: %{name}%{?_isa} = %{version}-%{release} +Group: Applications/System +Summary: GNU ccaudio support applications + %package devel -Requires: %{name} = %{version}-%{release} -Requires: ucommon-devel >= 6.0.0 +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ucommon-devel%{?_isa} >= 6.0.0 Group: Development/Libraries Summary: Headers for building ccaudio applications +%description bin +This is a collection of command line tools that use various aspects of the +ccaudio2 library. This includes command line tools for telephonic processing +of audio files. + %description devel This package provides header and support files for building applications that use GNU ccAudio. @@ -38,38 +51,40 @@ %prep %setup -q %build +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DSYSCONFDIR=%{_sysconfdir} \ + -DINSTALL_MANDIR=%{_mandir} \ + -DINSTALL_INCLUDEDIR=%{_includedir} \ + -DINSTALL_DATADIR=%{_datadir} \ + -DINSTALL_BINDIR=%{_bindir} \ + -DINSTALL_LIBDIR=%{_libdir} \ + . -%configure --disable-static %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} INSTALL="install -p" install -%{__rm} %{buildroot}%{_libdir}/*.la - -%clean -%{__rm} -rf %{buildroot} %files -%defattr(-,root,root,-) -%doc AUTHORS README COPYING NEWS SUPPORT ChangeLog +%doc AUTHORS README COPYING COPYING.LESSER NEWS SUPPORT ChangeLog %{_libdir}/*.so.* +%config(noreplace) %{_sysconfdir}/tones.conf + +%files bin %{_bindir}/audiotool %{_bindir}/tonetool +%{_mandir}/man1/audiotool.* +%{_mandir}/man1/tonetool.* %files devel -%defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/ccaudio2.h %{_libdir}/pkgconfig/*.pc -%{_bindir}/ccaudio2-config -%{_mandir}/man1/ccaudio2-config.* %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog -* Sat Jan 1 2011 - David Sugar - 2.0.0-0 -- initial packaging for redhat/fedora submission policies. diff -Nru libccaudio2-2.1.1/ccaudio2.spec.in libccaudio2-2.1.3/ccaudio2.spec.in --- libccaudio2-2.1.1/ccaudio2.spec.in 2013-10-08 11:41:06.000000000 +0000 +++ libccaudio2-2.1.3/ccaudio2.spec.in 2014-05-04 00:51:55.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2009 David Sugar, Tycho Softworks. +# Copyright (c) 2014 David Sugar, Tycho Softworks. # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. @@ -13,11 +13,14 @@ Version: @VERSION@ Release: 0%{?dist} License: LGPLv3+ -URL: http://www.gnu.org/software/ccaudio +URL: http://www.gnutelephony.org/index.php/GNU_ccAudio2 Group: System Environment/Libraries -Source0: http://www.gnutelephony.org/dist/tarballs/ccaudio2-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source0: http://dev.gnutelephony.org/dist/tarballs/ccaudio2-%{version}.tar.gz BuildRequires: ucommon-devel >= 6.0.0 +BuildRequires: gsm-devel +BuildRequires: speex-devel +BuildRequires: pkgconfig(ucommon) +BuildRequires: cmake %description The GNU telephonic audio library covers a range of functionality including @@ -25,12 +28,22 @@ frames, accessing of audio files on disk, phrasebook management, and audio utilities. +%package bin +Requires: %{name}%{?_isa} = %{version}-%{release} +Group: Applications/System +Summary: GNU ccaudio support applications + %package devel -Requires: %{name} = %{version}-%{release} -Requires: ucommon-devel >= 6.0.0 +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ucommon-devel%{?_isa} >= 6.0.0 Group: Development/Libraries Summary: Headers for building ccaudio applications +%description bin +This is a collection of command line tools that use various aspects of the +ccaudio2 library. This includes command line tools for telephonic processing +of audio files. + %description devel This package provides header and support files for building applications that use GNU ccAudio. @@ -38,38 +51,40 @@ %prep %setup -q %build +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DSYSCONFDIR=%{_sysconfdir} \ + -DINSTALL_MANDIR=%{_mandir} \ + -DINSTALL_INCLUDEDIR=%{_includedir} \ + -DINSTALL_DATADIR=%{_datadir} \ + -DINSTALL_BINDIR=%{_bindir} \ + -DINSTALL_LIBDIR=%{_libdir} \ + . -%configure --disable-static %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} INSTALL="install -p" install -%{__rm} %{buildroot}%{_libdir}/*.la - -%clean -%{__rm} -rf %{buildroot} %files -%defattr(-,root,root,-) -%doc AUTHORS README COPYING NEWS SUPPORT ChangeLog +%doc AUTHORS README COPYING COPYING.LESSER NEWS SUPPORT ChangeLog %{_libdir}/*.so.* +%config(noreplace) %{_sysconfdir}/tones.conf + +%files bin %{_bindir}/audiotool %{_bindir}/tonetool +%{_mandir}/man1/audiotool.* +%{_mandir}/man1/tonetool.* %files devel -%defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/ccaudio2.h %{_libdir}/pkgconfig/*.pc -%{_bindir}/ccaudio2-config -%{_mandir}/man1/ccaudio2-config.* %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog -* Sat Jan 1 2011 - David Sugar - 2.0.0-0 -- initial packaging for redhat/fedora submission policies. diff -Nru libccaudio2-2.1.1/ChangeLog libccaudio2-2.1.3/ChangeLog --- libccaudio2-2.1.1/ChangeLog 2013-10-08 11:41:28.000000000 +0000 +++ libccaudio2-2.1.3/ChangeLog 2014-05-24 16:14:42.000000000 +0000 @@ -1,3 +1,11 @@ +Changes from 2.1.2 to 2.1.3 +- general namespace cleanup +- ignore work files + +from ccaudio2 2.1.1 to ccaudio2 2.1.2 +- fixed cmake shared library builds +- windows audio fixups + from ccaudio2 2.1.0 to ccaudio2 2.1.1 - fixed library naming in CMakeLists.txt - updated spec files diff -Nru libccaudio2-2.1.1/cmake-abi.sh libccaudio2-2.1.3/cmake-abi.sh --- libccaudio2-2.1.1/cmake-abi.sh 1970-01-01 00:00:00.000000000 +0000 +++ libccaudio2-2.1.3/cmake-abi.sh 2014-05-03 15:57:58.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +ltver=`grep LT_VERSION= configure.ac | sed -e "s/^.*=//" | sed -e "s/\"//g"` +release=`echo $ltver | sed -e "s/:.*//"` +compat=`echo $ltver | sed -e "s/.*://"` +abi=`echo $ltver | sed -e "s/^$release://" -e "s/:.*$//"` +echo -n $release.$compat.$abi diff -Nru libccaudio2-2.1.1/CMakeLists.txt libccaudio2-2.1.3/CMakeLists.txt --- libccaudio2-2.1.1/CMakeLists.txt 2013-10-08 11:43:20.000000000 +0000 +++ libccaudio2-2.1.3/CMakeLists.txt 2014-05-24 17:21:00.000000000 +0000 @@ -11,15 +11,24 @@ cmake_minimum_required(VERSION 2.6) PROJECT(ccaudio2) +set (VERSION 2.1.3) + +set(RC_VERSION ${VERSION}) +STRING(REGEX REPLACE "[.]" "," RC_VERSION ${RC_VERSION}) +set(RC_VERSION "${RC_VERSION},0") + +if(UNIX) + execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND "./cmake-abi.sh" OUTPUT_VARIABLE LIB_VERSION) +else() + set(LIB_VERSION ${VERSION}) +endif() + +set(SOVERSION ${LIB_VERSION}) +STRING(REGEX REPLACE "[.].*$" "" SOVERSION ${SOVERSION}) + INCLUDE(CheckIncludeFiles) INCLUDE(CheckLibraryExists) -set (VERSION 2.1.1) -set (SOVERSION 2) -set(INSTALL_INCLUDEDIR include) -set(INSTALL_BINDIR bin) -set(INSTALL_SBINDIR sbin) -set(INSTALL_DATADIR share) if(WIN32) set(INSTALL_MANDIR man) @@ -27,19 +36,47 @@ set(INSTALL_LOCALE locale) set(INSTALL_LIBDIR bin) set(INSTALL_INFODIR info) + set(INSTALL_INCLUDEDIR include) + set(INSTALL_BINDIR bin) + set(INSTALL_DATADIR share) set(SYSCONFDIR "etc" CACHE PATH "config directory") set(STATEDIR "var" CACHE PATH "state directory") else() - set(INSTALL_MANDIR ${INSTALL_DATADIR}/man) - set(INSTALL_LOCALE ${INSTALL_DATADIR}/locale) - set(INSTALL_DOCDIR ${INSTALL_DATADIR}/doc/${PROJECT_NAME}) - set(INSTALL_INFODIR ${INSTALL_DATADIR}/info) - set(INSTALL_LIBDIR lib${LIB_POSTFIX}) set(SYSCONFDIR "/etc" CACHE PATH "config directory") set(STATEDIR "/var" CACHE PATH "state directory") endif() -set(UCOMMON_LOCALE ${CMAKE_INSTALL_PREFIX}/${INSTALL_LOCALE}) +if(NOT INSTALL_BINDIR) + set(INSTALL_BINDIR bin) +endif() + +if(NOT INSTALL_INCLUDEDIR) + set(INSTALL_INCLUDEDIR include) +endif() + +if(NOT INSTALL_MANDIR) + set(INSTALL_MANDIR share/man) +endif() + +if(NOT INSTALL_LOCALE) + set(INSTALL_LOCALE share/locale) +endif() + +if(NOT INSTALL_DOCDIR) + set(INSTALL_DOCDIR share/doc/${PROJECT_NAME}) +endif() + +if(NOT INSTALL_INFODIR) + set(INSTALL_INFODIR share/info) +endif() + +if(NOT INSTALL_LIBDIR) + set(INSTALL_LIBDIR lib${LIB_SUFFIX}) +endif() + +if(NOT INSTALL_DATADIR) + set(INSTALL_DATADIR data) +endif() if(WIN32) set(DEFAULT_CFGPATH "${CMAKE_INSTALL_PREFIX}/${SYSCONFDIR}") @@ -54,12 +91,9 @@ set(DEFAULT_LIBPATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}) if(MSVC60) - set(BUILD_STATIC ON CACHE BOOL "static linking only" FORCE) - MARK_AS_ADVANCED(FORCE BUILD_STATIC) -elseif(WIN32) - option(BUILD_STATIC "Set to OFF to build shared libraries" ON) + MARK_AS_ADVANCED(BUILD_RUNTIME) else() - option(BUILD_STATIC "Set to ON to build static libraries" OFF) + option(BUILD_RUNTIME "Set to OFF to build static runtime" ON) endif() MESSAGE( STATUS "Configuring GNU ccaudio2 ${VERSION}...") @@ -131,13 +165,12 @@ # by default we build static libs for windows, shared libs for unix. # we may also set this from a top level cmake or -DWITH_XX_LIBS -if(BUILD_STATIC) - set(BUILD_LIBRARY_TYPE STATIC) +if(BUILD_RUNTIME) + set(BUILD_RUNTIME_TYPE SHARED) else() - set(BUILD_LIBRARY_TYPE SHARED) + set(BUILD_RUNTIME_TYPE STATIC) endif() - check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H) check_include_files(speex/speex.h HAVE_SPEEX_SPEEX_H) check_include_files(gsm.h HAVE_GSM_H) @@ -180,23 +213,42 @@ configure_file(ccaudio2-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2-config.h) file(GLOB ccaudio_src src/*.cpp) +file(GLOB ccaudio_man1 utils/*.1) +file(GLOB ccaudio_conf utils/*.conf) + set(ccaudio_inc inc/ccaudio2.h) -add_library(ccaudio2 ${BUILD_LIBRARY_TYPE} ${ccaudio_src} ${ccaudio_inc}) -set_target_properties(ccaudio2 PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION}) +add_library(ccaudio2 ${BUILD_RUNTIME_TYPE} ${ccaudio_src} ${ccaudio_inc}) +set_target_properties(ccaudio2 PROPERTIES VERSION ${LIB_VERSION} SOVERSION ${SOVERSION}) add_dependencies(ccaudio2 ucommon) target_link_libraries(ccaudio2 ${USES_UCOMMON_LIBRARIES} ${AUDIO_LIBS} ${WITH_MATH_LIB} ${MATH_LIB}) add_executable(ccaudio-tonetool utils/tonetool.cpp) add_dependencies(ccaudio-tonetool ccaudio2 ucommon) set_target_properties(ccaudio-tonetool PROPERTIES OUTPUT_NAME tonetool) -target_link_libraries(ccaudio-tonetool ccaudio2 ${USES_UCOMMON_LIBRARIES}) +target_link_libraries(ccaudio-tonetool ccaudio2 ucommon ${USES_UCOMMON_LIBRARIES}) add_executable(ccaudio-audiotool utils/audiotool.cpp) add_dependencies(ccaudio-audiotool ccaudio2 ucommon) set_target_properties(ccaudio-audiotool PROPERTIES OUTPUT_NAME audiotool) -target_link_libraries(ccaudio-audiotool ccaudio2 ${USES_UCOMMON_LIBRARIES}) +target_link_libraries(ccaudio-audiotool ccaudio2 ucommon ${USES_UCOMMON_LIBRARIES}) -install(FILES inc/ccaudio2.h DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT headers) -install(TARGETS ccaudio2 DESTINATION ${INSTALL_LIBDIR} COMPONENT libraries) +if(UNIX) + foreach(flag ${USES_UCOMMON_CFLAGS}) + set(PACKAGE_FLAGS "${PACKAGE_FLAGS} ${flag}") + endforeach() + foreach(lib ${USES_UCOMMON_LIBRARIES}) + STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) + set(PACKAGE_LIBS "${PACKAGE_LIBS} -l${slib}") + endforeach() + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ccaudio2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig) +endif() + +install(FILES ${ccaudio_conf} DESTINATION ${SYSCONFDIR}) +install(FILES ${ccaudio_man1} DESTINATION ${INSTALL_MANDIR}/man1) +install(FILES inc/ccaudio2.h DESTINATION ${INSTALL_INCLUDEDIR}) +install(TARGETS ccaudio2 DESTINATION ${INSTALL_LIBDIR}) install(TARGETS ccaudio-tonetool ccaudio-audiotool DESTINATION ${INSTALL_BINDIR}) diff -Nru libccaudio2-2.1.1/configure libccaudio2-2.1.3/configure --- libccaudio2-2.1.1/configure 2013-10-08 11:43:30.000000000 +0000 +++ libccaudio2-2.1.3/configure 2014-05-24 16:15:30.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ccaudio2 2.1.1. +# Generated by GNU Autoconf 2.69 for ccaudio2 2.1.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='ccaudio2' PACKAGE_TARNAME='ccaudio2' -PACKAGE_VERSION='2.1.1' -PACKAGE_STRING='ccaudio2 2.1.1' +PACKAGE_VERSION='2.1.3' +PACKAGE_STRING='ccaudio2 2.1.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1350,7 +1350,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ccaudio2 2.1.1 to adapt to many kinds of systems. +\`configure' configures ccaudio2 2.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ccaudio2 2.1.1:";; + short | recursive ) echo "Configuration of ccaudio2 2.1.3:";; esac cat <<\_ACEOF @@ -1541,7 +1541,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ccaudio2 configure 2.1.1 +ccaudio2 configure 2.1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2094,7 +2094,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ccaudio2 $as_me 2.1.1, which was +It was created by ccaudio2 $as_me 2.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2444,7 +2444,7 @@ -LT_VERSION="2:2:0" +LT_VERSION="2:3:0" UCOMMON_REQUIRES="6.0.0" ac_aux_dir= @@ -7495,7 +7495,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7520,7 +7520,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7539,7 +7542,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -16240,7 +16246,7 @@ # Define the identity of the package. PACKAGE='ccaudio2' - VERSION='2.1.1' + VERSION='2.1.3' cat >>confdefs.h <<_ACEOF @@ -16588,6 +16594,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + ac_config_headers="$ac_config_headers ccaudio2-config.h" @@ -17353,7 +17360,7 @@ -ac_config_files="$ac_config_files Makefile inc/Makefile src/Makefile utils/Makefile ccaudio2-config ccaudio2.pc ccaudio2.spec directive" +ac_config_files="$ac_config_files Makefile inc/Makefile src/Makefile utils/Makefile ccaudio2.pc ccaudio2.spec directive" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -17888,7 +17895,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ccaudio2 $as_me 2.1.1, which was +This file was extended by ccaudio2 $as_me 2.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17954,7 +17961,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ccaudio2 config.status 2.1.1 +ccaudio2 config.status 2.1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18467,7 +18474,6 @@ "inc/Makefile") CONFIG_FILES="$CONFIG_FILES inc/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; - "ccaudio2-config") CONFIG_FILES="$CONFIG_FILES ccaudio2-config" ;; "ccaudio2.pc") CONFIG_FILES="$CONFIG_FILES ccaudio2.pc" ;; "ccaudio2.spec") CONFIG_FILES="$CONFIG_FILES ccaudio2.spec" ;; "directive") CONFIG_FILES="$CONFIG_FILES directive" ;; diff -Nru libccaudio2-2.1.1/configure.ac libccaudio2-2.1.3/configure.ac --- libccaudio2-2.1.1/configure.ac 2013-10-08 11:43:07.000000000 +0000 +++ libccaudio2-2.1.3/configure.ac 2014-05-24 16:15:01.000000000 +0000 @@ -8,10 +8,10 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -AC_INIT([ccaudio2], [2.1.1]) +AC_INIT([ccaudio2], [2.1.3]) AC_CONFIG_SRCDIR([src/audiobase.cpp]) -LT_VERSION="2:2:0" +LT_VERSION="2:3:0" UCOMMON_REQUIRES="6.0.0" AC_CONFIG_AUX_DIR(autoconf) @@ -177,5 +177,5 @@ AC_SUBST(CCAUDIO_LIBS) AC_SUBST(CXXFLAGS) AC_OUTPUT(Makefile inc/Makefile src/Makefile utils/Makefile -ccaudio2-config ccaudio2.pc ccaudio2.spec directive) +ccaudio2.pc ccaudio2.spec directive) diff -Nru libccaudio2-2.1.1/debian/changelog libccaudio2-2.1.3/debian/changelog --- libccaudio2-2.1.1/debian/changelog 2014-01-11 20:48:35.000000000 +0000 +++ libccaudio2-2.1.3/debian/changelog 2014-06-25 12:28:48.000000000 +0000 @@ -1,15 +1,14 @@ -libccaudio2 (2.1.1-1ubuntu1) trusty; urgency=medium +libccaudio2 (2.1.3-1) unstable; urgency=low + * New upstream release + + [ Logan Rosen ] * Use dh-autoreconf to get new libtool macros for ppc64el. + - Fixes "run dh-autoreconf to update config.{sub,guess} and + {libtool,aclocal}.m4" (Closes: #727397) * Build-depend on pkg-config to fix FTBFS. - -- Logan Rosen Sat, 11 Jan 2014 15:45:50 -0500 - -libccaudio2 (2.1.1-1build1) trusty; urgency=low - - * Rebuild against libucommon6. - - -- Colin Watson Fri, 25 Oct 2013 15:04:36 +0100 + -- Mark Purcell Wed, 25 Jun 2014 22:28:43 +1000 libccaudio2 (2.1.1-1) unstable; urgency=low diff -Nru libccaudio2-2.1.1/debian/control libccaudio2-2.1.3/debian/control --- libccaudio2-2.1.1/debian/control 2014-01-11 20:48:27.000000000 +0000 +++ libccaudio2-2.1.3/debian/control 2014-06-25 12:21:29.000000000 +0000 @@ -1,8 +1,7 @@ Source: libccaudio2 Section: libs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian VoIP Team +Maintainer: Debian VoIP Team Uploaders: Mark Purcell , Kilian Krause Build-Depends: debhelper (>= 9), dh-autoreconf, libgsm1-dev, libspeex-dev, doxygen, dpkg-dev (>= 1.13.19), libucommon-dev, pkg-config Standards-Version: 3.9.4 diff -Nru libccaudio2-2.1.1/inc/ccaudio2.h libccaudio2-2.1.3/inc/ccaudio2.h --- libccaudio2-2.1.1/inc/ccaudio2.h 2013-10-04 17:55:25.000000000 +0000 +++ libccaudio2-2.1.3/inc/ccaudio2.h 2014-05-24 10:07:04.000000000 +0000 @@ -31,7 +31,7 @@ #include #endif -NAMESPACE_UCOMMON +namespace ucommon { #define AUDIO_SIGNED_LINEAR_RAW 1 #define AUDIO_LINEAR_CONVERSION 1 @@ -716,7 +716,7 @@ * @return sample rate in samples per second. */ inline Rate getRate(void) const - {return rate;}; + {return rate;} /** * Get the frame size for the number of audio samples generated. @@ -724,7 +724,7 @@ * @return number of samples processed in frame. */ inline size_t getSamples(void) const - {return samples;}; + {return samples;} /** * Test if the tone generator is currently set to silence. @@ -838,7 +838,7 @@ * @return audio encoding of this object. */ inline Encoding getEncoding(void) const - {return info.encoding;}; + {return info.encoding;} /** * Generic sample rate. @@ -846,7 +846,7 @@ * @return audio sample rate of this object. */ inline unsigned getSampleRate(void) const - {return info.rate;}; + {return info.rate;} /** * Abstract interface to put raw data. @@ -874,7 +874,7 @@ * @param data to get. */ inline ssize_t getPacket(Encoded data) - {return getBuffer(data, 0);}; + {return getBuffer(data, 0);} /** * Get raw data and assure is in native machine endian. @@ -1008,7 +1008,7 @@ * @return next file to open or NULL when done. */ virtual char *getContinuation(void) - {return NULL;}; + {return NULL;} /** * Return a human-readable error message given a numeric error @@ -1029,7 +1029,7 @@ * @return number of bytes in file header. */ inline unsigned long getHeader(void) const - {return header;}; + {return header;} /** * Convert binary 2 byte data stored in the order specified @@ -1095,7 +1095,7 @@ * Construct an audio file without attaching to the filesystem. */ inline AudioFile() - {initialize();}; + {initialize();} virtual ~AudioFile(); @@ -1137,7 +1137,7 @@ * @return max frame size in bytes. */ inline size_t getSize(void) - {return maxFramesize(info);}; + {return maxFramesize(info);} /** * Close an object associated with an open file. This @@ -1332,7 +1332,7 @@ * @return audio encoding format. */ inline Encoding getEncoding(void) const - {return info.encoding;}; + {return info.encoding;} /** * Return base file format of containing audio file. @@ -1340,7 +1340,7 @@ * @return audio file container format. */ inline Format getFormat(void) const - {return info.format;}; + {return info.format;} /** * Get audio encoding sample rate, in samples per second, for @@ -1349,7 +1349,7 @@ * @return sample rate. */ inline unsigned getSampleRate(void) const - {return info.rate;}; + {return info.rate;} /** * Get annotation extracted from header of containing file. @@ -1357,7 +1357,7 @@ * @return annotation text if any, else NULL. */ inline char *getAnnotation(void) const - {return info.annotation;}; + {return info.annotation;} /** * Get last error code. @@ -1365,13 +1365,13 @@ * @return alst error code. */ inline Error getError(void) const - {return error;}; + {return error;} inline operator bool() const - {return is_open();}; + {return is_open();} inline bool operator!(void) const - {return (bool)!is_open();}; + {return (bool)!is_open();} /** * Return if the current content is signed or unsigned samples. @@ -1601,7 +1601,7 @@ * @return codec used. */ inline AudioCodec *getCodec(void) - {return codec;}; + {return codec;} }; /** @@ -1633,7 +1633,7 @@ * @param format name from spd. */ virtual AudioCodec *getByFormat(const char *format) - {return this;}; + {return this;} /** * get a codec by audio source info descriptor. @@ -1642,7 +1642,7 @@ * @param info audio source descriptor. */ virtual AudioCodec *getByInfo(Info &info) - {return this;}; + {return this;} public: /** @@ -1654,12 +1654,12 @@ AudioCodec(const char *name, Encoding encoding); inline const char *getName(void) const - {return name;}; + {return name;} inline const char *getDescription(void) const - {return info.annotation;}; + {return info.annotation;} - virtual ~AudioCodec() {}; + virtual ~AudioCodec() {} /** * End use of a requested codec. If constructed then will be @@ -1793,7 +1793,7 @@ * @return info. */ inline Info getInfo(void) const - {return info;}; + {return info;} }; class __EXPORT AudioDevice : public AudioBase @@ -1802,7 +1802,7 @@ bool enabled; public: - virtual ~AudioDevice() {}; + virtual ~AudioDevice() {} /** * Copy linear samples to an audio device through its virtual. @@ -1850,7 +1850,7 @@ * @param info source description for device settings. */ virtual bool setEncoded(Info &info) - {return false;}; + {return false;} /** * Set properties for audio device. @@ -1869,7 +1869,7 @@ * can handle it. */ virtual void sync(void) - {return;}; + {return;} /** * Flush any pending buffered samples in audio device. @@ -1904,7 +1904,7 @@ * @return audio device descriptor. */ inline const Info *getInfo(void) const - {return &info;}; + {return &info;} /** * Whether device is currently enabled. If invalid audio @@ -1915,7 +1915,7 @@ * @see #setAudio #setInfo */ inline bool is_enabled(void) const - {return enabled;}; + {return enabled;} }; /** @@ -2112,7 +2112,7 @@ tone_detection_descriptor_t fax_detect_2nd; }; -END_NAMESPACE +} // namespace ucommon #endif diff -Nru libccaudio2-2.1.1/inc/Makefile.in libccaudio2-2.1.3/inc/Makefile.in --- libccaudio2-2.1.1/inc/Makefile.in 2013-10-08 11:43:29.000000000 +0000 +++ libccaudio2-2.1.3/inc/Makefile.in 2014-05-24 16:15:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru libccaudio2-2.1.1/Makefile.am libccaudio2-2.1.3/Makefile.am --- libccaudio2-2.1.1/Makefile.am 2013-10-04 19:04:54.000000000 +0000 +++ libccaudio2-2.1.3/Makefile.am 2014-05-04 00:51:55.000000000 +0000 @@ -8,20 +8,20 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip -EXTRA_DIST = autogen.sh README *.pc.in *.spec.in *.spec *-config.in \ - cmodel.sh ccaudio2-config.1 SUPPORT CMakeLists.txt \ - ccaudio2-config.h.cmake COPYING* THANKS directive.in autoconf/* +AUTOMAKE_OPTIONS = no-dependencies dist-zip +EXTRA_DIST = autogen.sh README *.pc.in *.spec.in *.spec cmodel.sh \ + SUPPORT CMakeLists.txt ccaudio2-config.h.cmake COPYING* THANKS \ + directive.in cmake-abi.sh ccaudio2-config.h.in *.pc.cmake \ + autoconf/* SUBDIRS = src inc utils pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = ccaudio2.pc -scriptdir = $(bindir) -script_SCRIPTS = ccaudio2-config - -man_MANS = ccaudio2-config.1 +srpm: + rm -f *.rpm + rpmbuild -bs --nodeps --define "_sourcedir ." --define "_srcrpmdir ." --sign ccaudio2.spec dist-hook: cleandist diff -Nru libccaudio2-2.1.1/Makefile.in libccaudio2-2.1.3/Makefile.in --- libccaudio2-2.1.1/Makefile.in 2013-10-08 11:43:29.000000000 +0000 +++ libccaudio2-2.1.3/Makefile.in 2014-05-24 16:15:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -24,7 +24,6 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ @@ -94,11 +93,11 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/ccaudio2-config.h.in $(srcdir)/ccaudio2-config.in \ - $(srcdir)/ccaudio2.pc.in $(srcdir)/ccaudio2.spec.in \ - $(srcdir)/directive.in COPYING COPYING.LESSER THANKS TODO \ - autoconf/compile autoconf/config.guess autoconf/config.sub \ - autoconf/install-sh autoconf/missing autoconf/ltmain.sh \ + $(srcdir)/ccaudio2-config.h.in $(srcdir)/ccaudio2.pc.in \ + $(srcdir)/ccaudio2.spec.in $(srcdir)/directive.in COPYING \ + COPYING.LESSER THANKS TODO autoconf/compile \ + autoconf/config.guess autoconf/config.sub autoconf/install-sh \ + autoconf/missing autoconf/ltmain.sh \ $(top_srcdir)/autoconf/compile \ $(top_srcdir)/autoconf/config.guess \ $(top_srcdir)/autoconf/config.sub \ @@ -113,39 +112,8 @@ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = ccaudio2-config.h -CONFIG_CLEAN_FILES = ccaudio2-config ccaudio2.pc ccaudio2.spec \ - directive +CONFIG_CLEAN_FILES = ccaudio2.pc ccaudio2.spec directive CONFIG_CLEAN_VPATH_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 = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(pkgconfigdir)" -SCRIPTS = $(script_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -175,9 +143,34 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -man1dir = $(mandir)/man1 -NROFF = nroff -MANS = $(man_MANS) +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 = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -244,9 +237,9 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).shar.gz $(distdir).zip +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip GZIP_ENV = --best -DIST_TARGETS = dist-shar dist-gzip dist-zip +DIST_TARGETS = dist-gzip dist-zip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -394,17 +387,15 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip -EXTRA_DIST = autogen.sh README *.pc.in *.spec.in *.spec *-config.in \ - cmodel.sh ccaudio2-config.1 SUPPORT CMakeLists.txt \ - ccaudio2-config.h.cmake COPYING* THANKS directive.in autoconf/* +AUTOMAKE_OPTIONS = no-dependencies dist-zip +EXTRA_DIST = autogen.sh README *.pc.in *.spec.in *.spec cmodel.sh \ + SUPPORT CMakeLists.txt ccaudio2-config.h.cmake COPYING* THANKS \ + directive.in cmake-abi.sh ccaudio2-config.h.in *.pc.cmake \ + autoconf/* SUBDIRS = src inc utils pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = ccaudio2.pc -scriptdir = $(bindir) -script_SCRIPTS = ccaudio2-config -man_MANS = ccaudio2-config.1 all: ccaudio2-config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -458,49 +449,12 @@ distclean-hdr: -rm -f ccaudio2-config.h stamp-h1 -ccaudio2-config: $(top_builddir)/config.status $(srcdir)/ccaudio2-config.in - cd $(top_builddir) && $(SHELL) ./config.status $@ ccaudio2.pc: $(top_builddir)/config.status $(srcdir)/ccaudio2.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ ccaudio2.spec: $(top_builddir)/config.status $(srcdir)/ccaudio2.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ directive: $(top_builddir)/config.status $(srcdir)/directive.in cd $(top_builddir) && $(SHELL) ./config.status $@ -install-scriptSCRIPTS: $(script_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(script_SCRIPTS)'; test -n "$(scriptdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(scriptdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(scriptdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(scriptdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(scriptdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-scriptSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(script_SCRIPTS)'; test -n "$(scriptdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(scriptdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -510,49 +464,6 @@ distclean-libtool: -rm -f libtool config.lt -install-man1: $(man_MANS) - @$(NORMAL_INSTALL) - @list1=''; \ - list2='$(man_MANS)'; \ - test -n "$(man1dir)" \ - && test -n "`echo $$list1$$list2`" \ - || exit 0; \ - echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ - { for i in $$list1; do echo "$$i"; done; \ - if test -n "$$list2"; then \ - for i in $$list2; do echo "$$i"; done \ - | sed -n '/\.1[a-z]*$$/p'; \ - fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ - fi; \ - done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ - done; } - -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list=''; test -n "$(man1dir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ @@ -770,6 +681,7 @@ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) + dist-shar: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -814,9 +726,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -871,10 +784,10 @@ exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) ccaudio2-config.h +all-am: Makefile $(DATA) ccaudio2-config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)"; do \ + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -929,8 +842,7 @@ info-am: -install-data-am: install-man install-pkgconfigDATA \ - install-scriptSCRIPTS +install-data-am: install-pkgconfigDATA install-dvi: install-dvi-recursive @@ -946,7 +858,7 @@ install-info-am: -install-man: install-man1 +install-man: install-pdf: install-pdf-recursive @@ -976,10 +888,7 @@ ps-am: -uninstall-am: uninstall-man uninstall-pkgconfigDATA \ - uninstall-scriptSCRIPTS - -uninstall-man: uninstall-man1 +uninstall-am: uninstall-pkgconfigDATA .MAKE: $(am__recursive_targets) all install-am install-strip @@ -993,15 +902,18 @@ 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-man1 \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-scriptSCRIPTS 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-am uninstall \ - uninstall-am uninstall-man uninstall-man1 \ - uninstall-pkgconfigDATA uninstall-scriptSCRIPTS + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA 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-am uninstall uninstall-am \ + uninstall-pkgconfigDATA + +srpm: + rm -f *.rpm + rpmbuild -bs --nodeps --define "_sourcedir ." --define "_srcrpmdir ." --sign ccaudio2.spec dist-hook: cleandist diff -Nru libccaudio2-2.1.1/src/audiobase.cpp libccaudio2-2.1.3/src/audiobase.cpp --- libccaudio2-2.1.1/src/audiobase.cpp 2013-10-04 18:06:02.000000000 +0000 +++ libccaudio2-2.1.3/src/audiobase.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -21,8 +21,7 @@ #include #include -using namespace UCOMMON_NAMESPACE; - +namespace ucommon { AudioBase::AudioBase() { @@ -55,4 +54,5 @@ return result; } +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/audiobuffer.cpp libccaudio2-2.1.3/src/audiobuffer.cpp --- libccaudio2-2.1.1/src/audiobuffer.cpp 2013-10-04 18:06:19.000000000 +0000 +++ libccaudio2-2.1.3/src/audiobuffer.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -21,7 +21,7 @@ #include #include -using namespace UCOMMON_NAMESPACE; +namespace ucommon { AudioBuffer::AudioBuffer(Info *i, size_t sz) : AudioBase(i) @@ -107,6 +107,6 @@ return (ssize_t)amount; } - +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/audiofile.cpp libccaudio2-2.1.3/src/audiofile.cpp --- libccaudio2-2.1.1/src/audiofile.cpp 2013-10-04 19:36:32.000000000 +0000 +++ libccaudio2-2.1.3/src/audiofile.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -37,7 +37,7 @@ #define __BYTE_ORDER __LITTLE_ENDIAN #endif -using namespace UCOMMON_NAMESPACE; +namespace ucommon { #ifdef _PACKED #pragma pack(1) @@ -1602,5 +1602,4 @@ toTimestamp(pos * info.framing, timestamp, size); } - - +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/codec.cpp libccaudio2-2.1.3/src/codec.cpp --- libccaudio2-2.1.1/src/codec.cpp 2013-10-04 18:07:31.000000000 +0000 +++ libccaudio2-2.1.3/src/codec.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -43,7 +43,7 @@ #define M_PI 3.14159265358979323846 #endif -using namespace UCOMMON_NAMESPACE; +namespace ucommon { static LinkedObject *first = NULL; @@ -2002,3 +2002,4 @@ #endif +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/detect.cpp libccaudio2-2.1.3/src/detect.cpp --- libccaudio2-2.1.1/src/detect.cpp 2013-10-04 18:29:51.000000000 +0000 +++ libccaudio2-2.1.3/src/detect.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -52,8 +52,6 @@ * Frequency tolerance +- 1.5% will detect, +-3.5% will reject */ -using namespace UCOMMON_NAMESPACE; - #define SAMPLE_RATE 8000.0 #define DTMF_THRESHOLD 8.0e7 @@ -66,6 +64,8 @@ #define DTMF_2ND_HARMONIC_ROW 2.5 /* 4dB normal */ #define DTMF_2ND_HARMONIC_COL 63.1 /* 18dB */ +namespace ucommon { + DTMFDetect::DTMFDetect() { int i; @@ -380,4 +380,4 @@ return max; } - +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/dialers.cpp libccaudio2-2.1.3/src/dialers.cpp --- libccaudio2-2.1.1/src/dialers.cpp 2013-10-04 18:07:52.000000000 +0000 +++ libccaudio2-2.1.3/src/dialers.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -21,7 +21,7 @@ #include #include -using namespace UCOMMON_NAMESPACE; +namespace ucommon { DTMFTones::DTMFTones(const char *d, Level l, timeout_t duration, timeout_t timer) : AudioTone(duration) @@ -319,3 +319,5 @@ } } } + +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/fileio.cpp libccaudio2-2.1.3/src/fileio.cpp --- libccaudio2-2.1.1/src/fileio.cpp 2013-10-04 18:08:07.000000000 +0000 +++ libccaudio2-2.1.3/src/fileio.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -32,7 +32,7 @@ #include #endif -using namespace UCOMMON_NAMESPACE; +namespace ucommon { bool AudioFile::afCreate(const char *name, bool exclusive) { @@ -261,3 +261,4 @@ return pos; } +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/friends.cpp libccaudio2-2.1.3/src/friends.cpp --- libccaudio2-2.1.1/src/friends.cpp 2013-10-04 18:27:41.000000000 +0000 +++ libccaudio2-2.1.3/src/friends.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -37,9 +37,9 @@ #define __BYTE_ORDER __LITTLE_ENDIAN #endif -using namespace UCOMMON_NAMESPACE; +namespace ucommon { -class AudioRegistry +class __LOCAL AudioRegistry { public: AudioRegistry(); @@ -49,8 +49,9 @@ }; #ifdef _MSWINDOWS_ -extern LONG buffer_framing = 120; // millisec -extern LONG buffer_count = 8; +extern LONG buffer_framing, buffer_count; +LONG buffer_framing = 120; // millisec +LONG buffer_count = 8; #endif static class AudioRegistry registry; @@ -1213,3 +1214,4 @@ #endif +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/Makefile.in libccaudio2-2.1.3/src/Makefile.in --- libccaudio2-2.1.1/src/Makefile.in 2013-10-08 11:43:29.000000000 +0000 +++ libccaudio2-2.1.3/src/Makefile.in 2014-05-24 16:15:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru libccaudio2-2.1.1/src/mapper.cpp libccaudio2-2.1.3/src/mapper.cpp --- libccaudio2-2.1.1/src/mapper.cpp 2013-10-04 18:08:28.000000000 +0000 +++ libccaudio2-2.1.3/src/mapper.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -22,13 +22,13 @@ #include #include -using namespace UCOMMON_NAMESPACE; - #define MAP_HASH_SIZE 197 #define MAP_PAGE_COUNT 255 #define MAP_PAGE_SIZE (sizeof(void *[MAP_PAGE_COUNT])) #define MAP_PAGE_FIX (MAP_PAGE_SIZE / MAP_PAGE_COUNT) +namespace ucommon { + static unsigned char *page = NULL; static unsigned used = MAP_PAGE_SIZE; static TelTone::tonekey_t *hash[MAP_HASH_SIZE]; @@ -272,3 +272,4 @@ return false; } +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/oss.cpp libccaudio2-2.1.3/src/oss.cpp --- libccaudio2-2.1.1/src/oss.cpp 2013-10-04 18:08:43.000000000 +0000 +++ libccaudio2-2.1.3/src/oss.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -33,7 +33,7 @@ #include #include -using namespace UCOMMON_NAMESPACE; +namespace ucommon { class OSSAudioDevice : public AudioDevice { @@ -336,4 +336,6 @@ return dev; } +} // namespace ucommon + #endif diff -Nru libccaudio2-2.1.1/src/osx.cpp libccaudio2-2.1.3/src/osx.cpp --- libccaudio2-2.1.1/src/osx.cpp 2013-10-04 18:08:53.000000000 +0000 +++ libccaudio2-2.1.3/src/osx.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -100,7 +100,7 @@ return true; } -using namespace UCOMMON_NAMESPACE; +namespace ucommon { bool Audio::is_available(unsigned index) { @@ -115,5 +115,7 @@ return NULL; } +} // namespace ucommon + #endif diff -Nru libccaudio2-2.1.1/src/resample.cpp libccaudio2-2.1.3/src/resample.cpp --- libccaudio2-2.1.1/src/resample.cpp 2013-10-04 18:09:03.000000000 +0000 +++ libccaudio2-2.1.3/src/resample.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -21,7 +21,7 @@ #include #include -using namespace UCOMMON_NAMESPACE; +namespace ucommon { AudioResample::AudioResample(Rate div, Rate mul) { @@ -108,3 +108,5 @@ } return saved; } + +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/stream.cpp libccaudio2-2.1.3/src/stream.cpp --- libccaudio2-2.1.1/src/stream.cpp 2013-10-04 18:30:48.000000000 +0000 +++ libccaudio2-2.1.3/src/stream.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -21,7 +21,7 @@ #include #include -using namespace UCOMMON_NAMESPACE; +namespace ucommon { ssize_t AudioDevice::putBuffer(Encoded data, size_t count) { @@ -648,3 +648,5 @@ return count; } + +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/teltones.cpp libccaudio2-2.1.3/src/teltones.cpp --- libccaudio2-2.1.1/src/teltones.cpp 2013-10-04 18:09:25.000000000 +0000 +++ libccaudio2-2.1.3/src/teltones.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -22,7 +22,7 @@ #include #include -using namespace UCOMMON_NAMESPACE; +namespace ucommon { TelTone::TelTone(tonekey_t *k, Level l, timeout_t duration) : AudioTone(duration) @@ -91,3 +91,5 @@ return AudioTone::getFrame(); } + +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/tone.cpp libccaudio2-2.1.3/src/tone.cpp --- libccaudio2-2.1.1/src/tone.cpp 2013-10-04 18:09:35.000000000 +0000 +++ libccaudio2-2.1.3/src/tone.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -26,7 +26,7 @@ #define M_PI 3.14159265358979323846 #endif -using namespace UCOMMON_NAMESPACE; +namespace ucommon { AudioTone::AudioTone(timeout_t duration, Rate r) { @@ -203,4 +203,4 @@ return false; } - +} // namespace ucommon diff -Nru libccaudio2-2.1.1/src/w32.cpp libccaudio2-2.1.3/src/w32.cpp --- libccaudio2-2.1.1/src/w32.cpp 2013-10-04 18:09:44.000000000 +0000 +++ libccaudio2-2.1.3/src/w32.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -43,7 +43,7 @@ extern LONG buffer_framing; extern LONG buffer_count; -class W32Semaphore +class __LOCAL W32Semaphore { private: HANDLE sem; @@ -75,9 +75,9 @@ ReleaseSemaphore(sem, 1, (LPLONG)NULL); } -using namespace UCOMMON_NAMESPACE; +namespace ucommon { -class W32AudioDevice : public AudioDevice +class __LOCAL W32AudioDevice : public AudioDevice { private: HWAVEOUT hPlay; @@ -111,7 +111,7 @@ W32AudioDevice *W32AudioDevice::devices[MAX_DEVICES + 1]; -static void CALLBACK playProc(HWAVEOUT hPlay, UINT msg, DWORD instance, DWORD p1, DWORD p2) +void CALLBACK playProc(HWAVEOUT hPlay, UINT msg, DWORD instance, DWORD p1, DWORD p2) { W32AudioDevice *dev = W32AudioDevice::devices[instance]; if(msg != WOM_DONE) @@ -222,7 +222,7 @@ info.bitrate = rate * 16 * channels; info.order = __BYTE_ORDER; info.format = raw; - info.annotation = "Microsoft Windows"; + info.annotation = (char *)"Microsoft Windows"; info.framecount = bufsize / 2 / channels; info.framesize = bufsize; info.framing = (info.framecount * 1000l) / info.rate; @@ -245,10 +245,6 @@ sem = new W32Semaphore(bufcount); -#if !defined(_MSC_VER) || _MSC_VER < 1300 -#define DWORD_PTR DWORD -#endif - if(waveOutOpen(&hPlay, WAVE_MAPPER, &wfx, (DWORD_PTR)&playProc, (DWORD)devid, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) return false; @@ -327,4 +323,6 @@ return dev; } +} // namespace ucommon + #endif diff -Nru libccaudio2-2.1.1/utils/audiotool.cpp libccaudio2-2.1.3/utils/audiotool.cpp --- libccaudio2-2.1.1/utils/audiotool.cpp 2013-10-04 19:41:25.000000000 +0000 +++ libccaudio2-2.1.3/utils/audiotool.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -29,7 +29,7 @@ #define __BYTE_ORDER __LITTLE_ENDIAN #endif -using namespace UCOMMON_NAMESPACE; +using namespace ucommon; static const char *delfile = NULL; @@ -1135,7 +1135,7 @@ buffer = new unsigned char[Audio::maxFramesize(info)]; while((count = packetfile.getPacket(buffer)) > 0) - printf("-- %ld\n", count); + printf("-- %ld\n", (long)count); delete[] buffer; packetfile.close(); diff -Nru libccaudio2-2.1.1/utils/Makefile.in libccaudio2-2.1.3/utils/Makefile.in --- libccaudio2-2.1.1/utils/Makefile.in 2013-10-08 12:08:59.000000000 +0000 +++ libccaudio2-2.1.3/utils/Makefile.in 2014-05-24 16:15:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -Nru libccaudio2-2.1.1/utils/tonetool.cpp libccaudio2-2.1.3/utils/tonetool.cpp --- libccaudio2-2.1.1/utils/tonetool.cpp 2013-10-04 19:41:25.000000000 +0000 +++ libccaudio2-2.1.3/utils/tonetool.cpp 2014-05-24 10:07:04.000000000 +0000 @@ -18,7 +18,7 @@ #include #include -using namespace UCOMMON_NAMESPACE; +using namespace ucommon; static const char *delfile = NULL;