diff --git a/Backport-Use-cmake-to-look-up-abseil-dependency.patch b/Backport-Use-cmake-to-look-up-abseil-dependency.patch new file mode 100644 index 0000000000000000000000000000000000000000..86ce1f1a0ee9ba657910768e9e1e861fc29a0037 --- /dev/null +++ b/Backport-Use-cmake-to-look-up-abseil-dependency.patch @@ -0,0 +1,69 @@ +From 3f9907f93d3983033e176e95f5134a57900a7f6e Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +Date: Thu, 10 Dec 2020 19:06:31 -0500 +Subject: [PATCH] build: Use cmake to look up abseil dependency + +This should be much more robust than looking up the library directly. + +Fixes: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4 + +Reference: +https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/commit/3f9907f93d3983033e176e95f5134a57900a7f6e +https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/commit/ce1a78887a1a0dfed3ebdb4de964d7afefebe896 +https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/commit/8ce8bebb7d852491326af1075ead74e757ae4611 +--- + meson.build | 27 +++++++++++---------------- + 1 file changed, 11 insertions(+), 16 deletions(-) + +diff --git a/meson.build b/meson.build +index de8cd75..96d84d7 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ +-project('webrtc-audio-processing-1', 'c', 'cpp', +- version : '1.0', ++project('webrtc-audio-processing', 'c', 'cpp', ++ version : '1.1', + meson_version : '>= 0.54', + default_options : [ 'warning_level=1', + 'buildtype=debugoptimized', +@@ -27,7 +27,7 @@ ac_minor_version = minor_version + ac_version = ac_major_version + '.' + ac_minor_version + ac_project_name = 'webrtc-audio-coding-' + ac_major_version + +-include_subdir = meson.project_name() ++include_subdir = apm_project_name + + cc = meson.get_compiler('c') + cpp = meson.get_compiler('cpp') +@@ -40,19 +40,14 @@ os_deps = [] + have_posix = false + have_win = false + +-absl_dep = [ +- cpp.find_library('absl_base'), +- cpp.find_library('absl_bad_optional_access'), +- cpp.find_library('absl_flags_internal'), +- cpp.find_library('absl_flags_marshalling'), +- cpp.find_library('absl_flags_parse'), +- cpp.find_library('absl_flags_registry'), +- cpp.find_library('absl_flags_usage_internal'), +- cpp.find_library('absl_raw_logging_internal'), +- cpp.find_library('absl_strings'), +- cpp.find_library('absl_synchronization'), +- cpp.find_library('absl_throw_delegate'), +-] ++absl_dep = dependency('absl', method : 'cmake', ++ modules : [ ++ 'absl::base', ++ 'absl::flags_parse', ++ 'absl::strings', ++ 'absl::synchronization', ++ ] ++) + + if ['darwin', 'ios'].contains(host_system) + os_cflags = ['-DWEBRTC_MAC'] +-- +2.27.0 + diff --git a/support-riscv.patch b/support-riscv.patch deleted file mode 100644 index a18ee031bfe014d6bacf77387f57c46939586122..0000000000000000000000000000000000000000 --- a/support-riscv.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 53c01b783b8e3223ff589a794742e02647a5de98 Mon Sep 17 00:00:00 2001 -From: yangyanchao -Date: Wed, 28 Oct 2020 17:02:42 +0800 -Subject: [PATCH] huawei-support-riscv - ---- - webrtc/typedefs.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h -index d875490..bbd904e 100644 ---- a/webrtc/typedefs.h -+++ b/webrtc/typedefs.h -@@ -44,6 +44,13 @@ - #elif defined(__MIPSEL__) - #define WEBRTC_ARCH_32_BITS - #define WEBRTC_ARCH_LITTLE_ENDIAN -+#elif defined(__riscv) -+#define WEBRTC_ARCH_LITTLE_ENDIAN -+#if __riscv_xlen == 64 -+#define WEBRTC_ARCH_64_BITS -+#else -+#define WEBRTC_ARCH_32_BTIS -+#endif - #elif defined(__pnacl__) - #define WEBRTC_ARCH_32_BITS - #define WEBRTC_ARCH_LITTLE_ENDIAN --- -1.8.3.1 diff --git a/webrtc-audio-processing-0.3.1.tar.xz b/webrtc-audio-processing-0.3.1.tar.xz deleted file mode 100644 index f36e2ec5e29419fb0edd874fc41676f1a9de7d5b..0000000000000000000000000000000000000000 Binary files a/webrtc-audio-processing-0.3.1.tar.xz and /dev/null differ diff --git a/webrtc-audio-processing-1.0.tar.gz b/webrtc-audio-processing-1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e91366194eeee74fe01fd7e233cad3734514eb9a Binary files /dev/null and b/webrtc-audio-processing-1.0.tar.gz differ diff --git a/webrtc-audio-processing.spec b/webrtc-audio-processing.spec index ddcad195776dd7b0fb45a9e30dd7c89d676c47fa..26488015f6f8f8e46f85a2253e8f27b126dfe54c 100644 --- a/webrtc-audio-processing.spec +++ b/webrtc-audio-processing.spec @@ -1,13 +1,17 @@ Name: webrtc-audio-processing -Version: 0.3.1 -Release: 5 +Version: 1.0 +Release: 1 Summary: Real-Time Communication Library for Web Browsers License: BSD and MIT URL: https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/ -Source0: https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/%{name}-%{version}.tar.xz -Patch1: support-riscv.patch +Source0: https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/%{name}-%{version}.tar.gz + +# fix building failed +Patch6000: Backport-Use-cmake-to-look-up-abseil-dependency.patch BuildRequires: autoconf automake libtool gcc gcc-c++ +BuildRequires: meson abseil-cpp-devel cmake +Requires: abseil-cpp %description WebRTC is an open source project that enables web browsers with Real-Time @@ -29,39 +33,33 @@ Header files for webrtc-audio-processing %autosetup -n %{name}-%{version} -p1 %build -autoreconf -vif -%configure \ -%ifarch %{arm} aarch64 - --enable-neon=no \ -%endif - --disable-silent-rules -%make_build +%meson +%meson_build %install -%make_install - -%delete_la - -%ldconfig_scriptlets +%meson_install %files %defattr(-,root,root) %doc README.md AUTHORS %license COPYING -%{_libdir}/libwebrtc_audio_processing.so.1* +%{_libdir}/libwebrtc-audio-processing-1.so.* +%{_libdir}/libwebrtc-audio-coding-1.so.* %files devel %defattr(-,root,root) -%{_libdir}/*.a -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/libwebrtc_audio_processing.so -%{_includedir}/webrtc_audio_processing/webrtc/* - +%{_libdir}/pkgconfig/*.pc +%{_libdir}/*.so +%{_includedir}/webrtc-audio-processing-1/* + %files help %defattr(-,root,root) %doc NEWS %changelog +* Wed Dec 08 2021 wangkerong - 1.0-1 +- update to 1.0 + * Fri Nov 20 2020 yangyanchao - 0.3.1-5 - Cleancode: add patch id, change patch name