From nobody@FreeBSD.org  Mon Jun  6 23:38:48 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 080CA106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  6 Jun 2011 23:38:48 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id E24308FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  6 Jun 2011 23:38:47 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p56Nclfp004404
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 6 Jun 2011 23:38:47 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p56NclSf004403;
	Mon, 6 Jun 2011 23:38:47 GMT
	(envelope-from nobody)
Message-Id: <201106062338.p56NclSf004403@red.freebsd.org>
Date: Mon, 6 Jun 2011 23:38:47 GMT
From: Ryan Steinmetz <rpsfa@rit.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [update] audio/sox to 14.3.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: dnelson@allantgroup.com

>Number:         157673
>Category:       ports
>Synopsis:       [update] audio/sox to 14.3.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 06 23:40:06 UTC 2011
>Closed-Date:    Sat Jun 11 02:48:03 UTC 2011
>Last-Modified:  Sat Jun 11 02:50:07 UTC 2011
>Originator:     Ryan Steinmetz
>Release:        8.2-RELEASE
>Organization:
Rochester Institute of Technology
>Environment:
>Description:
- Update to 14.3.2

=======================================

sox-14.3.2      2011-02-27
----------

File formats:

  o Add seek support to mp3 handler for speed improvements.  (Pavel Karneliuk)
  o Fix bug were WavPack header was not updated correctly when closing
    file.  Fixed libsox memory leak when closing WavPack files.
    (David Bryant)
  o Fix RIFF chunk length error when writing 24-bit files. (David Bryant)
  o 24-bit WAV files were leaving channel maps unassigned. Change to use
    common channel mappings based on channel count.  This allows to
    work more seemlessly with other apps such as WavPack and Foobar2000.
    (David Bryant)
  o Fix ffmpeg playback bug caused by alignment requirements on some platforms.
    Closes bug #3017690.  (Reuben Thomas).
  o Fix memory leak in ffmpeg. (Doug Cook)
  o Handle 0 length chunks in WAV files gracefully.  (Beat Jorg)
  o When skipping over chunks, account for word alignment. Helps
    with some Logic Pro generated files.  (D Lambley)
  o Fix incorrect MP3 file length determination with VBR & .5s initial
    silence.  (robs)

Audio device drivers:

  o Fix immediate segfault on OSX while attempting to record. (Adam Fritzler)
  o Fix segfault on OSX playback for some HW that gives smaller then
    requested buffers. (cbagwell)
  o Clean up system resource in coreaudio on close.  Allows running
    back-to-back open()/close()'s without exiting app first. (cbagwell)
  o Add support for 32-bit samples to OSS driver. (Eric Lammerts)
  o Add support for 24 and 32-bit samples to waveaudio (Win32) driver.
    (Doug Cook)
  o Support specifying audio device other than default on OSX (cbagwell)

Effects:

  o F.R. [3051700] spectrogram -r for `raw' spectrogram, no legend.  (robs)
  o Fix -w option on stats effect. (Ronald Sprouse)
  o Fix segfault with some ladspa plugins (Thor Andreassen)
  o Optionally look for png.h in libpng directory to support OpenBSD
    packaging.  Helps enable spectrograph effect. (cbagwell)
  o libpng15 requires application to include zlib.h header file. (cbagwell)
    Add this to spectrograph effect. [3184238]
  o Enable LADSPA effects on all platforms without any external
    dependencies.  Mainly useful for Linux, Windows and OS X which have
    binaries readily available. (cbagwell)
  o Support specifying an absolute end location for trim effect instead
    only an offset from trim begin location. (Ulrich Klauer)
  o Fix regression where MP3 handler required libmad headers to be installed.
    (Samuli Suominen) 
  o Allow dynamic loading of lame to be enabled even if lame header files
    are not installed.  (Doug Cook)

Other new features:

  o Soxi now reports duration of AMR files.  (robs)
  o Document the "multiple" combine option in man pages and in
    usage output (Ulrich Klauer).

Internal improvements:

  o Distribute msvc9 project files that had been in CVS only. (cbagwell)
  o Add msvc10 project files (also compatible with the Windows SDK 7.1).
    (Doug Cook)
  o cmake now compiles waveaudio driver under windows environment. (cbagwell)
    [3072672]
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/audio/sox/Makefile sox/Makefile
--- /usr/ports/audio/sox/Makefile	2011-02-10 11:36:07.000000000 -0500
+++ sox/Makefile	2011-06-06 18:44:22.000000000 -0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sox
-PORTVERSION=	14.3.1
+PORTVERSION=	14.3.2
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -24,6 +24,9 @@
 USE_AUTOTOOLS=	libltdl
 USE_GNOME=	pkgconfig
 
+LICENSE_COMB=	dual
+LICENSE=	LGPL21 GPLv2
+
 # Default LAME to off for packages so we don't end up RESTRICTED
 .if defined(PACKAGE_BUILDING)
 _LAME=	off
@@ -51,7 +54,7 @@
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	CPPFLAGS+="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 CONFIGURE_ARGS+=	--with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
 
diff -urN /usr/ports/audio/sox/distinfo sox/distinfo
--- /usr/ports/audio/sox/distinfo	2011-02-10 11:36:07.000000000 -0500
+++ sox/distinfo	2011-06-06 18:43:39.000000000 -0400
@@ -1,2 +1,2 @@
-SHA256 (sox-14.3.1.tar.gz) = c4be9ebdb1e77a3bc9f3ee1f3fd274a1fe7b162a174fcc74874b231f3f1ace54
-SIZE (sox-14.3.1.tar.gz) = 1044595
+SHA256 (sox-14.3.2.tar.gz) = 0668cc087c346f7c4084ae294c676a11ddefb462974bc3f67be30d789c850e8f
+SIZE (sox-14.3.2.tar.gz) = 1110175


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jun 6 23:40:16 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157673 
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Mon Jun 6 23:46:50 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157673 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dnelson@allantgroup.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/157673: [update] audio/sox to 14.3.2
Date: Mon, 6 Jun 2011 23:40:14 UT

 Maintainer of audio/sox,
 
 Please note that PR ports/157673 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/157673
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Dan Nelson <dnelson@allantgroup.com>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/157673: [update] audio/sox to 14.3.2
Date: Wed, 8 Jun 2011 11:48:03 -0500

 --BXVAT5kNtrzKuDFl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 
 Here's a better patch:
 
 + update to 14.3.2 and add LICENSE, as in the original patch
 
 + Remove CPPFLAGS="${CPPFLAGS}" from CONFIGURE_ENV, since as of 2011-03-20
   the ports system does this for you.  Note: += syntax is not valid in
   CONFIGURE_ENV.
 
 + disable some more autoconf checks when WITH_GSM=no; sox was still finding
   libgsm.so if it existed.
 
 + remove the #include path fixups of gsm.h and libavformat.h; they're not
   needed anymore.
 
 + add files/patch-ffmpeg , to allow sox to build if the ffmpeg-devel is
   installed.
 
 
 -- 
 	Dan Nelson
 	dnelson@allantgroup.com
 
 --BXVAT5kNtrzKuDFl
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="sox.patch"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/audio/sox/Makefile,v
 retrieving revision 1.53
 diff -u -r1.53 Makefile
 --- Makefile	10 Feb 2011 16:36:07 -0000	1.53
 +++ Makefile	8 Jun 2011 16:46:36 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	sox
 -PORTVERSION=	14.3.1
 +PORTVERSION=	14.3.2
  CATEGORIES=	audio
  MASTER_SITES=	SF
  
 @@ -23,6 +23,8 @@
  USE_LDCONFIG=	yes
  USE_AUTOTOOLS=	libltdl
  USE_GNOME=	pkgconfig
 +LICENSE_COMB=	dual
 +LICENSE=	LGPL21 GPLv2
  
  # Default LAME to off for packages so we don't end up RESTRICTED
  .if defined(PACKAGE_BUILDING)
 @@ -51,7 +53,7 @@
  
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 -CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 +CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
  CONFIGURE_ARGS+=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
  CONFIGURE_ARGS+=	--with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
  
 @@ -147,8 +149,9 @@
  .else
  CONFIGURE_ARGS+=	--with-gsm
  # We cannot ask for gsm to be enabled without it trying to use external gsm,
 -# so workaround with the below line
 -CONFIGURE_ENV+=		ac_cv_header_gsm_h=no
 +# so force the autoconf checks to fail
 +CONFIGURE_ENV+=	ac_cv_header_gsm_h=no ac_cv_header_gsm_gsm_h=no \
 +		ac_cv_lib_gsm_gsm_create=no
  .endif
  
  .if defined(WITH_ID3TAG)
 @@ -165,11 +168,4 @@
  CONFIGURE_ARGS+=	--without-wavpack
  .endif
  
 -# Tell configure that libgsm's headers are in $LOCALDIR/include
 -post-patch:
 -	@${REINPLACE_CMD} -Ee 's![[:<:]]gsm/gsm.h!gsm.h!' ${WRKSRC}/configure \
 -		${WRKSRC}/src/gsm.c ${WRKSRC}/src/wav.c
 -	@${REINPLACE_CMD} -Ee 's!ffmpeg/avformat.h!libavformat/avformat.h!' \
 -		${WRKSRC}/configure ${WRKSRC}/src/ffmpeg.c
 -
  .include <bsd.port.post.mk>
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/audio/sox/distinfo,v
 retrieving revision 1.22
 diff -u -r1.22 distinfo
 --- distinfo	10 Feb 2011 16:36:07 -0000	1.22
 +++ distinfo	7 Jun 2011 05:21:10 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (sox-14.3.1.tar.gz) = c4be9ebdb1e77a3bc9f3ee1f3fd274a1fe7b162a174fcc74874b231f3f1ace54
 -SIZE (sox-14.3.1.tar.gz) = 1044595
 +SHA256 (sox-14.3.2.tar.gz) = 0668cc087c346f7c4084ae294c676a11ddefb462974bc3f67be30d789c850e8f
 +SIZE (sox-14.3.2.tar.gz) = 1110175
 Index: files/patch-ffmpeg
 ===================================================================
 RCS file: files/patch-ffmpeg
 diff -N files/patch-ffmpeg
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-ffmpeg	8 Jun 2011 16:46:24 -0000
 @@ -0,0 +1,55 @@
 +*** diff
 +
 +Update to use the new ffmpeg library API, but still work with 
 +the old one.
 +
 +--- src/ffmpeg.c	2011-06-07 00:29:34.000000000 -0500
 ++++ src/ffmpeg.c	2011-06-07 00:34:12.830996927 -0500
 +@@ -50,6 +50,11 @@
 + #include <ctype.h>
 + #include "ffmpeg.h"
 + 
 ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0)
 ++#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
 ++#define AV_PKT_FLAG_KEY PKT_FLAG_KEY
 ++#endif
 ++ 		    
 + /* Private data for ffmpeg files */
 + typedef struct {
 +   int audio_index;
 +@@ -91,7 +96,7 @@ static int stream_component_open(priv_t 
 + 
 +   if (!codec || avcodec_open(enc, codec) < 0)
 +     return -1;
 +-  if (enc->codec_type != CODEC_TYPE_AUDIO) {
 ++  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
 +     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
 +     return -1;
 +   }
 +@@ -182,7 +187,7 @@ static int startread(sox_format_t * ft)
 +   /* Find audio stream (FIXME: allow different stream to be selected) */
 +   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
 +     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
 +-    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
 ++    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
 +       ffmpeg->audio_index = i;
 +       break;
 +     }
 +@@ -273,7 +278,7 @@ static AVStream *add_audio_stream(sox_fo
 + 
 +   c = st->codec;
 +   c->codec_id = codec_id;
 +-  c->codec_type = CODEC_TYPE_AUDIO;
 ++  c->codec_type = AVMEDIA_TYPE_AUDIO;
 + 
 +   /* put sample parameters */
 +   c->bit_rate = 256000;  /* FIXME: allow specification */
 +@@ -423,7 +428,7 @@ static size_t write_samples(sox_format_t
 +       av_init_packet(&pkt);
 +       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
 +       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
 +-      pkt.flags |= PKT_FLAG_KEY;
 ++      pkt.flags |= AV_PKT_FLAG_KEY;
 +       pkt.stream_index = ffmpeg->audio_st->index;
 +       pkt.data = ffmpeg->audio_buf_aligned;
 + 
 
 --BXVAT5kNtrzKuDFl--
State-Changed-From-To: feedback->closed 
State-Changed-By: wxs 
State-Changed-When: Sat Jun 11 02:48:01 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157673 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157673: commit references a PR
Date: Sat, 11 Jun 2011 02:47:59 +0000 (UTC)

 wxs         2011-06-11 02:47:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/sox            Makefile distinfo 
   Added files:
     audio/sox/files      patch-ffmpeg 
   Log:
   - Update to 14.3.2.
   - Add LICENSE.
   - Add a patch to fix build if ffmpeg-devel is installed.
   
   PR:             ports/157673
   Submitted by:   Ryan Steinmetz <rpsfa@rit.edu>
   Approved by:    Dan Nelson <dnelson@allantgroup.com> (maintainer)
   
   Revision  Changes    Path
   1.54      +7 -11     ports/audio/sox/Makefile
   1.23      +2 -2      ports/audio/sox/distinfo
   1.1       +55 -0     ports/audio/sox/files/patch-ffmpeg (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
