From d899ebd3cc9b6cf2e99002ff4511fc615726dc4d Mon Sep 17 00:00:00 2001 From: Chris Rees Date: Thu, 3 Jan 2013 15:09:27 +0000 Subject: Introducing baresip 0.4.2, along with the same versions of libre and librem. re and rem must be updated first, since baresip will not compile against older versions. [ Fix linking of Speex modules PR: ports/174925 (based on) Submitted by: Anish Mistry ] --- UPDATING | 10 ++++++++++ audio/baresip/Makefile | 7 ++++--- audio/baresip/distinfo | 4 ++-- audio/baresip/files/patch-modules-v4l-v4l-c | 10 ---------- audio/baresip/files/patch-modules-v4l2-v4l2-c | 10 ---------- audio/re/Makefile | 2 +- audio/re/distinfo | 4 ++-- audio/rem/Makefile | 2 +- audio/rem/distinfo | 4 ++-- 9 files changed, 22 insertions(+), 31 deletions(-) delete mode 100644 audio/baresip/files/patch-modules-v4l-v4l-c delete mode 100644 audio/baresip/files/patch-modules-v4l2-v4l2-c diff --git a/UPDATING b/UPDATING index 411287afe2a8..5dd90017bb51 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130103: + AFFECTS: users of audio/baresip + AUTHOR: crees@FreeBSD.org + + Baresip is tightly linked to the versions of audio/re and audio/rem, and + will not build against different versions. + + To update without problems, the -R flag for portupgrade is mandatory, or + build will fail. Portmaster and pkgng will handle this correctly. + 20130103: AFFECTS: users of emulators/virtualbox-ose AUTHOR: decke@FreeBSD.org diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile index 796e623fe6e4..1d98ed449032 100644 --- a/audio/baresip/Makefile +++ b/audio/baresip/Makefile @@ -1,15 +1,15 @@ # $FreeBSD$ PORTNAME= baresip -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.2 CATEGORIES= audio MASTER_SITES= http://www.creytiv.com/pub/ MAINTAINER= crees@FreeBSD.org COMMENT= Small SIP client -BUILD_DEPENDS= ${LOCALBASE}/share/re/re.mk:${PORTSDIR}/audio/re \ - ${LOCALBASE}/include/rem/rem.h:${PORTSDIR}/audio/rem +BUILD_DEPENDS= re=${PORTVERSION}:${PORTSDIR}/audio/re \ + rem=${PORTVERSION}:${PORTSDIR}/audio/rem RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GMAKE= yes @@ -58,6 +58,7 @@ USE_SDL= sdl sound . for s in SPEEX_AEC SPEEX_PP SPEEX_RESAMP MAKE_ARGS+= USE_$s=yes . endfor +MAKE_ARGS+= HAVE_SPEEXDSP=yes .endif .if ${PORT_OPTIONS:MX11} diff --git a/audio/baresip/distinfo b/audio/baresip/distinfo index 7b27de22ba72..5df7c3d4cb36 100644 --- a/audio/baresip/distinfo +++ b/audio/baresip/distinfo @@ -1,2 +1,2 @@ -SHA256 (baresip-0.4.0.tar.gz) = e1c81730556f2cd24db94e63e4f3172892a1e8ca1047f1f506d5bbd0b436e17f -SIZE (baresip-0.4.0.tar.gz) = 288029 +SHA256 (baresip-0.4.2.tar.gz) = 3ac15b3d3cf17b2417ba871e7eaaaf41ab10cb30b900adcee357d5e91ea033e7 +SIZE (baresip-0.4.2.tar.gz) = 323824 diff --git a/audio/baresip/files/patch-modules-v4l-v4l-c b/audio/baresip/files/patch-modules-v4l-v4l-c deleted file mode 100644 index 8f74a4341172..000000000000 --- a/audio/baresip/files/patch-modules-v4l-v4l-c +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/v4l/v4l.c.orig 2012-09-01 17:58:40.658452422 +0100 -+++ modules/v4l/v4l.c 2012-09-01 17:58:49.687451121 +0100 -@@ -7,7 +7,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/audio/baresip/files/patch-modules-v4l2-v4l2-c b/audio/baresip/files/patch-modules-v4l2-v4l2-c deleted file mode 100644 index f5beef0aeac8..000000000000 --- a/audio/baresip/files/patch-modules-v4l2-v4l2-c +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/v4l2/v4l2.c.orig 2012-09-03 19:15:11.128472643 +0100 -+++ modules/v4l2/v4l2.c 2012-09-03 19:15:22.190452621 +0100 -@@ -7,7 +7,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/audio/re/Makefile b/audio/re/Makefile index 7023116977eb..9af23a09a233 100644 --- a/audio/re/Makefile +++ b/audio/re/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= re -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.2 CATEGORIES= audio devel MASTER_SITES= http://www.creytiv.com/pub/ diff --git a/audio/re/distinfo b/audio/re/distinfo index cf5ef259ec8b..c8a7affb4a27 100644 --- a/audio/re/distinfo +++ b/audio/re/distinfo @@ -1,2 +1,2 @@ -SHA256 (re-0.4.0.tar.gz) = 1057da19d56dd44ca8d36202aeb5801f611bc9840840e19f55c4f17388de0683 -SIZE (re-0.4.0.tar.gz) = 252293 +SHA256 (re-0.4.2.tar.gz) = 1585e2f954abda8e9b97a8eafa2165e816aea46fb0b7ac80220d6243f4f329b1 +SIZE (re-0.4.2.tar.gz) = 263172 diff --git a/audio/rem/Makefile b/audio/rem/Makefile index eb4f31f94a64..c5e43892c1b1 100644 --- a/audio/rem/Makefile +++ b/audio/rem/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rem -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.2 CATEGORIES= audio devel MASTER_SITES= http://www.creytiv.com/pub/ diff --git a/audio/rem/distinfo b/audio/rem/distinfo index ae4b0704cc6e..a9d3dee4b578 100644 --- a/audio/rem/distinfo +++ b/audio/rem/distinfo @@ -1,2 +1,2 @@ -SHA256 (rem-0.4.0.tar.gz) = 7b85a0945ad2632fcc950f5d29a1e38dc47e29bffa0063ec1176ad85df32e8fc -SIZE (rem-0.4.0.tar.gz) = 24352 +SHA256 (rem-0.4.2.tar.gz) = 55c66118e3026c5ed42d8b9e0c668149baefe83f1aa76394cddba2d72f45d5c7 +SIZE (rem-0.4.2.tar.gz) = 32978 -- cgit v1.2.3