Attachment 201021 Details for Bug 234547 – opus patch

[patch] opus patch

asterisk16.opus.patch (text/plain), 8.48 KB, created by Ludovic Desweemer on 2019-01-11 13:31:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludovic Desweemer

Created: 2019-01-11 13:31:15 UTC

Size: 8.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 488806)
>+++ Makefile	(working copy)
>@@ -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}${PKGNAMESUFFIX}
> 
> MAINTAINER=	madpilot@FreeBSD.org
> COMMENT=	Open Source PBX and telephony toolkit
>@@ -75,7 +78,7 @@
> 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 @@
> 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_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
> 
>@@ -247,6 +257,11 @@
> 	${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
> .if exists(${FILESDIR}/.asterisk.makeopts)
>Index: distinfo
>===================================================================
>--- distinfo	(revision 488806)
>+++ distinfo	(working copy)
>@@ -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 (asterisk16/asterisk-16.1.1.tar.gz) = bbf21452dfb213ecc0f24ef05d240e72b57cbc834f9e2e113062c2db2bde6ea5
>+SIZE (asterisk16/asterisk-16.1.1.tar.gz) = 27490688
>+SHA256 (asterisk16/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
>+SIZE (asterisk16/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
>+SHA256 (asterisk16/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
>+SIZE (asterisk16/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
>+SHA256 (asterisk16/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
>+SIZE (asterisk16/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 24044
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 488806)
>+++ files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.orig	2018-08-08 16:02:31 UTC
>+--- configure.orig	2018-12-26 18:45:13 UTC
> +++ configure
>-@@ -4661,8 +4661,6 @@ case "${host_os}" in
>+@@ -4681,8 +4681,6 @@ case "${host_os}" in
>       ;;
>       dragonfly*|freebsd*)
>       ac_default_prefix=/usr/local
>@@ -9,8 +9,102 @@
>       ;;
>       openbsd*)
>       ac_default_prefix=/usr/local
>-@@ -20328,6 +20326,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
>+@@ -7436,93 +7434,6 @@ $as_echo "no" >&6; }
>+ fi
>  
>+ 
>+-for ac_prog in xmlstarlet xml
>+-do
>+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
>+-set dummy $ac_prog; ac_word=$2
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
>+-$as_echo_n "checking for $ac_word... " >&6; }
>+-if ${ac_cv_path_XMLSTARLET+:} false; then :
>+-  $as_echo_n "(cached) " >&6
>+-else
>+-  case $XMLSTARLET in
>+-  [\\/]* | ?:[\\/]*)
>+-  ac_cv_path_XMLSTARLET="$XMLSTARLET" # Let the user override the test with a path.
>+-  ;;
>+-  *)
>+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+-for as_dir in $PATH
>+-do
>+-  IFS=$as_save_IFS
>+-  test -z "$as_dir" && as_dir=.
>+-    for ac_exec_ext in '' $ac_executable_extensions; do
>+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+-    ac_cv_path_XMLSTARLET="$as_dir/$ac_word$ac_exec_ext"
>+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
>+-    break 2
>+-  fi
>+-done
>+-  done
>+-IFS=$as_save_IFS
>+-
>+-  ;;
>+-esac
>+-fi
>+-XMLSTARLET=$ac_cv_path_XMLSTARLET
>+-if test -n "$XMLSTARLET"; then
>+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLSTARLET" >&5
>+-$as_echo "$XMLSTARLET" >&6; }
>+-else
>+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+-$as_echo "no" >&6; }
>+-fi
>+-
>+-
>+-  test -n "$XMLSTARLET" && break
>+-done
>+-test -n "$XMLSTARLET" || XMLSTARLET=":"
>+-
>+-# Extract the first word of "bash", so it can be a program name with args.
>+-set dummy bash; ac_word=$2
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
>+-$as_echo_n "checking for $ac_word... " >&6; }
>+-if ${ac_cv_path_BASH+:} false; then :
>+-  $as_echo_n "(cached) " >&6
>+-else
>+-  case $BASH in
>+-  [\\/]* | ?:[\\/]*)
>+-  ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
>+-  ;;
>+-  *)
>+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+-for as_dir in $PATH
>+-do
>+-  IFS=$as_save_IFS
>+-  test -z "$as_dir" && as_dir=.
>+-    for ac_exec_ext in '' $ac_executable_extensions; do
>+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+-    ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
>+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
>+-    break 2
>+-  fi
>+-done
>+-  done
>+-IFS=$as_save_IFS
>+-
>+-  test -z "$ac_cv_path_BASH" && ac_cv_path_BASH=":"
>+-  ;;
>+-esac
>+-fi
>+-BASH=$ac_cv_path_BASH
>+-if test -n "$BASH"; then
>+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
>+-$as_echo "$BASH" >&6; }
>+-else
>+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+-$as_echo "no" >&6; }
>+-fi
>+-
>+-
>+ # Extract the first word of "git", so it can be a program name with args.
>+ set dummy git; ac_word=$2
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
>+@@ -20419,6 +20330,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
>+ 
>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> + #include <sys/types.h>
>@@ -18,7 +112,7 @@
>   #include <ifaddrs.h>
>  int
>  main ()
>-@@ -29156,6 +29156,8 @@ fi
>+@@ -29295,6 +29208,8 @@ fi
>  
>  for ver in 5.3 5.2 5.1; do
>  
>@@ -27,7 +121,7 @@
>  if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
>     pbxlibdir=""
>     # if --with-LUA=DIR has been specified, use it.
>-@@ -29170,13 +29172,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
>+@@ -29309,13 +29224,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
>        ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
>        CFLAGS="${CFLAGS} "
>        as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
>@@ -44,7 +138,7 @@
>  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
>  
>-@@ -29218,7 +29220,7 @@ fi
>+@@ -29357,7 +29272,7 @@ fi
>  
>     # now check for the header.
>     if test "${AST_LUA_FOUND}" = "yes"; then
>@@ -53,7 +147,7 @@
>        # if --with-LUA=DIR has been specified, use it.
>        if test "x${LUA_DIR}" != "x"; then
>           LUA_INCLUDE="-I${LUA_DIR}/include"
>-@@ -29228,8 +29230,8 @@ fi
>+@@ -29367,8 +29282,8 @@ fi
>           # check for the header
>           ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
>           CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
>@@ -64,7 +158,7 @@
>  if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
>    LUA_HEADER_FOUND=1
>  else
>-@@ -29256,9 +29258,9 @@ fi
>+@@ -29395,9 +29310,9 @@ fi
>  
>  	if test "x${PBX_LUA}" = "x1" ; then
>  		if test x"${LUA_DIR}" = x; then

Actions: View | Diff

Attachments on bug 234547: 200683 | 200687 | 201021