Attachment #125371 for bug #168990

Lines 6-81 Link Here

(-)audio/ecasound/Makefile (-18 / +36 lines)
6	#	6	#
7		7
8	PORTNAME= ecasound	8	PORTNAME= ecasound
9	PORTVERSION= 2.8.1	9	PORTVERSION= 2.9.0
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://ecasound.seul.org/download/	11	MASTER_SITES= http://ecasound.seul.org/download/ \
		12	http://eca.cx/download/ \
		13	http://ecawave.sourceforge.net/download/
12		14
13	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Multitrack audio processing software	16	COMMENT= Multitrack audio processing software
15		17
		18	LICENSE= GPLv2 GPLv3
		19	LICENSE_COMB= dual
		20
16	BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa	21	BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
17		22
18	OPTIONS_DEFINE= ARTS AUDIOFILE JACK LO OIL SAMPLERATE	23	OPTIONS_DEFINE= ALSA ARTS AUDIOFILE JACK LO OIL PYTHON SAMPLERATE
		24	OPTIONS_DEFAULT=PYTHON
19	AUDIOFILE_DESC= Enable libaudiofile support	25	AUDIOFILE_DESC= Enable libaudiofile support
20	LO_DESC= Enable liblo support	26	LO_DESC= Enable liblo support
21	OIL_DESC= Enable liboil support	27	OIL_DESC= Enable liboil support
22		28
23	LICENSE= GPLv2 GPLv3
24	LICENSE_COMB= dual
25
26	USE_GMAKE= yes	29	USE_GMAKE= yes
27	USE_AUTOTOOLS= libtool	30	USE_AUTOTOOLS= libtool
28	CONFIGURE_ARGS= --disable-pyecasound \	31	CONFIGURE_ARGS= --disable-liblilv \
29	--disable-rubyecasound \	32	--disable-rubyecasound \
30	--enable-sys-readline	33	--enable-sys-readline
31	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
		35	MAKE_JOBS_SAFE= yes
		36
		37	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		38	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
32		39
33	MAN1= ecaconvert.1 ecafixdc.1 ecalength.1 ecamonitor.1 \	40	MAN1= ecaconvert.1 ecafixdc.1 ecalength.1 ecamonitor.1 \
34	ecanormalize.1 ecaplay.1 ecasignalview.1 ecasound.1 \	41	ecanormalize.1 ecaplay.1 ecasignalview.1 ecasound.1 \
35	ecasound-iam.1 ecatools.1	42	ecasound-iam.1 ecatools.1
36	MAN5= ecasoundrc.5	43	MAN5= ecasoundrc.5
37		44
38	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
39	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
40
41	.include <bsd.port.options.mk>	45	.include <bsd.port.options.mk>
42		46
43	.if exists(${LOCALBASE}/lib/libreadline.so.6)	47	.if exists(${LOCALBASE}/lib/libreadline.so)
44	LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline	48	LIB_DEPENDS+= readline:${PORTSDIR}/devel/readline
		49	.endif
		50
		51	.if ${PORT_OPTIONS:MALSA}
		52	LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
		53	.else
		54	CONFIGURE_ARGS+= --disable-alsa
45	.endif	55	.endif
46		56
47	.if ${PORT_OPTIONS:MARTS}	57	.if ${PORT_OPTIONS:MARTS}
48	LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts	58	LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts
49	.else	59	.else
50	CONFIGURE_ARGS+= --disable-arts	60	CONFIGURE_ARGS+= --disable-arts
51	.endif	61	.endif
52		62
53	.if ${PORT_OPTIONS:MAUDIOFILE}	63	.if ${PORT_OPTIONS:MAUDIOFILE}
54	LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile	64	LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile
55	.else	65	.else
56	CONFIGURE_ARGS+= --disable-audiofile	66	CONFIGURE_ARGS+= --disable-audiofile
57	.endif	67	.endif
58		68
59	.if ${PORT_OPTIONS:MJACK}	69	.if ${PORT_OPTIONS:MJACK}
60	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack	70	LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
61	.else	71	.else
62	CONFIGURE_ARGS+= --disable-jack	72	CONFIGURE_ARGS+= --disable-jack
63	.endif	73	.endif
64		74
65	.if ${PORT_OPTIONS:MLO}	75	.if ${PORT_OPTIONS:MLO}
66	LIB_DEPENDS+= lo.7:${PORTSDIR}/audio/liblo	76	LIB_DEPENDS+= lo:${PORTSDIR}/audio/liblo
67	.else	77	.else
68	CONFIGURE_ARGS+= --disable-liblo	78	CONFIGURE_ARGS+= --disable-liblo
69	.endif	79	.endif
70		80
71	.if ${PORT_OPTIONS:MOIL}	81	.if ${PORT_OPTIONS:MOIL}
72	LIB_DEPENDS+= oil-0.3.0:${PORTSDIR}/devel/liboil	82	LIB_DEPENDS+= oil-0.3:${PORTSDIR}/devel/liboil
73	.else	83	.else
74	CONFIGURE_ARGS+= --disable-liboil	84	CONFIGURE_ARGS+= --disable-liboil
75	.endif	85	.endif
76		86
		87	.if ${PORT_OPTIONS:MPYTHON}
		88	USE_PYTHON= yes
		89	CONFIGURE_ARGS+= --enable-pyecasound
		90	PLIST_SUB+= PYTHON=""
		91	.else
		92	PLIST_SUB+= PYTHON="@comment "
		93	.endif
		94
77	.if ${PORT_OPTIONS:MSAMPLERATE}	95	.if ${PORT_OPTIONS:MSAMPLERATE}
78	LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate	96	LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate
79	.else	97	.else
80	CONFIGURE_ARGS+= --disable-libsamplerate --disable-sndfile	98	CONFIGURE_ARGS+= --disable-libsamplerate --disable-sndfile
81	.endif	99	.endif

Lines 1-2 Link Here

(-)audio/ecasound/distinfo (-2 / +2 lines)
1	SHA256 (ecasound-2.8.1.tar.gz) = e55accabeaf5cc5dcaac56cdb83dabb908ad1195d79c2a3df7718b834d328994	1	SHA256 (ecasound-2.9.0.tar.gz) = e2b0b8f8cce6074d660e460b3a02fc0132a51e1e982b78b3a68fa14e79fcc6c6
2	SIZE (ecasound-2.8.1.tar.gz) = 1056331	2	SIZE (ecasound-2.9.0.tar.gz) = 1055913




--- ecatools/ecaplay.c.orig	Mon Oct  3 06:44:57 2005
+++ ecatools/ecaplay.c	Sun Jan 29 21:54:01 2006
@@ -211,9 +211,10 @@
   else {
     static int once = 1;
     if (once) {
+      char *tmpstr;
       eci_command_r(eci, "ao-iselect 1");
       eci_command_r(eci, "ao-describe");
-      char *tmpstr = (char*)eci_last_string_r(eci);
+      tmpstr = (char*)eci_last_string_r(eci);
       /* skip the "-x:" prefix where x is one of [io] */
       while(*tmpstr && *tmpstr++ != ':') 
 	;

Lines 34-39 Link Here

(-)audio/ecasound/pkg-plist (+5 lines)
34	include/libecasound/audiofx_envelope_modulation.h	34	include/libecasound/audiofx_envelope_modulation.h
35	include/libecasound/audiofx_filter.h	35	include/libecasound/audiofx_filter.h
36	include/libecasound/audiofx_ladspa.h	36	include/libecasound/audiofx_ladspa.h
		37	include/libecasound/audiofx_lv2.h
		38	include/libecasound/audiofx_lv2_world.h
37	include/libecasound/audiofx_misc.h	39	include/libecasound/audiofx_misc.h
38	include/libecasound/audiofx_mixing.h	40	include/libecasound/audiofx_mixing.h
39	include/libecasound/audiofx_rcfilter.h	41	include/libecasound/audiofx_rcfilter.h
Lines 155-160 Link Here
155	lib/libecasoundc.la	157	lib/libecasoundc.la
156	lib/libkvutils.a	158	lib/libkvutils.a
157	lib/libkvutils.la	159	lib/libkvutils.la
		160	%%PYTHON%%%%PYTHON_SITELIBDIR%%/ecacontrol.py
		161	%%PYTHON%%%%PYTHON_SITELIBDIR%%/eci.py
		162	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyeca.py
158	%%DATADIR%%/ecasound.el	163	%%DATADIR%%/ecasound.el
159	%%DATADIR%%/ecasoundrc	164	%%DATADIR%%/ecasoundrc
160	%%DATADIR%%/effect_presets	165	%%DATADIR%%/effect_presets

Return to bug 168990

Lines 1-14 Link Here

(-)audio/ecasound/files/patch-ecatools__ecaplay.c (-14 lines)
1	--- ecatools/ecaplay.c.orig Mon Oct 3 06:44:57 2005
2	+++ ecatools/ecaplay.c Sun Jan 29 21:54:01 2006
3	@@ -211,9 +211,10 @@
4	else {
5	static int once = 1;
6	if (once) {
7	+ char *tmpstr;
8	eci_command_r(eci, "ao-iselect 1");
9	eci_command_r(eci, "ao-describe");
10	- char tmpstr = (char)eci_last_string_r(eci);
11	+ tmpstr = (char*)eci_last_string_r(eci);
12	/* skip the "-x:" prefix where x is one of [io] */
13	while(tmpstr && tmpstr++ != ':')
14	;