diff --git a/0001-add-sw_64-architecture.patch b/0001-add-sw_64-architecture.patch new file mode 100644 index 0000000..25c3aa6 --- /dev/null +++ b/0001-add-sw_64-architecture.patch @@ -0,0 +1,40 @@ +From 4eb65cf5194bd556baff817842d1f1860cec6cf9 Mon Sep 17 00:00:00 2001 +From: li weigang +Date: Wed, 18 Oct 2023 15:57:26 +0800 +Subject: [PATCH] add sw_64 architecture + +--- + meson.build | 1 + + webrtc/rtc_base/system/arch.h | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/meson.build b/meson.build +index 3843e92..f92813a 100644 +--- a/meson.build ++++ b/meson.build +@@ -112,6 +112,7 @@ have_arm = false + have_armv7 = false + have_neon = false + have_mips = false ++have_sw_64 = false + have_mips64 = false + have_x86 = false + have_avx2 = false +diff --git a/webrtc/rtc_base/system/arch.h b/webrtc/rtc_base/system/arch.h +index aee3756..4e27f12 100644 +--- a/webrtc/rtc_base/system/arch.h ++++ b/webrtc/rtc_base/system/arch.h +@@ -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 +-- +2.20.1 + 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 86ce1f1..0000000 --- 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-sw.patch b/webrtc-audio-processing-1.0-sw.patch deleted file mode 100755 index f0fa27f..0000000 --- a/webrtc-audio-processing-1.0-sw.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 diff --git a/webrtc-audio-processing-1.0.tar.gz b/webrtc-audio-processing-1.0.tar.gz deleted file mode 100644 index e913661..0000000 Binary files a/webrtc-audio-processing-1.0.tar.gz and /dev/null differ diff --git a/webrtc-audio-processing-1.3.tar.gz b/webrtc-audio-processing-1.3.tar.gz new file mode 100644 index 0000000..537dff1 Binary files /dev/null and b/webrtc-audio-processing-1.3.tar.gz differ diff --git a/webrtc-audio-processing.spec b/webrtc-audio-processing.spec index 9b738fb..8ae54e3 100644 --- a/webrtc-audio-processing.spec +++ b/webrtc-audio-processing.spec @@ -1,15 +1,13 @@ Name: webrtc-audio-processing -Version: 1.0 -Release: 8 +Version: 1.3 +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.gz -# fix building failed -Patch6000: Backport-Use-cmake-to-look-up-abseil-dependency.patch %ifarch sw_64 -Patch6001: webrtc-audio-processing-1.0-sw.patch +Patch6001: 0001-add-sw_64-architecture.patch %endif %ifarch loongarch64 riscv64 Patch6002: webrtc-fix-typedefs-on-other-arches.patch @@ -64,6 +62,9 @@ sed -i '/vector/a #include ' webrtc/modules/audio_processing/aec3/reverb %doc NEWS %changelog +* Wed Oct 18 2023 li weigang - - 1.3-1 +- update to version 1.3 + * Thu Jul 20 2023 EulerOSWander <314264452@qq.com> - 1.0-8 - Fix compile error