Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Jan 2019 13:06:18 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490557 - in head/net: asterisk13 asterisk15 asterisk16
Message-ID:  <201901171306.x0HD6ILR008861@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Thu Jan 17 13:06:18 2019
New Revision: 490557
URL: https://svnweb.freebsd.org/changeset/ports/490557

Log:
  Add OPUS option to asterisk ports to enable the opus codec.
  
  While here use DIST_SUBDIR to keep all the asterisk files in one
  subdirectory.
  
  PR:		234547
  Submitted by:	Ludovic Desweemer <ludovic.desweemer@gmail.com>

Modified:
  head/net/asterisk13/Makefile
  head/net/asterisk13/distinfo
  head/net/asterisk15/Makefile
  head/net/asterisk15/distinfo
  head/net/asterisk16/Makefile
  head/net/asterisk16/distinfo

Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile	Thu Jan 17 13:04:09 2019	(r490556)
+++ head/net/asterisk13/Makefile	Thu Jan 17 13:06:18 2019	(r490557)
@@ -2,13 +2,16 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	13.24.1
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
+MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \
+		https://github.com/traud/asterisk-opus/archive/:opus
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	13
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
@@ -74,7 +77,7 @@ OPTIONS_DEFAULT_armv6=		BASE
 OPTIONS_DEFAULT_armv7=		BASE
 
 OPTIONS_GROUP=			CODECS
-OPTIONS_GROUP_CODECS=		GSM NEWG711 SPEEX VORBIS
+OPTIONS_GROUP_CODECS=		GSM NEWG711 OPUS SPEEX VORBIS
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 
 OPTIONS_SINGLE=			COMPILER
@@ -108,6 +111,7 @@ EXCHANGE_DESC?=	Exchange calendar support
 MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
 NEWG711_DESC?=	New G711 Codec
 OOH323_DESC?=	ooh323 support
+OPUS_DESC?=	Opus Codec
 PJSIP_DESC?=	Build the PJSIP based SIP channel
 SRTP_DESC?=	SecureRTP support
 SYSINFO_DESC?=	Use devel/libsysinfo to get system information
@@ -166,6 +170,12 @@ ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
+OPUS_COMMIT=		83e1b458c77e0e287adeca494eeb79edb077b0ff
+OPUS_SRC=		asterisk-opus-${OPUS_COMMIT}
+OPUS_EXTRACT_ONLY=	${OPUS_COMMIT}${EXTRACT_SUFX}
+OPUS_DISTFILES=		${OPUS_COMMIT}${EXTRACT_SUFX}:opus
+
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
@@ -245,6 +255,11 @@ post-extract:
 post-extract-G729-on:
 	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
 	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
+
+post-extract-OPUS-on:
+	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk
+	${CP} ${WRKDIR}/${OPUS_SRC}/codecs/* ${WRKSRC}/codecs
+	${CP} ${WRKDIR}/${OPUS_SRC}/res/* ${WRKSRC}/res
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample

Modified: head/net/asterisk13/distinfo
==============================================================================
--- head/net/asterisk13/distinfo	Thu Jan 17 13:04:09 2019	(r490556)
+++ head/net/asterisk13/distinfo	Thu Jan 17 13:06:18 2019	(r490557)
@@ -1,7 +1,9 @@
-TIMESTAMP = 1545873808
-SHA256 (asterisk-13.24.1.tar.gz) = f381b2184579e4f3e0a2f758a5db9b2cdd628fa35b1c9e69d0325047b69790be
-SIZE (asterisk-13.24.1.tar.gz) = 32977390
-SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
-SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
-SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
-SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
+TIMESTAMP = 1547713284
+SHA256 (asterisk/asterisk-13.24.1.tar.gz) = f381b2184579e4f3e0a2f758a5db9b2cdd628fa35b1c9e69d0325047b69790be
+SIZE (asterisk/asterisk-13.24.1.tar.gz) = 32977390
+SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
+SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
+SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
+SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
+SHA256 (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
+SIZE (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 24044

Modified: head/net/asterisk15/Makefile
==============================================================================
--- head/net/asterisk15/Makefile	Thu Jan 17 13:04:09 2019	(r490556)
+++ head/net/asterisk15/Makefile	Thu Jan 17 13:06:18 2019	(r490557)
@@ -2,13 +2,16 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	15.7.1
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
+MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729  \
+		https://github.com/traud/asterisk-opus/archive/:opus
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	15
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
@@ -78,7 +81,7 @@ OPTIONS_DEFAULT_armv6=		BASE
 OPTIONS_DEFAULT_armv7=		BASE
 
 OPTIONS_GROUP=			CODECS
-OPTIONS_GROUP_CODECS=		GSM NEWG711 SPEEX VORBIS
+OPTIONS_GROUP_CODECS=		GSM NEWG711 OPUS SPEEX VORBIS
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 
 OPTIONS_SINGLE=			COMPILER
@@ -112,6 +115,7 @@ EXCHANGE_DESC?=	Exchange calendar support
 MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
 NEWG711_DESC?=	New G711 Codec
 OOH323_DESC?=	ooh323 support
+OPUS_DESC?=	Opus Codec
 PJSIP_DESC?=	Build the PJSIP based SIP channel
 SRTP_DESC?=	SecureRTP support
 SYSINFO_DESC?=	Use devel/libsysinfo to get system information
@@ -170,6 +174,12 @@ ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
+OPUS_COMMIT=	83e1b458c77e0e287adeca494eeb79edb077b0ff
+OPUS_SRC=	asterisk-opus-${OPUS_COMMIT}
+OPUS_EXTRACT_ONLY=	${OPUS_COMMIT}${EXTRACT_SUFX}
+OPUS_DISTFILES=	${OPUS_COMMIT}${EXTRACT_SUFX}:opus
+
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
@@ -249,6 +259,11 @@ post-extract:
 post-extract-G729-on:
 	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
 	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
+
+post-extract-OPUS-on:
+	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk
+	${CP} ${WRKDIR}/${OPUS_SRC}/codecs/* ${WRKSRC}/codecs
+	${CP} ${WRKDIR}/${OPUS_SRC}/res/* ${WRKSRC}/res
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample

Modified: head/net/asterisk15/distinfo
==============================================================================
--- head/net/asterisk15/distinfo	Thu Jan 17 13:04:09 2019	(r490556)
+++ head/net/asterisk15/distinfo	Thu Jan 17 13:06:18 2019	(r490557)
@@ -1,7 +1,9 @@
-TIMESTAMP = 1545873862
-SHA256 (asterisk-15.7.1.tar.gz) = 67514d4c81f506fe0f564dd899c14b3ee6f98fd635233682432c590935baa4c1
-SIZE (asterisk-15.7.1.tar.gz) = 27591665
-SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
-SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
-SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
-SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
+TIMESTAMP = 1547713284
+SHA256 (asterisk/asterisk-15.7.1.tar.gz) = 67514d4c81f506fe0f564dd899c14b3ee6f98fd635233682432c590935baa4c1
+SIZE (asterisk/asterisk-15.7.1.tar.gz) = 27591665
+SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
+SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
+SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
+SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
+SHA256 (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
+SIZE (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 24044

Modified: head/net/asterisk16/Makefile
==============================================================================
--- head/net/asterisk16/Makefile	Thu Jan 17 13:04:09 2019	(r490556)
+++ head/net/asterisk16/Makefile	Thu Jan 17 13:06:18 2019	(r490557)
@@ -2,13 +2,16 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	16.1.1
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
+MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \
+		https://github.com/traud/asterisk-opus/archive/:opus
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	16
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
@@ -75,7 +78,7 @@ OPTIONS_DEFAULT_armv6=		BASE
 OPTIONS_DEFAULT_armv7=		BASE
 
 OPTIONS_GROUP=			CODECS
-OPTIONS_GROUP_CODECS=		GSM NEWG711 SPEEX VORBIS
+OPTIONS_GROUP_CODECS=		GSM NEWG711 OPUS SPEEX VORBIS
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 
 OPTIONS_SINGLE=			COMPILER
@@ -109,6 +112,7 @@ EXCHANGE_DESC?=	Exchange calendar support
 MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
 NEWG711_DESC?=	New G711 Codec
 OOH323_DESC?=	ooh323 support
+OPUS_DESC?=	Opus Codec
 PJSIP_DESC?=	Build the PJSIP based SIP channel
 SRTP_DESC?=	SecureRTP support
 SYSINFO_DESC?=	Use devel/libsysinfo to get system information
@@ -167,6 +171,12 @@ ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
+OPUS_COMMIT=	83e1b458c77e0e287adeca494eeb79edb077b0ff
+OPUS_SRC=	asterisk-opus-${OPUS_COMMIT}
+OPUS_EXTRACT_ONLY=	${OPUS_COMMIT}${EXTRACT_SUFX}
+OPUS_DISTFILES=	${OPUS_COMMIT}${EXTRACT_SUFX}:opus
+
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
@@ -246,6 +256,11 @@ post-extract:
 post-extract-G729-on:
 	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
 	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
+
+post-extract-OPUS-on:
+	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk
+	${CP} ${WRKDIR}/${OPUS_SRC}/codecs/* ${WRKSRC}/codecs
+	${CP} ${WRKDIR}/${OPUS_SRC}/res/* ${WRKSRC}/res
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample

Modified: head/net/asterisk16/distinfo
==============================================================================
--- head/net/asterisk16/distinfo	Thu Jan 17 13:04:09 2019	(r490556)
+++ head/net/asterisk16/distinfo	Thu Jan 17 13:06:18 2019	(r490557)
@@ -1,7 +1,9 @@
-TIMESTAMP = 1545873899
-SHA256 (asterisk-16.1.1.tar.gz) = bbf21452dfb213ecc0f24ef05d240e72b57cbc834f9e2e113062c2db2bde6ea5
-SIZE (asterisk-16.1.1.tar.gz) = 27490688
-SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
-SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
-SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
-SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
+TIMESTAMP = 1547164616
+SHA256 (asterisk/asterisk-16.1.1.tar.gz) = bbf21452dfb213ecc0f24ef05d240e72b57cbc834f9e2e113062c2db2bde6ea5
+SIZE (asterisk/asterisk-16.1.1.tar.gz) = 27490688
+SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
+SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
+SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
+SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
+SHA256 (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
+SIZE (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 24044



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901171306.x0HD6ILR008861>