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

(-)Makefile (-7 / +50 lines)
Lines 6-30 Link Here
6
#
6
#
7
7
8
PORTNAME=	sox
8
PORTNAME=	sox
9
PORTVERSION=	12.17.3
9
PORTVERSION=	12.17.4
10
PORTREVISION=	1
10
PORTREVISION=	0
11
CATEGORIES=	audio
11
CATEGORIES=	audio
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	sox
13
MASTER_SITE_SUBDIR=	sox
14
14
15
MAINTAINER=		dnelson@emsphone.com
15
MAINTAINER=	dnelson@allantgroup.com
16
COMMENT=	SOund eXchange - universal sound sample translator
16
COMMENT=	SOund eXchange - universal sound sample translator
17
17
18
MAN1=			sox.1 play.1 soxexam.1
18
MAN1=			sox.1 play.1 soxexam.1
19
MLINKS=			play.1 rec.1 sox.1 soxmix.1
19
MLINKS=			play.1 rec.1 sox.1 soxmix.1
20
GNU_CONFIGURE=		yes
20
GNU_CONFIGURE=		yes
21
21
22
.include <bsd.port.pre.mk>
23
24
.if exists(${LOCALBASE}/lib/libmp3lame.so.0)
25
WITH_LAME=	YES
26
.endif
27
28
.if exists(${LOCALBASE}/lib/libmad.so.1)
29
WITH_MAD=	YES
30
.endif
31
32
.if exists(${LOCALBASE}/lib/libvorbis.so.2)
33
WITH_VORBIS=	YES
34
.endif
35
36
.if defined(WITH_VORBIS) || defined(WITH_LAME) || defined(WITH_MAD)
37
CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
38
		LDFLAGS="-L${LOCALBASE}/lib"
39
.endif
40
22
.if defined(WITH_VORBIS)
41
.if defined(WITH_VORBIS)
23
CONFIGURE_ARGS+=	--with-ogg-vorbisinc=${LOCALBASE}/include \
42
CONFIGURE_ARGS+=	--enable-ogg-vorbis
24
		 	--with-ogg-vorbislib=${LOCALBASE}/lib
25
LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
43
LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
26
.else
44
.else
27
CONFIGURE_ARGS+=	--with-ogg-vorbisinc=no
45
CONFIGURE_ARGS+=	--disable-ogg-vorbis
46
.endif
47
48
.if defined(WITH_LAME)
49
CONFIGURE_ARGS+=	--enable-lame
50
LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
51
.else
52
CONFIGURE_ARGS+=	--disable-lame
53
.endif
54
55
.if defined(WITH_MAD)
56
CONFIGURE_ARGS+=	--enable-mad
57
LIB_DEPENDS+=		mad.1:${PORTSDIR}/audio/mad
58
.else
59
CONFIGURE_ARGS+=	--disable-mad
60
.endif
61
62
pre-fetch:
63
.if !defined(WITH_LAME)
64
	@${ECHO_MSG} "You can enable mp3 encoding by defining WITH_LAME."
65
.endif
66
.if !defined(WITH_MAD)
67
	@${ECHO_MSG} "You can enable mp3 decoding by defining WITH_MAD."
68
.endif
69
.if !defined(WITH_VORBIS)
70
	@${ECHO_MSG} "You can enable Ogg Vorbis support by defining WITH_VORBIS."
28
.endif
71
.endif
29
72
30
.include <bsd.port.mk>
73
.include <bsd.port.post.mk>
(-)distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (sox-12.17.3.tar.gz) = 1b9998387616ce0638c8edd1145f9932
1
MD5 (sox-12.17.4.tar.gz) = 39bdb64e06a8c456057e87eff7d0b339
(-)files/patch-Makefile.in (+11 lines)
Added Link Here
1
--- Makefile.in~	Sat Feb  8 08:39:19 2003
2
+++ Makefile.in	Thu Mar 27 22:24:53 2003
3
@@ -28,7 +28,7 @@
4
 GSM_LIB_1 = -lgsm
5
 GSM_SUPPORT  = @GSM_SUPPORT@
6
 
7
-CFLAGS	= @CFLAGS@ -I$(srcdir) -I$(builddir)
8
+CFLAGS	= @CFLAGS@ @CPPFLAGS@ -I$(srcdir) -I$(builddir)
9
 LDFLAGS	= -L. -L./gsm @LDFLAGS@
10
 LIBS	= -lst $(GSM_LIB_$(GSM_SUPPORT)) @LIBS@
11
 
(-)files/patch-ac (-11 lines)
Removed Link Here
1
--- Makefile.in~	Wed Sep  5 11:06:01 2001
2
+++ Makefile.in	Tue Oct  9 11:59:26 2001
3
@@ -74,7 +74,7 @@
4
 	$(CC) $(LDFLAGS) -o sox sox.o $(LIBS)
5
 
6
 soxmix.o: sox.c
7
-	$(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o $<
8
+	$(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o sox.c
9
 
10
 soxmix: libst.a soxmix.o
11
 	$(CC) $(LDFLAGS) -o soxmix soxmix.o $(LIBS)
(-)files/patch-vorbis.c (-17 lines)
Removed Link Here
1
2
$FreeBSD: ports/audio/sox/files/patch-vorbis.c,v 1.1 2002/01/17 19:22:41 naddy Exp $
3
4
--- vorbis.c.orig	Thu Jan 17 01:11:39 2002
5
+++ vorbis.c	Thu Jan 17 01:13:07 2002
6
@@ -337,9 +337,8 @@
7
 	fprintf(stdout, "Channels: %d  Rate: %ld\n", ft->info.channels,
8
 		rate);
9
 
10
-	/* Set encoding to average bit rate of 128kbps with no min or max */
11
-	vorbis_encode_init(&ve->vi, ft->info.channels, ft->info.rate,
12
-			   -1, 128000, -1);
13
+	/* Set encoding to average bit rate of 112kbps VBR */
14
+	vorbis_encode_init_vbr(&ve->vi, ft->info.channels, ft->info.rate, 0.3f);
15
 
16
 	vorbis_analysis_init(&ve->vd, &ve->vi);
17
 	vorbis_block_init(&ve->vd, &ve->vb);

Return to bug 54562