Attachment #170240 for bug #209477

View | Details | Raw Unified | Return to bug 209477
Collapse All | Expand All

Lines 1-8 Link Here

(-)net/pjsip/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pjsip	3	PORTNAME= pjsip
4	PORTVERSION= 2.4.5	4	PORTVERSION= 2.5
5	PORTREVISION= 1
6	CATEGORIES= net	5	CATEGORIES= net
7	MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/	6	MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/
8	DISTNAME= pjproject-${DISTVERSION}	7	DISTNAME= pjproject-${DISTVERSION}

Lines 1-2 Link Here

(-)net/pjsip/distinfo (-2 / +2 lines)
1	SHA256 (pjproject-2.4.5.tar.bz2) = 086f5e70dcaee312b66ddc24dac6ef85e6f1fec4eed00ff2915cebe0ee3cdd8d	1	SHA256 (pjproject-2.5.tar.bz2) = 66e2ee1a81548efba21fa6c234d7fa6260dc98b3cd95af2137b851846d6501de
2	SIZE (pjproject-2.4.5.tar.bz2) = 4654415	2	SIZE (pjproject-2.5.tar.bz2) = 4179560




--- aconfigure.orig	2016-04-12 07:46:12 UTC
+++ aconfigure
@@ -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; }

Line 0 Link Here

(-)net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (+11 lines)
	1	--- pjmedia/build/os-auto.mak.in.orig 2016-05-13 06:08:17 UTC
	2	+++ pjmedia/build/os-auto.mak.in
	3	@@ -209,7 +209,7 @@ endif
	4	# Unix specific
	5	#
	6	ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)
	7	-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \
	8	+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=0 \
	9	-DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
	10	-DPJMEDIA_AUDIO_DEV_HAS_WMME=0
	11	endif




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

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

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

Return to bug 209477

Lines 1-6 Link Here

(-)net/pjsip/files/patch-aconfigure (-2 / +17 lines)
1	--- aconfigure.orig 2014-08-19 02:18:07 UTC	1	--- aconfigure.orig 2016-04-12 07:46:12 UTC
2	+++ aconfigure	2	+++ aconfigure
3	@@ -6654,7 +6654,7 @@ else	3	@@ -6179,14 +6179,7 @@ $as_echo "Checking sound device backend.
		4	;;
		5	*)
		6	ac_pjmedia_snd=alsa
		7	- ac_pa_use_alsa=1
		8	-
		9	- ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
		10	-if test "x$ac_cv_header_alsa_version_h" = xyes; then :
		11	- LIBS="$LIBS -lasound"
		12	-else
		13	ac_pa_use_alsa=0
		14	-fi
		15
		16
		17	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
		18	@@ -6773,7 +6766,7 @@ else
4	FFMPEG_PREFIX=$with_ffmpeg	19	FFMPEG_PREFIX=$with_ffmpeg
5	{ $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
6	$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }	21	$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }

Lines 143-148 Link Here

(-)net/pjsip/pkg-plist (+3 lines)
143	include/pjmedia-codec/l16.h	143	include/pjmedia-codec/l16.h
144	include/pjmedia-codec/opencore_amr.h	144	include/pjmedia-codec/opencore_amr.h
145	include/pjmedia-codec/openh264.h	145	include/pjmedia-codec/openh264.h
		146	include/pjmedia-codec/opus.h
146	include/pjmedia-codec/passthrough.h	147	include/pjmedia-codec/passthrough.h
147	include/pjmedia-codec/silk.h	148	include/pjmedia-codec/silk.h
148	include/pjmedia-codec/speex.h	149	include/pjmedia-codec/speex.h
Lines 155-160 Link Here
155	include/pjmedia-videodev/videodev_imp.h	156	include/pjmedia-videodev/videodev_imp.h
156	include/pjmedia.h	157	include/pjmedia.h
157	include/pjmedia/alaw_ulaw.h	158	include/pjmedia/alaw_ulaw.h
		159	include/pjmedia/audiodev.h
158	include/pjmedia/avi.h	160	include/pjmedia/avi.h
159	include/pjmedia/avi_stream.h	161	include/pjmedia/avi_stream.h
160	include/pjmedia/bidirectional.h	162	include/pjmedia/bidirectional.h
Lines 211-216 Link Here
211	include/pjmedia/vid_port.h	213	include/pjmedia/vid_port.h
212	include/pjmedia/vid_stream.h	214	include/pjmedia/vid_stream.h
213	include/pjmedia/vid_tee.h	215	include/pjmedia/vid_tee.h
		216	include/pjmedia/videodev.h
214	include/pjmedia/wav_playlist.h	217	include/pjmedia/wav_playlist.h
215	include/pjmedia/wav_port.h	218	include/pjmedia/wav_port.h
216	include/pjmedia/wave.h	219	include/pjmedia/wave.h