svn commit: r415115 - in head/net: asterisk13 pjsip pjsip/files
Guido Falsi
madpilot at FreeBSD.org
Fri May 13 14:25:23 UTC 2016
Author: madpilot
Date: Fri May 13 14:25:21 2016
New Revision: 415115
URL: https://svnweb.freebsd.org/changeset/ports/415115
Log:
- Update net/pjsip to 2.5 [1]
- Disable unneeded ALSA support in pjsip [1]
- Replace custom patch with USES=pathfix
- Fix pjsip build system to allow building while previous version
is installed in PREFIX/LOCALBASE
- Bump dependent port asterisk13 PORTREVISION to avoid runtime crash
(seen while testing)
PR: 209477 [1]
Submitted by: yuri at rawbw.com
Added:
head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (contents, props changed)
Deleted:
head/net/pjsip/files/patch-Makefile
Modified:
head/net/asterisk13/Makefile
head/net/pjsip/Makefile
head/net/pjsip/distinfo
head/net/pjsip/files/patch-aconfigure (contents, props changed)
head/net/pjsip/pkg-plist
Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile Fri May 13 14:12:03 2016 (r415114)
+++ head/net/asterisk13/Makefile Fri May 13 14:25:21 2016 (r415115)
@@ -2,6 +2,7 @@
PORTNAME= asterisk
PORTVERSION= 13.9.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
MASTER_SITE_SUBDIR= asterisk/:main \
Modified: head/net/pjsip/Makefile
==============================================================================
--- head/net/pjsip/Makefile Fri May 13 14:12:03 2016 (r415114)
+++ head/net/pjsip/Makefile Fri May 13 14:25:21 2016 (r415115)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pjsip
-PORTVERSION= 2.4.5
-PORTREVISION= 1
+PORTVERSION= 2.5
CATEGORIES= net
MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/
DISTNAME= pjproject-${DISTVERSION}
@@ -19,7 +18,8 @@ CONFLICTS= pjsip-extsrtp-[0-9]*
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-external-pa \
--disable-silk
-USES= gmake localbase tar:bz2
+USES= gmake localbase pathfix tar:bz2
+PATHFIX_MAKEFILEIN= Makefile
USE_LDCONFIG= yes
PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}"
MAKE_JOBS_UNSAFE= yes
@@ -86,6 +86,9 @@ EXTSRTP_LIB_DEPENDS= libsrtp.so:net/lib
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/pkgconfig.py
+ @${REINPLACE_CMD} -e 's/$$(APP_LDFLAGS) \{0,1\}//' \
+ -e 's/$$(OS_LDFLAGS)/$$(APP_LDFLAGS) &/' \
+ ${WRKSRC}/*/build/Makefile
@${ECHO} "#include <sys/select.h>" > ${WRKSRC}/pjlib/include/pj/config_site.h
@${ECHO} "#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)" >> ${WRKSRC}/pjlib/include/pj/config_site.h
Modified: head/net/pjsip/distinfo
==============================================================================
--- head/net/pjsip/distinfo Fri May 13 14:12:03 2016 (r415114)
+++ head/net/pjsip/distinfo Fri May 13 14:25:21 2016 (r415115)
@@ -1,2 +1,2 @@
-SHA256 (pjproject-2.4.5.tar.bz2) = 086f5e70dcaee312b66ddc24dac6ef85e6f1fec4eed00ff2915cebe0ee3cdd8d
-SIZE (pjproject-2.4.5.tar.bz2) = 4654415
+SHA256 (pjproject-2.5.tar.bz2) = 66e2ee1a81548efba21fa6c234d7fa6260dc98b3cd95af2137b851846d6501de
+SIZE (pjproject-2.5.tar.bz2) = 4179560
Modified: head/net/pjsip/files/patch-aconfigure
==============================================================================
--- head/net/pjsip/files/patch-aconfigure Fri May 13 14:12:03 2016 (r415114)
+++ head/net/pjsip/files/patch-aconfigure Fri May 13 14:25:21 2016 (r415115)
@@ -1,6 +1,21 @@
---- aconfigure.orig 2014-08-19 02:18:07 UTC
+--- aconfigure.orig 2016-04-12 07:46:12 UTC
+++ aconfigure
-@@ -6654,7 +6654,7 @@ else
+@@ -6179,14 +6179,7 @@ $as_echo "Checking sound device backend.
+ ;;
+ *)
+ ac_pjmedia_snd=alsa
+- ac_pa_use_alsa=1
+-
+- ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
+-if test "x$ac_cv_header_alsa_version_h" = xyes; then :
+- LIBS="$LIBS -lasound"
+-else
+ ac_pa_use_alsa=0
+-fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
+@@ -6773,7 +6766,7 @@ else
FFMPEG_PREFIX=$with_ffmpeg
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
Added: head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in Fri May 13 14:25:21 2016 (r415115)
@@ -0,0 +1,11 @@
+--- pjmedia/build/os-auto.mak.in.orig 2016-05-13 06:08:17 UTC
++++ pjmedia/build/os-auto.mak.in
+@@ -209,7 +209,7 @@ endif
+ # Unix specific
+ #
+ ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)
+-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \
++export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=0 \
+ -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
+ -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+ endif
Modified: head/net/pjsip/pkg-plist
==============================================================================
--- head/net/pjsip/pkg-plist Fri May 13 14:12:03 2016 (r415114)
+++ head/net/pjsip/pkg-plist Fri May 13 14:25:21 2016 (r415115)
@@ -143,6 +143,7 @@ include/pjmedia-codec/ipp_codecs.h
include/pjmedia-codec/l16.h
include/pjmedia-codec/opencore_amr.h
include/pjmedia-codec/openh264.h
+include/pjmedia-codec/opus.h
include/pjmedia-codec/passthrough.h
include/pjmedia-codec/silk.h
include/pjmedia-codec/speex.h
@@ -155,6 +156,7 @@ include/pjmedia-videodev/videodev.h
include/pjmedia-videodev/videodev_imp.h
include/pjmedia.h
include/pjmedia/alaw_ulaw.h
+include/pjmedia/audiodev.h
include/pjmedia/avi.h
include/pjmedia/avi_stream.h
include/pjmedia/bidirectional.h
@@ -211,6 +213,7 @@ include/pjmedia/vid_codec_util.h
include/pjmedia/vid_port.h
include/pjmedia/vid_stream.h
include/pjmedia/vid_tee.h
+include/pjmedia/videodev.h
include/pjmedia/wav_playlist.h
include/pjmedia/wav_port.h
include/pjmedia/wave.h
More information about the svn-ports-head
mailing list