Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
8440e8d100
!29 [sync] PR-28: 修复riscv64上typedef错误
From: @openeuler-sync-bot 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
2023-07-12 08:10:02 +00:00
laokz
46790c2ae5 fix riscv64 typedef error
(cherry picked from commit 0cc749101da38387805cd67ab265bda7af91fcfb)
2023-07-10 15:02:02 +08:00
openeuler-ci-bot
11ee348edb
!23 Optimize the patch for add sw architecture
From: @zhouwenpei 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-11-30 06:12:45 +00:00
zhouwenpei
2f18118280 Optimize the patch for add sw architecture 2022-11-30 02:44:34 +00:00
openeuler-ci-bot
cbe61f8f29
!20 [sync] PR-17: add loongarch64 support.
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-11-30 02:03:40 +00:00
Jingyun Hua
b38cfd72e6 Add support loongarch64
Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
(cherry picked from commit bad403b10799e93dab5cfbf617ef5f8012e3e798)
2022-11-28 15:02:20 +08:00
openeuler-ci-bot
04d2bf76b0
!19 [sync] PR-16: 添加sw架构
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-11-17 13:29:53 +00:00
wzx
bf9028d2d1 Add sw64 architecture
Signed-off-by: wzx <wuzx1226@qq.com>
(cherry picked from commit 0e3285113de339874d68204ca510ca56bed64965)
2022-11-15 08:20:23 +08:00
openeuler-ci-bot
288e5cc0f5
!12 [sync] PR-11: 【轻量级 PR】:remove self-dependency
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-03-25 02:30:54 +00:00
kerongw
d9d6093459 remove self-dependency
(cherry picked from commit 96ec46c1f2e756f756ba8ce7edcd6230c1f06cd3)
2022-03-25 10:22:34 +08:00
3 changed files with 73 additions and 7 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: 2
Release: 7
Summary: Real-Time Communication Library for Web Browsers
License: BSD and MIT
URL: https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/
@ -8,9 +8,14 @@ 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 riscv64
Patch6002: webrtc-fix-typedefs-on-other-arches.patch
%endif
BuildRequires: autoconf automake libtool gcc gcc-c++
BuildRequires: meson abseil-cpp-devel cmake webrtc-audio-processing-devel
BuildRequires: meson abseil-cpp-devel cmake
Requires: abseil-cpp
%description
@ -39,15 +44,12 @@ Header files for webrtc-audio-processing
%install
%meson_install
cp -a %{_libdir}/libwebrtc_audio_processing.so.1* %{buildroot}%{_libdir}
%files
%defattr(-,root,root)
%doc README.md AUTHORS
%license COPYING
%{_libdir}/libwebrtc-audio-processing-1.so.*
%{_libdir}/libwebrtc-audio-coding-1.so.*
%{_libdir}/libwebrtc_audio_processing.so.1*
%files devel
%defattr(-,root,root)
@ -60,7 +62,22 @@ cp -a %{_libdir}/libwebrtc_audio_processing.so.1* %{buildroot}%{_libdir}
%doc NEWS
%changelog
* Wed Dec 22 2021 wangkerong <wangkerong@huawei.com> - 1.0-1-1
* Fri Jul 07 2023 laokz <zhangkai@iscas.ac.cn> - 1.0-7
- Fix riscv64 typedef error
* 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
* Wed Dec 22 2021 wangkerong <wangkerong@huawei.com> - 1.0-2
- add the missing libwebrtc_audio_processing.so.1 fix building error
* Wed Dec 08 2021 wangkerong <wangkerong@huawei.com> - 1.0-1

View File

@ -0,0 +1,24 @@
diff -Nur a/webrtc/rtc_base/system/arch.h b/webrtc/rtc_base/system/arch.h
--- a/webrtc/rtc_base/system/arch.h 2020-11-28 03:30:53.000000000 +0800
+++ b/webrtc/rtc_base/system/arch.h 2022-04-11 14:35:41.689733918 +0800
@@ -51,7 +51,19 @@
#define WEBRTC_ARCH_32_BITS
#define WEBRTC_ARCH_LITTLE_ENDIAN
#else
-#error Please add support for your architecture in rtc_base/system/arch.h
+/* instead of failing, use typical unix defines... */
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define WEBRTC_ARCH_BIG_ENDIAN
+#else
+#error __BYTE_ORDER__ is not defined
+#endif
+#if defined(__LP64__)
+#define WEBRTC_ARCH_64_BITS
+#else
+#define WEBRTC_ARCH_32_BITS
+#endif
#endif
#if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))