diff --git a/Backport-Use-cmake-to-look-up-abseil-dependency.patch b/Backport-Use-cmake-to-look-up-abseil-dependency.patch deleted file mode 100644 index 86ce1f1a0ee9ba657910768e9e1e861fc29a0037..0000000000000000000000000000000000000000 --- a/Backport-Use-cmake-to-look-up-abseil-dependency.patch +++ /dev/null @@ -1,69 +0,0 @@ -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/webrtc-audio-processing-1.0.tar.gz b/webrtc-audio-processing-1.0.tar.gz deleted file mode 100644 index e91366194eeee74fe01fd7e233cad3734514eb9a..0000000000000000000000000000000000000000 Binary files a/webrtc-audio-processing-1.0.tar.gz and /dev/null differ diff --git a/webrtc-audio-processing-master.tar.gz b/webrtc-audio-processing-master.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4adb6009c1b9c470f35c95b71d977b80a7525600 Binary files /dev/null and b/webrtc-audio-processing-master.tar.gz differ diff --git a/webrtc-audio-processing.spec b/webrtc-audio-processing.spec index ff08d6fcb911f3e0276957a275492527f2c25af9..245304a16afeaa7e175018b9989806db3413f8ab 100644 --- a/webrtc-audio-processing.spec +++ b/webrtc-audio-processing.spec @@ -4,10 +4,7 @@ Release: 3 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.gz - -# fix building failed -Patch6000: Backport-Use-cmake-to-look-up-abseil-dependency.patch +Source0: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/master/webrtc-audio-processing-master.tar.gz BuildRequires: autoconf automake libtool gcc gcc-c++ BuildRequires: meson abseil-cpp-devel cmake @@ -30,7 +27,7 @@ Header files for webrtc-audio-processing %package_help %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-master -p1 %build %meson @@ -57,6 +54,9 @@ Header files for webrtc-audio-processing %doc NEWS %changelog +* Wed Apr 20 2022 deng weijin - 1.0-4 +- Update. follow latest master commit to fix submodule abseil related + * Fri Mar 25 2022 wangkerong - 1.0-3 - remove self-dependency