Attachment 205094 Details for Bug 238252 – Update to 4.3.2_delta

[patch] Update to 4.3.2_delta

chan-sccp_delta.patch (text/plain), 5.83 KB, created by Diederik de Groot on 2019-06-16 00:51:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Diederik de Groot

Created: 2019-06-16 00:51:24 UTC

Size: 5.83 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 504245)
>+++ Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	chan_sccp
> DISTVERSIONPREFIX=	v
> DISTVERSION=	4.3.2
>-DISTVERSIONSUFFIX=	-gamma
>+DISTVERSIONSUFFIX=	-delta
> CATEGORIES=	net
> PKGNAMEPREFIX=	asterisk-
> 
>@@ -14,7 +14,7 @@
> LICENSE=	GPLv1
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		autoreconf gettext-tools iconv libtool
>+USES=		autoreconf compiler libtool localbase gettext-tools iconv
> USE_GITHUB=	yes
> GH_ACCOUNT=	chan-sccp
> GH_PROJECT=	chan-sccp
>@@ -34,30 +34,33 @@
> 		lib/asterisk/modules/chan_sccp.so \
> 		share/asterisk/documentation/thirdparty/chan_sccp-en_US.xml
> 
>-OPTIONS_DEFINE=		CONFERENCE VIDEO
>-OPTIONS_DEFAULT=	AST16 CONFERENCE VIDEO
>-OPTIONS_SINGLE=		ASTVER
>-OPTIONS_SINGLE_ASTVER=	AST13 AST15 AST16
>+FLAVORS=			asterisk13 asterisk15 asterisk16
>+FLAVOR?=			${FLAVORS[1]}
> 
>-ASTVER_DESC=		Which asterisk to build for
>-AST13_DESC=		Asterisk 13
>-AST15_DESC=		Asterisk 15
>-AST16_DESC=		Asterisk 16
>-CONFERENCE_DESC=	Enable Conference Support
>-VIDEO_DESC=		Enable Video Support
>+asterisk13_PKGNAMEPREFIX=	asterisk13-
>+asterisk13_CONFLICTS_INSTALL=	asterisk15-chan_sccp asterisk16-chan_sccp
>+asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
>+asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
> 
>-AST13_BUILD_DEPENDS=	asterisk13>0:net/asterisk13
>-AST13_RUN_DEPENDS=	asterisk13>0:net/asterisk13
>-
> # AST15 will be EOL october 2019
>-AST15_BUILD_DEPENDS=	asterisk15>0:net/asterisk15
>-AST15_RUN_DEPENDS=	asterisk15>0:net/asterisk15
>+asterisk15_PKGNAMEPREFIX=	asterisk15-
>+asterisk15_CONFLICTS_INSTALL=	asterisk13-chan_sccp asterisk16-chan_sccp
>+asterisk15_BUILD_DEPENDS=	asterisk:net/asterisk15
>+asterisk15_RUN_DEPENDS=		asterisk:net/asterisk15
> 
>-AST16_BUILD_DEPENDS=	asterisk16>0:net/asterisk16
>-AST16_RUN_DEPENDS=	asterisk16>0:net/asterisk16
>+asterisk16_PKGNAMEPREFIX=	asterisk16-
>+asterisk16_CONFLICTS_INSTALL=	asterisk13-chan_sccp asterisk15-chan_sccp
>+asterisk16_BUILD_DEPENDS=	asterisk:net/asterisk16
>+asterisk16_RUN_DEPENDS=		asterisk:net/asterisk16
> 
>+OPTIONS_DEFINE=			CONFERENCE VIDEO
>+OPTIONS_DEFAULT=		CONFERENCE VIDEO
>+CONFERENCE_DESC=		Enable Conference Support
>+VIDEO_DESC=			Enable Video Support
>+
> CONFERENCE_CONFIGURE_ENABLE=	conference
> VIDEO_CONFIGURE_ENABLE=		video
>+.include <bsd.port.pre.mk>
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/asterisk
>@@ -66,4 +69,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/conf/sccp.conf.annotated \
> 		${STAGEDIR}${PREFIX}/etc/asterisk
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 504245)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1550622097
>-SHA256 (chan-sccp-chan-sccp-v4.3.2-gamma_GH0.tar.gz) = e18971fdd131d60e543bce0d1f86c8e7243147ea4a5fdc35bb1aad77ac3577aa
>-SIZE (chan-sccp-chan-sccp-v4.3.2-gamma_GH0.tar.gz) = 1957293
>+SHA256 (chan-sccp-chan-sccp-v4.3.2-delta_GH0.tar.gz) = 34d859768458ed2696c455a44a0ef06774e4f77669b3f6fbdc74423a87aa2d03
>+SIZE (chan-sccp-chan-sccp-v4.3.2-delta_GH0.tar.gz) = 1998749
>Index: files/patch-fix-new-asterisk-include
>===================================================================
>--- files/patch-fix-new-asterisk-include	(revision 504245)
>+++ files/patch-fix-new-asterisk-include	(nonexistent)
>@@ -1,85 +0,0 @@
>-From 9684efb7709c1be23c99f555f61b5a3ad15b0675 Mon Sep 17 00:00:00 2001
>-From: Diederik de Groot <dkgroot@talon.nl>
>-Date: Thu, 16 May 2019 17:48:55 +0200
>-Subject: [PATCH] Add support for new asterisk mwi.h header file
>-
>----
>- autoconf/asterisk.m4 |  6 ++++++
>- configure            | 13 +++++++++++++
>- src/config.h.in      |  3 +++
>- src/sccp_mwi.c       |  4 ++++
>- 4 files changed, 26 insertions(+)
>-
>-diff --git a/autoconf/asterisk.m4 b/autoconf/asterisk.m4
>-index 52c6ef70e..67969940a 100644
>---- autoconf/asterisk.m4
>-+++ autoconf/asterisk.m4
>-@@ -1120,6 +1120,12 @@ dnl 	CFLAGS="${CFLAGS_saved} -Werror=implicit-function-declaration"
>- 		],,[ 
>- 			$HEADER_INCLUDE
>- 		])
>-+		AC_CHECK_HEADER([asterisk/mwi.h],
>-+		[
>-+			AC_DEFINE([HAVE_PBX_MWI_H],1,[Found 'asterisk/mwi.h'])
>-+		],,[ 
>-+			$HEADER_INCLUDE
>-+		])
>- 		AC_CHECK_HEADER([asterisk/utils.h],
>- 		[
>- 			AC_DEFINE([HAVE_PBX_UTILS_H],1,[Found 'asterisk/utils.h'])
>-diff --git a/configure b/configure
>-index 8cff697c7..182f27ac4 100755
>---- configure
>-+++ configure
>-@@ -28852,6 +28852,19 @@ if test "x$ac_cv_header_asterisk_message_h" = xyes; then :
>- $as_echo "#define HAVE_PBX_MESSAGE_H 1" >>confdefs.h
>- 
>- 
>-+fi
>-+
>-+
>-+		ac_fn_c_check_header_compile "$LINENO" "asterisk/mwi.h" "ac_cv_header_asterisk_mwi_h" "
>-+			$HEADER_INCLUDE
>-+
>-+"
>-+if test "x$ac_cv_header_asterisk_mwi_h" = xyes; then :
>-+
>-+
>-+$as_echo "#define HAVE_PBX_MWI_H 1" >>confdefs.h
>-+
>-+
>- fi
>- 
>- 
>-diff --git a/src/config.h.in b/src/config.h.in
>-index e5ba1bfec..ad7d25efc 100644
>---- src/config.h.in
>-+++ src/config.h.in
>-@@ -583,6 +583,9 @@
>- /* Found 'asterisk/message.h' */
>- #undef HAVE_PBX_MESSAGE_H
>- 
>-+/* Found 'asterisk/mwi.h' */
>-+#undef HAVE_PBX_MWI_H
>-+
>- /* Found 'asterisk/pbx.h' */
>- #undef HAVE_PBX_PBX_H
>- 
>-diff --git a/src/sccp_mwi.c b/src/sccp_mwi.c
>-index d21c43c7f..5238f506c 100644
>---- src/sccp_mwi.c
>-+++ src/sccp_mwi.c
>-@@ -25,9 +25,13 @@ SCCP_FILE_VERSION(__FILE__, "");
>- #elif HAVE_PBX_STASIS_H
>- #include <asterisk/stasis.h>
>- #endif
>-+#ifdef HAVE_PBX_MWI_H				// ast_mwi_state_type
>-+#include <asterisk/mwi.h>
>-+#else
>- #ifdef HAVE_PBX_APP_H				// ast_mwi_state_type
>- #include <asterisk/app.h>
>- #endif
>-+#endif
>- #include <asterisk/cli.h>
>- 
>- pbx_mutex_t subscriptions_lock;
>
>Property changes on: files/patch-fix-new-asterisk-include
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 238252: 204728 | 205094