Attachment #215663 for bug #247274

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1475029544	1	TIMESTAMP = 1592228108
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




--- 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);




# $FreeBSD: head/audio/darkice/Makefile 523220 2020-01-16 09:34:42Z bapt $

PORTNAME=	darkice
PORTVERSION=	1.4
PORTREVISION=	2
CATEGORIES=	audio net
MASTER_SITES=	https://github.com/rafael2k/darkice/releases/download/v${PORTVERSION}/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	IceCast, IceCast2, and ShoutCast live audio streamer


AACPLUS_DESC=		AAC HEv2 and libsamplerate support
AACPLUS_LIB_DEPENDS=	libaacplus.so:audio/libaacplus \
			libsamplerate.so:audio/libsamplerate\
			libfftw3f.so:math/fftw3-float
AACPLUS_CONFIGURE_ON=	--with-aacplus --with-samplerate
AACPLUS_CONFIGURE_OFF=	--without-aacplus --without-samplerate
FAAC_LIB_DEPENDS=	libfaac.so:audio/faac

LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
LAME_CONFIGURE_ON=	--with-lame-prefix=${LOCALBASE}
LAME_CONFIGURE_OFF=	--without-lame
OPUS_LIB_DEPENDS=	libopus.so:audio/opus\
			libogg.so:audio/libogg
OPUS_CONFIGURE_WITH=	opus
PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
TWOLAME_CONFIGURE_WITH=	twolame
VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis\
			libogg.so:audio/libogg
VORBIS_CONFIGURE_WITH=	vorbis

post-patch:

Return to bug 247274

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);

Lines 2-11 Link Here

(-)./Makefile (-6 / +8 lines)
2	# $FreeBSD: head/audio/darkice/Makefile 523220 2020-01-16 09:34:42Z bapt $	2	# $FreeBSD: head/audio/darkice/Makefile 523220 2020-01-16 09:34:42Z bapt $
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 28-34 OPTIONS_DEFAULT= VORBIS Link Here
28		27
29	AACPLUS_DESC= AAC HEv2 and libsamplerate support	28	AACPLUS_DESC= AAC HEv2 and libsamplerate support
30	AACPLUS_LIB_DEPENDS= libaacplus.so:audio/libaacplus \	29	AACPLUS_LIB_DEPENDS= libaacplus.so:audio/libaacplus \
31	libsamplerate.so:audio/libsamplerate	30	libsamplerate.so:audio/libsamplerate\
		31	libfftw3f.so:math/fftw3-float
32	AACPLUS_CONFIGURE_ON= --with-aacplus --with-samplerate	32	AACPLUS_CONFIGURE_ON= --with-aacplus --with-samplerate
33	AACPLUS_CONFIGURE_OFF= --without-aacplus --without-samplerate	33	AACPLUS_CONFIGURE_OFF= --without-aacplus --without-samplerate
34	FAAC_LIB_DEPENDS= libfaac.so:audio/faac	34	FAAC_LIB_DEPENDS= libfaac.so:audio/faac
Lines 39-51 JACK_CONFIGURE_WITH= jack Link Here
39	LAME_LIB_DEPENDS= libmp3lame.so:audio/lame	39	LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
40	LAME_CONFIGURE_ON= --with-lame-prefix=${LOCALBASE}	40	LAME_CONFIGURE_ON= --with-lame-prefix=${LOCALBASE}
41	LAME_CONFIGURE_OFF= --without-lame	41	LAME_CONFIGURE_OFF= --without-lame
42	OPUS_LIB_DEPENDS= libopus.so:audio/opus	42	OPUS_LIB_DEPENDS= libopus.so:audio/opus\
		43	libogg.so:audio/libogg
43	OPUS_CONFIGURE_WITH= opus	44	OPUS_CONFIGURE_WITH= opus
44	PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio	45	PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio
45	PULSEAUDIO_CONFIGURE_WITH= pulseaudio	46	PULSEAUDIO_CONFIGURE_WITH= pulseaudio
46	TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame	47	TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
47	TWOLAME_CONFIGURE_WITH= twolame	48	TWOLAME_CONFIGURE_WITH= twolame
48	VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis	49	VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis\
		50	libogg.so:audio/libogg
49	VORBIS_CONFIGURE_WITH= vorbis	51	VORBIS_CONFIGURE_WITH= vorbis
50		52
51	post-patch:	53	post-patch: