Attachment #90416 for bug #127593

View | Details | Raw Unified | Return to bug 127593
Collapse All | Expand All




#

PORTNAME=	sox
PORTVERSION=	14.1.0
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	SF



CONFLICTS=	play-[0-9]*

MAN1=		sox.1 soxi.1
MAN3=		libsox.3
MAN7=		soxformat.7 soxeffect.7
MLINKS=		sox.1 play.1 sox.1 rec.1
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
USE_AUTOTOOLS=	libltdl
USE_GNOME=	pkgconfig
# src/Makefile uses ${RM} but never sets it
MAKE_ENV+=	RM="rm -f"

.if defined(PACKAGE_BUILDING)
_LAME=	off
.else
_LAME=	on
.endif

OPTIONS=	AO "Enable libao output" on \
		AMRNB "AMR Speech Codec (Narrowband)" off \
		AMRWB "AMR Speech Codec (Wideband)" off \

		FLAC "Enable flac en/decoding with libflac" on \
		GSM "Use libgsm from ports (else use bundled lib)" on \
		LADSPA "Audio plugin support" off \
		LAME "Enable mp3 encoding with LAME" ${_LAME} \
		MAD "Enable mp3 decoding with MAD" on \
		SAMPLERATE "Enable libsamplerate" on \
		SNDFILE "Enable libsndfile" on \
		VORBIS "Enable Ogg Vorbis support" on \
		WAVPACK "Enable Wavpack support" off

.include <bsd.port.pre.mk>

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png

.if !defined(WITH_LAME) && !defined(WITH_MAD)
PLIST_SUB+=	PLIST_MP3="@comment "

CONFIGURE_ARGS+=	--without-samplerate
.endif

.if defined(WITH_WAVPACK)
CONFIGURE_ARGS+=	--with-wavpack
LIB_DEPENDS+=		wavpack.1:${PORTSDIR}/audio/wavpack
PLIST_SUB+=		PLIST_WAVPACK=""
.else
CONFIGURE_ARGS+=	--without-wavpack
PLIST_SUB+=		PLIST_WAVPACK="@comment "
.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>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (sox-14.0.1.tar.gz) = 6c95af60b20b9655531bf3162c0be937	1	MD5 (sox-14.1.0.tar.gz) = b8e2cb3d615d3830347a0948dd8b74a8
2	SHA256 (sox-14.0.1.tar.gz) = 52398a49bef64aa6e06b158cb59b3e1790fa1bf94262b896688bcfdcf539ca73	2	SHA256 (sox-14.1.0.tar.gz) = 319cf07ee06fcbfbcaced7307e23ca567739c278f76bc143a9258a9a23e42101
3	SIZE (sox-14.0.1.tar.gz) = 859538	3	SIZE (sox-14.1.0.tar.gz) = 912057




bin/play
bin/rec
bin/sox
bin/soxi
include/sox.h
include/soxstdint.h
lib/libsfx.a

lib/sox/libsox_fmt_au.la
lib/sox/libsox_fmt_au.so
lib/sox/libsox_fmt_au.so.0
lib/sox/libsox_fmt_auto.a
lib/sox/libsox_fmt_auto.la
lib/sox/libsox_fmt_auto.so
lib/sox/libsox_fmt_auto.so.0
lib/sox/libsox_fmt_avr.a
lib/sox/libsox_fmt_avr.la
lib/sox/libsox_fmt_avr.so
lib/sox/libsox_fmt_avr.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so.0
lib/sox/libsox_fmt_cdr.a
lib/sox/libsox_fmt_cdr.la
lib/sox/libsox_fmt_cdr.so

lib/sox/libsox_fmt_dvms.la
lib/sox/libsox_fmt_dvms.so
lib/sox/libsox_fmt_dvms.so.0
lib/sox/libsox_fmt_f4.a
lib/sox/libsox_fmt_f4.la
lib/sox/libsox_fmt_f4.so
lib/sox/libsox_fmt_f4.so.0
lib/sox/libsox_fmt_f8.a
lib/sox/libsox_fmt_f8.la
lib/sox/libsox_fmt_f8.so
lib/sox/libsox_fmt_f8.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.so.0
%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.a
%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.la
%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.so

lib/sox/libsox_fmt_hcom.la
lib/sox/libsox_fmt_hcom.so
lib/sox/libsox_fmt_hcom.so.0
lib/sox/libsox_fmt_htk.a
lib/sox/libsox_fmt_htk.la
lib/sox/libsox_fmt_htk.so
lib/sox/libsox_fmt_htk.so.0
lib/sox/libsox_fmt_ima.a
lib/sox/libsox_fmt_ima.la
lib/sox/libsox_fmt_ima.so

lib/sox/libsox_fmt_lu.la
lib/sox/libsox_fmt_lu.so
lib/sox/libsox_fmt_lu.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so.0
lib/sox/libsox_fmt_maud.a
lib/sox/libsox_fmt_maud.la
lib/sox/libsox_fmt_maud.so

lib/sox/libsox_fmt_oss.la
lib/sox/libsox_fmt_oss.so
lib/sox/libsox_fmt_oss.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so.0
lib/sox/libsox_fmt_prc.a
lib/sox/libsox_fmt_prc.la
lib/sox/libsox_fmt_prc.so
lib/sox/libsox_fmt_prc.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so.0
lib/sox/libsox_fmt_raw.a
lib/sox/libsox_fmt_raw.la
lib/sox/libsox_fmt_raw.so

lib/sox/libsox_fmt_s4.la
lib/sox/libsox_fmt_s4.so
lib/sox/libsox_fmt_s4.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so.0
lib/sox/libsox_fmt_sf.a
lib/sox/libsox_fmt_sf.la
lib/sox/libsox_fmt_sf.so

%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so.0
lib/sox/libsox_fmt_sounder.a
lib/sox/libsox_fmt_sounder.la
lib/sox/libsox_fmt_sounder.so
lib/sox/libsox_fmt_sounder.so.0
lib/sox/libsox_fmt_soundtool.a
lib/sox/libsox_fmt_soundtool.la
lib/sox/libsox_fmt_soundtool.so
lib/sox/libsox_fmt_soundtool.so.0
lib/sox/libsox_fmt_sphere.a
lib/sox/libsox_fmt_sphere.la
lib/sox/libsox_fmt_sphere.so

lib/sox/libsox_fmt_vox.la
lib/sox/libsox_fmt_vox.so
lib/sox/libsox_fmt_vox.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so.0
lib/sox/libsox_fmt_wav.a
lib/sox/libsox_fmt_wav.la
lib/sox/libsox_fmt_wav.so
lib/sox/libsox_fmt_wav.so.0
%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.a
%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.la
%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so
%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so.0
lib/sox/libsox_fmt_wve.a
lib/sox/libsox_fmt_wve.la
lib/sox/libsox_fmt_wve.so

lib/sox/libsox_fmt_xa.la
lib/sox/libsox_fmt_xa.so
lib/sox/libsox_fmt_xa.so.0
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so.0
@dirrm lib/sox
libdata/pkgconfig/sox.pc




Fix badly-imbalanced parens.

diff -burp sox-14.1.0/src/sox.c sox-14.1.0-dan/src/sox.c
--- src/sox.c	2008-07-28 15:04:36.000000000 -0500
+++ src/sox.c	2008-07-30 11:36:41.046073378 -0500
@@ -1716,7 +1716,7 @@ int main(int argc, char **argv)
     combine_method = sox_concatenate;
 
   /* Make sure we got at least the required # of input filenames */
-  if (input_count < is_serial(combine_method ? 1 : 2))
+  if (input_count < (is_serial(combine_method) ? 1 : 2))
     usage("Not enough input filenames specified");
 
   /* Check for misplaced input/output-specific options */

Return to bug 127593

Lines 6-13 Link Here

(-)Makefile (-6 / +26 lines)
6	#	6	#
7		7
8	PORTNAME= sox	8	PORTNAME= sox
9	PORTVERSION= 14.0.1	9	PORTVERSION= 14.1.0
10	PORTREVISION= 1
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12
Lines 16-31 Link Here
16		15
17	CONFLICTS= play-[0-9]*	16	CONFLICTS= play-[0-9]*
18		17
19	MAN1= sox.1	18	MAN1= sox.1 soxi.1
20	MAN3= libsox.3	19	MAN3= libsox.3
21	MAN7= soxexam.7 soxformat.7 soxeffect.7	20	MAN7= soxformat.7 soxeffect.7
22	MLINKS= sox.1 play.1 sox.1 rec.1	21	MLINKS= sox.1 play.1 sox.1 rec.1
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
24	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
25	USE_AUTOTOOLS= libltdl	24	USE_AUTOTOOLS= libltdl
		25	USE_GNOME= pkgconfig
26	# src/Makefile uses ${RM} but never sets it	26	# src/Makefile uses ${RM} but never sets it
27	MAKE_ENV+= RM="rm -f"	27	MAKE_ENV+= RM="rm -f"
28		28
		29	.if defined(PACKAGE_BUILDING)
		30	_LAME= off
		31	.else
		32	_LAME= on
		33	.endif
		34
29	OPTIONS= AO "Enable libao output" on \	35	OPTIONS= AO "Enable libao output" on \
30	AMRNB "AMR Speech Codec (Narrowband)" off \	36	AMRNB "AMR Speech Codec (Narrowband)" off \
31	AMRWB "AMR Speech Codec (Wideband)" off \	37	AMRWB "AMR Speech Codec (Wideband)" off \
Lines 33-49 Link Here
33	FLAC "Enable flac en/decoding with libflac" on \	39	FLAC "Enable flac en/decoding with libflac" on \
34	GSM "Use libgsm from ports (else use bundled lib)" on \	40	GSM "Use libgsm from ports (else use bundled lib)" on \
35	LADSPA "Audio plugin support" off \	41	LADSPA "Audio plugin support" off \
36	LAME "Enable mp3 encoding with LAME" on \	42	LAME "Enable mp3 encoding with LAME" ${_LAME} \
37	MAD "Enable mp3 decoding with MAD" on \	43	MAD "Enable mp3 decoding with MAD" on \
38	SAMPLERATE "Enable libsamplerate" on \	44	SAMPLERATE "Enable libsamplerate" on \
39	SNDFILE "Enable libsndfile" on \	45	SNDFILE "Enable libsndfile" on \
40	VORBIS "Enable Ogg Vorbis support" on	46	VORBIS "Enable Ogg Vorbis support" on \
		47	WAVPACK "Enable Wavpack support" off
41		48
42	.include <bsd.port.pre.mk>	49	.include <bsd.port.pre.mk>
43		50
44	CPPFLAGS+= -I${LOCALBASE}/include	51	CPPFLAGS+= -I${LOCALBASE}/include
45	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	52	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
46	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	53	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		54	CONFIGURE_ARGS+= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
		55	LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
47		56
48	.if !defined(WITH_LAME) && !defined(WITH_MAD)	57	.if !defined(WITH_LAME) && !defined(WITH_MAD)
49	PLIST_SUB+= PLIST_MP3="@comment "	58	PLIST_SUB+= PLIST_MP3="@comment "
Lines 154-162 Link Here
154	CONFIGURE_ARGS+= --without-samplerate	163	CONFIGURE_ARGS+= --without-samplerate
155	.endif	164	.endif
156		165
		166	.if defined(WITH_WAVPACK)
		167	CONFIGURE_ARGS+= --with-wavpack
		168	LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack
		169	PLIST_SUB+= PLIST_WAVPACK=""
		170	.else
		171	CONFIGURE_ARGS+= --without-wavpack
		172	PLIST_SUB+= PLIST_WAVPACK="@comment "
		173	.endif
		174
157	# Tell configure that libgsm's headers are in $LOCALDIR/include	175	# Tell configure that libgsm's headers are in $LOCALDIR/include
158	post-patch:	176	post-patch:
159	@${REINPLACE_CMD} -Ee 's![[:<:]]gsm/gsm.h!gsm.h!' ${WRKSRC}/configure \	177	@${REINPLACE_CMD} -Ee 's![[:<:]]gsm/gsm.h!gsm.h!' ${WRKSRC}/configure \
160	${WRKSRC}/src/gsm.c ${WRKSRC}/src/wav.c	178	${WRKSRC}/src/gsm.c ${WRKSRC}/src/wav.c
		179	@${REINPLACE_CMD} -Ee 's!ffmpeg/avformat.h!libavformat/avformat.h!' \
		180	${WRKSRC}/configure ${WRKSRC}/src/ffmpeg.c
161		181
162	.include <bsd.port.post.mk>	182	.include <bsd.port.post.mk>

Lines 2-7 Link Here

(-)pkg-plist (-8 / +62 lines)
2	bin/play	2	bin/play
3	bin/rec	3	bin/rec
4	bin/sox	4	bin/sox
		5	bin/soxi
5	include/sox.h	6	include/sox.h
6	include/soxstdint.h	7	include/soxstdint.h
7	lib/libsfx.a	8	lib/libsfx.a
Lines 40-53 Link Here
40	lib/sox/libsox_fmt_au.la	41	lib/sox/libsox_fmt_au.la
41	lib/sox/libsox_fmt_au.so	42	lib/sox/libsox_fmt_au.so
42	lib/sox/libsox_fmt_au.so.0	43	lib/sox/libsox_fmt_au.so.0
43	lib/sox/libsox_fmt_auto.a
44	lib/sox/libsox_fmt_auto.la
45	lib/sox/libsox_fmt_auto.so
46	lib/sox/libsox_fmt_auto.so.0
47	lib/sox/libsox_fmt_avr.a	44	lib/sox/libsox_fmt_avr.a
48	lib/sox/libsox_fmt_avr.la	45	lib/sox/libsox_fmt_avr.la
49	lib/sox/libsox_fmt_avr.so	46	lib/sox/libsox_fmt_avr.so
50	lib/sox/libsox_fmt_avr.so.0	47	lib/sox/libsox_fmt_avr.so.0
		48	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.a
		49	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.la
		50	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so
		51	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so.0
51	lib/sox/libsox_fmt_cdr.a	52	lib/sox/libsox_fmt_cdr.a
52	lib/sox/libsox_fmt_cdr.la	53	lib/sox/libsox_fmt_cdr.la
53	lib/sox/libsox_fmt_cdr.so	54	lib/sox/libsox_fmt_cdr.so
Lines 64-69 Link Here
64	lib/sox/libsox_fmt_dvms.la	65	lib/sox/libsox_fmt_dvms.la
65	lib/sox/libsox_fmt_dvms.so	66	lib/sox/libsox_fmt_dvms.so
66	lib/sox/libsox_fmt_dvms.so.0	67	lib/sox/libsox_fmt_dvms.so.0
		68	lib/sox/libsox_fmt_f4.a
		69	lib/sox/libsox_fmt_f4.la
		70	lib/sox/libsox_fmt_f4.so
		71	lib/sox/libsox_fmt_f4.so.0
		72	lib/sox/libsox_fmt_f8.a
		73	lib/sox/libsox_fmt_f8.la
		74	lib/sox/libsox_fmt_f8.so
		75	lib/sox/libsox_fmt_f8.so.0
		76	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.a
		77	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.la
		78	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.so
		79	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.so.0
67	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.a	80	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.a
68	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.la	81	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.la
69	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.so	82	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.so
Lines 80-85 Link Here
80	lib/sox/libsox_fmt_hcom.la	93	lib/sox/libsox_fmt_hcom.la
81	lib/sox/libsox_fmt_hcom.so	94	lib/sox/libsox_fmt_hcom.so
82	lib/sox/libsox_fmt_hcom.so.0	95	lib/sox/libsox_fmt_hcom.so.0
		96	lib/sox/libsox_fmt_htk.a
		97	lib/sox/libsox_fmt_htk.la
		98	lib/sox/libsox_fmt_htk.so
		99	lib/sox/libsox_fmt_htk.so.0
83	lib/sox/libsox_fmt_ima.a	100	lib/sox/libsox_fmt_ima.a
84	lib/sox/libsox_fmt_ima.la	101	lib/sox/libsox_fmt_ima.la
85	lib/sox/libsox_fmt_ima.so	102	lib/sox/libsox_fmt_ima.so
Lines 96-101 Link Here
96	lib/sox/libsox_fmt_lu.la	113	lib/sox/libsox_fmt_lu.la
97	lib/sox/libsox_fmt_lu.so	114	lib/sox/libsox_fmt_lu.so
98	lib/sox/libsox_fmt_lu.so.0	115	lib/sox/libsox_fmt_lu.so.0
		116	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.a
		117	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.la
		118	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.so
		119	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.so.0
		120	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.a
		121	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.la
		122	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so
		123	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so.0
99	lib/sox/libsox_fmt_maud.a	124	lib/sox/libsox_fmt_maud.a
100	lib/sox/libsox_fmt_maud.la	125	lib/sox/libsox_fmt_maud.la
101	lib/sox/libsox_fmt_maud.so	126	lib/sox/libsox_fmt_maud.so
Lines 112-121 Link Here
112	lib/sox/libsox_fmt_oss.la	137	lib/sox/libsox_fmt_oss.la
113	lib/sox/libsox_fmt_oss.so	138	lib/sox/libsox_fmt_oss.so
114	lib/sox/libsox_fmt_oss.so.0	139	lib/sox/libsox_fmt_oss.so.0
		140	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.a
		141	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.la
		142	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so
		143	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so.0
115	lib/sox/libsox_fmt_prc.a	144	lib/sox/libsox_fmt_prc.a
116	lib/sox/libsox_fmt_prc.la	145	lib/sox/libsox_fmt_prc.la
117	lib/sox/libsox_fmt_prc.so	146	lib/sox/libsox_fmt_prc.so
118	lib/sox/libsox_fmt_prc.so.0	147	lib/sox/libsox_fmt_prc.so.0
		148	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.a
		149	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.la
		150	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so
		151	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so.0
119	lib/sox/libsox_fmt_raw.a	152	lib/sox/libsox_fmt_raw.a
120	lib/sox/libsox_fmt_raw.la	153	lib/sox/libsox_fmt_raw.la
121	lib/sox/libsox_fmt_raw.so	154	lib/sox/libsox_fmt_raw.so
Lines 136-141 Link Here
136	lib/sox/libsox_fmt_s4.la	169	lib/sox/libsox_fmt_s4.la
137	lib/sox/libsox_fmt_s4.so	170	lib/sox/libsox_fmt_s4.so
138	lib/sox/libsox_fmt_s4.so.0	171	lib/sox/libsox_fmt_s4.so.0
		172	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.a
		173	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.la
		174	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so
		175	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so.0
139	lib/sox/libsox_fmt_sf.a	176	lib/sox/libsox_fmt_sf.a
140	lib/sox/libsox_fmt_sf.la	177	lib/sox/libsox_fmt_sf.la
141	lib/sox/libsox_fmt_sf.so	178	lib/sox/libsox_fmt_sf.so
Lines 148-157 Link Here
148	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.la	185	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.la
149	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so	186	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so
150	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so.0	187	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so.0
151	lib/sox/libsox_fmt_sndrtool.a	188	lib/sox/libsox_fmt_sounder.a
152	lib/sox/libsox_fmt_sndrtool.la	189	lib/sox/libsox_fmt_sounder.la
153	lib/sox/libsox_fmt_sndrtool.so	190	lib/sox/libsox_fmt_sounder.so
154	lib/sox/libsox_fmt_sndrtool.so.0	191	lib/sox/libsox_fmt_sounder.so.0
		192	lib/sox/libsox_fmt_soundtool.a
		193	lib/sox/libsox_fmt_soundtool.la
		194	lib/sox/libsox_fmt_soundtool.so
		195	lib/sox/libsox_fmt_soundtool.so.0
155	lib/sox/libsox_fmt_sphere.a	196	lib/sox/libsox_fmt_sphere.a
156	lib/sox/libsox_fmt_sphere.la	197	lib/sox/libsox_fmt_sphere.la
157	lib/sox/libsox_fmt_sphere.so	198	lib/sox/libsox_fmt_sphere.so
Lines 196-205 Link Here
196	lib/sox/libsox_fmt_vox.la	237	lib/sox/libsox_fmt_vox.la
197	lib/sox/libsox_fmt_vox.so	238	lib/sox/libsox_fmt_vox.so
198	lib/sox/libsox_fmt_vox.so.0	239	lib/sox/libsox_fmt_vox.so.0
		240	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.a
		241	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.la
		242	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so
		243	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so.0
199	lib/sox/libsox_fmt_wav.a	244	lib/sox/libsox_fmt_wav.a
200	lib/sox/libsox_fmt_wav.la	245	lib/sox/libsox_fmt_wav.la
201	lib/sox/libsox_fmt_wav.so	246	lib/sox/libsox_fmt_wav.so
202	lib/sox/libsox_fmt_wav.so.0	247	lib/sox/libsox_fmt_wav.so.0
		248	%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.a
		249	%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.la
		250	%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so
		251	%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so.0
203	lib/sox/libsox_fmt_wve.a	252	lib/sox/libsox_fmt_wve.a
204	lib/sox/libsox_fmt_wve.la	253	lib/sox/libsox_fmt_wve.la
205	lib/sox/libsox_fmt_wve.so	254	lib/sox/libsox_fmt_wve.so
Lines 208-211 Link Here
208	lib/sox/libsox_fmt_xa.la	257	lib/sox/libsox_fmt_xa.la
209	lib/sox/libsox_fmt_xa.so	258	lib/sox/libsox_fmt_xa.so
210	lib/sox/libsox_fmt_xa.so.0	259	lib/sox/libsox_fmt_xa.so.0
		260	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.a
		261	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.la
		262	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so
		263	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so.0
211	@dirrm lib/sox	264	@dirrm lib/sox
		265	libdata/pkgconfig/sox.pc

Added Link Here

(-)files/patch-sox.c (+14 lines)
1	Fix badly-imbalanced parens.
2
3	diff -burp sox-14.1.0/src/sox.c sox-14.1.0-dan/src/sox.c
4	--- src/sox.c 2008-07-28 15:04:36.000000000 -0500
5	+++ src/sox.c 2008-07-30 11:36:41.046073378 -0500
6	@@ -1716,7 +1716,7 @@ int main(int argc, char **argv)
7	combine_method = sox_concatenate;
8
9	/* Make sure we got at least the required # of input filenames */
10	- if (input_count < is_serial(combine_method ? 1 : 2))
11	+ if (input_count < (is_serial(combine_method) ? 1 : 2))
12	usage("Not enough input filenames specified");
13
14	/* Check for misplaced input/output-specific options */