!24 rebase master from 22.03-LTS-Next

From: @zhouwenpei 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2022-11-30 06:13:06 +00:00 committed by Gitee
commit 031df151b3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 37 additions and 3 deletions

View File

@ -0,0 +1,25 @@
diff -Naur webrtc-audio-processing-1.0.org/meson.build webrtc-audio-processing-1.0.sw/meson.build
--- webrtc-audio-processing-1.0.org/meson.build 2022-05-17 05:51:34.850000000 +0000
+++ webrtc-audio-processing-1.0.sw/meson.build 2022-05-17 05:58:14.940000000 +0000
@@ -80,6 +80,7 @@
have_armv7 = false
have_neon = false
have_mips = false
+have_sw_64 = false
have_mips64 = false
have_x86 = false
have_avx2 = false
diff -Naur webrtc-audio-processing-1.0.org/webrtc/rtc_base/system/arch.h webrtc-audio-processing-1.0.sw/webrtc/rtc_base/system/arch.h
--- webrtc-audio-processing-1.0.org/webrtc/rtc_base/system/arch.h 2022-05-17 05:51:34.840000000 +0000
+++ webrtc-audio-processing-1.0.sw/webrtc/rtc_base/system/arch.h 2022-05-17 05:54:18.720000000 +0000
@@ -23,6 +23,10 @@
#define WEBRTC_ARCH_X86_64
#define WEBRTC_ARCH_64_BITS
#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(_M_SW_64) || defined(__sw_64__)
+#define WEBRTC_ARCH_SW_64_FAMILY
+#define WEBRTC_ARCH_64_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
#elif defined(_M_ARM64) || defined(__aarch64__)
#define WEBRTC_ARCH_ARM_FAMILY
#define WEBRTC_ARCH_64_BITS

View File

@ -1,6 +1,6 @@
Name: webrtc-audio-processing
Version: 1.0
Release: 4
Release: 6
Summary: Real-Time Communication Library for Web Browsers
License: BSD and MIT
URL: https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/
@ -8,8 +8,11 @@ Source0: https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/%{n
# fix building failed
Patch6000: Backport-Use-cmake-to-look-up-abseil-dependency.patch
%ifarch sw_64
Patch6001: webrtc-audio-processing-1.0-sw.patch
%endif
%ifarch loongarch64
Patch0001: webrtc-fix-typedefs-on-other-arches.patch
Patch6002: webrtc-fix-typedefs-on-other-arches.patch
%endif
BuildRequires: autoconf automake libtool gcc gcc-c++
BuildRequires: meson abseil-cpp-devel cmake
@ -59,9 +62,15 @@ Header files for webrtc-audio-processing
%doc NEWS
%changelog
* Mon Nov 14 2022 huajingyun <huajingyun@loongson.cn> - 1.0-4
* Wed Nov 30 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 1.0-6
- Optimize the patch for add sw architecture
* Mon Nov 14 2022 huajingyun <huajingyun@loongson.cn> - 1.0-5
- Add support of loongarch64
* Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 1.0-4
- Add sw64 architecture
* Fri Mar 25 2022 wangkerong <wangkerong@h-partners.com> - 1.0-3
- remove self-dependency