One more thing:
===> Configuring for sox-14.4.2^M
Using /usr/ports/pobj/sox-14.4.2/config.site (generated)^M
configure: WARNING: unrecognized options: --disable-gtk-doc^M
How did this get there?
The source tarball does not contain 'gtk' anywhere (says grep),
neither does audio/sox. Is this somehow added by the ports system?
Jan
On Feb 24 20:34:38, [email protected] wrote:
> Update to another SoX release.
>
> Drop --without-ffmpeg as ffmpeg has finally been kicked out.
>
> Add --without-opus instead of the expected --with-opus,
> as configure cannot pick it up. I am working on this.
>
> Remove sthen's cherry-picked patches as they are included.
>
> While there, reorder the LIB_DEPENDS alphabetically.
>
> Tested on current/amd64 and current/i386
> - can other users please test as well?
>
> I am sure my diff is not quite OK:
> it makes the no-longer-patches zero-sized instead of nonexistent.
> I did a 'cvs remove -f' on them in my tree.
> Should I do something else?
>
> Jan
>
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/sox/Makefile,v
> retrieving revision 1.58
> diff -u -p -r1.58 Makefile
> --- Makefile 29 Dec 2014 10:44:55 -0000 1.58
> +++ Makefile 24 Feb 2015 16:17:17 -0000
> @@ -2,9 +2,8 @@
>
> COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation
>
> -DISTNAME= sox-14.4.1
> -REVISION= 0
> -SHARED_LIBS += sox 3.0 # .2.1
> +DISTNAME= sox-14.4.2
> +SHARED_LIBS += sox 3.0
>
> CATEGORIES= audio
> HOMEPAGE= http://sox.sourceforge.net/
> @@ -27,18 +26,18 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
>
> # see CONFIGURE_ARGS below
> LIB_DEPENDS= \
> - devel/libmagic \
> - graphics/png \
> + audio/flac \
> + audio/gsm \
> audio/libmad \
> audio/libid3tag \
> audio/lame \
> - audio/twolame \
> - audio/libvorbis \
> - audio/flac \
> - audio/wavpack \
> audio/libsndfile \
> + audio/libvorbis \
> audio/opencore-amr \
> - audio/gsm
> + audio/twolame \
> + audio/wavpack \
> + devel/libmagic \
> + graphics/png
>
> CONFIGURE_STYLE=gnu
> CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
> @@ -69,12 +68,12 @@ CONFIGURE_ARGS+= \
> --with-lame \
> --with-twolame \
> --with-oggvorbis \
> + --without-opus \
> --with-flac \
> --with-amrwb \
> --with-amrnb \
> --with-wavpack \
> --with-sndfile \
> - --without-ffmpeg \
> --with-mp3 \
> --with-gsm
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/audio/sox/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 3 Feb 2013 13:19:23 -0000 1.13
> +++ distinfo 24 Feb 2015 16:17:17 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (sox-14.4.1.tar.gz) = mowsb+UeYI2jRqFX4RFQipV6+ePs894meB026aZ/qJs=
> -SIZE (sox-14.4.1.tar.gz) = 1111653
> +SHA256 (sox-14.4.2.tar.gz) = tF9ZhkP/vY42P/JNYRZszsSDb+ptOIiIG431Pju1X2w=
> +SIZE (sox-14.4.2.tar.gz) = 1134299
> Index: patches/patch-src_formats_c
> ===================================================================
> RCS file: /cvs/ports/audio/sox/patches/patch-src_formats_c,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-src_formats_c
> --- patches/patch-src_formats_c 24 Dec 2014 12:31:23 -0000 1.5
> +++ patches/patch-src_formats_c 24 Feb 2015 16:17:17 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-src_formats_c,v 1.5 2014/12/24 12:31:23 sthen Exp $
> ---- src/formats.c.orig Sun Jan 13 19:57:39 2013
> -+++ src/formats.c Wed Dec 24 12:30:53 2014
> -@@ -349,7 +349,7 @@ static int sox_checkformat(sox_format_t * ft)
> +--- src/formats.c.orig Mon Oct 27 03:55:50 2014
> ++++ src/formats.c Tue Feb 24 17:07:28 2015
> +@@ -353,7 +353,7 @@ static int sox_checkformat(sox_format_t * ft)
> return SOX_SUCCESS;
> }
>
> @@ -10,7 +10,7 @@ $OpenBSD: patch-src_formats_c,v 1.5 2014
> {
> return !(
> strncasecmp(text, "http:" , (size_t)5) &&
> -@@ -386,7 +386,7 @@ static FILE * xfopen(char const * identifier, char con
> +@@ -390,7 +390,7 @@ static FILE * xfopen(char const * identifier, char con
> else if (is_url(identifier)) {
> FILE * f = NULL;
> #ifdef HAVE_POPEN
> Index: patches/patch-src_gain_c
> ===================================================================
> RCS file: patches/patch-src_gain_c
> diff -N patches/patch-src_gain_c
> --- patches/patch-src_gain_c 29 Dec 2014 10:44:55 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-src_gain_c,v 1.1 2014/12/29 10:44:55 sthen Exp $
> -
> -[1c3d52] prevent division by 0 when input signal is entirely non-negative,
> -non-positive, or both
> -
> ---- src/gain.c.orig Wed Dec 24 12:32:38 2014
> -+++ src/gain.c Wed Dec 24 12:32:53 2014
> -@@ -80,7 +80,9 @@ static int start(sox_effect_t * effp)
> - if (!p->do_equalise && !p->do_balance && !p->do_balance_no_clip)
> - effp->flows = 1; /* essentially a conditional SOX_EFF_MCHAN */
> - }
> -- p->mult = p->max = p->min = 0;
> -+ p->mult = 0;
> -+ p->max = 1;
> -+ p->min = -1;
> - if (p->do_scan) {
> - p->tmp_file = lsx_tmpfile();
> - if (p->tmp_file == NULL) {
> Index: patches/patch-src_sphere_c
> ===================================================================
> RCS file: patches/patch-src_sphere_c
> diff -N patches/patch-src_sphere_c
> --- patches/patch-src_sphere_c 29 Dec 2014 10:44:55 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-src_sphere_c,v 1.3 2014/12/29 10:44:55 sthen Exp $
> -
> -[7d3f38] Check for minimum size sphere headers
> -
> ---- src/sphere.c.orig Wed Dec 24 12:31:33 2014
> -+++ src/sphere.c Wed Dec 24 12:31:53 2014
> -@@ -47,6 +47,11 @@ static int start_read(sox_format_t * ft)
> -
> - /* Determine header size, and allocate a buffer large enough to hold it.
> */
> - sscanf(fldsval, "%lu", &header_size_ul);
> -+ if (header_size_ul < 16) {
> -+ lsx_fail_errno(ft, SOX_EHDR, "Error reading Sphere header");
> -+ return (SOX_EOF);
> -+ }
> -+
> - buf = lsx_malloc(header_size = header_size_ul);
> -
> - /* Skip what we have read so far */
> Index: patches/patch-src_wav_c
> ===================================================================
> RCS file: patches/patch-src_wav_c
> diff -N patches/patch-src_wav_c
> --- patches/patch-src_wav_c 29 Dec 2014 10:44:55 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-src_wav_c,v 1.1 2014/12/29 10:44:55 sthen Exp $
> -
> -[f39c57] More checks for invalid MS ADPCM blocks.
> -
> -If block doesn't exacty match blockAlign then do not allow
> -number of samples in invalid size block to ever be more than
> -what WAV header defined as samplesPerBlock.
> -
> ---- src/wav.c.orig Wed Dec 24 12:33:35 2014
> -+++ src/wav.c Wed Dec 24 12:33:54 2014
> -@@ -166,7 +166,7 @@ static unsigned short AdpcmReadBlock(sox_format_t * f
> - /* work with partial blocks. Specs say it should be null */
> - /* padded but I guess this is better than trailing quiet. */
> - samplesThisBlock = lsx_ms_adpcm_samples_in((size_t)0,
> (size_t)ft->signal.channels, bytesRead, (size_t)0);
> -- if (samplesThisBlock == 0)
> -+ if (samplesThisBlock == 0 || samplesThisBlock >
> wav->samplesPerBlock)
> - {
> - lsx_warn("Premature EOF on .wav input file");
> - return 0;
