summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-12-10 02:42:18 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-12-10 02:42:18 +0000
commit9539d5682495af533b7c98c1739fd4d835f0af8b (patch)
treefcc643533aae7f0ea4d44d2b4182a0b105d325ba
parentmisc/py-toil: Update 4.2.0 -> 5.0.0 (diff)
audio/webrtc-audio-processing: update to 1.0
Changes: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/compare/v0.3.1...v1.0 Reported by: Repology
Notes
Notes: svn path=/head/; revision=557409
-rw-r--r--audio/Makefile1
-rw-r--r--audio/gstreamer1-plugins-webrtcdsp/Makefile2
-rw-r--r--audio/pulseaudio/Makefile4
-rw-r--r--audio/webrtc-audio-processing/Makefile16
-rw-r--r--audio/webrtc-audio-processing/distinfo8
-rw-r--r--audio/webrtc-audio-processing/pkg-plist47
-rw-r--r--audio/webrtc-audio-processing0/Makefile20
-rw-r--r--audio/webrtc-audio-processing0/distinfo3
-rw-r--r--audio/webrtc-audio-processing0/files/patch-big-endian (renamed from audio/webrtc-audio-processing/files/patch-big-endian)0
-rw-r--r--audio/webrtc-audio-processing0/files/patch-configure.ac (renamed from audio/webrtc-audio-processing/files/patch-configure.ac)0
-rw-r--r--audio/webrtc-audio-processing0/files/patch-webrtc_base_checks.cc (renamed from audio/webrtc-audio-processing/files/patch-webrtc_base_checks.cc)0
-rw-r--r--audio/webrtc-audio-processing0/files/patch-webrtc_base_platform__thread.cc (renamed from audio/webrtc-audio-processing/files/patch-webrtc_base_platform__thread.cc)0
-rw-r--r--audio/webrtc-audio-processing0/files/patch-webrtc_base_stringutils.h (renamed from audio/webrtc-audio-processing/files/patch-webrtc_base_stringutils.h)0
-rw-r--r--audio/webrtc-audio-processing0/files/patch-webrtc_system__wrappers_source_condition__variable.cc (renamed from audio/webrtc-audio-processing/files/patch-webrtc_system__wrappers_source_condition__variable.cc)0
-rw-r--r--audio/webrtc-audio-processing0/pkg-descr12
-rw-r--r--audio/webrtc-audio-processing0/pkg-plist18
-rw-r--r--multimedia/gstreamer1-plugins/Makefile.common2
17 files changed, 104 insertions, 29 deletions
diff --git a/audio/Makefile b/audio/Makefile
index 1426aabbdc27..894010003f10 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -847,6 +847,7 @@
SUBDIR += wavpack
SUBDIR += wavplay
SUBDIR += webrtc-audio-processing
+ SUBDIR += webrtc-audio-processing0
SUBDIR += welle.io
SUBDIR += whysynth
SUBDIR += wildmidi
diff --git a/audio/gstreamer1-plugins-webrtcdsp/Makefile b/audio/gstreamer1-plugins-webrtcdsp/Makefile
index 66a6c1bccfb9..31679cbbf5ca 100644
--- a/audio/gstreamer1-plugins-webrtcdsp/Makefile
+++ b/audio/gstreamer1-plugins-webrtcdsp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= GStreamer WebRTC Audio Processing plugin
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 177cb373c260..93dbbbd96d69 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -6,7 +6,7 @@
PORTNAME= pulseaudio
PORTVERSION= 13.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
@@ -89,7 +89,7 @@ SPEEX_DESC= Speex resampler and AEC support
SPEEX_CONFIGURE_WITH= speex
SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp
WEBRTC_AEC_DESC= WebRTC-based echo canceller
-WEBRTC_AEC_LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing
+WEBRTC_AEC_LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing0
WEBRTC_AEC_CONFIGURE_ENABLE= webrtc-aec
OPTIONS_SINGLE= DATABASE
diff --git a/audio/webrtc-audio-processing/Makefile b/audio/webrtc-audio-processing/Makefile
index bcb652681cbf..bbde55f43dde 100644
--- a/audio/webrtc-audio-processing/Makefile
+++ b/audio/webrtc-audio-processing/Makefile
@@ -1,19 +1,27 @@
# $FreeBSD$
PORTNAME= webrtc-audio-processing
-PORTVERSION= 0.3.1
-PORTREVISION= 2
+DISTVERSION= 1.0
CATEGORIES= audio
MASTER_SITES= https://freedesktop.org/software/pulseaudio/${PORTNAME}/
+PATCH_SITES= https://gitlab.freedesktop.org/pulseaudio/${PORTNAME}/-/commit/
+PATCHFILES+= 2083c9a5dd34.diff:-p1 # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/merge_requests/6
+
MAINTAINER= jbeich@FreeBSD.org
COMMENT= AudioProcessing module from WebRTC project
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= autoreconf compiler:c++11-lib libtool pkgconfig tar:xz
+LIB_DEPENDS= libabsl_strings.so:devel/abseil
+
+USES= compiler:c++14-lang localbase:ldflags meson
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
+CFLAGS_i386= -msse # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
+
+post-patch:
+# https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4
+ @${REINPLACE_CMD} '/absl/s/registry/reflection/' ${WRKSRC}/meson.build
.include <bsd.port.mk>
diff --git a/audio/webrtc-audio-processing/distinfo b/audio/webrtc-audio-processing/distinfo
index f0b4010ef1ef..0d1441cafdb6 100644
--- a/audio/webrtc-audio-processing/distinfo
+++ b/audio/webrtc-audio-processing/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1532354746
-SHA256 (webrtc-audio-processing-0.3.1.tar.xz) = a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf
-SIZE (webrtc-audio-processing-0.3.1.tar.xz) = 695920
+TIMESTAMP = 1606505453
+SHA256 (webrtc-audio-processing-1.0.tar.gz) = 441a30d2717b2eb4145c6eb96c2d5a270fe0b4bc71aebf76716750c47be1936f
+SIZE (webrtc-audio-processing-1.0.tar.gz) = 856721
+SHA256 (2083c9a5dd34.diff) = e61660be88366621317924a3bbd6a852e07ee0912e96cbcbe332bf76a57761b9
+SIZE (2083c9a5dd34.diff) = 2243
diff --git a/audio/webrtc-audio-processing/pkg-plist b/audio/webrtc-audio-processing/pkg-plist
index 0cb8228850fb..f03f4397d672 100644
--- a/audio/webrtc-audio-processing/pkg-plist
+++ b/audio/webrtc-audio-processing/pkg-plist
@@ -1,18 +1,29 @@
-include/webrtc_audio_processing/webrtc/base/arraysize.h
-include/webrtc_audio_processing/webrtc/base/basictypes.h
-include/webrtc_audio_processing/webrtc/base/checks.h
-include/webrtc_audio_processing/webrtc/base/constructormagic.h
-include/webrtc_audio_processing/webrtc/base/maybe.h
-include/webrtc_audio_processing/webrtc/base/platform_file.h
-include/webrtc_audio_processing/webrtc/common.h
-include/webrtc_audio_processing/webrtc/common_types.h
-include/webrtc_audio_processing/webrtc/modules/audio_processing/beamformer/array_util.h
-include/webrtc_audio_processing/webrtc/modules/audio_processing/include/audio_processing.h
-include/webrtc_audio_processing/webrtc/modules/interface/module_common_types.h
-include/webrtc_audio_processing/webrtc/system_wrappers/include/trace.h
-include/webrtc_audio_processing/webrtc/typedefs.h
-lib/libwebrtc_audio_processing.a
-lib/libwebrtc_audio_processing.so
-lib/libwebrtc_audio_processing.so.1
-lib/libwebrtc_audio_processing.so.1.0.0
-libdata/pkgconfig/webrtc-audio-processing.pc
+include/webrtc-audio-processing-1/api/array_view.h
+include/webrtc-audio-processing-1/api/audio/echo_canceller3_config.h
+include/webrtc-audio-processing-1/api/audio/echo_control.h
+include/webrtc-audio-processing-1/api/scoped_refptr.h
+include/webrtc-audio-processing-1/modules/audio_coding/codecs/isac/bandwidth_info.h
+include/webrtc-audio-processing-1/modules/audio_coding/codecs/isac/main/include/isac.h
+include/webrtc-audio-processing-1/modules/audio_coding/codecs/isac/main/source/settings.h
+include/webrtc-audio-processing-1/modules/audio_processing/include/audio_processing.h
+include/webrtc-audio-processing-1/modules/audio_processing/include/audio_processing_statistics.h
+include/webrtc-audio-processing-1/modules/audio_processing/include/config.h
+include/webrtc-audio-processing-1/rtc_base/arraysize.h
+include/webrtc-audio-processing-1/rtc_base/checks.h
+include/webrtc-audio-processing-1/rtc_base/constructor_magic.h
+include/webrtc-audio-processing-1/rtc_base/deprecation.h
+include/webrtc-audio-processing-1/rtc_base/numerics/safe_compare.h
+include/webrtc-audio-processing-1/rtc_base/ref_count.h
+include/webrtc-audio-processing-1/rtc_base/system/file_wrapper.h
+include/webrtc-audio-processing-1/rtc_base/system/inline.h
+include/webrtc-audio-processing-1/rtc_base/system/rtc_export.h
+include/webrtc-audio-processing-1/rtc_base/type_traits.h
+include/webrtc-audio-processing-1/system_wrappers/include/cpu_features_wrapper.h
+include/webrtc-audio-processing-1/system_wrappers/include/metrics.h
+include/webrtc-audio-processing-1/system_wrappers/include/sleep.h
+lib/libwebrtc-audio-coding-1.so
+lib/libwebrtc-audio-coding-1.so.0
+lib/libwebrtc-audio-processing-1.so
+lib/libwebrtc-audio-processing-1.so.0
+libdata/pkgconfig/webrtc-audio-coding-1.pc
+libdata/pkgconfig/webrtc-audio-processing-1.pc
diff --git a/audio/webrtc-audio-processing0/Makefile b/audio/webrtc-audio-processing0/Makefile
new file mode 100644
index 000000000000..e54229968cbf
--- /dev/null
+++ b/audio/webrtc-audio-processing0/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= webrtc-audio-processing
+PORTVERSION= 0.3.1
+PORTREVISION= 2
+CATEGORIES= audio
+MASTER_SITES= https://freedesktop.org/software/pulseaudio/${PORTNAME}/
+PKGNAMESUFFIX= 0
+
+MAINTAINER= jbeich@FreeBSD.org
+COMMENT= AudioProcessing module from WebRTC project (legacy version)
+
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= autoreconf compiler:c++11-lib libtool pkgconfig tar:xz
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+
+.include <bsd.port.mk>
diff --git a/audio/webrtc-audio-processing0/distinfo b/audio/webrtc-audio-processing0/distinfo
new file mode 100644
index 000000000000..f0b4010ef1ef
--- /dev/null
+++ b/audio/webrtc-audio-processing0/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1532354746
+SHA256 (webrtc-audio-processing-0.3.1.tar.xz) = a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf
+SIZE (webrtc-audio-processing-0.3.1.tar.xz) = 695920
diff --git a/audio/webrtc-audio-processing/files/patch-big-endian b/audio/webrtc-audio-processing0/files/patch-big-endian
index 57daadce1870..57daadce1870 100644
--- a/audio/webrtc-audio-processing/files/patch-big-endian
+++ b/audio/webrtc-audio-processing0/files/patch-big-endian
diff --git a/audio/webrtc-audio-processing/files/patch-configure.ac b/audio/webrtc-audio-processing0/files/patch-configure.ac
index b41e30d1a20a..b41e30d1a20a 100644
--- a/audio/webrtc-audio-processing/files/patch-configure.ac
+++ b/audio/webrtc-audio-processing0/files/patch-configure.ac
diff --git a/audio/webrtc-audio-processing/files/patch-webrtc_base_checks.cc b/audio/webrtc-audio-processing0/files/patch-webrtc_base_checks.cc
index 82ffcf49c7ec..82ffcf49c7ec 100644
--- a/audio/webrtc-audio-processing/files/patch-webrtc_base_checks.cc
+++ b/audio/webrtc-audio-processing0/files/patch-webrtc_base_checks.cc
diff --git a/audio/webrtc-audio-processing/files/patch-webrtc_base_platform__thread.cc b/audio/webrtc-audio-processing0/files/patch-webrtc_base_platform__thread.cc
index 23840052102e..23840052102e 100644
--- a/audio/webrtc-audio-processing/files/patch-webrtc_base_platform__thread.cc
+++ b/audio/webrtc-audio-processing0/files/patch-webrtc_base_platform__thread.cc
diff --git a/audio/webrtc-audio-processing/files/patch-webrtc_base_stringutils.h b/audio/webrtc-audio-processing0/files/patch-webrtc_base_stringutils.h
index c01ec8a2c14b..c01ec8a2c14b 100644
--- a/audio/webrtc-audio-processing/files/patch-webrtc_base_stringutils.h
+++ b/audio/webrtc-audio-processing0/files/patch-webrtc_base_stringutils.h
diff --git a/audio/webrtc-audio-processing/files/patch-webrtc_system__wrappers_source_condition__variable.cc b/audio/webrtc-audio-processing0/files/patch-webrtc_system__wrappers_source_condition__variable.cc
index b1c7dd0e2d06..b1c7dd0e2d06 100644
--- a/audio/webrtc-audio-processing/files/patch-webrtc_system__wrappers_source_condition__variable.cc
+++ b/audio/webrtc-audio-processing0/files/patch-webrtc_system__wrappers_source_condition__variable.cc
diff --git a/audio/webrtc-audio-processing0/pkg-descr b/audio/webrtc-audio-processing0/pkg-descr
new file mode 100644
index 000000000000..625fcd90b737
--- /dev/null
+++ b/audio/webrtc-audio-processing0/pkg-descr
@@ -0,0 +1,12 @@
+Audio processing routines extracted from WebRTC project into a
+standalone library. It provides the following features:
+
+- Acoustic echo cancellation
+- Acoustic echo control for mobile
+- Automatic gain control
+- High-pass filter
+- Level estimator
+- Noise suppression
+- Voice activity detection
+
+WWW: https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
diff --git a/audio/webrtc-audio-processing0/pkg-plist b/audio/webrtc-audio-processing0/pkg-plist
new file mode 100644
index 000000000000..0cb8228850fb
--- /dev/null
+++ b/audio/webrtc-audio-processing0/pkg-plist
@@ -0,0 +1,18 @@
+include/webrtc_audio_processing/webrtc/base/arraysize.h
+include/webrtc_audio_processing/webrtc/base/basictypes.h
+include/webrtc_audio_processing/webrtc/base/checks.h
+include/webrtc_audio_processing/webrtc/base/constructormagic.h
+include/webrtc_audio_processing/webrtc/base/maybe.h
+include/webrtc_audio_processing/webrtc/base/platform_file.h
+include/webrtc_audio_processing/webrtc/common.h
+include/webrtc_audio_processing/webrtc/common_types.h
+include/webrtc_audio_processing/webrtc/modules/audio_processing/beamformer/array_util.h
+include/webrtc_audio_processing/webrtc/modules/audio_processing/include/audio_processing.h
+include/webrtc_audio_processing/webrtc/modules/interface/module_common_types.h
+include/webrtc_audio_processing/webrtc/system_wrappers/include/trace.h
+include/webrtc_audio_processing/webrtc/typedefs.h
+lib/libwebrtc_audio_processing.a
+lib/libwebrtc_audio_processing.so
+lib/libwebrtc_audio_processing.so.1
+lib/libwebrtc_audio_processing.so.1.0.0
+libdata/pkgconfig/webrtc-audio-processing.pc
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index 8737a0e91384..1812d865ca65 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -501,7 +501,7 @@ gst_vulkan_CONFIGURE_ARGS= --enable-wayland
gst_webp_LIB_DEPENDS= libwebp.so:graphics/webp
# webrtcdsp
-gst_webrtcdsp_LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing
+gst_webrtcdsp_LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing0
# X ximage and xvimage sinks aka output
.if ${DIST} == base