+++ /dev/null
---- a/build_tools/menuselect-deps.in
-+++ b/build_tools/menuselect-deps.in
-@@ -45,6 +45,7 @@ NEON29=@PBX_NEON29@
- OGG=@PBX_OGG@
- OPENH323=@PBX_OPENH323@
- OPUS=@PBX_OPUS@
-+OPUSFILE=@PBX_OPUSFILE@
- OSPTK=@PBX_OSPTK@
- OSS=@PBX_OSS@
- PGSQL=@PBX_PGSQL@
---- a/configure.ac
-+++ b/configure.ac
-@@ -468,6 +468,7 @@ AST_EXT_LIB_SETUP([NEWT], [newt], [newt])
- AST_EXT_LIB_SETUP([OGG], [OGG], [ogg])
- AST_EXT_LIB_SETUP([OPENR2], [MFR2], [openr2])
- AST_EXT_LIB_SETUP([OPUS], [Opus], [opus])
-+AST_EXT_LIB_SETUP([OPUSFILE], [Opusfile], [opusfile])
- AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
- AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
- AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
-@@ -2293,6 +2294,13 @@ AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_set_isup_timer], [libss7.h])
- AST_EXT_LIB_CHECK([OPENR2], [openr2], [openr2_chan_new], [openr2.h])
-
- AST_EXT_LIB_CHECK([OPUS], [opus], [opus_encoder_create], [opus/opus.h])
-+# opusfile.h includes <opus_multistream.h> so we need to make sure that
-+# either $OPUS_INCLUDE or /usr/include/opus is added to the search path.
-+__opus_include=${OPUS_INCLUDE}
-+if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then
-+ __opus_include=-I/usr/include/opus
-+fi
-+AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
-
- if test "${USE_PWLIB}" != "no"; then
- if test -n "${PWLIB_DIR}"; then
---- a/makeopts.in
-+++ b/makeopts.in
-@@ -223,6 +223,9 @@ OGG_LIB=@OGG_LIB@
- OPUS_INCLUDE=@OPUS_INCLUDE@
- OPUS_LIB=@OPUS_LIB@
-
-+OPUSFILE_INCLUDE=@OPUSFILE_INCLUDE@
-+OPUSFILE_LIB=@OPUSFILE_LIB@
-+
- OSPTK_INCLUDE=@OSPTK_INCLUDE@
- OSPTK_LIB=@OSPTK_LIB@
-
# - vpb (libvpb, vpbapi.h)
# - make package for moh sound files
# - build res_ari_mailboxes as an alternative for voicemail subpackages
-# - +x missing:
-# ldd: warning: you do not have execution permission for `/usr/lib/libasteriskssl.so.1'
#
# Conditional build:
%bcond_with corosync # res_corosync module (broken in 12.0.0)
%bcond_without pjsip # build without PJSIP stack
%bcond_without opus_vp8 # build without Opus codec and VP8 passthrough
%bcond_with malloc_debug # build with MALLOC_DEBUG
+%bcond_with system_pjproject # build with system pjproject (see below)
%bcond_without apidocs # disable apidocs building
%bcond_without verbose # verbose build
+# NOTE:
+# Building with system pjproject may be not a good idea. pjproject comes
+# optimized for client usage and asterisk is a SIP server. Asterisk requries
+# pjproject properly patched and configured and keeping our pjproject in sync
+# with Asterisk requirements may be tricky. Also, Asterisk is the only
+# package using pjproject in PLD, so there is little gain with using system
+# one.
+#
+# Before switching the 'system_pjproject' bcond make sure the pjproject
+# package is updated to the version used by Asterisk, with all Asterisk
+# patches applied and with configuration synced.
+
+%define pjproject_version 2.7.1
+
%define opus_commit a6b9521f10817c1f39f21f90fecd3f00bbb164d0
Summary: Asterisk PBX
Summary(pl.UTF-8): Centralka (PBX) Asterisk
Name: asterisk
-Version: 14.7.6
-Release: 2
+Version: 15.2.2
+Release: 1
License: GPL v2
Group: Applications/System
Source0: http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 4b5f8c04c93902b7a0c7c49b41881783
+# Source0-md5: aadc45419967e71b652f4a8ba75e12e7
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.tmpfiles
# https://github.com/traud/asterisk-opus
Source8: https://github.com/seanbright/asterisk-opus/archive/%{opus_commit}/asterisk-opus-%{opus_commit}.tar.gz
# Source8-md5: d2deae1095b6b42331d3060700c25493
+Source9: https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/%{pjproject_version}/pjproject-%{pjproject_version}.tar.bz2
+# Source9-md5: 99a64110fa5c2debff40e0e8d4676380
Patch0: lua51-path.patch
Patch1: %{name}-ppc.patch
Patch2: FHS-paths.patch
Patch5: %{name}-histedit.patch
Patch6: x32.patch
Patch7: %{name}-ilbc.patch
-Patch8: asterisk-opus.patch
+Patch8: bundled_pjproject_libs.patch
URL: http://www.asterisk.org/
BuildRequires: OSPToolkit-devel >= 4.0.0
%{?with_oss:BuildRequires: SDL-devel}
BuildRequires: alsa-lib-devel
BuildRequires: autoconf >= 2.60
BuildRequires: automake
+%if %{without system_pjproject} && %{with pjsip}
+BuildRequires: bcg729-devel >= 1.0.2
+%endif
# libbfd (used only for debug builds?)
#BuildRequires: binutils-devel
BuildRequires: bison >= 2
BuildRequires: opus-devel
%{?with_opus_vp8:BuildRequires: opusfile-devel}
BuildRequires: pam-devel
-%{?with_pjsip:BuildRequires: pjproject-devel >= 2.6-4}
+%if %{with system_pjproject} && %{with pjsip}
+BuildRequires: pjproject-devel >= 2.6-4
+%endif
BuildRequires: pkgconfig
BuildRequires: popt-devel
%{?with_portaudio:BuildRequires: portaudio-devel >= 19}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# references symbols in the asterisk binary
-%define skip_post_check_so libasteriskssl.so.*
+%define skip_post_check_so libasteriskssl.so.* libasteriskpj.so.*
%define _noautoprovfiles %{_libdir}/asterisk/modules/.*
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%if %{with opus_vp8}
-%patch8 -p1
cp -a asterisk-opus-%{opus_commit}/codecs/* codecs
cp -a asterisk-opus-%{opus_commit}/formats/* formats
cp -a asterisk-opus-%{opus_commit}/include/asterisk/* include/asterisk
%endif
+%if %{without system_pjproject} && %{with pjsip}
+mkdir externals
+ln -s %{SOURCE9} externals
+md5sum %{SOURCE9} > externals/pjproject-%{pjproject_version}.md5
+%endif
+
# Fixup makefile so sound archives aren't downloaded/installed
%{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
%{__sed} -i -e 's/^install:.*$/install:/' sounds/Makefile
export ASTLDFLAGS="%{rpmldflags}"
export WGET="/bin/true"
+%if %{without system_pjproject} && %{with pjsip}
+export EXTERNALS_CACHE_DIR="$PWD/externals"
+%endif
+
# be sure to invoke ./configure with our flags
cd menuselect
%{__aclocal} -I ../autoconf
cd ..
%configure \
+ %{__without_if system_pjproject pjproject-bundled} \
--with-unbound \
%{__without oss SDL_image} \
%{__without bluetooth bluetooth} \
%files
%defattr(644,root,root,755)
-%doc README *.txt ChangeLog BUGS CREDITS configs
+%doc README*.md *.txt ChangeLog CHANGES BUGS CREDITS configs LICENSE
%doc doc/asterisk.sgml
%attr(755,root,root) %{_sbindir}/astcanary
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/users.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/vpb.conf
-%{_libdir}/libasteriskssl.so.1
+%attr(755,root,root) %{_libdir}/libasteriskssl.so.1
+%if %{without system_pjproject} && %{with pjsip}
+%attr(755,root,root) %{_libdir}/libasteriskpj.so.2
+%endif
%dir %{_libdir}/asterisk
%dir %{_libdir}/asterisk/modules
%attr(755,root,root) %{_libdir}/asterisk/modules/app_stack.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_stasis.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_statsd.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/app_stream_echo.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_system.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_talkdetect.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_test.so
# res_rtp_asterisk.so pulls some pjproject libs, but it still looks like a core module
%attr(755,root,root) %{_libdir}/asterisk/modules/res_rtp_asterisk.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_rtp_multicast.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_sdp_translator_pjmedia.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_security_log.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_smdi.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_sorcery_astdb.so
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libasteriskssl.so
+%if %{without system_pjproject} && %{with pjsip}
+%attr(755,root,root) %{_libdir}/libasteriskpj.so
+%endif
%dir %{_includedir}/asterisk
%{_includedir}/asterisk/*.h
%{_includedir}/asterisk.h
projects / packages / asterisk.git / commitdiff