From owner-svn-ports-all@FreeBSD.ORG Tue May 20 08:39:57 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9557123; Tue, 20 May 2014 08:39:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 962602C24; Tue, 20 May 2014 08:39:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4K8dvSd062998; Tue, 20 May 2014 08:39:57 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4K8dulC062989; Tue, 20 May 2014 08:39:56 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201405200839.s4K8dulC062989@svn.freebsd.org> From: Pietro Cerutti Date: Tue, 20 May 2014 08:39:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354617 - in head/audio/ccaudio2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2014 08:39:57 -0000 Author: gahr Date: Tue May 20 08:39:56 2014 New Revision: 354617 URL: http://svnweb.freebsd.org/changeset/ports/354617 QAT: https://qat.redports.org/buildarchive/r354617/ Log: - Update to 2.1.2 Changes: 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 - updated lib .so name from ccaudio2 2.0.5 to ccaudio2 2.1.0 - modernized automake - patches from Brandon Invergo for current ucommon - various code cleanups - Fix MASTER_SITE, general description and WWW line in pkg-descr Deleted: head/audio/ccaudio2/files/patch-src_audiofile.cpp head/audio/ccaudio2/files/patch-src_friends.cpp head/audio/ccaudio2/files/patch-utils_audiotool.cpp Modified: head/audio/ccaudio2/Makefile head/audio/ccaudio2/distinfo head/audio/ccaudio2/files/patch-CMakeLists.txt head/audio/ccaudio2/files/patch-src_oss.cpp head/audio/ccaudio2/pkg-descr head/audio/ccaudio2/pkg-plist Modified: head/audio/ccaudio2/Makefile ============================================================================== --- head/audio/ccaudio2/Makefile Tue May 20 08:37:04 2014 (r354616) +++ head/audio/ccaudio2/Makefile Tue May 20 08:39:56 2014 (r354617) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= ccaudio2 -PORTVERSION= 2.0.5 -PORTREVISION= 6 +PORTVERSION= 2.1.2 CATEGORIES= audio -MASTER_SITES= http://www.gnutelephony.org/dist/tarballs/ +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR=ccaudio MAINTAINER= gahr@FreeBSD.org COMMENT= C++ class framework for manipulating audio files @@ -15,12 +15,12 @@ LIB_DEPENDS= libccgnu2.so:${PORTSDIR}/de libgsm.so:${PORTSDIR}/audio/gsm \ libspeex.so:${PORTSDIR}/audio/speex -CONFLICTS= ccaudio-[0-9]* - -USES= pathfix cmake:outsource pkgconfig +USES= cmake:outsource pkgconfig USE_LDCONFIG= yes CMAKE_ARGS+= -DWITH_INCLUDES:PATH=${LOCALBASE}/include \ - -DWITH_LIBS:PATH=${LOCALBASE}/lib + -DWITH_LIBS:PATH=${LOCALBASE}/lib \ + -DINSTALL_MANDIR=man \ + -DSYSCONFDIR=${PREFIX}/etc .include Modified: head/audio/ccaudio2/distinfo ============================================================================== --- head/audio/ccaudio2/distinfo Tue May 20 08:37:04 2014 (r354616) +++ head/audio/ccaudio2/distinfo Tue May 20 08:39:56 2014 (r354617) @@ -1,2 +1,2 @@ -SHA256 (ccaudio2-2.0.5.tar.gz) = 0f9d0427e9edf11a87a7a15777d78701077f0baac1b87a0776703f968fd38acc -SIZE (ccaudio2-2.0.5.tar.gz) = 409732 +SHA256 (ccaudio2-2.1.2.tar.gz) = c74a9ae7ccaaabb9928e7aacf17ea88d0caae646bc71202a37dea00f07c37540 +SIZE (ccaudio2-2.1.2.tar.gz) = 443795 Modified: head/audio/ccaudio2/files/patch-CMakeLists.txt ============================================================================== --- head/audio/ccaudio2/files/patch-CMakeLists.txt Tue May 20 08:37:04 2014 (r354616) +++ head/audio/ccaudio2/files/patch-CMakeLists.txt Tue May 20 08:39:56 2014 (r354617) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2011-03-27 18:41:32.000000000 +0200 -+++ CMakeLists.txt 2012-04-16 12:13:31.000000000 +0200 -@@ -125,7 +125,7 @@ +--- CMakeLists.txt.orig 2014-05-04 01:56:54.000000000 +0200 ++++ CMakeLists.txt 2014-05-20 10:27:42.000000000 +0200 +@@ -159,7 +159,7 @@ endif() include_directories(${USES_UCOMMON_INCLUDE_DIRS}) @@ -9,3 +9,12 @@ add_definitions(${USES_UCOMMON_CFLAGS}) # by default we build static libs for windows, shared libs for unix. +@@ -243,7 +243,7 @@ + + 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) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc DESTINATION libdata/pkgconfig) + endif() + + install(FILES ${ccaudio_conf} DESTINATION ${SYSCONFDIR}) Modified: head/audio/ccaudio2/files/patch-src_oss.cpp ============================================================================== --- head/audio/ccaudio2/files/patch-src_oss.cpp Tue May 20 08:37:04 2014 (r354616) +++ head/audio/ccaudio2/files/patch-src_oss.cpp Tue May 20 08:39:56 2014 (r354617) @@ -1,7 +1,7 @@ ---- src/oss.cpp.orig 2011-02-21 11:44:54.000000000 +0000 -+++ src/oss.cpp 2011-02-21 11:45:19.000000000 +0000 +--- src/oss.cpp.orig 2014-01-28 20:43:54.000000000 +0100 ++++ src/oss.cpp 2014-05-20 10:23:04.000000000 +0200 @@ -20,6 +20,13 @@ - #include + #include #include +#ifdef __FreeBSD__ Modified: head/audio/ccaudio2/pkg-descr ============================================================================== --- head/audio/ccaudio2/pkg-descr Tue May 20 08:37:04 2014 (r354616) +++ head/audio/ccaudio2/pkg-descr Tue May 20 08:39:56 2014 (r354617) @@ -1,6 +1,15 @@ GNU ccAudio2 is a stand-alone portable C++ class framework for manipulating -audio data. This library is optimized for DSP frame presentation and for -merging audio from multiple sources. Support is provided for many common -and popular sound file formats such as .au, .wav/RIFF, etc. +audio data. GNU ccAudio2 offers platform indipendent classes for directly +accessing audio files from disk. These classes are endian aware and also, +unlike some audio file manipulation libraries, content format aware; +ccAudio treats audio as an array of descreat sample points rather than simply +as binary data. ccAudio can also manipulate header information such as +annotations. GNU ccAudio2 supports sun audio, raw samples, and RIFF encoded +audio data. In addition to manipulating audio thru disk files, GNU ccAudio2 +can provide audio processing of sample sets in memory. This includes generation +of pure tones, energy measurement of audio poackets, and software codec +conversions. GNU ccAudio2 includes a framework for developing plugin audio +codecs and is intended to be a carrier for freely licensed audio codecs as well +as to expand into a general purpose audio/signal processing C++ library. -WWW: http://www.gnutelephony.org/index.php/GNU_ccAudio2 +WWW: http://www.gnu.org/software/ccaudio/ Modified: head/audio/ccaudio2/pkg-plist ============================================================================== --- head/audio/ccaudio2/pkg-plist Tue May 20 08:37:04 2014 (r354616) +++ head/audio/ccaudio2/pkg-plist Tue May 20 08:39:56 2014 (r354617) @@ -1,6 +1,10 @@ bin/audiotool bin/tonetool +etc/tones.conf include/ccaudio2.h -lib/libccaudio.so -lib/libccaudio.so.2 -lib/libccaudio.so.2.0.5 +lib/libccaudio2.so +lib/libccaudio2.so.2 +lib/libccaudio2.so.2.0.2 +libdata/pkgconfig/ccaudio2.pc +man/man1/audiotool.1.gz +man/man1/tonetool.1.gz