Date: Mon, 12 Sep 2016 15:26:47 +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: r421929 - in head/net/pjsip: . files Message-ID: <201609121526.u8CFQlRr072868@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Sep 12 15:26:46 2016 New Revision: 421929 URL: https://svnweb.freebsd.org/changeset/ports/421929 Log: - Add PJSUA option (on by default) to install the pjsua client binary - Strip libraries - Reflowed OPTIONS_DEFINE PR: 211533 Submitted by: Joseph Mingrone <jrm at ftfl.ca> Added: head/net/pjsip/files/patch-build.mak.in (contents, props changed) Modified: head/net/pjsip/Makefile head/net/pjsip/files/patch-aconfigure head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in head/net/pjsip/pkg-plist Modified: head/net/pjsip/Makefile ============================================================================== --- head/net/pjsip/Makefile Mon Sep 12 15:14:14 2016 (r421928) +++ head/net/pjsip/Makefile Mon Sep 12 15:26:46 2016 (r421929) @@ -2,6 +2,7 @@ PORTNAME= pjsip PORTVERSION= 2.5.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ DISTNAME= pjproject-${DISTVERSION} @@ -24,8 +25,9 @@ USE_LDCONFIG= yes PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}" MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 OPENH264 RESAMPLE RESAMPLEDLL \ - SAMPLERATE SDL SHARED SPEEX SPEEXAEC V4L SOUND VIDEO AMR EXTSRTP +OPTIONS_DEFINE= DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 \ + OPENH264 PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \ + SHARED SPEEX SPEEXAEC V4L SOUND VIDEO AMR EXTSRTP OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC G711_DESC= G.711 codec support @@ -34,6 +36,7 @@ G7221_DESC= G.722.1 codec support ILBC_DESC= iLBC codec support L16_DESC= Linear/L16 codec support OPENH264_DESC= OpenH264 support +PJSUA_DESC= Command line SIP agent RESAMPLE_DESC= Enable resampling implementations RESAMPLEDLL_DESC= Build libresample as shared library SHARED_DESC= Build shared libraries (other ports may depend on this) @@ -60,6 +63,7 @@ IPV6_CFLAGS_OFF= -DPJ_HAS_IPV6=1 L16_CONFIGURE_ENABLE= l16-codec OPENH264_CONFIGURE_ENABLE= openh264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 +PJSUA_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp RESAMPLE_CONFIGURE_ENABLE= resample RESAMPLEDLL_CONFIGURE_ENABLE= resample-dll SAMPLERATE_CONFIGURE_ENABLE= libsamplerate @@ -92,4 +96,15 @@ post-patch: @${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 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + +post-install-PJSUA-on: + ${INSTALL_PROGRAM} \ + ${WRKSRC}/pjsip-apps/bin/pjsua-${ARCH}-portbld-${OPSYS:tl}${OSREL} \ + ${STAGEDIR}${PREFIX}/bin/pjsua + ${INSTALL_PROGRAM} \ + ${WRKSRC}/pjsip-apps/bin/pjsystest-${ARCH}-portbld-${OPSYS:tl}${OSREL} \ + ${STAGEDIR}${PREFIX}/bin/pjsystest + .include <bsd.port.mk> Modified: head/net/pjsip/files/patch-aconfigure ============================================================================== --- head/net/pjsip/files/patch-aconfigure Mon Sep 12 15:14:14 2016 (r421928) +++ head/net/pjsip/files/patch-aconfigure Mon Sep 12 15:26:46 2016 (r421929) @@ -1,6 +1,6 @@ ---- aconfigure.orig 2016-04-12 07:46:12 UTC +--- aconfigure.orig 2016-07-20 07:03:49 UTC +++ aconfigure -@@ -6179,14 +6179,7 @@ $as_echo "Checking sound device backend. +@@ -6234,14 +6234,7 @@ $as_echo "Checking sound device backend. ;; *) ac_pjmedia_snd=alsa @@ -15,7 +15,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5 -@@ -6773,7 +6766,7 @@ else +@@ -6865,7 +6858,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-build.mak.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/files/patch-build.mak.in Mon Sep 12 15:26:46 2016 (r421929) @@ -0,0 +1,20 @@ +--- build.mak.in.orig 2016-06-28 14:32:08 UTC ++++ build.mak.in +@@ -106,7 +106,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/t + endif + endif + +-ifneq ($(findstring pa,@ac_pjmedia_snd@),) ++#ifneq ($(findstring pa,@ac_pjmedia_snd@),) + ifeq (@ac_external_pa@,1) + # External PA + APP_THIRD_PARTY_EXT += -lportaudio +@@ -119,7 +119,7 @@ APP_THIRD_PARTY_LIBS += -lportaudio + APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX) + endif + endif +-endif ++#endif + + ifneq (@ac_no_yuv@,1) + ifeq (@ac_external_yuv@,1) Modified: head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in ============================================================================== --- head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in Mon Sep 12 15:14:14 2016 (r421928) +++ head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in Mon Sep 12 15:26:46 2016 (r421929) @@ -1,11 +1,53 @@ ---- pjmedia/build/os-auto.mak.in.orig 2016-05-13 06:08:17 UTC +--- pjmedia/build/os-auto.mak.in.orig 2016-06-28 14:32:08 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 +@@ -203,50 +203,7 @@ export CFLAGS += -I$(THIRD_PARTY)/yuv/in + endif endif + +- +-# +-# MacOSX specific +-# +-ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),) +-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \ +- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ +- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 +-endif +- +-# +-# Unix specific +-# +-ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),) +-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \ +- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ +- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 +-endif +- +-# +-# Windows specific +-# +-ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),) +-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \ +- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 +-else + export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 +-endif +- +-# +-# Null sound device +-# +-ifeq ($(AC_PJMEDIA_SND),null) +-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ +- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 +-endif +- +-# +-# External sound device +-# +-ifeq ($(AC_PJMEDIA_SND),external) +-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ +- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 +-endif + + # + # QT video device Modified: head/net/pjsip/pkg-plist ============================================================================== --- head/net/pjsip/pkg-plist Mon Sep 12 15:14:14 2016 (r421928) +++ head/net/pjsip/pkg-plist Mon Sep 12 15:26:46 2016 (r421929) @@ -352,3 +352,5 @@ lib/libpjsua2-%%CONFIGURE_TARGET%%.a %%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so %%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so.2 libdata/pkgconfig/libpjproject.pc +%%PJSUA%%bin/pjsua +%%PJSUA%%bin/pjsystest
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609121526.u8CFQlRr072868>