Attachment 175030 Details for Bug 212729 – svn diff

[patch] svn diff

svn-diff.patch.txt (text/plain), 9.39 KB, created by Šimun Mikecin on 2016-09-21 11:15:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Šimun Mikecin

Created: 2016-09-21 11:15:36 UTC

Size: 9.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 422551)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	freeswitch
>-PORTVERSION=	1.6.8
>+PORTVERSION=	1.6.10
> CATEGORIES=	net
> MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
> 		http://files.freeswitch.org/releases/sounds/:sounds
>@@ -16,10 +16,14 @@
> LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
> 		libcurl.so:ftp/curl \
> 		libpcre.so:devel/pcre \
>+		libspeexdsp.so:audio/speexdsp \
> 		libspeex.so:audio/speex \
> 		libldns.so:dns/ldns \
> 		libopus.so:audio/opus \
>-		libsndfile.so:audio/libsndfile
>+		libsndfile.so:audio/libsndfile \
>+		libfreetype.so:print/freetype2 \
>+		libpng16.so:graphics/png \
>+		libjbig.so:graphics/jbigkit
> 
> CONFLICTS_BUILD=	xmlrpc-c-*
> 
>@@ -26,7 +30,7 @@
> BROKEN_FreeBSD_9=	Fails in configure due to compiler issues
> ONLY_FOR_ARCHS=	amd64
> 
>-USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz
>+USES=		gmake jpeg pkgconfig lua perl5 libtool shebangfix tar:xz iconv libedit ssl
> USE_LDCONFIG=	yes
> 
> ALL_MODULES_DESC=	Build all modules
>@@ -46,6 +50,7 @@
> NO_OPTIONS_SORT=	yes
> OPTIONS_SUB=		yes
> 
>+ALL_MODULES_CONFLICTS_BUILD+=	apr
> ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf
> 
> GNU_CONFIGURE=		yes
>@@ -66,11 +71,13 @@
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MALL_MODULES}
>+USE_XORG=	x11
> BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
> 		${LOCALBASE}/bin/aclocal:devel/automake
> RUN_DEPENDS+=	${LOCALBASE}/include/ladspa.h:audio/ladspa
> LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
> 		libopencv_legacy.so:graphics/opencv \
>+		libopencv_core.so:graphics/opencv-core \
> 		libhiredis.so:databases/hiredis \
> 		libmemcached.so:databases/libmemcached \
> 		libSoundTouch.so:audio/soundtouch \
>@@ -85,7 +92,6 @@
> 		libyaml.so:textproc/libyaml \
> 		libMagickWand-6.so:graphics/ImageMagick-nox11
> USE_OPENLDAP=	yes
>-USE_OPENSSL=	yes
> .endif
> 
> EDPRE=	freeswitch-sounds
>Index: distinfo
>===================================================================
>--- distinfo	(revision 422551)
>+++ distinfo	(working copy)
>@@ -1,34 +1,11 @@
>-SHA256 (freeswitch-1.6.8.tar.xz) = a9834667c0afc164631611b4862acd6411e4e6ddb706e4af4b51eab4adbe4fc1
>-SIZE (freeswitch-1.6.8.tar.xz) = 33460304
>+TIMESTAMP = 1474009500
>+SHA256 (freeswitch-1.6.10.tar.xz) = b7beaaac29dc0a58cc34cfd402bf1c7e8ca06975722fd8ddb2983cbed17dd6e4
>+SIZE (freeswitch-1.6.10.tar.xz) = 33487164
> SHA256 (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 7556d3eb314be939992a3f73c0d7754e44b36859d670e0b42d4cff7f9c0789a9
> SIZE (freeswitch-sounds-music-8000-1.0.51.tar.gz) = 14619493
> SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8
> SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031
>-SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c
>-SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178
>-SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66
>-SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200
> SHA256 (freeswitch-sounds-music-16000-1.0.51.tar.gz) = 94b72b14b61054e4faeca2b7282aa976fae641aba5df84b13fb4a811c07c5e0e
> SIZE (freeswitch-sounds-music-16000-1.0.51.tar.gz) = 27993050
> SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2
> SIZE (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776
>-SHA256 (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6
>-SIZE (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = 26591167
>-SHA256 (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b
>-SIZE (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = 25072831
>-SHA256 (freeswitch-sounds-music-32000-1.0.51.tar.gz) = c6b6a5ea1b68ee1eb0d879e449052d07dc9ed6371a50cd173fbe09b532becf1e
>-SIZE (freeswitch-sounds-music-32000-1.0.51.tar.gz) = 53016061
>-SHA256 (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838
>-SIZE (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 73012907
>-SHA256 (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b
>-SIZE (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 52040064
>-SHA256 (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc
>-SIZE (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = 49276482
>-SHA256 (freeswitch-sounds-music-48000-1.0.51.tar.gz) = 13ca541c76e42c13e686ff8da3b93cf21fdcff5388e6353856daef4d7bac30fd
>-SIZE (freeswitch-sounds-music-48000-1.0.51.tar.gz) = 75546338
>-SHA256 (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa
>-SIZE (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = 105319388
>-SHA256 (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0
>-SIZE (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = 76666642
>-SHA256 (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d
>-SIZE (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = 72438142
>Index: files/extrapatch-modules.conf
>===================================================================
>--- files/extrapatch-modules.conf	(revision 422551)
>+++ files/extrapatch-modules.conf	(working copy)
>@@ -1,17 +1,17 @@
>---- modules.conf.orig	2016-05-05 16:42:20.000000000 -0400
>-+++ modules.conf	2016-05-06 16:42:38.276496730 -0400
>-@@ -1,161 +1,161 @@
>+--- modules.conf.orig	2016-08-25 12:35:35 UTC
>++++ modules.conf
>+@@ -1,162 +1,162 @@
> -#applications/mod_abstraction
> -#applications/mod_av
> -#applications/mod_avmd
>-+applications/mod_abstraction
>-+applications/mod_av
>-+applications/mod_avmd
> -#applications/mod_bert
> -#applications/mod_blacklist
> -#applications/mod_callcenter
> -#applications/mod_cidlookup
> -#applications/mod_cluechoo
>++applications/mod_abstraction
>++applications/mod_av
>++applications/mod_avmd
> +applications/mod_bert
> +applications/mod_blacklist
> +applications/mod_callcenter
>@@ -69,6 +69,7 @@
> +applications/mod_redis
> +applications/mod_rss
>  applications/mod_sms
>+ #applications/mod_sms_flowroute
> -#applications/mod_snapshot
> -#applications/mod_snom
> -#applications/mod_sonar
>Index: files/patch-build_Makefile.in
>===================================================================
>--- files/patch-build_Makefile.in	(revision 422551)
>+++ files/patch-build_Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- build/Makefile.in.orig	2016-03-07 21:11:29 UTC
>+--- build/Makefile.in.orig	2016-08-25 12:36:43 UTC
> +++ build/Makefile.in
>-@@ -588,76 +588,9 @@ uninstall-am:
>+@@ -594,76 +594,9 @@ uninstall-am:
>  
>  all:
>  	@echo " +---------- FreeSWITCH Build Complete ----------+"
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 422551)
>+++ files/patch-configure	(nonexistent)
>@@ -1,11 +0,0 @@
>---- configure.orig	2016-05-18 22:49:18.753911000 +0000
>-+++ configure	2016-05-18 22:49:38.480978000 +0000
>-@@ -20062,7 +20062,7 @@
>- fi
>- 
>- 
>--for luaversion in lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do
>-+for luaversion in lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua; do
>- 
>-   succeeded=no
>- 
>
>Property changes on: files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-libs_sofia-sip_config.h.in
>===================================================================
>--- files/patch-libs_sofia-sip_config.h.in	(nonexistent)
>+++ files/patch-libs_sofia-sip_config.h.in	(working copy)
>@@ -0,0 +1,12 @@
>+--- libs/sofia-sip/config.h.in.orig	2016-08-25 12:36:03 UTC
>++++ libs/sofia-sip/config.h.in
>+@@ -518,7 +518,9 @@
>+ #undef _POSIX_SOURCE
>+ 
>+ /* Little Endian */
>++#ifndef __BYTE_ORDER
>+ #undef __BYTE_ORDER
>++#endif
>+ 
>+ /* Define to empty if `const' does not conform to ANSI C. */
>+ #undef const
>
>Property changes on: files/patch-libs_sofia-sip_config.h.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
>Index: files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c
>===================================================================
>--- files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c	(revision 422551)
>+++ files/patch-src_mod_applications_mod__avmd_avmd__fast__acosf.c	(working copy)
>@@ -1,12 +1,12 @@
>---- src/mod/applications/mod_avmd/avmd_fast_acosf.c.orig	2016-05-05 20:42:20 UTC
>+--- src/mod/applications/mod_avmd/avmd_fast_acosf.c.orig	2016-08-25 12:35:35 UTC
> +++ src/mod/applications/mod_avmd/avmd_fast_acosf.c
> @@ -23,6 +23,9 @@
>  #include "avmd_fast_acosf.h"
>  #include "avmd_options.h"
>-
>+ 
> +#ifndef MAP_POPULATE
> +#define MAP_POPULATE 0
> +#endif
>-
>+ 
>  typedef union {
>      uint32_t i;

Actions: View | Diff

Attachments on bug 212729: 174832 | 175030 | 175033 | 175059 | 175612