Attachment #216326 for bug #247274

Lines 2-11 Link Here

(-)Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= darkice	4	PORTNAME= darkice
5	PORTVERSION= 1.3	5	PORTVERSION= 1.4
6	PORTREVISION= 2
7	CATEGORIES= audio net	6	CATEGORIES= audio net
8	MASTER_SITES= SF	7	MASTER_SITES= https://github.com/rafael2k/darkice/releases/download/v${PORTVERSION}/
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= IceCast, IceCast2, and ShoutCast live audio streamer	10	COMMENT= IceCast, IceCast2, and ShoutCast live audio streamer

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1475029544	1	TIMESTAMP = 1592166243
2	SHA256 (darkice-1.3.tar.gz) = 2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6	2	SHA256 (darkice-1.4.tar.gz) = e6a8ec2b447cf5b4ffaf9b62700502b6bdacebf00b476f4e9bf9f9fe1e3dd817
3	SIZE (darkice-1.3.tar.gz) = 371411	3	SIZE (darkice-1.4.tar.gz) = 364782




--- darkice.cfg.orig	2015-05-18 17:38:07 UTC
+++ darkice.cfg
@@ -26,7 +26,9 @@ bitrate         = 96        # bitrate of the stream se
 server          = yp.yourserver.com
                             # host name of the server
 port            = 8000      # port of the IceCast2 server, usually 8000
-password        = hackme    # source password to the IceCast2 server
+# source password to the IceCast2 server
+password        = hackme
+# there must not be a comment following the password
 mountPoint      = sample96  # mount point of this stream on the IceCast2 server
 name            = DarkIce trial
                             # name of the stream
@@ -48,7 +50,9 @@ quality         = 0.8       # encoding quality
 server          = yp.yourserver.com
                             # host name of the server
 port            = 8000      # port of the IceCast server, usually 8000
-password        = hackme    # source password to the IceCast server
+# source password to the IceCast2 server
+password        = hackme
+# there must not be a comment following the password
 mountPoint      = sample96  # mount point of this stream on the IceCast server
 name            = DarkIce trial
                             # name of the stream
@@ -68,7 +72,9 @@ quality         = 0.5       # encoding quality
 server          = yp.yourserver.com
                             # host name of the server
 port            = 8001      # source port of the ShoutCast server, usually 8001
-password        = hackme    # source password to the ShoutCast server
+# source password to the IceCast2 server
+password        = hackme
+# there must not be a comment following the password
 name            = DarkIce trial
                             # name of the stream
 url             = http://www.yourserver.com




--- src/FaacEncoder.cpp.orig	2015-05-18 17:38:07 UTC
+++ src/FaacEncoder.cpp
@@ -95,7 +95,9 @@ FaacEncoder :: open ( void )
     faacConfig->useTns        = 1;
     faacConfig->shortctl      = SHORTCTL_NORMAL;
     faacConfig->useLfe        = 0;
-    faacConfig->allowMidside  = 1;
+    //Do not set allowMidside for API compatibility with faac,
+    //see https://github.com/knik0/faac/issues/8 for details
+    //faacConfig->allowMidside  = 1;
     faacConfig->bitRate       = getOutBitrate() * 1000 / getOutChannel();
     faacConfig->bandWidth     = lowpass;
     faacConfig->quantqual     = (unsigned long) (getOutQuality() * 1000.0);

Lines 17-23 Link Here

(-)files/pkg-message.in (-1 / +1 lines)
17	present, the client will be started now. Otherwise, edit	17	present, the client will be started now. Otherwise, edit
18	/etc/rc.conf and execute this command:	18	/etc/rc.conf and execute this command:
19		19
20	%%ETCDIR%%/rc.d/darkice start	20	%%PREFIX%%/etc/rc.d/darkice start
21	EOM	21	EOM
22	}	22	}
23	]	23	]

Return to bug 247274

Line 0 Link Here

(-)files/patch-darkice.cfg (+35 lines)
	1	--- darkice.cfg.orig 2015-05-18 17:38:07 UTC
	2	+++ darkice.cfg
	3	@@ -26,7 +26,9 @@ bitrate = 96 # bitrate of the stream se
	4	server = yp.yourserver.com
	5	# host name of the server
	6	port = 8000 # port of the IceCast2 server, usually 8000
	7	-password = hackme # source password to the IceCast2 server
	8	+# source password to the IceCast2 server
	9	+password = hackme
	10	+# there must not be a comment following the password
	11	mountPoint = sample96 # mount point of this stream on the IceCast2 server
	12	name = DarkIce trial
	13	# name of the stream
	14	@@ -48,7 +50,9 @@ quality = 0.8 # encoding quality
	15	server = yp.yourserver.com
	16	# host name of the server
	17	port = 8000 # port of the IceCast server, usually 8000
	18	-password = hackme # source password to the IceCast server
	19	+# source password to the IceCast2 server
	20	+password = hackme
	21	+# there must not be a comment following the password
	22	mountPoint = sample96 # mount point of this stream on the IceCast server
	23	name = DarkIce trial
	24	# name of the stream
	25	@@ -68,7 +72,9 @@ quality = 0.5 # encoding quality
	26	server = yp.yourserver.com
	27	# host name of the server
	28	port = 8001 # source port of the ShoutCast server, usually 8001
	29	-password = hackme # source password to the ShoutCast server
	30	+# source password to the IceCast2 server
	31	+password = hackme
	32	+# there must not be a comment following the password
	33	name = DarkIce trial
	34	# name of the stream
	35	url = http://www.yourserver.com

Lines 1-13 Link Here

(-)files/patch-src_FaacEncoder.cpp (-13 lines)
1	--- src/FaacEncoder.cpp.orig 2015-05-18 17:38:07 UTC
2	+++ src/FaacEncoder.cpp
3	@@ -95,7 +95,9 @@ FaacEncoder :: open ( void )
4	faacConfig->useTns = 1;
5	faacConfig->shortctl = SHORTCTL_NORMAL;
6	faacConfig->useLfe = 0;
7	- faacConfig->allowMidside = 1;
8	+ //Do not set allowMidside for API compatibility with faac,
9	+ //see https://github.com/knik0/faac/issues/8 for details
10	+ //faacConfig->allowMidside = 1;
11	faacConfig->bitRate = getOutBitrate() * 1000 / getOutChannel();
12	faacConfig->bandWidth = lowpass;
13	faacConfig->quantqual = (unsigned long) (getOutQuality() * 1000.0);