Attachment 149698 Details for Bug 194399 – update comms/spandsp and bump affected ports

[patch] update comms/spandsp and bump affected ports

spandsp-upgrade.patch (text/plain), 12.87 KB, created by Pawel Pekala on 2014-11-21 22:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Pekala

Created: 2014-11-21 22:30:10 UTC

Size: 12.87 KB

patch

obsolete

>Index: comms/gstreamer1-plugins-spandsp/Makefile
>===================================================================
>--- comms/gstreamer1-plugins-spandsp/Makefile	(wersja 373014)
>+++ comms/gstreamer1-plugins-spandsp/Makefile	(kopia robocza)
>@@ -1,6 +1,6 @@
> # $FreeBSD$
> 
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	comms
> 
> COMMENT=	Gstreamer DSP library and software FAX machine plugin
>Index: comms/spandsp/Makefile
>===================================================================
>--- comms/spandsp/Makefile	(wersja 373014)
>+++ comms/spandsp/Makefile	(kopia robocza)
>@@ -2,20 +2,20 @@
> # $FreeBSD$
> 
> PORTNAME=	spandsp
>-PORTVERSION=	0.0.5
>-PORTREVISION=	1
>+PORTVERSION=	0.0.6
> CATEGORIES=	comms
>-MASTER_SITES=	http://www.soft-switch.org/downloads/spandsp/ \
>-		http://www.soft-switch.org/downloads/spandsp/old/
>+MASTER_SITES=	http://www.soft-switch.org/downloads/spandsp/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	DSP library and software FAX machine
> 
>+LICENSE=	LGPL21
>+
> LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-USES=		autoreconf gmake libtool tar:tgz
>+USES=		autoreconf gmake libtool
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
>Index: comms/spandsp/distinfo
>===================================================================
>--- comms/spandsp/distinfo	(wersja 373014)
>+++ comms/spandsp/distinfo	(kopia robocza)
>@@ -1,2 +1,2 @@
>-SHA256 (spandsp-0.0.5.tgz) = 07f42a237c77b08fa765c3a148c83cdfa267bf24c0ab681d80b90d30dd0b3dbf
>-SIZE (spandsp-0.0.5.tgz) = 2506742
>+SHA256 (spandsp-0.0.6.tar.gz) = cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465
>+SIZE (spandsp-0.0.6.tar.gz) = 3309837
>Index: comms/spandsp/files/patch-Makefile.am
>===================================================================
>--- comms/spandsp/files/patch-Makefile.am	(wersja 0)
>+++ comms/spandsp/files/patch-Makefile.am	(kopia robocza)
>@@ -0,0 +1,11 @@
>+--- Makefile.am.orig	2014-09-03 14:15:04.000000000 +0300
>++++ Makefile.am	2014-09-03 14:15:16.000000000 +0300
>+@@ -61,7 +61,7 @@ SUBDIRS = src $(MAYBE_DOC) $(MAYBE_TESTD
>+ 
>+ DIST_SUBDIRS = src doc test-data spandsp-sim tests
>+ 
>+-pkgconfigdir = $(libdir)/pkgconfig
>++pkgconfigdir = $(libdir)data/pkgconfig
>+ pkgconfig_DATA = spandsp.pc
>+ 
>+ faq: faq.xml
>
>Zmiany atrybutÃ³w dla: comms/spandsp/files/patch-Makefile.am
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: comms/spandsp/files/patch-configure.ac
>===================================================================
>--- comms/spandsp/files/patch-configure.ac	(wersja 373014)
>+++ comms/spandsp/files/patch-configure.ac	(kopia robocza)
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2012-09-01 12:05:10.795461874 +0100
>-+++ configure.ac	2012-09-01 12:05:47.473457036 +0100
>-@@ -194,7 +194,6 @@
>+--- configure.ac.orig	2014-11-11 15:56:10.000000000 +0100
>++++ configure.ac	2014-11-11 15:58:13.000000000 +0100
>+@@ -198,7 +198,6 @@ AC_CHECK_HEADERS([stdlib.h])
>  AC_CHECK_HEADERS([string.h])
>  AC_CHECK_HEADERS([strings.h])
>  AC_CHECK_HEADERS([malloc.h])
>@@ -8,3 +8,30 @@
>  AC_CHECK_HEADERS([math.h], [INSERT_MATH_HEADER="#include <math.h>"])
>  AC_CHECK_HEADERS([float.h])
>  AC_CHECK_HEADERS([fcntl.h])
>+@@ -331,7 +330,7 @@ AX_CHECK_EXPORT_CAPABILITY([$host],
>+ 
>+ case "${ax_cv_c_compiler_vendor}" in
>+ gnu)
>+-    COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
>++    COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
>+     if test "$enable_avx" = "yes" ; then
>+         COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS"
>+     fi
>+@@ -392,7 +391,7 @@ sun)
>+     REMOVE_FROM_VAR(CFLAGS, -Xc)
>+     ;;
>+ intel)
>+-    COMP_VENDOR_CFLAGS="-std=c99 -D_POSIX_C_SOURCE=2 -D_GNU_SOURCE=1 -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
>++    COMP_VENDOR_CFLAGS="-std=c99 -D_POSIX_C_SOURCE=2 -D_GNU_SOURCE=1 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
>+     if test "$enable_avx" = "yes" ; then
>+         COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS"
>+     fi
>+@@ -426,7 +425,7 @@ intel)
>+     COMP_VENDOR_LDFLAGS=
>+     ;;
>+ *)
>+-    COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
>++    COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
>+     COMP_VENDOR_LDFLAGS=
>+     ;;
>+ esac
>Index: comms/spandsp/pkg-plist
>===================================================================
>--- comms/spandsp/pkg-plist	(wersja 373014)
>+++ comms/spandsp/pkg-plist	(kopia robocza)
>@@ -51,7 +51,6 @@
> include/spandsp/t38_core.h
> include/spandsp/t38_gateway.h
> include/spandsp/t38_terminal.h
>-include/spandsp/t4.h
> include/spandsp/telephony.h
> include/spandsp/time_scale.h
> include/spandsp/timing.h
>@@ -70,7 +69,84 @@
> include/spandsp/vector_float.h
> include/spandsp/vector_int.h
> include/spandsp/version.h
>+include/spandsp/ademco_contactid.h
>+include/spandsp/complex_vector_int.h
>+include/spandsp/expose.h
>+include/spandsp/fast_convert.h
>+include/spandsp/fax_modems.h
>+include/spandsp/image_translate.h
>+include/spandsp/math_fixed.h
>+include/spandsp/private/ademco_contactid.h
>+include/spandsp/private/adsi.h
>+include/spandsp/private/async.h
>+include/spandsp/private/at_interpreter.h
>+include/spandsp/private/awgn.h
>+include/spandsp/private/bell_r2_mf.h
>+include/spandsp/private/bert.h
>+include/spandsp/private/bitstream.h
>+include/spandsp/private/dtmf.h
>+include/spandsp/private/echo.h
>+include/spandsp/private/fax.h
>+include/spandsp/private/fax_modems.h
>+include/spandsp/private/fsk.h
>+include/spandsp/private/g711.h
>+include/spandsp/private/g722.h
>+include/spandsp/private/g726.h
>+include/spandsp/private/gsm0610.h
>+include/spandsp/private/hdlc.h
>+include/spandsp/private/ima_adpcm.h
>+include/spandsp/private/image_translate.h
>+include/spandsp/private/logging.h
>+include/spandsp/private/lpc10.h
>+include/spandsp/private/modem_connect_tones.h
>+include/spandsp/private/modem_echo.h
>+include/spandsp/private/noise.h
>+include/spandsp/private/oki_adpcm.h
>+include/spandsp/private/queue.h
>+include/spandsp/private/schedule.h
>+include/spandsp/private/sig_tone.h
>+include/spandsp/private/silence_gen.h
>+include/spandsp/private/super_tone_rx.h
>+include/spandsp/private/super_tone_tx.h
>+include/spandsp/private/swept_tone.h
>+include/spandsp/private/t30.h
>+include/spandsp/private/t30_dis_dtc_dcs_bits.h
>+include/spandsp/private/t31.h
>+include/spandsp/private/t38_core.h
>+include/spandsp/private/t38_gateway.h
>+include/spandsp/private/t38_non_ecm_buffer.h
>+include/spandsp/private/t38_terminal.h
>+include/spandsp/private/t4_rx.h
>+include/spandsp/private/t4_t6_decode.h
>+include/spandsp/private/t4_t6_encode.h
>+include/spandsp/private/t4_tx.h
>+include/spandsp/private/time_scale.h
>+include/spandsp/private/timezone.h
>+include/spandsp/private/tone_detect.h
>+include/spandsp/private/tone_generate.h
>+include/spandsp/private/v17rx.h
>+include/spandsp/private/v17tx.h
>+include/spandsp/private/v18.h
>+include/spandsp/private/v22bis.h
>+include/spandsp/private/v27ter_rx.h
>+include/spandsp/private/v27ter_tx.h
>+include/spandsp/private/v29rx.h
>+include/spandsp/private/v29tx.h
>+include/spandsp/private/v42.h
>+include/spandsp/private/v42bis.h
>+include/spandsp/private/v8.h
>+include/spandsp/saturated.h
>+include/spandsp/stdbool.h
>+include/spandsp/swept_tone.h
>+include/spandsp/t38_non_ecm_buffer.h
>+include/spandsp/t4_rx.h
>+include/spandsp/t4_t6_decode.h
>+include/spandsp/t4_t6_encode.h
>+include/spandsp/t4_tx.h
>+include/spandsp/timezone.h
>+include/spandsp/v18.h
> lib/libspandsp.a
> lib/libspandsp.so
>-lib/libspandsp.so.1
>-lib/libspandsp.so.1.0.0
>+lib/libspandsp.so.2
>+lib/libspandsp.so.2.0.0
>+libdata/pkgconfig/spandsp.pc
>Index: misc/libsupertone/Makefile
>===================================================================
>--- misc/libsupertone/Makefile	(wersja 373014)
>+++ misc/libsupertone/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libsupertone
> PORTVERSION=	0.0.2
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	misc
> MASTER_SITES=	http://www.soft-switch.org/downloads/unicall/
> 
>@@ -13,7 +13,7 @@
> LICENSE=	LGPL21
> 
> LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
>-		libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel \
>+		libspandsp.so:${PORTSDIR}/comms/spandsp \
> 		libtiff.so:${PORTSDIR}/graphics/tiff \
> 		libxml2.so:${PORTSDIR}/textproc/libxml2
> 
>Index: multimedia/gstreamer1-plugins/Makefile.common
>===================================================================
>--- multimedia/gstreamer1-plugins/Makefile.common	(wersja 373014)
>+++ multimedia/gstreamer1-plugins/Makefile.common	(kopia robocza)
>@@ -360,8 +360,7 @@
> 			${GST_LIB_DIR}/libgstsouphttpsrc.so
> 
> # spandsp
>-# keep shlib version here, so we don't pick up the comms/spandsp port by accident.
>-gst_spandsp_LIB_DEPENDS=	libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel
>+gst_spandsp_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
> 
> # speex
> gst_speex_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
>Index: net/asterisk/Makefile
>===================================================================
>--- net/asterisk/Makefile	(wersja 373014)
>+++ net/asterisk/Makefile	(kopia robocza)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	asterisk
> PORTVERSION=	1.8.32.1
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
> 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
>@@ -104,7 +105,7 @@
> CURL_CONFIGURE_OFF=	--with-libcurl=no
> CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
> SPANDSP_CONFIGURE_WITH=	spandsp
>-SPANDSP_LIB_DEPENDS=	libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel
>+SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
> EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
> EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon29
> SRTP_CONFIGURE_WITH=	srtp
>Index: net/asterisk11/Makefile
>===================================================================
>--- net/asterisk11/Makefile	(wersja 373014)
>+++ net/asterisk11/Makefile	(kopia robocza)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	asterisk
> PORTVERSION=	11.14.1
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
> 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
>@@ -98,7 +99,7 @@
> CURL_CONFIGURE_OFF=	--with-libcurl=no
> CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
> SPANDSP_CONFIGURE_WITH=	spandsp
>-SPANDSP_LIB_DEPENDS=	libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel
>+SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
> EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
> EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon29
> SRTP_CONFIGURE_WITH=	srtp
>Index: net/mediastreamer/Makefile
>===================================================================
>--- net/mediastreamer/Makefile	(wersja 373014)
>+++ net/mediastreamer/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mediastreamer
> PORTVERSION=	2.10.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	net
> MASTER_SITES=	SAVANNAH/linphone/mediastreamer
> 
>@@ -57,7 +57,7 @@
> OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
> 
> SPANDSP_CONFIGURE_ENABLE=	spandsp
>-SPANDSP_LIB_DEPENDS=	libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel
>+SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
> 
> SPEEX_CONFIGURE_ENABLE=	speex
> SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
>Index: net/opal/Makefile
>===================================================================
>--- net/opal/Makefile	(wersja 373014)
>+++ net/opal/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	opal
> PORTVERSION=	3.10.10
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	net
> MASTER_SITES=	GNOME
> 
>@@ -209,9 +209,8 @@
> CONFIGURE_ARGS+=	--disable-h281
> .endif
> 
>-# keep version in lib_depend, to see the difference between spandsp-devel and normal
> .if ${PORT_OPTIONS:MFAX}
>-LIB_DEPENDS+=	libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel
>+LIB_DEPENDS+=	libspandsp.so:${PORTSDIR}/comms/spandsp
> CONFIGURE_ARGS+=	--enable-spandsp --enable-fax --enable-t38
> PLIST_SUB+=	FAX=""
> .else
>Index: net/yate/Makefile
>===================================================================
>--- net/yate/Makefile	(wersja 373014)
>+++ net/yate/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	yate
> DISTVERSION=	5.4.0p1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net
> MASTER_SITES=	http://yate.null.ro/tarballs/yate5/
> DISTNAME=	${PORTNAME}-5.4.0-1
>@@ -105,7 +105,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MSPANDSP}
>-LIB_DEPENDS+=	libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel
>+LIB_DEPENDS+=	libspandsp.so:${PORTSDIR}/comms/spandsp
> CONFIGURE_ARGS+=	--with-spandsp
> PLIST_SUB+=		WITH_SPANDSP=""
> .else

Actions: View | Diff

Attachments on bug 194399: 148365 | 149292 | 149698