Attachment #174478 for bug #211533





PORTNAME=	pjsip
PORTVERSION=	2.5.5
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://www.pjsip.org/release/${PORTVERSION}/
DISTNAME=	pjproject-${DISTVERSION}

PLIST_SUB=	CONFIGURE_TARGET="${CONFIGURE_TARGET}"
MAKE_JOBS_UNSAFE=	yes

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

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)

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

	@${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>

Lines 1-6 Link Here

(-)files/patch-aconfigure (-3 / +3 lines)
1	--- aconfigure.orig 2016-04-12 07:46:12 UTC	1	--- aconfigure.orig 2016-07-20 07:03:49 UTC
2	+++ aconfigure	2	+++ aconfigure
3	@@ -6179,14 +6179,7 @@ $as_echo "Checking sound device backend.	3	@@ -6234,14 +6234,7 @@ $as_echo "Checking sound device backend.
4	;;	4	;;
5	*)	5	*)
6	ac_pjmedia_snd=alsa	6	ac_pjmedia_snd=alsa
Lines 15-21 Link Here
15		15
16		16
17	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5	17	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
18	@@ -6773,7 +6766,7 @@ else	18	@@ -6865,7 +6858,7 @@ else
19	FFMPEG_PREFIX=$with_ffmpeg	19	FFMPEG_PREFIX=$with_ffmpeg
20	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5	20	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
21	$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }	21	$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }




--- 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)




--- pjmedia/build/os-auto.mak.in.orig	2016-06-28 14:32:08 UTC
+++ pjmedia/build/os-auto.mak.in
@@ -207,46 +207,46 @@ 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
+#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
+#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
+#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
+#endif
 
 #
 # Null sound device
 #
-ifeq ($(AC_PJMEDIA_SND),null)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
-		 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
+#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
+#ifeq ($(AC_PJMEDIA_SND),external)
+#export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
+#		 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+#endif
 
 #
 # QT video device

Lines 352-354 Link Here

(-)pkg-plist (+2 lines)
352	%%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so	352	%%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so
353	%%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so.2	353	%%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so.2
354	libdata/pkgconfig/libpjproject.pc	354	libdata/pkgconfig/libpjproject.pc
		355	%%PJSUA%%bin/pjsua
		356	%%PJSUA%%bin/pjsystest

Return to bug 211533

Lines 2-7 Link Here

(-)Makefile (-2 / +17 lines)
2		2
3	PORTNAME= pjsip	3	PORTNAME= pjsip
4	PORTVERSION= 2.5.5	4	PORTVERSION= 2.5.5
		5	PORTREVISION= 1
5	CATEGORIES= net	6	CATEGORIES= net
6	MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/	7	MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/
7	DISTNAME= pjproject-${DISTVERSION}	8	DISTNAME= pjproject-${DISTVERSION}
Lines 24-31 Link Here
24	PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}"	25	PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}"
25	MAKE_JOBS_UNSAFE= yes	26	MAKE_JOBS_UNSAFE= yes
26		27
27	OPTIONS_DEFINE= DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 OPENH264 RESAMPLE RESAMPLEDLL \	28	OPTIONS_DEFINE= DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 \
28	SAMPLERATE SDL SHARED SPEEX SPEEXAEC V4L SOUND VIDEO AMR EXTSRTP	29	OPENH264 PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \
		30	SHARED SPEEX SPEEXAEC V4L SOUND VIDEO AMR EXTSRTP
29	OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC	31	OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC
30		32
31	G711_DESC= G.711 codec support	33	G711_DESC= G.711 codec support
Lines 34-39 Link Here
34	ILBC_DESC= iLBC codec support	36	ILBC_DESC= iLBC codec support
35	L16_DESC= Linear/L16 codec support	37	L16_DESC= Linear/L16 codec support
36	OPENH264_DESC= OpenH264 support	38	OPENH264_DESC= OpenH264 support
		39	PJSUA_DESC= Command line SIP agent
37	RESAMPLE_DESC= Enable resampling implementations	40	RESAMPLE_DESC= Enable resampling implementations
38	RESAMPLEDLL_DESC= Build libresample as shared library	41	RESAMPLEDLL_DESC= Build libresample as shared library
39	SHARED_DESC= Build shared libraries (other ports may depend on this)	42	SHARED_DESC= Build shared libraries (other ports may depend on this)
Lines 60-65 Link Here
60	L16_CONFIGURE_ENABLE= l16-codec	63	L16_CONFIGURE_ENABLE= l16-codec
61	OPENH264_CONFIGURE_ENABLE= openh264	64	OPENH264_CONFIGURE_ENABLE= openh264
62	OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264	65	OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264
		66	PJSUA_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp
63	RESAMPLE_CONFIGURE_ENABLE= resample	67	RESAMPLE_CONFIGURE_ENABLE= resample
64	RESAMPLEDLL_CONFIGURE_ENABLE= resample-dll	68	RESAMPLEDLL_CONFIGURE_ENABLE= resample-dll
65	SAMPLERATE_CONFIGURE_ENABLE= libsamplerate	69	SAMPLERATE_CONFIGURE_ENABLE= libsamplerate
Lines 92-95 Link Here
92	@${ECHO} "#include <sys/select.h>" > ${WRKSRC}/pjlib/include/pj/config_site.h	96	@${ECHO} "#include <sys/select.h>" > ${WRKSRC}/pjlib/include/pj/config_site.h
93	@${ECHO} "#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)" >> ${WRKSRC}/pjlib/include/pj/config_site.h	97	@${ECHO} "#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)" >> ${WRKSRC}/pjlib/include/pj/config_site.h
94		98
		99	post-install:
		100	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
		101
		102	post-install-PJSUA-on:
		103	${INSTALL_PROGRAM} \
		104	${WRKSRC}/pjsip-apps/bin/pjsua-${ARCH}-portbld-${OPSYS:tl}${OSREL} \
		105	${STAGEDIR}${PREFIX}/bin/pjsua
		106	${INSTALL_PROGRAM} \
		107	${WRKSRC}/pjsip-apps/bin/pjsystest-${ARCH}-portbld-${OPSYS:tl}${OSREL} \
		108	${STAGEDIR}${PREFIX}/bin/pjsystest
		109
95	.include <bsd.port.mk>	110	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-build.mak.in (+20 lines)
	1	--- build.mak.in.orig 2016-06-28 14:32:08 UTC
	2	+++ build.mak.in
	3	@@ -106,7 +106,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/t
	4	endif
	5	endif
	6
	7	-ifneq ($(findstring pa,@ac_pjmedia_snd@),)
	8	+#ifneq ($(findstring pa,@ac_pjmedia_snd@),)
	9	ifeq (@ac_external_pa@,1)
	10	# External PA
	11	APP_THIRD_PARTY_EXT += -lportaudio
	12	@@ -119,7 +119,7 @@ APP_THIRD_PARTY_LIBS += -lportaudio
	13	APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX)
	14	endif
	15	endif
	16	-endif
	17	+#endif
	18
	19	ifneq (@ac_no_yuv@,1)
	20	ifeq (@ac_external_yuv@,1)

Lines 1-11 Link Here

(-)files/patch-pjmedia_build_os-auto.mak.in (-7 / +68 lines)
1	--- pjmedia/build/os-auto.mak.in.orig 2016-05-13 06:08:17 UTC	1	--- pjmedia/build/os-auto.mak.in.orig 2016-06-28 14:32:08 UTC
2	+++ pjmedia/build/os-auto.mak.in	2	+++ pjmedia/build/os-auto.mak.in
3	@@ -209,7 +209,7 @@ endif	3	@@ -207,46 +207,46 @@ endif
		4	#
		5	# MacOSX specific
		6	#
		7	-ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),)
		8	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \
		9	- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
		10	- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
		11	-endif
		12	+#ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),)
		13	+#export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \
		14	+# -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
		15	+# -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
		16	+#endif
		17
		18	#
4	# Unix specific	19	# Unix specific
5	#	20	#
6	ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)	21	-ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)
7	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \	22	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \
8	+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=0 \	23	- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
9	-DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \	24	- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
10	-DPJMEDIA_AUDIO_DEV_HAS_WMME=0	25	-endif
11	endif	26	+#ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)
		27	+#export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \
		28	+# -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
		29	+# -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
		30	+#endif
		31
		32	#
		33	# Windows specific
		34	#
		35	-ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),)
		36	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \
		37	- -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0
		38	-else
		39	+#ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),)
		40	+#export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \
		41	+# -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0
		42	+#else
		43	export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
		44	-endif
		45	+#endif
		46
		47	#
		48	# Null sound device
		49	#
		50	-ifeq ($(AC_PJMEDIA_SND),null)
		51	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
		52	- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
		53	-endif
		54	+#ifeq ($(AC_PJMEDIA_SND),null)
		55	+#export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
		56	+# -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
		57	+#endif
		58
		59	#
		60	# External sound device
		61	#
		62	-ifeq ($(AC_PJMEDIA_SND),external)
		63	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
		64	- -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
		65	-endif
		66	+#ifeq ($(AC_PJMEDIA_SND),external)
		67	+#export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
		68	+# -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
		69	+#endif
		70
		71	#
		72	# QT video device