Attachment 151191 Details for Bug 196249 – alternate patch

[patch] alternate patch

ortp.patch (text/plain), 3.23 KB, created by Tijl Coosemans on 2015-01-01 13:39:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-01-01 13:39:14 UTC

Size: 3.23 KB

patch

obsolete

>Index: net/ortp/Makefile
>===================================================================
>--- net/ortp/Makefile	(revision 375829)
>+++ net/ortp/Makefile	(working copy)
>@@ -3,8 +3,9 @@
> 
> PORTNAME=	ortp
> PORTVERSION=	0.23.0
>+PORTREVISION=	1
> CATEGORIES=	net
>-MASTER_SITES=	SAVANNAH/linphone/ortp
>+MASTER_SITES=	SAVANNAH/linphone/ortp/sources
> 
> MAINTAINER=	sobomax@FreeBSD.org
> COMMENT=	Real-time Transport Protocol (RTP) library
>@@ -16,9 +17,20 @@ CONFLICTS_INSTALL=	linphone-base-[0-9]*
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-silent-rules --disable-strict
>-CPPFLAGS+=	-DHAVE_DEV_RANDOM
> INSTALL_TARGET=	install-strip
> USES=		libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> 
>+OPTIONS_DEFINE=	SRTP ZRTP
>+OPTIONS_DEFAULT=SRTP ZRTP
>+
>+SRTP_DESC=		Secure RTP support
>+SRTP_LIB_DEPENDS=	libsrtp.so:${PORTSDIR}/net/libsrtp
>+SRTP_CONFIGURE_ON=	--with-srtp
>+SRTP_CONFIGURE_OFF=	--with-srtp=none
>+
>+ZRTP_DESC=		SRTP with secure key exchange (RFC 6189) (LGPL3)
>+ZRTP_LIB_DEPENDS=	libzrtpcppcore.so:${PORTSDIR}/security/libzrtpcppcore
>+ZRTP_CONFIGURE_ENABLE=	zrtp
>+
> .include <bsd.port.mk>
>Index: net/ortp/files/patch-configure
>===================================================================
>--- net/ortp/files/patch-configure	(revision 0)
>+++ net/ortp/files/patch-configure	(working copy)
>@@ -0,0 +1,20 @@
>+--- configure.orig	2014-02-19 14:31:33 UTC
>++++ configure
>+@@ -12021,7 +12021,6 @@ $as_echo "#define NOCONNECT 1" >>confdef
>+ 
>+ $as_echo "#define NOCONNECT 1" >>confdefs.h
>+ 
>+-		PTHREAD_LDFLAGS="-pthread"
>+ 	;;
>+ 	*mingw32ce)
>+ 		CFLAGS="$CFLAGS -D_WIN32_WCE -D_WIN32_WINNT=0x0501 -DORTP_STATIC"
>+@@ -12211,7 +12210,8 @@ if test "${srtp_prefix}" != "none" ; the
>+ 		SRTP_CFLAGS="-I${srtp_prefix}/include -I${srtp_prefix}/include/srtp"
>+ 		SRTP_LIBS="-L${srtp_prefix}/lib"
>+ 	fi
>+-	SRTP_LIBS="$SRTP_LIBS -lsrtp"
>++	SRTP_CFLAGS="$(pkg-config --cflags libsrtp)"
>++	SRTP_LIBS="$(pkg-config --libs libsrtp)"
>+ 
>+ 		have_srtp=no
>+ 	CPPFLAGS_save=$CPPFLAGS
>
>Property changes on: net/ortp/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/ortp/files/patch-ortp.pc.in
>===================================================================
>--- net/ortp/files/patch-ortp.pc.in	(revision 0)
>+++ net/ortp/files/patch-ortp.pc.in	(working copy)
>@@ -0,0 +1,10 @@
>+--- ortp.pc.in.orig	2010-02-08 14:38:31 UTC
>++++ ortp.pc.in
>+@@ -6,5 +6,6 @@ includedir=@includedir@
>+ Name: oRTP 
>+ Description: Implement the RFC3550 (RTP) with a easy to use API with high and low level access. 
>+ Version: @ORTP_PKGCONFIG_VERSION@                           
>+-Libs: -L@libdir@ -lortp @ORTPDEPS_LIBS@
>++Libs: -L@libdir@ -lortp
>++Libs.private: @ORTPDEPS_LIBS@
>+ Cflags: -I@includedir@ @ORTPDEPS_CFLAGS@
>
>Property changes on: net/ortp/files/patch-ortp.pc.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 196249: 150934 | 151191