aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING7
-rw-r--r--audio/Makefile1
-rw-r--r--audio/bcg729/Makefile16
-rw-r--r--audio/bcg729/files/patch-Makefile.am11
-rw-r--r--audio/bcg729/files/patch-include_bcg729_Makefile.am13
-rw-r--r--audio/bcg729/files/patch-src_Makefile.am11
-rw-r--r--audio/bcg729/pkg-descr2
-rw-r--r--audio/bcg729/pkg-plist4
-rw-r--r--audio/msbcg729/Makefile23
-rw-r--r--audio/msbcg729/distinfo2
-rw-r--r--audio/msbcg729/pkg-descr12
-rw-r--r--audio/msbcg729/pkg-plist4
12 files changed, 53 insertions, 53 deletions
diff --git a/UPDATING b/UPDATING
index 8feda2031f64..8242121be36e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,13 @@ 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.
+20150417:
+ AFFECTS: Users of audio/bcg729
+ AUTHOR: tijl@FreeBSD.org
+
+ The Mediastreamer plugin included in this package has been separated into
+ a new port audio/msbcg729.
+
20150409:
AFFECTS: User of security/sguil
AUTHOR: feld@FreeBSD.org
diff --git a/audio/Makefile b/audio/Makefile
index bdcc3788599b..cfe94adcf0e7 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -498,6 +498,7 @@
SUBDIR += mpg321
SUBDIR += mpiosh
SUBDIR += mps
+ SUBDIR += msbcg729
SUBDIR += msilbc
SUBDIR += mumble
SUBDIR += murmur
diff --git a/audio/bcg729/Makefile b/audio/bcg729/Makefile
index 27e1f1a3961b..5e773e82bbf7 100644
--- a/audio/bcg729/Makefile
+++ b/audio/bcg729/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bcg729
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SAVANNAH/linphone/plugins/sources
@@ -14,19 +14,9 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-strict
+CONFIGURE_ARGS= --disable-msplugin --disable-strict
INSTALL_TARGET= install-strip
-USES= autoreconf libtool pkgconfig
+USES= libtool pathfix pkgconfig
USE_LDCONFIG= yes
-OPTIONS_DEFINE= MEDIASTREAMER
-OPTIONS_DEFAULT= MEDIASTREAMER
-
-MEDIASTREAMER_DESC= Mediastreamer(linphone) support
-
-OPTIONS_SUB= yes
-MEDIASTREAMER_CONFIGURE_ENABLE= msplugin
-MEDIASTREAMER_LIB_DEPENDS= libortp.so:${PORTSDIR}/net/ortp \
- libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer
-
.include <bsd.port.mk>
diff --git a/audio/bcg729/files/patch-Makefile.am b/audio/bcg729/files/patch-Makefile.am
deleted file mode 100644
index 4a227edc7caa..000000000000
--- a/audio/bcg729/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2015-02-25 20:45:18 UTC
-+++ Makefile.am
-@@ -10,7 +10,7 @@ endif
- if RUN_TESTS
- SUBDIRS += test
- endif
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libbcg729.pc
-
- rpm:
diff --git a/audio/bcg729/files/patch-include_bcg729_Makefile.am b/audio/bcg729/files/patch-include_bcg729_Makefile.am
deleted file mode 100644
index a30d64f5e9f7..000000000000
--- a/audio/bcg729/files/patch-include_bcg729_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/bcg729/Makefile.am.orig 2015-03-12 20:39:23 UTC
-+++ include/bcg729/Makefile.am
-@@ -2,9 +2,6 @@ bcg729_includedir=$(includedir)/bcg729
-
- public_headers=encoder.h decoder.h
-
--bcg729_include_HEADERS=
--if !BUILD_MSBCG729
--bcg729_include_HEADERS+=$(public_headers)
--endif
-+bcg729_include_HEADERS=$(public_headers)
-
- EXTRA_DIST=$(public_headers)
diff --git a/audio/bcg729/files/patch-src_Makefile.am b/audio/bcg729/files/patch-src_Makefile.am
deleted file mode 100644
index a84c6bb55977..000000000000
--- a/audio/bcg729/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig 2015-03-12 20:39:18 UTC
-+++ src/Makefile.am
-@@ -1,8 +1,4 @@
--if BUILD_MSBCG729
--noinst_LTLIBRARIES = libbcg729.la
--else
- lib_LTLIBRARIES = libbcg729.la
--endif
-
- libbcg729_la_SOURCES= LP2LSPConversion.c \
- LPSynthesisFilter.c \
diff --git a/audio/bcg729/pkg-descr b/audio/bcg729/pkg-descr
index 16542e106634..1bf6f9c31b15 100644
--- a/audio/bcg729/pkg-descr
+++ b/audio/bcg729/pkg-descr
@@ -7,4 +7,4 @@ It can be executed on many platforms, including both ARM and x86 with very
decent performances. libbcg729 supports concurrent channel encoding/decoding
for multi-call applications such as conferencing.
-WWW: http://www.linphone.org/technical-corner/bcg729.html
+WWW: https://www.linphone.org/technical-corner/bcg729.html
diff --git a/audio/bcg729/pkg-plist b/audio/bcg729/pkg-plist
index 462ba016d067..5fcf3b9f1f35 100644
--- a/audio/bcg729/pkg-plist
+++ b/audio/bcg729/pkg-plist
@@ -4,8 +4,4 @@ lib/libbcg729.a
lib/libbcg729.so
lib/libbcg729.so.0
lib/libbcg729.so.0.0.0
-%%MEDIASTREAMER%%lib/mediastreamer/plugins/libmsbcg729.a
-%%MEDIASTREAMER%%lib/mediastreamer/plugins/libmsbcg729.so
-%%MEDIASTREAMER%%lib/mediastreamer/plugins/libmsbcg729.so.0
-%%MEDIASTREAMER%%lib/mediastreamer/plugins/libmsbcg729.so.0.0.0
libdata/pkgconfig/libbcg729.pc
diff --git a/audio/msbcg729/Makefile b/audio/msbcg729/Makefile
new file mode 100644
index 000000000000..a6f90a5ff0f6
--- /dev/null
+++ b/audio/msbcg729/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME= msbcg729
+PORTVERSION= 1.0.0
+CATEGORIES= audio
+MASTER_SITES= SAVANNAH/linphone/plugins/sources
+DISTNAME= bcg729-${DISTVERSION}
+
+MAINTAINER= tijl@FreeBSD.org
+COMMENT= Software G729A codec plugin for Mediastreamer
+
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+LIB_DEPENDS= libortp.so:${PORTSDIR}/net/ortp \
+ libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-static --disable-strict
+INSTALL_TARGET= install-strip
+USES= libtool pkgconfig
+
+.include <bsd.port.mk>
diff --git a/audio/msbcg729/distinfo b/audio/msbcg729/distinfo
new file mode 100644
index 000000000000..f810b822ed08
--- /dev/null
+++ b/audio/msbcg729/distinfo
@@ -0,0 +1,2 @@
+SHA256 (bcg729-1.0.0.tar.gz) = f7d2ff2789c132f43ac2223e418023f512474c819ef96a24fee5b75edab840cc
+SIZE (bcg729-1.0.0.tar.gz) = 446709
diff --git a/audio/msbcg729/pkg-descr b/audio/msbcg729/pkg-descr
new file mode 100644
index 000000000000..590324041bfb
--- /dev/null
+++ b/audio/msbcg729/pkg-descr
@@ -0,0 +1,12 @@
+Bcg729 is a software G729A encoder and decoder library written in C, developed
+by Belledonne Communications, the company supporting the Linphone project.
+It was written from scratch and is NOT a derivative work of ITU reference
+source code in any kind.
+
+It can be executed on many platforms, including both ARM and x86 with very
+decent performances. libbcg729 supports concurrent channel encoding/decoding
+for multi-call applications such as conferencing.
+
+This package provides a plugin for Mediastreamer.
+
+WWW: https://www.linphone.org/technical-corner/bcg729.html
diff --git a/audio/msbcg729/pkg-plist b/audio/msbcg729/pkg-plist
new file mode 100644
index 000000000000..18155a9cd1aa
--- /dev/null
+++ b/audio/msbcg729/pkg-plist
@@ -0,0 +1,4 @@
+lib/mediastreamer/plugins/libmsbcg729.so
+lib/mediastreamer/plugins/libmsbcg729.so.0
+lib/mediastreamer/plugins/libmsbcg729.so.0.0.0
+@comment lib/pkgconfig/libbcg729.pc