Hi,
this update allows linphone's mediastreamer2 lib to correctly find
bcg729, the version we ship is more than 5 years old now.
switched to cmake and removes the BDEP on net/ortp which i didnt even
notice when porting linphone bits, afaict the latter isnt used by
anything in the portstree. Once bctoolbox is in (a new ortp dep) i can
update net/ortp or move it to telephony/linphone/ortp as in my previous
submission.
the 'fetch additional files if you want to run tests' is somewhat
clever.. and ofc all tests pass. Currently building pjsip and wireshark,
can someone using asterisk-g729 check that it works with this update ?
stuart ? :)
Landry
? bcg729-1.0.2-libbcg729.so.0.1
? bcg729-1.1.1-libbcg729.so.0.1
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/bcg729/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 14 Jul 2019 00:39:40 -0000 1.6
+++ Makefile 14 Jun 2021 06:40:40 -0000
@@ -2,33 +2,34 @@
COMMENT= software G729A encoder and decoder library
-DISTNAME= bcg729-1.0.2
+V= 1.1.1
+DISTNAME= bcg729-${V}
SHARED_LIBS += bcg729 0.1 # unknown
CATEGORIES= telephony audio
-HOMEPAGE= http://www.linphone.org/technical-corner/bcg729/overview
+HOMEPAGE= http://www.linphone.org/technical-corner/bcg729/
# Dual: GPLv2(only) or commercial
PERMIT_PACKAGE= Yes
-MASTER_SITES=
http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/
+MASTER_SITES = https://gitlab.linphone.org/BC/public/bcg729/-/archive/${V}/
-BUILD_DEPENDS= net/ortp
+MODULES = devel/cmake
+CONFIGURE_ARGS +=-DENABLE_TESTS=YES
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --disable-msplugin
-
-# Use bundled libtool for the tests only; otherwise they fail to link.
-TEST_FLAGS= LIBTOOL="/bin/sh ../../libtool"
TEST_IS_INTERACTIVE= Yes
pre-test:
- @if ! [ -d ${WRKSRC}/test/patterns ]; then echo; echo \
+ @if ! [ -e ${WRKBUILD}/test/patterns ]; then echo; echo \
">>> Tests require an additional download. Please fetch"; echo \
- ">>>
http://www.belledonne-communications.com/downloads/bcg729-patterns.zip";; echo \
- ">>> and unzip it in ${WRKSRC}/test"; \
+ ">>> http://linphone.org/bc-downloads/bcg729-patterns-v1.1.0.zip";;
echo \
+ ">>> and unzip it in ${WRKBUILD}/test"; echo \
+ "#ftp -o ${WRKBUILD}/test/bcg729-patterns-v1.1.0.zip
http://linphone.org/bc-downloads/bcg729-patterns-v1.1.0.zip"; ; echo \
+ "#unzip -d ${WRKBUILD}test/
${WRKBUILD}/test/bcg729-patterns-v1.1.0.zip" \
echo; exit 1; fi
+do-test:
+ cd ${WRKBUILD}/test && sh ./testCampaignAll
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/bcg729/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 6 Aug 2017 20:09:40 -0000 1.3
+++ distinfo 14 Jun 2021 06:40:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (bcg729-1.0.2.tar.gz) = d8kj7cV6UwFNpfMXiLY++6v8cnfAberq2gZXRijksD8=
-SIZE (bcg729-1.0.2.tar.gz) = 474851
+SHA256 (bcg729-1.1.1.tar.gz) = aFmahQU10bGCkys/hlWKyKdtS4maVIGDsGKVbF/ckW0=
+SIZE (bcg729-1.1.1.tar.gz) = 122475
Index: patches/patch-test_testCampaignAll
===================================================================
RCS file: patches/patch-test_testCampaignAll
diff -N patches/patch-test_testCampaignAll
--- patches/patch-test_testCampaignAll 10 Oct 2015 13:00:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-test_testCampaignAll,v 1.1 2015/10/10 13:00:04 sthen Exp $
---- test/testCampaignAll.orig Sat Oct 10 13:44:54 2015
-+++ test/testCampaignAll Sat Oct 10 13:45:03 2015
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#!/bin/sh
- # This script check if we have the tests patterns and download them if needed
- # then run all available tests
-
Index: patches/patch-test_testCampaignAll_cmake
===================================================================
RCS file: patches/patch-test_testCampaignAll_cmake
diff -N patches/patch-test_testCampaignAll_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_testCampaignAll_cmake 14 Jun 2021 06:40:40 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: test/testCampaignAll.cmake
+--- test/testCampaignAll.cmake.orig
++++ test/testCampaignAll.cmake
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#!/bin/sh
+ # This script check if we have the tests patterns and download them if needed
+ # then run all available tests
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/telephony/bcg729/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 10 Oct 2015 12:33:16 -0000 1.1.1.1
+++ pkg/PLIST 14 Jun 2021 06:40:40 -0000
@@ -2,7 +2,12 @@
include/bcg729/
include/bcg729/decoder.h
include/bcg729/encoder.h
-lib/libbcg729.a
-lib/libbcg729.la
+@static-lib lib/libbcg729.a
@lib lib/libbcg729.so.${LIBbcg729_VERSION}
lib/pkgconfig/libbcg729.pc
+share/Bcg729/
+share/Bcg729/cmake/
+share/Bcg729/cmake/Bcg729Config.cmake
+share/Bcg729/cmake/Bcg729ConfigVersion.cmake
+share/Bcg729/cmake/Bcg729Targets${MODCMAKE_BUILD_SUFFIX}
+share/Bcg729/cmake/Bcg729Targets.cmake
