pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

freeswitch-core: Minor optimizations. - Improve build time by reducing REPLACE wildcards. - Change MASTER_SITES to specific release URL. - Add missing dependencies (to be reviewed). - Add CFLAGS.



Module Name:	pkgsrc-wip
Committed By:	Angel M. Adames <angelmadames%gmail.com@localhost>
Pushed By:	angelmadames
Date:		Mon Nov 27 17:50:32 2017 +0000
Changeset:	31d1bd3f77c9b17ac23400a215ac80a14fcae50c

Modified Files:
	freeswitch-core/Makefile
	freeswitch-core/distinfo

Log Message:
freeswitch-core: Minor optimizations.
	- Improve build time by reducing REPLACE wildcards.
	- Change MASTER_SITES to specific release URL.
	- Add missing dependencies (to be reviewed).
	- Add CFLAGS.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=31d1bd3f77c9b17ac23400a215ac80a14fcae50c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 freeswitch-core/Makefile | 127 +++++++++++++++++++++++++++++++++++++----------
 freeswitch-core/distinfo |   2 +-
 2 files changed, 102 insertions(+), 27 deletions(-)

diffs:
diff --git a/freeswitch-core/Makefile b/freeswitch-core/Makefile
index 360a4196b3..2e90840c50 100644
--- a/freeswitch-core/Makefile
+++ b/freeswitch-core/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	freeswitch-${VERSION}
 VERSION=	1.6.19
 CATEGORIES=	net
-MASTER_SITES=	http://files.freeswitch.org/
+MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	angelmadames%gmail.com@localhost
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	libtool */libtool */*/libtool */*/*/libtool
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		automake autoconf gmake perl pkg-config
+USE_TOOLS+=		aclocal automake autoconf gmake perl pkg-config bash
 
 BUILD_DEFS+=		VARBASE
 
@@ -41,31 +41,93 @@ CONFIGURE_ARGS+=	--with-dbdir=${VARBASE}/db/freeswitch
 CONFIGURE_ARGS+=	--with-imagesdir=${PREFIX}/share/freeswitch/images
 CONFIGURE_ARGS+=	--with-recordingsdir=${PREFIX}/freeswitch/recordings
 CONFIGURE_ARGS+=	--with-modinstdir=${PREFIX}/freeswitch/modules
-CONFIGURE_ARGS+=	--disable-libvpx
-CONFIGURE_ARGS+=	--enable-srtp
 CONFIGURE_ARGS+=	--enable-zrtp
 CONFIGURE_ARGS+=	--enable-core-pgsql-support
 CONFIGURE_ARGS+=	--enable-xmlrpc-c
-
-REPLACE_PERL+=		support-d/utils/*
-REPLACE_PERL+=		build/*
-REPLACE_PERL+=		libs/xmlrpc-c/tools/binmode-rpc-kit/*
-REPLACE_PERL+=		libs/apr/helpers/*
-REPLACE_PERL+=		libs/sofia-sip/libsofia-sip-ua/tport/*
-REPLACE_PERL+=		libs/*/*
-REPLACE_PERL+=		libs/*/*/*
-REPLACE_PERL+=		libs/libtpl-1.5/*/*/*/*
-REPLACE_PERL+=		libs/libtpl-1.5/*/*/*
-REPLACE_PERL+=		libs/libtpl-1.5/*/*
-REPLACE_PERL+=		scripts/*
-REPLACE_PERL+=		scripts/*/*
-REPLACE_PERL+=		scripts/*/*/*
-REPLACE_PERL+=		scripts/*/*/*/*
-REPLACE_PERL+=		scripts/*/*/*/*/*/*
-REPLACE_PERL+=		src/mod/*/*/*
-REPLACE_PERL+=		src/mod/*/*/*/*
-REPLACE_PERL+=		src/mod/*/*/*/*/*
-REPLACE_PERL+=		docs/phrase/*
+CONFIGURE_ARGS+=	--enable-64
+
+REPLACE_PERL+=		scripts/rss/*.pl
+REPLACE_PERL+=		scripts/perl/*.pl
+REPLACE_PERL+=		scripts/perl/*.cgi
+REPLACE_PERL+=		scripts/perl/multicast/send.pl
+REPLACE_PERL+=		scripts/perl/add_user
+REPLACE_PERL+=		scripts/perl/sendmail
+REPLACE_PERL+=		scripts/perl/fslog
+REPLACE_PERL+=		scripts/perl/g729_activate
+REPLACE_PERL+=		scripts/perl/FreeSWITCH/debian/rules
+REPLACE_PERL+=		scripts/perl/POE-Filter-FSSocket/lib/POE/Filter/FSSocket.pm
+REPLACE_PERL+=		scripts/perl/POE-Filter-FSSocket/examples/*.pl
+REPLACE_PERL+=		scripts/perl/POE-Filter-FSSocket/Makefile.PL
+REPLACE_PERL+=		scripts/trace/sipgrep
+REPLACE_PERL+=		scripts/fsxs.in
+REPLACE_PERL+=		support-d/utils/*.pl
+REPLACE_PERL+=		support-d/utils/gl
+REPLACE_PERL+=		support-d/utils/btgrep
+REPLACE_PERL+=		support-d/utils/hashfinder
+REPLACE_PERL+=		build/*.pl
+REPLACE_PERL+=		docs/phrase/phrase.pl
+REPLACE_PERL+=		docs/Doxygen.conf
+REPLACE_PERL+=		libs/sofia-sip/utils/Doxyfile.in
+REPLACE_PERL+=		libs/sofia-sip/libsofia-sip-ua/tport/*.pl
+REPLACE_PERL+=		libs/libzrtp/create_pack.pl
+REPLACE_PERL+=		libs/libzrtp/doc/Doxyfile.in
+REPLACE_PERL+=		libs/freetdm/docs/Doxygen.conf
+REPLACE_PERL+=		libs/libvpx/libs.doxy_template
+REPLACE_PERL+=		libs/libg722_1/doc/libg722_1-doxygen
+REPLACE_PERL+=		libs/spandsp/doc/doxygen.in
+REPLACE_PERL+=		libs/ilbc/doc/libilbc-doxygen
+REPLACE_PERL+=		libs/libdingaling/docs/Doxygen.conf
+REPLACE_PERL+=		libs/broadvoice/doc/broadvoice-doxygen
+REPLACE_PERL+=		libs/xmlrpc-c/tools/binmode-rpc-kit/binmode-rpc2xml-rpc
+REPLACE_PERL+=		libs/xmlrpc-c/tools/binmode-rpc-kit/oct2bin
+REPLACE_PERL+=		libs/srtp/doc/Doxyfile
+REPLACE_PERL+=		libs/esl/test.pl
+REPLACE_PERL+=		libs/esl/perl/*.pl
+REPLACE_PERL+=		libs/apr/helpers/apr_rename.pl
+REPLACE_PERL+=		libs/libtpl-1.5/lang/perl/tests/*
+REPLACE_PERL+=		libs/libtpl-1.5/doc/html/*.html
+REPLACE_PERL+=		libs/libtpl-1.5/doc/txt/*.txt
+REPLACE_PERL+=		libs/libtpl-1.5/tests/other/do_tests
+REPLACE_PERL+=		libs/libtpl-1.5/tests/do_tests.cygwin
+REPLACE_PERL+=		libs/libtpl-1.5/tests/do_tests
+REPLACE_PERL+=		libs/libtpl-1.5/tests/sizes
+REPLACE_PERL+=		src/mod/applications/mod_httapi/examples/perl/*.cgi
+REPLACE_PERL+=		src/mod/applications/mod_avmd/scripts/*.pl
+REPLACE_PERL+=		src/mod/endpoints/mod_skypopen/install/install.pl
+REPLACE_PERL+=		src/mod/endpoints/mod_gsmopen/asterisk/ciapalo
+REPLACE_PERL+=		src/mod/endpoints/mod_skinny/test-skinny.pl
+
+REPLACE_BASH+=		devel-bootstrap.sh
+REPLACE_BASH+=		scripts/*.sh
+REPLACE_BASH+=		debian/*.sh
+REPLACE_BASH+=		build/*.sh
+REPLACE_BASH+=		src/mod/say/mod_say_pl/create_sound_files.sh
+REPLACE_BASH+=		src/mod/endpoints/mod_khomp/tools/*.sh
+REPLACE_BASH+=		src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/setmixers
+REPLACE_BASH+=		src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/makepy.sh
+REPLACE_BASH+=		src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsmsmsrequeue
+REPLACE_BASH+=		src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsmsmsspool
+REPLACE_BASH+=		src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/multi.sh
+REPLACE_BASH+=		build/fs_ivrd.init.redhat
+REPLACE_BASH+=		build/freeswitch.init.redhat
+REPLACE_BASH+=		build/standalone_module/bootstrap.sh
+REPLACE_BASH+=		support-d/utils/pcap-extract.sh
+REPLACE_BASH+=		libs/libcodec2/script/menu.sh
+REPLACE_BASH+=		libs/libcodec2/unittest/run_tests.sh
+REPLACE_BASH+=		libs/libsndfile/src/make-static-lib-hidden-privates.sh
+REPLACE_BASH+=		libs/libsndfile/Octave/octave_test.sh
+REPLACE_BASH+=		libs/libsndfile/tests/pedantic-header-test.sh.in
+REPLACE_BASH+=		libs/libsndfile/Scripts/*.sh
+REPLACE_BASH+=		libs/libvpx/tools/author_first_release.sh
+REPLACE_BASH+=		libs/libvpx/tools/gen_authors.sh
+REPLACE_BASH+=		libs/libvpx/build/make/*.sh
+REPLACE_BASH+=		libs/freetdm/mod_freetdm/clean.sh
+REPLACE_BASH+=		libs/freetdm/cyginstall.sh
+REPLACE_BASH+=		libs/freetdm/mkrelease.sh
+REPLACE_BASH+=		libs/libyuv/tools/valgrind-libyuv/libyuv_tests.sh
+REPLACE_BASH+=		libs/silk/test_vectors/test_*.sh
+REPLACE_BASH+=		html5/verto/verto_communicator/debian8-install.sh
+REPLACE_BASH+=		scripts/ci/test_build.sh
 
 RCD_SCRIPTS=		freeswitch
 
@@ -75,6 +137,11 @@ INSTALLATION_DIRS+=	freeswitch/modules
 INSTALLATION_DIRS+=	freeswitch/sounds
 INSTALLATION_DIRS+=	freeswitch/recordings
 
+CONFLICTS=      	xmlrpc-c-[0-9]*
+
+DEPENDS+=        	flite-[0-9]*:../../audio/flite
+DEPENDS+=        	libyaml-[0-9]*:../../textproc/libyaml
+
 .include "../../mk/bsd.prefs.mk"
 
 FS_USER?=		freeswitch
@@ -100,6 +167,8 @@ PKG_SYSCONFSUBDIR=	freeswitch
 PKG_SYSCONFDIR_PERMS=	${FS_USER} ${FS_GROUP} 0755
 
 BUILDLINK_TRANSFORM+=	rm:-Werror
+CFLAGS+=        	-Wno-c11-extensions -Wno-deprecated-declarations \
+			-Wno-zero-length-array -Wno-incompatible-pointer-types
 
 post-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/srtp/libsrtp.la ${DESTDIR}${PREFIX}/lib
@@ -108,19 +177,25 @@ post-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/tiff-4.0.2/libtiff/libtiffxx.la ${DESTDIR}${PREFIX}/lib
 	${LIBTOOL} --finish ${PREFIX}/lib
 
-.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/libmemcached/buildlink3.mk"
 .include "../../lang/lua52/buildlink3.mk"
 .include "../../multimedia/libvpx/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../net/ldns/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../audio/speexdsp/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 #.include "../../wip/libzrtp/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/freeswitch-core/distinfo b/freeswitch-core/distinfo
index 54720f739a..f06858cf2a 100644
--- a/freeswitch-core/distinfo
+++ b/freeswitch-core/distinfo
@@ -5,7 +5,7 @@ RMD160 (freeswitch-1.6.19.tar.xz) = 2e6514bb3f67cf7f464dd924541e95e1baab283f
 SHA512 (freeswitch-1.6.19.tar.xz) = 2cf678b7035e17d05f3745921dccafd2fb874cf927fdde5bd274cc07a42e372e941bedaa9569c59d09882eed02de9e874661a64a165e3de860fa6be7adc365ae
 Size (freeswitch-1.6.19.tar.xz) = 33497296 bytes
 SHA1 (patch-configure) = 76661c5bd14857de5fcea046d58f2ec46c04d767
-SHA1 (patch-libs_libzrtp_third__party_bnlib_configure.ac) = 2eff9bde9e663fb6512ff6ce3261cccbb58b9d03
+SHA1 (patch-libs_libzrtp_third__party_bnlib_configure.ac) = dfda65d9e1302c74d9074139f10fde2e5d92bdca
 SHA1 (patch-libs_spandsp_configure) = ace14e1f5ed3318c2f3a0ec7f47bbdf6308a2f34
 SHA1 (patch-libs_spandsp_unpack__gsm0610__data.sh) = facfda4025aeb36f9277b088dace41442417ec9c
 SHA1 (patch-libs_unimrcp_configure) = d4ce12c4bc47e89ac60675c9fc9d67dd546061ba


Home | Main Index | Thread Index | Old Index