Attachment #99203 for bug #138248

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




#

PORTNAME=	sox
PORTVERSION=	14.3.0
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	SF


USE_AUTOTOOLS=	libltdl
USE_GNOME=	pkgconfig

# Default LAME to off for packages so we don't end up RESTRICTED
.if defined(PACKAGE_BUILDING)
_LAME=	off
.else

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

LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
CONFIGURE_ARGS+=	--with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
.if !defined(WITH_LAME) && !defined(WITH_MAD)
PLIST_SUB+=	PLIST_MP3="@comment "
.else
PLIST_SUB+=	PLIST_MP3=""
.endif

.if defined(WITH_AO)
CONFIGURE_ARGS+=	--with-ao
LIB_DEPENDS+=		ao.3:${PORTSDIR}/audio/libao
PLIST_SUB+=		PLIST_AO=""
.else
CONFIGURE_ARGS+=	--without-ao
PLIST_SUB+=		PLIST_AO="@comment "
.endif

.if defined(WITH_AMRNB)
CONFIGURE_ARGS+=	--with-amrnb
LIB_DEPENDS+=		amrnb.3:${PORTSDIR}/audio/libamrnb
PLIST_SUB+=		PLIST_AMRNB=""
.else
CONFIGURE_ARGS+=	--without-amrnb
PLIST_SUB+=		PLIST_AMRNB="@comment "
.endif

.if defined(WITH_AMRWB)
CONFIGURE_ARGS+=	--with-amrwb
LIB_DEPENDS+=		amrwb.3:${PORTSDIR}/audio/libamrwb
PLIST_SUB+=		PLIST_AMRWB=""
.else
CONFIGURE_ARGS+=	--without-amrwb
PLIST_SUB+=		PLIST_AMRWB="@comment "
.endif

.if defined(WITH_FFMPEG)
CONFIGURE_ARGS+=	--with-ffmpeg
LIB_DEPENDS+=		avformat:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+=		PLIST_FFMPEG=""
.else
CONFIGURE_ARGS+=	--without-ffmpeg
PLIST_SUB+=		PLIST_FFMPEG="@comment "
.endif

.if defined(WITH_VORBIS)
CONFIGURE_ARGS+=	--with-oggvorbis
LIB_DEPENDS+=		vorbis.4:${PORTSDIR}/audio/libvorbis
PLIST_SUB+=		PLIST_VORBIS=""
.else
CONFIGURE_ARGS+=	--without-oggvorbis
PLIST_SUB+=		PLIST_VORBIS="@comment "
.endif

.if defined(WITH_SNDFILE)
CONFIGURE_ARGS+=	--with-sndfile
LIB_DEPENDS+=		sndfile.1:${PORTSDIR}/audio/libsndfile
PLIST_SUB+=		PLIST_SNDFILE=""
.else
CONFIGURE_ARGS+=	--without-sndfile
PLIST_SUB+=		PLIST_SNDFILE="@comment "
.endif

.if defined(WITH_LADSPA)

.if defined(WITH_FLAC)
CONFIGURE_ARGS+=	--with-flac
LIB_DEPENDS+=		FLAC.10:${PORTSDIR}/audio/flac
PLIST_SUB+=		PLIST_FLAC=""
.else
CONFIGURE_ARGS+=	--without-flac
PLIST_SUB+=		PLIST_FLAC="@comment "
.endif

.if defined(WITH_MAD)

.endif

.if defined(WITH_GSM)
CONFIGURE_ARGS+=	--with-gsm
LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm
PLIST_SUB+=		PLIST_GSM=""
.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
PLIST_SUB+=		PLIST_GSM="@comment "
.endif

.if defined(WITH_ID3TAG)
CONFIGURE_ARGS+=	--with-id3tag
LIB_DEPENDS+=		id3-3.8.3:${PORTSDIR}/audio/id3lib
.else
CONFIGURE_ARGS+=	--without-id3tag
.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

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (sox-14.2.0.tar.gz) = 7afc0e85d14be014f08e7d3b7ee8c24e	1	MD5 (sox-14.3.0.tar.gz) = 8e3509804e6227273ef84092e1a2fea7
2	SHA256 (sox-14.2.0.tar.gz) = 8d1b8eb33a72a181369475c9da5fdcbe5f6820e6af3d86a0e84f6939e61a9dc1	2	SHA256 (sox-14.3.0.tar.gz) = 9abf411c949366d75c884b368284690b6c8c7d5fb5df0deaf599539b704b2397
3	SIZE (sox-14.2.0.tar.gz) = 964800	3	SIZE (sox-14.3.0.tar.gz) = 1007679




lib/libsox.la
lib/libsox.so
lib/libsox.so.1
lib/sox/libsox_fmt_aifc.a
lib/sox/libsox_fmt_aifc.la
lib/sox/libsox_fmt_aifc.so
lib/sox/libsox_fmt_aiff.a
lib/sox/libsox_fmt_aiff.la
lib/sox/libsox_fmt_aiff.so
lib/sox/libsox_fmt_al.a
lib/sox/libsox_fmt_al.la
lib/sox/libsox_fmt_al.so
%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.a
%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.la
%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.so
%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.a
%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.la
%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.so
%%PLIST_AO%%lib/sox/libsox_fmt_ao.a
%%PLIST_AO%%lib/sox/libsox_fmt_ao.la
%%PLIST_AO%%lib/sox/libsox_fmt_ao.so
lib/sox/libsox_fmt_au.a
lib/sox/libsox_fmt_au.la
lib/sox/libsox_fmt_au.so
lib/sox/libsox_fmt_avr.a
lib/sox/libsox_fmt_avr.la
lib/sox/libsox_fmt_avr.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so
lib/sox/libsox_fmt_cdr.a
lib/sox/libsox_fmt_cdr.la
lib/sox/libsox_fmt_cdr.so
lib/sox/libsox_fmt_cvsd.a
lib/sox/libsox_fmt_cvsd.la
lib/sox/libsox_fmt_cvsd.so
lib/sox/libsox_fmt_dat.a
lib/sox/libsox_fmt_dat.la
lib/sox/libsox_fmt_dat.so
lib/sox/libsox_fmt_dvms.a
lib/sox/libsox_fmt_dvms.la
lib/sox/libsox_fmt_dvms.so
lib/sox/libsox_fmt_f4.a
lib/sox/libsox_fmt_f4.la
lib/sox/libsox_fmt_f4.so
lib/sox/libsox_fmt_f8.a
lib/sox/libsox_fmt_f8.la
lib/sox/libsox_fmt_f8.so
%%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_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.a
%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.la
%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.so
%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.a
%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.la
%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.so
lib/sox/libsox_fmt_gsm.a
lib/sox/libsox_fmt_gsm.la
lib/sox/libsox_fmt_gsm.so
lib/sox/libsox_fmt_hcom.a
lib/sox/libsox_fmt_hcom.la
lib/sox/libsox_fmt_hcom.so
lib/sox/libsox_fmt_htk.a
lib/sox/libsox_fmt_htk.la
lib/sox/libsox_fmt_htk.so
lib/sox/libsox_fmt_ima.a
lib/sox/libsox_fmt_ima.la
lib/sox/libsox_fmt_ima.so
lib/sox/libsox_fmt_la.a
lib/sox/libsox_fmt_la.la
lib/sox/libsox_fmt_la.so
lib/sox/libsox_fmt_lpc10.a
lib/sox/libsox_fmt_lpc10.la
lib/sox/libsox_fmt_lpc10.so
lib/sox/libsox_fmt_lu.a
lib/sox/libsox_fmt_lu.la
lib/sox/libsox_fmt_lu.so
%%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_mat5.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so
lib/sox/libsox_fmt_maud.a
lib/sox/libsox_fmt_maud.la
lib/sox/libsox_fmt_maud.so
%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.a
%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.la
%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.so
lib/sox/libsox_fmt_nul.a
lib/sox/libsox_fmt_nul.la
lib/sox/libsox_fmt_nul.so
lib/sox/libsox_fmt_oss.a
lib/sox/libsox_fmt_oss.la
lib/sox/libsox_fmt_oss.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so
lib/sox/libsox_fmt_prc.a
lib/sox/libsox_fmt_prc.la
lib/sox/libsox_fmt_prc.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so
lib/sox/libsox_fmt_raw.a
lib/sox/libsox_fmt_raw.la
lib/sox/libsox_fmt_raw.so
lib/sox/libsox_fmt_s1.a
lib/sox/libsox_fmt_s1.la
lib/sox/libsox_fmt_s1.so
lib/sox/libsox_fmt_s2.a
lib/sox/libsox_fmt_s2.la
lib/sox/libsox_fmt_s2.so
lib/sox/libsox_fmt_s3.a
lib/sox/libsox_fmt_s3.la
lib/sox/libsox_fmt_s3.so
lib/sox/libsox_fmt_s4.a
lib/sox/libsox_fmt_s4.la
lib/sox/libsox_fmt_s4.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so
lib/sox/libsox_fmt_sf.a
lib/sox/libsox_fmt_sf.la
lib/sox/libsox_fmt_sf.so
lib/sox/libsox_fmt_smp.a
lib/sox/libsox_fmt_smp.la
lib/sox/libsox_fmt_smp.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so
lib/sox/libsox_fmt_sounder.a
lib/sox/libsox_fmt_sounder.la
lib/sox/libsox_fmt_sounder.so
lib/sox/libsox_fmt_soundtool.a
lib/sox/libsox_fmt_soundtool.la
lib/sox/libsox_fmt_soundtool.so
lib/sox/libsox_fmt_sphere.a
lib/sox/libsox_fmt_sphere.la
lib/sox/libsox_fmt_sphere.so
lib/sox/libsox_fmt_svx.a
lib/sox/libsox_fmt_svx.la
lib/sox/libsox_fmt_svx.so
lib/sox/libsox_fmt_txw.a
lib/sox/libsox_fmt_txw.la
lib/sox/libsox_fmt_txw.so
lib/sox/libsox_fmt_u1.a
lib/sox/libsox_fmt_u1.la
lib/sox/libsox_fmt_u1.so
lib/sox/libsox_fmt_u2.a
lib/sox/libsox_fmt_u2.la
lib/sox/libsox_fmt_u2.so
lib/sox/libsox_fmt_u3.a
lib/sox/libsox_fmt_u3.la
lib/sox/libsox_fmt_u3.so
lib/sox/libsox_fmt_u4.a
lib/sox/libsox_fmt_u4.la
lib/sox/libsox_fmt_u4.so
lib/sox/libsox_fmt_ul.a
lib/sox/libsox_fmt_ul.la
lib/sox/libsox_fmt_ul.so
lib/sox/libsox_fmt_voc.a
lib/sox/libsox_fmt_voc.la
lib/sox/libsox_fmt_voc.so
%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.a
%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.la
%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.so
lib/sox/libsox_fmt_vox.a
lib/sox/libsox_fmt_vox.la
lib/sox/libsox_fmt_vox.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so
lib/sox/libsox_fmt_wav.a
lib/sox/libsox_fmt_wav.la
lib/sox/libsox_fmt_wav.so
%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.a
%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.la
%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so
lib/sox/libsox_fmt_wve.a
lib/sox/libsox_fmt_wve.la
lib/sox/libsox_fmt_wve.so
lib/sox/libsox_fmt_xa.a
lib/sox/libsox_fmt_xa.la
lib/sox/libsox_fmt_xa.so
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.a
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.la
%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so
@dirrm lib/sox
libdata/pkgconfig/sox.pc

Removed Link Here

(-)files/patch-configure (-11 lines)
1	--- configure.orig 2009-02-14 19:08:53.000000000 +0100
2	+++ configure 2009-02-14 19:09:06.000000000 +0100
3	@@ -20805,7 +20805,7 @@
4
5
6
7	-if test -r /etc/issue; then
8	+if false && test -r /etc/issue; then
9	{ $as_echo "$as_me:$LINENO: checking distro name" >&5
10	$as_echo_n "checking distro name... " >&6; }
11	DISTRO=`sed -e "s/.0-90-9;mJH//g" < /etc/issue\|tr "\n" " " \| sed -e "s/(\\\\?\\\\\\\\.//" -e "s/ */ /g" -e "s/^ //" -e "s/ $//"`




Generalize the "rewind on pipes" hack to work with all Torek-based stdio's
without having to check for each one.  Fix will appear in the next release.

http://sourceforge.net/tracker/index.php?func=detail&aid=2847998&group_id=10706&atid=310706

--- src/formats.c	2009-06-14 20:14:53.000000000 -0500
+++ src/formats.c	2009-08-31 13:16:21.440822225 -0500
@@ -392,7 +392,7 @@
  * Works by resetting the FILE buffer pointer */
 static void UNUSED rewind_pipe(FILE * fp)
 {
-#if defined _NEWLIB_VERSION || defined __APPLE__
+#if defined _FSTDIO /* Torek stdio (i.e. most BSD-derived libc's) */
   fp->_p -= AUTO_DETECT_SIZE;
   fp->_r += AUTO_DETECT_SIZE;
 #elif defined __GLIBC__

Return to bug 138248

Lines 6-13 Link Here

(-)Makefile (-42 / +20 lines)
6	#	6	#
7		7
8	PORTNAME= sox	8	PORTNAME= sox
9	PORTVERSION= 14.2.0	9	PORTVERSION= 14.3.0
10	PORTREVISION= 2
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12
Lines 25-30 Link Here
25	USE_AUTOTOOLS= libltdl	24	USE_AUTOTOOLS= libltdl
26	USE_GNOME= pkgconfig	25	USE_GNOME= pkgconfig
27		26
		27	# Default LAME to off for packages so we don't end up RESTRICTED
28	.if defined(PACKAGE_BUILDING)	28	.if defined(PACKAGE_BUILDING)
29	_LAME= off	29	_LAME= off
30	.else	30	.else
Lines 37-47 Link Here
37	FFMPEG "Enable ffmpeg en/decoding" on \	37	FFMPEG "Enable ffmpeg en/decoding" on \
38	FLAC "Enable flac en/decoding with libflac" on \	38	FLAC "Enable flac en/decoding with libflac" on \
39	GSM "Use libgsm from ports (else use bundled lib)" on \	39	GSM "Use libgsm from ports (else use bundled lib)" on \
		40	ID3TAG "Enable mp3 tagging with libid3tag" on \
40	LADSPA "Audio plugin support" off \	41	LADSPA "Audio plugin support" off \
41	LAME "Enable mp3 encoding with LAME" ${_LAME} \	42	LAME "Enable mp3 encoding with LAME" ${_LAME} \
42	MAD "Enable mp3 decoding with MAD" on \	43	MAD "Enable mp3 decoding with MAD" on \
43	PNG "Enable PNG spectrogram creation" on \	44	PNG "Enable PNG spectrogram creation" on \
44	SAMPLERATE "Enable libsamplerate" on \
45	SNDFILE "Enable libsndfile" on \	45	SNDFILE "Enable libsndfile" on \
46	VORBIS "Enable Ogg Vorbis support" on \	46	VORBIS "Enable Ogg Vorbis support" on \
47	WAVPACK "Enable Wavpack support" off	47	WAVPACK "Enable Wavpack support" off
Lines 52-116 Link Here
52	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	52	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
53	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	53	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
54	CONFIGURE_ARGS+= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"	54	CONFIGURE_ARGS+= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
55		55	CONFIGURE_ARGS+= --with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
56	.if !defined(WITH_LAME) && !defined(WITH_MAD)
57	PLIST_SUB+= PLIST_MP3="@comment "
58	.else
59	PLIST_SUB+= PLIST_MP3=""
60	.endif
61		56
62	.if defined(WITH_AO)	57	.if defined(WITH_AO)
63	CONFIGURE_ARGS+= --enable-libao	58	CONFIGURE_ARGS+= --with-ao
64	LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao	59	LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao
65	PLIST_SUB+= PLIST_AO=""
66	.else	60	.else
67	CONFIGURE_ARGS+= --disable-libao	61	CONFIGURE_ARGS+= --without-ao
68	PLIST_SUB+= PLIST_AO="@comment "
69	.endif	62	.endif
70		63
71	.if defined(WITH_AMRNB)	64	.if defined(WITH_AMRNB)
72	CONFIGURE_ARGS+= --with-amr-nb	65	CONFIGURE_ARGS+= --with-amrnb
73	LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb	66	LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb
74	PLIST_SUB+= PLIST_AMRNB=""
75	.else	67	.else
76	CONFIGURE_ARGS+= --without-amr-nb	68	CONFIGURE_ARGS+= --without-amrnb
77	PLIST_SUB+= PLIST_AMRNB="@comment "
78	.endif	69	.endif
79		70
80	.if defined(WITH_AMRWB)	71	.if defined(WITH_AMRWB)
81	CONFIGURE_ARGS+= --with-amr-wb	72	CONFIGURE_ARGS+= --with-amrwb
82	LIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb	73	LIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb
83	PLIST_SUB+= PLIST_AMRWB=""
84	.else	74	.else
85	CONFIGURE_ARGS+= --without-amr-wb	75	CONFIGURE_ARGS+= --without-amrwb
86	PLIST_SUB+= PLIST_AMRWB="@comment "
87	.endif	76	.endif
88		77
89	.if defined(WITH_FFMPEG)	78	.if defined(WITH_FFMPEG)
90	CONFIGURE_ARGS+= --with-ffmpeg	79	CONFIGURE_ARGS+= --with-ffmpeg
91	LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg	80	LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg
92	PLIST_SUB+= PLIST_FFMPEG=""
93	.else	81	.else
94	CONFIGURE_ARGS+= --without-ffmpeg	82	CONFIGURE_ARGS+= --without-ffmpeg
95	PLIST_SUB+= PLIST_FFMPEG="@comment "
96	.endif	83	.endif
97		84
98	.if defined(WITH_VORBIS)	85	.if defined(WITH_VORBIS)
99	CONFIGURE_ARGS+= --with-ogg	86	CONFIGURE_ARGS+= --with-oggvorbis
100	LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis	87	LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
101	PLIST_SUB+= PLIST_VORBIS=""
102	.else	88	.else
103	CONFIGURE_ARGS+= --without-ogg	89	CONFIGURE_ARGS+= --without-oggvorbis
104	PLIST_SUB+= PLIST_VORBIS="@comment "
105	.endif	90	.endif
106		91
107	.if defined(WITH_SNDFILE)	92	.if defined(WITH_SNDFILE)
108	CONFIGURE_ARGS+= --with-sndfile	93	CONFIGURE_ARGS+= --with-sndfile
109	LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile	94	LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
110	PLIST_SUB+= PLIST_SNDFILE=""
111	.else	95	.else
112	CONFIGURE_ARGS+= --without-sndfile	96	CONFIGURE_ARGS+= --without-sndfile
113	PLIST_SUB+= PLIST_SNDFILE="@comment "
114	.endif	97	.endif
115		98
116	.if defined(WITH_LADSPA)	99	.if defined(WITH_LADSPA)
Lines 131-140 Link Here
131	.if defined(WITH_FLAC)	114	.if defined(WITH_FLAC)
132	CONFIGURE_ARGS+= --with-flac	115	CONFIGURE_ARGS+= --with-flac
133	LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac	116	LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac
134	PLIST_SUB+= PLIST_FLAC=""
135	.else	117	.else
136	CONFIGURE_ARGS+= --without-flac	118	CONFIGURE_ARGS+= --without-flac
137	PLIST_SUB+= PLIST_FLAC="@comment "
138	.endif	119	.endif
139		120
140	.if defined(WITH_MAD)	121	.if defined(WITH_MAD)
Lines 152-181 Link Here
152	.endif	133	.endif
153		134
154	.if defined(WITH_GSM)	135	.if defined(WITH_GSM)
155	CONFIGURE_ARGS+= --with-external-gsm	136	CONFIGURE_ARGS+= --with-gsm
156	LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm	137	LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
157	PLIST_SUB+= PLIST_GSM=""
158	.else	138	.else
159	CONFIGURE_ARGS+= --without-external-gsm	139	CONFIGURE_ARGS+= --with-gsm
160	# Above configure flag does not exist, so workaround with the below line	140	# We cannot ask for gsm to be enabled without it trying to use external gsm,
		141	# so workaround with the below line
161	CONFIGURE_ENV+= ac_cv_header_gsm_h=no	142	CONFIGURE_ENV+= ac_cv_header_gsm_h=no
162	PLIST_SUB+= PLIST_GSM="@comment "
163	.endif	143	.endif
164		144
165	.if defined(WITH_SAMPLERATE)	145	.if defined(WITH_ID3TAG)
166	CONFIGURE_ARGS+= --with-samplerate	146	CONFIGURE_ARGS+= --with-id3tag
167	LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate	147	LIB_DEPENDS+= id3-3.8.3:${PORTSDIR}/audio/id3lib
168	.else	148	.else
169	CONFIGURE_ARGS+= --without-samplerate	149	CONFIGURE_ARGS+= --without-id3tag
170	.endif	150	.endif
171		151
172	.if defined(WITH_WAVPACK)	152	.if defined(WITH_WAVPACK)
173	CONFIGURE_ARGS+= --with-wavpack	153	CONFIGURE_ARGS+= --with-wavpack
174	LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack	154	LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack
175	PLIST_SUB+= PLIST_WAVPACK=""
176	.else	155	.else
177	CONFIGURE_ARGS+= --without-wavpack	156	CONFIGURE_ARGS+= --without-wavpack
178	PLIST_SUB+= PLIST_WAVPACK="@comment "
179	.endif	157	.endif
180		158
181	# Tell configure that libgsm's headers are in $LOCALDIR/include	159	# Tell configure that libgsm's headers are in $LOCALDIR/include

Lines 9-199 Link Here

(-)pkg-plist (-186 lines)
9	lib/libsox.la	9	lib/libsox.la
10	lib/libsox.so	10	lib/libsox.so
11	lib/libsox.so.1	11	lib/libsox.so.1
12	lib/sox/libsox_fmt_aifc.a
13	lib/sox/libsox_fmt_aifc.la
14	lib/sox/libsox_fmt_aifc.so
15	lib/sox/libsox_fmt_aiff.a
16	lib/sox/libsox_fmt_aiff.la
17	lib/sox/libsox_fmt_aiff.so
18	lib/sox/libsox_fmt_al.a
19	lib/sox/libsox_fmt_al.la
20	lib/sox/libsox_fmt_al.so
21	%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.a
22	%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.la
23	%%PLIST_AMRNB%%lib/sox/libsox_fmt_amr_nb.so
24	%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.a
25	%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.la
26	%%PLIST_AMRWB%%lib/sox/libsox_fmt_amr_wb.so
27	%%PLIST_AO%%lib/sox/libsox_fmt_ao.a
28	%%PLIST_AO%%lib/sox/libsox_fmt_ao.la
29	%%PLIST_AO%%lib/sox/libsox_fmt_ao.so
30	lib/sox/libsox_fmt_au.a
31	lib/sox/libsox_fmt_au.la
32	lib/sox/libsox_fmt_au.so
33	lib/sox/libsox_fmt_avr.a
34	lib/sox/libsox_fmt_avr.la
35	lib/sox/libsox_fmt_avr.so
36	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.a
37	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.la
38	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_caf.so
39	lib/sox/libsox_fmt_cdr.a
40	lib/sox/libsox_fmt_cdr.la
41	lib/sox/libsox_fmt_cdr.so
42	lib/sox/libsox_fmt_cvsd.a
43	lib/sox/libsox_fmt_cvsd.la
44	lib/sox/libsox_fmt_cvsd.so
45	lib/sox/libsox_fmt_dat.a
46	lib/sox/libsox_fmt_dat.la
47	lib/sox/libsox_fmt_dat.so
48	lib/sox/libsox_fmt_dvms.a
49	lib/sox/libsox_fmt_dvms.la
50	lib/sox/libsox_fmt_dvms.so
51	lib/sox/libsox_fmt_f4.a
52	lib/sox/libsox_fmt_f4.la
53	lib/sox/libsox_fmt_f4.so
54	lib/sox/libsox_fmt_f8.a
55	lib/sox/libsox_fmt_f8.la
56	lib/sox/libsox_fmt_f8.so
57	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.a
58	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.la
59	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_fap.so
60	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.a
61	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.la
62	%%PLIST_FFMPEG%%lib/sox/libsox_fmt_ffmpeg.so
63	%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.a
64	%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.la
65	%%PLIST_FLAC%%lib/sox/libsox_fmt_flac.so
66	lib/sox/libsox_fmt_gsm.a
67	lib/sox/libsox_fmt_gsm.la
68	lib/sox/libsox_fmt_gsm.so
69	lib/sox/libsox_fmt_hcom.a
70	lib/sox/libsox_fmt_hcom.la
71	lib/sox/libsox_fmt_hcom.so
72	lib/sox/libsox_fmt_htk.a
73	lib/sox/libsox_fmt_htk.la
74	lib/sox/libsox_fmt_htk.so
75	lib/sox/libsox_fmt_ima.a
76	lib/sox/libsox_fmt_ima.la
77	lib/sox/libsox_fmt_ima.so
78	lib/sox/libsox_fmt_la.a
79	lib/sox/libsox_fmt_la.la
80	lib/sox/libsox_fmt_la.so
81	lib/sox/libsox_fmt_lpc10.a
82	lib/sox/libsox_fmt_lpc10.la
83	lib/sox/libsox_fmt_lpc10.so
84	lib/sox/libsox_fmt_lu.a
85	lib/sox/libsox_fmt_lu.la
86	lib/sox/libsox_fmt_lu.so
87	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.a
88	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.la
89	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat4.so
90	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.a
91	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.la
92	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_mat5.so
93	lib/sox/libsox_fmt_maud.a
94	lib/sox/libsox_fmt_maud.la
95	lib/sox/libsox_fmt_maud.so
96	%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.a
97	%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.la
98	%%PLIST_MP3%%lib/sox/libsox_fmt_mp3.so
99	lib/sox/libsox_fmt_nul.a
100	lib/sox/libsox_fmt_nul.la
101	lib/sox/libsox_fmt_nul.so
102	lib/sox/libsox_fmt_oss.a
103	lib/sox/libsox_fmt_oss.la
104	lib/sox/libsox_fmt_oss.so
105	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.a
106	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.la
107	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_paf.so
108	lib/sox/libsox_fmt_prc.a
109	lib/sox/libsox_fmt_prc.la
110	lib/sox/libsox_fmt_prc.so
111	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.a
112	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.la
113	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_pvf.so
114	lib/sox/libsox_fmt_raw.a
115	lib/sox/libsox_fmt_raw.la
116	lib/sox/libsox_fmt_raw.so
117	lib/sox/libsox_fmt_s1.a
118	lib/sox/libsox_fmt_s1.la
119	lib/sox/libsox_fmt_s1.so
120	lib/sox/libsox_fmt_s2.a
121	lib/sox/libsox_fmt_s2.la
122	lib/sox/libsox_fmt_s2.so
123	lib/sox/libsox_fmt_s3.a
124	lib/sox/libsox_fmt_s3.la
125	lib/sox/libsox_fmt_s3.so
126	lib/sox/libsox_fmt_s4.a
127	lib/sox/libsox_fmt_s4.la
128	lib/sox/libsox_fmt_s4.so
129	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.a
130	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.la
131	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sd2.so
132	lib/sox/libsox_fmt_sf.a
133	lib/sox/libsox_fmt_sf.la
134	lib/sox/libsox_fmt_sf.so
135	lib/sox/libsox_fmt_smp.a
136	lib/sox/libsox_fmt_smp.la
137	lib/sox/libsox_fmt_smp.so
138	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.a
139	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.la
140	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_sndfile.so
141	lib/sox/libsox_fmt_sounder.a
142	lib/sox/libsox_fmt_sounder.la
143	lib/sox/libsox_fmt_sounder.so
144	lib/sox/libsox_fmt_soundtool.a
145	lib/sox/libsox_fmt_soundtool.la
146	lib/sox/libsox_fmt_soundtool.so
147	lib/sox/libsox_fmt_sphere.a
148	lib/sox/libsox_fmt_sphere.la
149	lib/sox/libsox_fmt_sphere.so
150	lib/sox/libsox_fmt_svx.a
151	lib/sox/libsox_fmt_svx.la
152	lib/sox/libsox_fmt_svx.so
153	lib/sox/libsox_fmt_txw.a
154	lib/sox/libsox_fmt_txw.la
155	lib/sox/libsox_fmt_txw.so
156	lib/sox/libsox_fmt_u1.a
157	lib/sox/libsox_fmt_u1.la
158	lib/sox/libsox_fmt_u1.so
159	lib/sox/libsox_fmt_u2.a
160	lib/sox/libsox_fmt_u2.la
161	lib/sox/libsox_fmt_u2.so
162	lib/sox/libsox_fmt_u3.a
163	lib/sox/libsox_fmt_u3.la
164	lib/sox/libsox_fmt_u3.so
165	lib/sox/libsox_fmt_u4.a
166	lib/sox/libsox_fmt_u4.la
167	lib/sox/libsox_fmt_u4.so
168	lib/sox/libsox_fmt_ul.a
169	lib/sox/libsox_fmt_ul.la
170	lib/sox/libsox_fmt_ul.so
171	lib/sox/libsox_fmt_voc.a
172	lib/sox/libsox_fmt_voc.la
173	lib/sox/libsox_fmt_voc.so
174	%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.a
175	%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.la
176	%%PLIST_VORBIS%%lib/sox/libsox_fmt_vorbis.so
177	lib/sox/libsox_fmt_vox.a
178	lib/sox/libsox_fmt_vox.la
179	lib/sox/libsox_fmt_vox.so
180	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.a
181	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.la
182	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_w64.so
183	lib/sox/libsox_fmt_wav.a
184	lib/sox/libsox_fmt_wav.la
185	lib/sox/libsox_fmt_wav.so
186	%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.a
187	%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.la
188	%%PLIST_WAVPACK%%lib/sox/libsox_fmt_wavpack.so
189	lib/sox/libsox_fmt_wve.a
190	lib/sox/libsox_fmt_wve.la
191	lib/sox/libsox_fmt_wve.so
192	lib/sox/libsox_fmt_xa.a
193	lib/sox/libsox_fmt_xa.la
194	lib/sox/libsox_fmt_xa.so
195	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.a
196	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.la
197	%%PLIST_SNDFILE%%lib/sox/libsox_fmt_xi.so
198	@dirrm lib/sox	12	@dirrm lib/sox
199	libdata/pkgconfig/sox.pc	13	libdata/pkgconfig/sox.pc

Added Link Here

(-)files/patch-formats.c (+16 lines)
1	Generalize the "rewind on pipes" hack to work with all Torek-based stdio's
2	without having to check for each one. Fix will appear in the next release.
3
4	http://sourceforge.net/tracker/index.php?func=detail&aid=2847998&group_id=10706&atid=310706
5
6	--- src/formats.c 2009-06-14 20:14:53.000000000 -0500
7	+++ src/formats.c 2009-08-31 13:16:21.440822225 -0500
8	@@ -392,7 +392,7 @@
9	* Works by resetting the FILE buffer pointer */
10	static void UNUSED rewind_pipe(FILE * fp)
11	{
12	-#if defined _NEWLIB_VERSION \|\| defined __APPLE__
13	+#if defined _FSTDIO /* Torek stdio (i.e. most BSD-derived libc's) */
14	fp->_p -= AUTO_DETECT_SIZE;
15	fp->_r += AUTO_DETECT_SIZE;
16	#elif defined __GLIBC__